doctrine · derrabus · Feb 7, 2022 · Feb 5, 2022
diff --git a/composer.json b/composer.json
@@ -36,7 +36,7 @@
         "psr/cache": "^1 || ^2 || ^3",
         "symfony/console": "^3.0 || ^4.0 || ^5.0 || ^6.0",
         "symfony/polyfill-php72": "^1.23",
-        "symfony/polyfill-php80": "^1.15"
+        "symfony/polyfill-php80": "^1.16"
     },
     "require-dev": {
         "doctrine/annotations": "^1.13",

diff --git a/lib/Doctrine/ORM/EntityRepository.php b/lib/Doctrine/ORM/EntityRepository.php
@@ -20,7 +20,7 @@
 use function array_slice;
 use function lcfirst;
 use function sprintf;
-use function strpos;
+use function str_starts_with;
 use function substr;
 
 /**
@@ -246,15 +246,15 @@ public function count(array $criteria)
      */
     public function __call($method, $arguments)
     {
-        if (strpos($method, 'findBy') === 0) {
+        if (str_starts_with($method, 'findBy')) {
             return $this->resolveMagicCall('findBy', substr($method, 6), $arguments);
         }
 
-        if (strpos($method, 'findOneBy') === 0) {
+        if (str_starts_with($method, 'findOneBy')) {
             return $this->resolveMagicCall('findOneBy', substr($method, 9), $arguments);
         }
 
-        if (strpos($method, 'countBy') === 0) {
+        if (str_starts_with($method, 'countBy')) {
             return $this->resolveMagicCall('count', substr($method, 7), $arguments);
         }
 

diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
@@ -35,8 +35,8 @@
 use function explode;
 use function in_array;
 use function is_subclass_of;
+use function str_contains;
 use function strlen;
-use function strpos;
 use function strtolower;
 use function substr;
 
@@ -338,7 +338,7 @@ private function addDefaultDiscriminatorMap(ClassMetadata $class): void
      */
     private function getShortName(string $className): string
     {
-        if (strpos($className, '\\') === false) {
+        if (! str_contains($className, '\\')) {
             return strtolower($className);
         }
 

diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
@@ -49,8 +49,8 @@
 use function ltrim;
 use function method_exists;
 use function spl_object_id;
+use function str_contains;
 use function str_replace;
-use function strpos;
 use function strtolower;
 use function trait_exists;
 use function trim;
@@ -2671,7 +2671,7 @@ public function setPrimaryTable(array $table)
     {
         if (isset($table['name'])) {
             // Split schema and table name from a table name like "myschema.mytable"
-            if (strpos($table['name'], '.') !== false) {
+            if (str_contains($table['name'], '.')) {
                 [$this->table['schema'], $table['name']] = explode('.', $table['name'], 2);
             }
 
@@ -2917,7 +2917,7 @@ public function addSqlResultSetMapping(array $resultMapping)
 
                         if (! isset($field['column'])) {
                             $fieldName = $field['name'];
-                            if (strpos($fieldName, '.')) {
+                            if (str_contains($fieldName, '.')) {
                                 [, $fieldName] = explode('.', $fieldName);
                             }
 
@@ -3701,7 +3701,7 @@ public function fullyQualifiedClassName($className)
             return $className;
         }

-        if (strpos($className, '\\') === false && $this->namespace) {
+        if (! str_contains($className, '\\') && $this->namespace) {
             return $this->namespace . '\\' . $className;
         }
 

diff --git a/lib/Doctrine/ORM/Mapping/DefaultNamingStrategy.php b/lib/Doctrine/ORM/Mapping/DefaultNamingStrategy.php
@@ -4,7 +4,7 @@
 
 namespace Doctrine\ORM\Mapping;
 
-use function strpos;
+use function str_contains;
 use function strrpos;
 use function strtolower;
 use function substr;
@@ -21,7 +21,7 @@ class DefaultNamingStrategy implements NamingStrategy
      */
     public function classToTableName($className)
     {
-        if (strpos($className, '\\') !== false) {
+        if (str_contains($className, '\\')) {
             return substr($className, strrpos($className, '\\') + 1);
         }
 

diff --git a/lib/Doctrine/ORM/Mapping/UnderscoreNamingStrategy.php b/lib/Doctrine/ORM/Mapping/UnderscoreNamingStrategy.php
@@ -7,7 +7,7 @@
 use Doctrine\Deprecations\Deprecation;
 
 use function preg_replace;
-use function strpos;
+use function str_contains;
 use function strrpos;
 use function strtolower;
 use function strtoupper;
@@ -79,7 +79,7 @@ public function setCase($case)
      */
     public function classToTableName($className)
     {
-        if (strpos($className, '\\') !== false) {
+        if (str_contains($className, '\\')) {
             $className = substr($className, strrpos($className, '\\') + 1);
         }
 

diff --git a/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php b/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php
@@ -48,7 +48,7 @@
 use function reset;
 use function spl_object_id;
 use function sprintf;
-use function strpos;
+use function str_contains;
 use function strtoupper;
 use function trim;
 
@@ -1733,7 +1733,7 @@ private function getSelectConditionStatementColumnSQL(
             return $columns;
         }
 
-        if ($assoc !== null && strpos($field, ' ') === false && strpos($field, '(') === false) {
+        if ($assoc !== null && ! str_contains($field, ' ') && ! str_contains($field, '(')) {
             // very careless developers could potentially open up this normally hidden api for userland attacks,
             // therefore checking for spaces and function calls which are not allowed.
 

diff --git a/lib/Doctrine/ORM/Query/Lexer.php b/lib/Doctrine/ORM/Query/Lexer.php
@@ -10,10 +10,10 @@
 use function ctype_alpha;
 use function defined;
 use function is_numeric;
+use function str_contains;
 use function str_replace;
 use function stripos;
 use function strlen;
-use function strpos;
 use function strtoupper;
 use function substr;
 
@@ -149,7 +149,7 @@ protected function getType(&$value)
         switch (true) {
             // Recognize numeric values
             case is_numeric($value):
-                if (strpos($value, '.') !== false || stripos($value, 'e') !== false) {
+                if (str_contains($value, '.') || stripos($value, 'e') !== false) {
                     return self::T_FLOAT;
                 }
 
@@ -173,11 +173,11 @@ protected function getType(&$value)
                     }
                 }
 
-                if (strpos($value, ':') !== false) {
+                if (str_contains($value, ':')) {
                     return self::T_ALIASED_NAME;
                 }
 
-                if (strpos($value, '\\') !== false) {
+                if (str_contains($value, '\\')) {
                     return self::T_FULLY_QUALIFIED_NAME;
                 }
 

diff --git a/lib/Doctrine/ORM/Query/Parser.php b/lib/Doctrine/ORM/Query/Parser.php
@@ -74,6 +74,7 @@
 use function interface_exists;
 use function is_string;
 use function sprintf;
+use function str_contains;
 use function strlen;
 use function strpos;
 use function strrpos;
@@ -670,7 +671,7 @@ private function processDeferredNewObjectExpressions(SelectStatement $AST): void
             $fromClassName = $AST->fromClause->identificationVariableDeclarations[0]->rangeVariableDeclaration->abstractSchemaName ?? null;
 
             // If the namespace is not given then assumes the first FROM entity namespace
-            if (strpos($className, '\\') === false && ! class_exists($className) && strpos($fromClassName, '\\') !== false) {
+            if (! str_contains($className, '\\') && ! class_exists($className) && str_contains($fromClassName, '\\')) {
                 $namespace = substr($fromClassName, 0, strrpos($fromClassName, '\\'));
                 $fqcn      = $namespace . '\\' . $className;
 

diff --git a/lib/Doctrine/ORM/Query/QueryExpressionVisitor.php b/lib/Doctrine/ORM/Query/QueryExpressionVisitor.php
@@ -13,7 +13,7 @@
 
 use function count;
 use function str_replace;
-use function strpos;
+use function str_starts_with;
 
 /**
  * Converts Collection expressions to Query expressions.
@@ -114,7 +114,7 @@ public function walkComparison(Comparison $comparison)
         $field = $this->queryAliases[0] . '.' . $comparison->getField();
 
         foreach ($this->queryAliases as $alias) {
-            if (strpos($comparison->getField() . '.', $alias . '.') === 0) {
+            if (str_starts_with($comparison->getField() . '.', $alias . '.')) {
                 $field = $comparison->getField();
                 break;
             }

diff --git a/lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php b/lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php
@@ -15,7 +15,7 @@
 use function explode;
 use function in_array;
 use function sprintf;
-use function strpos;
+use function str_contains;
 use function strtolower;
 
 /**
@@ -381,7 +381,7 @@ public function addNamedNativeQueryEntityResultMapping(ClassMetadataInfo $classM
                 $fieldName = $field['name'];
                 $relation  = null;
 
-                if (strpos($fieldName, '.') !== false) {
+                if (str_contains($fieldName, '.')) {
                     [$relation, $fieldName] = explode('.', $fieldName);
                 }
 

diff --git a/lib/Doctrine/ORM/QueryBuilder.php b/lib/Doctrine/ORM/QueryBuilder.php
@@ -27,6 +27,7 @@
 use function key;
 use function reset;
 use function sprintf;
+use function str_starts_with;
 use function strpos;
 use function strrpos;
 use function substr;
@@ -1334,7 +1335,7 @@ public function addCriteria(Criteria $criteria)
             foreach ($criteria->getOrderings() as $sort => $order) {
                 $hasValidAlias = false;
                 foreach ($allAliases as $alias) {
-                    if (strpos($sort . '.', $alias . '.') === 0) {
+                    if (str_starts_with($sort . '.', $alias . '.')) {
                         $hasValidAlias = true;
                         break;
                     }

diff --git a/lib/Doctrine/ORM/Tools/EntityGenerator.php b/lib/Doctrine/ORM/Tools/EntityGenerator.php
@@ -42,10 +42,10 @@
 use function max;
 use function mkdir;
 use function sprintf;
+use function str_contains;
 use function str_repeat;
 use function str_replace;
 use function strlen;
-use function strpos;
 use function strrpos;
 use function strtolower;
 use function substr;
@@ -960,7 +960,7 @@ protected function getTraits(ClassMetadataInfo $metadata)
      */
     protected function hasNamespace(ClassMetadataInfo $metadata)
     {
-        return (bool) strpos($metadata->name, '\\');
+        return str_contains($metadata->name, '\\');
     }
 
     /**

diff --git a/tests/Doctrine/Tests/ORM/Functional/ManyToOneOrphanRemovalTest.php b/tests/Doctrine/Tests/ORM/Functional/ManyToOneOrphanRemovalTest.php
@@ -4,10 +4,10 @@
 
 namespace Doctrine\Tests\ORM\Functional;
 
-use Doctrine\DBAL\Connection;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping\Driver\XmlDriver;
 use Doctrine\Persistence\Mapping\Driver\MappingDriver;
+use Doctrine\Tests\DbalExtensions\Connection;
 use Doctrine\Tests\Models\OrnementalOrphanRemoval\Person;
 use Doctrine\Tests\Models\OrnementalOrphanRemoval\PhoneNumber;
 use Doctrine\Tests\OrmFunctionalTestCase;

diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DBAL483Test.php b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DBAL483Test.php
@@ -12,7 +12,7 @@
 use Doctrine\Tests\OrmFunctionalTestCase;
 
 use function array_filter;
-use function strpos;
+use function str_contains;
 
 class DBAL483Test extends OrmFunctionalTestCase
 {
@@ -37,7 +37,7 @@ public function testDefaultValueIsComparedCorrectly(): void
         $updateSql = $this->schemaTool->getUpdateSchemaSql([$class]);
 
         $updateSql = array_filter($updateSql, static function ($sql) {
-            return strpos($sql, 'DBAL483') !== false;
+            return str_contains($sql, 'DBAL483');
         });
 
         self::assertCount(0, $updateSql);

diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DDC214Test.php b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DDC214Test.php
@@ -14,7 +14,7 @@
 use function array_filter;
 use function implode;
 use function method_exists;
-use function strpos;
+use function str_contains;
 
 use const PHP_EOL;
 
@@ -106,7 +106,7 @@ public function assertCreatedSchemaNeedsNoUpdates($classes): void
 
         $sql = $schemaDiff->toSql($this->_em->getConnection()->getDatabasePlatform());
         $sql = array_filter($sql, static function ($sql) {
-            return strpos($sql, 'DROP') === false;
+            return ! str_contains($sql, 'DROP');
         });
 
         self::assertCount(0, $sql, 'SQL: ' . implode(PHP_EOL, $sql));

diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/PostgreSqlSchemaToolTest.php b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/PostgreSqlSchemaToolTest.php
@@ -19,7 +19,7 @@
 use function array_filter;
 use function array_shift;
 use function implode;
-use function strpos;
+use function str_starts_with;
 
 class PostgreSqlSchemaToolTest extends OrmFunctionalTestCase
 {
@@ -120,7 +120,7 @@ public function testGetDropSchemaSql(): void
         $dropSequenceSQLs = 0;
 
         foreach ($sql as $stmt) {
-            if (strpos($stmt, 'DROP SEQUENCE') === 0) {
+            if (str_starts_with($stmt, 'DROP SEQUENCE')) {
                 $dropSequenceSQLs++;
             }
         }
@@ -143,7 +143,7 @@ public function testUpdateSchemaWithPostgreSQLSchema(): void
 
         $sql = $tool->getUpdateSchemaSql($classes);
         $sql = array_filter($sql, static function ($sql) {
-            return strpos($sql, 'DROP SEQUENCE stonewood.') === 0;
+            return str_starts_with($sql, 'DROP SEQUENCE stonewood.');
         });
 
         self::assertCount(0, $sql, implode("\n", $sql));

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH7875Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH7875Test.php
@@ -18,7 +18,8 @@
 use function current;
 use function method_exists;
 use function sprintf;
-use function strpos;
+use function str_contains;
+use function str_starts_with;
 
 /** @group GH7875 */
 final class GH7875Test extends OrmFunctionalTestCase
@@ -46,7 +47,7 @@ public function cleanUpSchema(): void
     private function filterCreateTable(array $sqls, string $tableName): array
     {
         return array_filter($sqls, static function (string $sql) use ($tableName): bool {
-            return strpos($sql, sprintf('CREATE TABLE %s (', $tableName)) === 0;
+            return str_starts_with($sql, sprintf('CREATE TABLE %s (', $tableName));
         });
     }
 
@@ -62,7 +63,7 @@ public function testUpdateSchemaSql(): void
         $this->_em->getConnection()->executeStatement(current($sqls));
 
         $sqls = array_filter($tool->getUpdateSchemaSql($classes), static function (string $sql): bool {
-            return strpos($sql, ' gh7875_my_entity ') !== false;
+            return str_contains($sql, ' gh7875_my_entity ');
         });
 
         self::assertSame([], $sqls);
@@ -114,7 +115,7 @@ public function testUpdateSchemaSqlWithSchemaAssetFilter(?string $filterRegex, ?
 
         $sqls = $tool->getUpdateSchemaSql($classes);
         $sqls = array_filter($sqls, static function (string $sql): bool {
-            return strpos($sql, ' gh7875_my_entity ') !== false;
+            return str_contains($sql, ' gh7875_my_entity ');
         });
 
         self::assertCount(0, $sqls);