fix(qa) apply PHP74Migration:risky rule

FriendsOfSymfony1 · Feb 6, 2024 · d75496e · d75496e
1 parent bfd53f9
commit d75496e
Show file tree

Hide file tree

Showing 16 changed files with 30 additions and 32 deletions.
diff --git a/lib/Doctrine/Adapter/Statement/Oracle.php b/lib/Doctrine/Adapter/Statement/Oracle.php
@@ -152,7 +152,7 @@ public function bindParam($column, &$variable, $type = null, $length = null, $dr
                 break;
         }
 
-        if (is_integer($column)) {
+        if (is_int($column)) {
             $variable_name = ":oci_b_var_{$column}";
         } else {
             $variable_name = $column;
@@ -381,7 +381,7 @@ public function fetchAll($fetchStyle = Doctrine_Core::FETCH_BOTH, $colnum = 0)
      */
     public function fetchColumn($columnIndex = 0)
     {
-        if (!is_integer($columnIndex)) {
+        if (!is_int($columnIndex)) {
             $this->handleError(['message' => 'columnIndex parameter should be numeric']);
 
             return false;
@@ -452,7 +452,7 @@ public function fetchObject($className = 'stdClass', $args = [])
      */
     public function getColumnMeta($column)
     {
-        if (is_integer($column)) {
+        if (is_int($column)) {
             $internal_column = $column + 1;
         } else {
             $internal_column = $column;

diff --git a/lib/Doctrine/Connection/Mssql.php b/lib/Doctrine/Connection/Mssql.php
@@ -177,7 +177,7 @@ private function parseOrderBy($orderby)
         $tokens = preg_split('/,/', $parsed);
 
         for ($i = 0, $iMax = count($tokens); $i < $iMax; ++$i) {
-            $tokens[$i] = trim(preg_replace_callback('/##(\d+)##/', function ($m) { return $chunks[$m[1]]; }, $tokens[$i]));
+            $tokens[$i] = trim(preg_replace_callback('/##(\d+)##/', fn ($m) => $chunks[$m[1]], $tokens[$i]));
         }
 
         return $tokens;
@@ -323,9 +323,7 @@ protected function replaceBoundParamsWithInlineValuesInQuery($query, array $para
 
         $self = $this;
 
-        return preg_replace_callback('/##(\d+)##/', function ($m) use ($params, $self) {
-            return (null === $params[$m[1]]) ? 'NULL' : $self->quote($params[$m[1]]);
-        }, $query);
+        return preg_replace_callback('/##(\d+)##/', fn ($m) => (null === $params[$m[1]]) ? 'NULL' : $self->quote($params[$m[1]]), $query);
     }
 
     /**

diff --git a/lib/Doctrine/Expression/Driver.php b/lib/Doctrine/Expression/Driver.php
@@ -308,7 +308,7 @@ public function concat()
     {
         $args = func_get_args();
 
-        return 'CONCAT('.join(', ', (array) $args).')';
+        return 'CONCAT('.implode(', ', (array) $args).')';
     }
 
     /**
@@ -635,7 +635,7 @@ public function coalesce()
     {
         $args = func_get_args();
 
-        return 'COALESCE('.join(', ', (array) $args).')';
+        return 'COALESCE('.implode(', ', (array) $args).')';
     }
 
     /**

diff --git a/lib/Doctrine/Expression/Oracle.php b/lib/Doctrine/Expression/Oracle.php
@@ -40,7 +40,7 @@ public function concat()
     {
         $args = func_get_args();
 
-        return join(' || ', $args);
+        return implode(' || ', $args);
     }
 
     /**

diff --git a/lib/Doctrine/Expression/Pgsql.php b/lib/Doctrine/Expression/Pgsql.php
@@ -137,7 +137,7 @@ public function concat()
     {
         $args = func_get_args();
 
-        return join(' || ', $args);
+        return implode(' || ', $args);
     }
 
     /**

diff --git a/lib/Doctrine/Expression/Sqlite.php b/lib/Doctrine/Expression/Sqlite.php
@@ -59,7 +59,7 @@ public static function concatImpl()
     {
         $args = func_get_args();
 
-        return join('', $args);
+        return implode('', $args);
     }
 
     /**

diff --git a/lib/Doctrine/Import/Builder.php b/lib/Doctrine/Import/Builder.php
@@ -739,12 +739,12 @@ public function buildPhpDocs(array $definition)
                 if (isset($phpCommentMap[$column['type']])) {
                     $comment = $phpCommentMap[$column['type']];
                     if ('enum' == $column['type']) {
-                        $comment = sprintf($comment, strtoupper(join(', ', $column['values'])));
+                        $comment = sprintf($comment, strtoupper(implode(', ', $column['values'])));
                     }
                     $commentOptions[] = $comment;
                 }
 
-                $comment = join(', ', $commentOptions);
+                $comment = implode(', ', $commentOptions);
 
                 $fieldName = trim($fieldName);
 

diff --git a/lib/Doctrine/Parser/sfYaml/sfYamlInline.php b/lib/Doctrine/Parser/sfYaml/sfYamlInline.php
@@ -120,7 +120,7 @@ protected static function dumpArray($value)
         $keys = array_keys($value);
         if (
             (1 == count($keys) && '0' == $keys[0])
-            || (count($keys) > 1 && array_reduce($keys, function ($v, $w) { return (int) ($v + $w); }, 0) == count($keys) * (count($keys) - 1) / 2)) {
+            || (count($keys) > 1 && array_reduce($keys, fn ($v, $w) => (int) ($v + $w), 0) == count($keys) * (count($keys) - 1) / 2)) {
             $output = [];
             foreach ($value as $val) {
                 $output[] = self::dump($val);

diff --git a/lib/Doctrine/Query/Abstract.php b/lib/Doctrine/Query/Abstract.php
@@ -1078,7 +1078,7 @@ public function execute($params = [], $hydrationMode = null)
         } else {
             $stmt = $this->_execute($params);
 
-            if (is_integer($stmt)) {
+            if (is_int($stmt)) {
                 $result = $stmt;
             } else {
                 $this->_hydrator->setQueryComponents($this->_queryComponents);

diff --git a/lib/Doctrine/Query/Tokenizer.php b/lib/Doctrine/Query/Tokenizer.php
@@ -358,7 +358,7 @@ private function clauseExplodeCountBrackets($str, $regexp, $e1 = '(', $e2 = ')')
                 }
 
                 $terms = array_merge($terms, $subterms);
-                $i += sizeof($subterms);
+                $i += count($subterms);
             }
         }
 

diff --git a/lib/Doctrine/Record.php b/lib/Doctrine/Record.php
@@ -955,7 +955,7 @@ public function state($state = null)
         }
 
         $err = false;
-        if (is_integer($state)) {
+        if (is_int($state)) {
             if ($state >= 1 && $state <= 7) {
                 $this->_state = $state;
             } else {

diff --git a/tests/ConnectionTestCase.php b/tests/ConnectionTestCase.php
@@ -185,7 +185,7 @@ public function testGetDbh()
 
     public function testCount()
     {
-        $this->assertTrue(is_integer(count($this->connection)));
+        $this->assertTrue(is_int(count($this->connection)));
     }
 
     public function testGetIterator()

diff --git a/tests/ManagerTestCase.php b/tests/ManagerTestCase.php
@@ -57,7 +57,7 @@ public function testGetIterator()
 
     public function testCount()
     {
-        $this->assertTrue(is_integer(count($this->manager)));
+        $this->assertTrue(is_int(count($this->manager)));
     }
 
     public function testGetCurrentConnection()
@@ -67,7 +67,7 @@ public function testGetCurrentConnection()
 
     public function testGetConnections()
     {
-        $this->assertTrue(is_integer(count($this->manager->getConnections())));
+        $this->assertTrue(is_int(count($this->manager->getConnections())));
     }
 
     public function testClassifyTableize()

diff --git a/tests/RecordTestCase.php b/tests/RecordTestCase.php
@@ -840,7 +840,7 @@ public function testCount()
     {
         $user = $this->connection->getTable('User')->find(4);
 
-        $this->assertTrue(is_integer($user->count()));
+        $this->assertTrue(is_int($user->count()));
     }
 
     public function testGetReference()

diff --git a/tests/Ticket/1195TestCase.php b/tests/Ticket/1195TestCase.php
@@ -79,11 +79,11 @@ public function testRawSQLDistinct()
         ;
 
         $res = $q->execute([], Doctrine_Core::HYDRATE_ARRAY);
-        $this->assertEqual(sizeof($res), 2);
+        $this->assertEqual(count($res), 2);
 
         $q->distinct();
         $res = $q->execute([], Doctrine_Core::HYDRATE_ARRAY);
-        $this->assertEqual(sizeof($res), 1);
+        $this->assertEqual(count($res), 1);
     }
 
     public function testRawSQLCount()

diff --git a/tests/Ticket/2375TestCase.php b/tests/Ticket/2375TestCase.php
@@ -48,8 +48,8 @@ public function testTest()
         $this->assertEqual(2, count($models1));
 
         // make sure the right models were loaded
-        $this->assertTrue(key_exists('Ticket_2375_Model1', $models1));
-        $this->assertTrue(key_exists('Ticket_2375_Model2', $models1));
+        $this->assertTrue(array_key_exists('Ticket_2375_Model1', $models1));
+        $this->assertTrue(array_key_exists('Ticket_2375_Model2', $models1));
 
         // get a list of all models that have been loaded
         $loadedModels = Doctrine_Core::getLoadedModelFiles();
@@ -63,10 +63,10 @@ public function testTest()
         $models2 = Doctrine_Core::loadModels($models2Dir);
 
         // make sure the right models were loaded
-        $this->assertTrue(key_exists('Ticket_2375_Model3', $models2));
-        $this->assertTrue(key_exists('Ticket_2375_Model4', $models2));
-        $this->assertTrue(key_exists('Ticket_2375_Model5', $models2));
-        $this->assertTrue(key_exists('Ticket_2375_Model6', $models2));
+        $this->assertTrue(array_key_exists('Ticket_2375_Model3', $models2));
+        $this->assertTrue(array_key_exists('Ticket_2375_Model4', $models2));
+        $this->assertTrue(array_key_exists('Ticket_2375_Model5', $models2));
+        $this->assertTrue(array_key_exists('Ticket_2375_Model6', $models2));
 
         // get a list of all models that have been loaded
         $loadedModels = Doctrine_Core::getLoadedModelFiles();
@@ -84,8 +84,8 @@ public function testTest()
         $models1 = Doctrine_Core::loadModels($models1Dir);
 
         // make sure the right models were loaded
-        $this->assertTrue(key_exists('Ticket_2375_Model1', $models1));
-        $this->assertTrue(key_exists('Ticket_2375_Model2', $models1));
+        $this->assertTrue(array_key_exists('Ticket_2375_Model1', $models1));
+        $this->assertTrue(array_key_exists('Ticket_2375_Model2', $models1));
 
         // get a list of all models that have been loaded
         $loadedModels = Doctrine_Core::getLoadedModelFiles();