Upgrading php-cs-fixer and adding some php 8 rulesets (#385)

Author: jaydiablo

.github/workflows/build.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ${{ matrix.operating-system }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:

.php-cs-fixer.php

@@ -10,10 +10,13 @@
 
 $config = new PhpCsFixer\Config();
 return $config
+    ->setParallelConfig(PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect())
     ->setRiskyAllowed(true)
     ->setRules(array(
         '@PSR2'                  => true,
-        '@PHP70Migration:risky'  => true,
+        '@PHP7x0Migration:risky' => true,
+        '@PHP8x0Migration'       => true,
+        '@PHP8x1Migration'       => true,
         'binary_operator_spaces' => array(
             'default'   => 'align_single_space_minimal',
             'operators' => array('||' => null, '&&' => null)

composer.json

@@ -29,21 +29,14 @@
     "replace": {
         "doctrine/doctrine1": "*"
     },
-    "repositories": [
-        {
-            "type": "vcs",
-            "no-api": true,
-            "url": "https://github.com/diablomedia/phpstorm-stubs"
-        }
-    ],
     "require": {
         "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
         "ext-pdo": "*",
         "symfony/yaml": "^5.0 || ^6.0 || ^7.0"
     },
     "require-dev": {
         "phpunit/php-code-coverage": "^9.1.10",
-        "friendsofphp/php-cs-fixer": "^3.75.0",
+        "friendsofphp/php-cs-fixer": "^3.88.0",
         "phpstan/phpstan": "2.1.17",
         "vimeo/psalm": "6.11.0"
     },

lib/Doctrine/Adapter/Oracle.php

@@ -70,7 +70,7 @@ class Doctrine_Adapter_Oracle implements Doctrine_Adapter_Interface
         'username'   => null,
         'password'   => null,
         'charset'    => null,
-        'persistent' => false
+        'persistent' => false,
     );
 
     /**

lib/Doctrine/Adapter/Statement/Oracle.php

@@ -397,7 +397,7 @@ public function fetchColumn($columnIndex = 0)
             return false;
         }
         $row = $this->fetch(Doctrine_Core::FETCH_NUM);
-        return isset($row[$columnIndex]) ? $row[$columnIndex] : false;
+        return $row[$columnIndex] ?? false;
     }
 
     /**

lib/Doctrine/AuditLog.php

@@ -169,6 +169,6 @@ public function getMaxVersion(Doctrine_Record $record)
 
         $result = $q->execute($values, Doctrine_Core::HYDRATE_ARRAY);
 
-        return isset($result[0]['max_version']) ? $result[0]['max_version']:0;
+        return $result[0]['max_version'] ?? 0;
     }
 }

lib/Doctrine/Cache/Db.php

@@ -176,18 +176,18 @@ public function createTable()
         $fields = array(
             'id' => array(
                 'type'   => 'string',
-                'length' => 255
+                'length' => 255,
             ),
             'data' => array(
-                'type' => 'blob'
+                'type' => 'blob',
             ),
             'expire' => array(
-                'type' => 'timestamp'
-            )
+                'type' => 'timestamp',
+            ),
         );
 
         $options = array(
-            'primary' => array('id')
+            'primary' => array('id'),
         );
 
         $this->getConnection()->export->createTable($name, $fields, $options);

lib/Doctrine/Cache/Driver.php

@@ -225,7 +225,7 @@ public function deleteAll()
      */
     protected function _getKey($id)
     {
-        $prefix = isset($this->_options['prefix']) ? $this->_options['prefix'] : '';
+        $prefix = $this->_options['prefix'] ?? '';
 
         if (! $prefix || strpos($id, $prefix) === 0) {
             return $id;

lib/Doctrine/Cli.php

@@ -39,7 +39,7 @@ class Doctrine_Cli
      *
      * @var string
      */
-    const TASK_BASE_CLASS = 'Doctrine_Task';
+    public const TASK_BASE_CLASS = 'Doctrine_Task';
 
     /**
      * @var string
@@ -502,7 +502,7 @@ protected function _run(array $args)
     {
         $this->_scriptName = $args[0];
 
-        $requestedTaskName = isset($args[1]) ? $args[1] : null;
+        $requestedTaskName = $args[1] ?? null;
 
         if (! $requestedTaskName || $requestedTaskName == 'help') {
             $this->printTasks(null, $requestedTaskName == 'help' ? true : false);

lib/Doctrine/Collection.php

@@ -193,7 +193,7 @@ public function __unserialize(array $array): void
 
         $this->_table = $connection->getTable((string) $this->_table);
 
-        $keyColumn = isset($array['keyColumn']) ? $array['keyColumn'] : null;
+        $keyColumn = $array['keyColumn'] ?? null;
         if ($keyColumn === null) {
             $keyColumn = $this->_table->getBoundQueryPart('indexBy');
         }