Skip to content

Commit

Permalink
Merge pull request #147 from shmurakami/remove-final-from-private
Browse files Browse the repository at this point in the history
final modifier for private method is no longer allowed in PHP8
  • Loading branch information
marc-mabe authored Sep 29, 2020
2 parents 57b9799 + e99fc17 commit 3a43735
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/Enum.php
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public function __toString(): string
* @throws LogicException Enums are not cloneable
* because instances are implemented as singletons
*/
final private function __clone()
final protected function __clone()
{
throw new LogicException('Enums are not cloneable');
}
Expand Down
6 changes: 3 additions & 3 deletions tests/MabeEnumTest/EnumTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ public function testGetNamesConstantsNotDetected(): void
$this->assertSame($expectedNames[$i], $names[$i]);
}
}

public function testGetOrdinals(): void
{
$constants = EnumInheritance::getConstants();
Expand Down Expand Up @@ -376,7 +376,7 @@ public function testCloneNotCallableAndThrowsLogicException(): void

$reflectionClass = new ReflectionClass($enum);
$reflectionMethod = $reflectionClass->getMethod('__clone');
$this->assertTrue($reflectionMethod->isPrivate(), 'The method __clone must be private');
$this->assertTrue($reflectionMethod->isProtected(), 'The method __clone must be protected');
$this->assertTrue($reflectionMethod->isFinal(), 'The method __clone must be final');

$reflectionMethod->setAccessible(true);
Expand Down Expand Up @@ -432,7 +432,7 @@ public function testConstVisibility(): void
'PUB' => ConstVisibilityEnum::PUB,
), $constants);
}

public function testConstVisibilityExtended(): void
{
$constants = ConstVisibilityEnumExtended::getConstants();
Expand Down

0 comments on commit 3a43735

Please sign in to comment.