diff --git a/composer.json b/composer.json index d213c6b258..6f2ba3f31d 100644 --- a/composer.json +++ b/composer.json @@ -45,7 +45,7 @@ "phpbench/phpbench": "^1.0.0", "phpstan/phpstan": "^1.4.6", "phpstan/phpstan-phpunit": "^1.0", - "phpunit/phpunit": "^9", + "phpunit/phpunit": "^9.5", "squizlabs/php_codesniffer": "^3.5", "symfony/cache": "^4.4 || ^5.0 || ^6.0", "vimeo/psalm": "^4.20.0" diff --git a/lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadata.php b/lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadata.php index cc214dc926..7272acf1ef 100644 --- a/lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadata.php +++ b/lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadata.php @@ -2597,8 +2597,7 @@ private function checkDuplicateMapping(array $mapping): void private function isTypedProperty(string $name): bool { - return PHP_VERSION_ID >= 70400 - && $this->reflClass->hasProperty($name) + return $this->reflClass->hasProperty($name) && $this->reflClass->getProperty($name)->hasType(); } diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Functional/FunctionalTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Functional/FunctionalTest.php index 97971903a0..96d116b50c 100644 --- a/tests/Doctrine/ODM/MongoDB/Tests/Functional/FunctionalTest.php +++ b/tests/Doctrine/ODM/MongoDB/Tests/Functional/FunctionalTest.php @@ -52,28 +52,16 @@ use function assert; use function bcscale; -use function bcsqrt; -use function min; -use function strlen; -use function version_compare; - -use const PHP_VERSION; class FunctionalTest extends BaseTest { - /** @var int */ - private $initialScale; + private int $initialScale; public function setUp(): void { parent::setUp(); - if (version_compare('7.3.0', PHP_VERSION, '<=')) { - $this->initialScale = bcscale(2); - } else { - $this->initialScale = min(0, strlen(bcsqrt('2')) - 2); - bcscale(2); - } + $this->initialScale = bcscale(2); } public function tearDown(): void diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Functional/Ticket/GH2310Test.php b/tests/Doctrine/ODM/MongoDB/Tests/Functional/Ticket/GH2310Test.php index 6411f99f64..105ec9c01d 100644 --- a/tests/Doctrine/ODM/MongoDB/Tests/Functional/Ticket/GH2310Test.php +++ b/tests/Doctrine/ODM/MongoDB/Tests/Functional/Ticket/GH2310Test.php @@ -9,9 +9,6 @@ use Documents74\GH2310Embedded; use MongoDB\BSON\ObjectId; -/** - * @requires PHP 7.4 - */ class GH2310Test extends BaseTest { public function testFindWithNullableEmbeddedAfterUpsert(): void diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Functional/TypedPropertiesTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Functional/TypedPropertiesTest.php index f28041c3d3..f764884607 100644 --- a/tests/Doctrine/ODM/MongoDB/Tests/Functional/TypedPropertiesTest.php +++ b/tests/Doctrine/ODM/MongoDB/Tests/Functional/TypedPropertiesTest.php @@ -11,9 +11,6 @@ use function assert; -/** - * @requires PHP 7.4 - */ class TypedPropertiesTest extends BaseTest { public function testPersistNew(): void diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Mapping/AbstractMappingDriverTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Mapping/AbstractMappingDriverTest.php index b570bab7ec..57de6aa5af 100644 --- a/tests/Doctrine/ODM/MongoDB/Tests/Mapping/AbstractMappingDriverTest.php +++ b/tests/Doctrine/ODM/MongoDB/Tests/Mapping/AbstractMappingDriverTest.php @@ -200,9 +200,6 @@ public function testIdentifier(ClassMetadata $class): ClassMetadata return $class; } - /** - * @requires PHP >= 7.4 - */ public function testFieldTypeFromReflection(): void { $class = $this->dm->getClassMetadata(UserTyped::class); diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Mapping/ClassMetadataTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Mapping/ClassMetadataTest.php index d664a9c566..04b9a8ad81 100644 --- a/tests/Doctrine/ODM/MongoDB/Tests/Mapping/ClassMetadataTest.php +++ b/tests/Doctrine/ODM/MongoDB/Tests/Mapping/ClassMetadataTest.php @@ -143,9 +143,6 @@ public function testFieldIsNullable(): void $this->assertFalse($cm->isNullable('name'), 'By default a field should not be nullable.'); } - /** - * @requires PHP >= 7.4 - */ public function testFieldTypeFromReflection(): void { $cm = new ClassMetadata(UserTyped::class);