Merge branch 'master' into symfony6

.github/workflows/bc.yml

@@ -11,7 +11,7 @@ jobs:
     name: Roave BC Check
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v4.1.2
       - name: fetch tags
         run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
       - name: Roave BC Check

.github/workflows/build.yml

@@ -13,12 +13,12 @@ jobs:
             fail-fast: false
             matrix:
                 operating-system: [ubuntu-latest]
-                php-versions: ['7.4', '8.0', '8.1']
+                php-versions: ['7.4', '8.0', '8.1', '8.2']
                 composer-args: ['', '--prefer-lowest']
         runs-on: ${{ matrix.operating-system }}
         steps:
             - name: Checkout
-              uses: actions/checkout@v3.1.0
+              uses: actions/checkout@v4.1.2
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
               with:
@@ -43,5 +43,4 @@ jobs:
               uses: codecov/codecov-action@v3
               with:
                 files: ./tests/coverage/clover.xml
-                fail_ci_if_error: true
                 verbose: true

.github/workflows/dependabot-auto-merge.yml

@@ -0,0 +1,22 @@
+name: Dependabot auto-merge
+on: pull_request
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  dependabot:
+    runs-on: ubuntu-latest
+    if: ${{ github.actor == 'dependabot[bot]' }}
+    steps:
+      - name: Dependabot metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@v1
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+      - name: Enable auto-merge for Dependabot PRs
+        run: gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

composer.json

@@ -37,15 +37,15 @@
         }
     ],
     "require": {
-        "php": "^7.4 || ~8.0.0 || ^8.1.0",
+        "php": "^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0",
         "ext-pdo": "*",
         "symfony/yaml": "^3.4 || ^4.1 || ^5.0 || ^6.0 || ^7.0"
     },
     "require-dev": {
         "phpunit/php-code-coverage": "^9.1.10",
-        "friendsofphp/php-cs-fixer": "3.6.0",
-        "phpstan/phpstan": "1.4.2",
-        "vimeo/psalm": "4.17.0"
+        "friendsofphp/php-cs-fixer": "^3.51.0",
+        "phpstan/phpstan": "1.10.14",
+        "vimeo/psalm": "5.9.0"
     },
     "scripts": {
         "test": "cd tests && php run.php",

lib/Doctrine/Adapter/Oracle.php

@@ -255,7 +255,7 @@ public function setAttribute($attribute, $value)
             case Doctrine_Core::ATTR_DRIVER_NAME:
                 //TODO throw an error since driver name can not be changed
             case Doctrine_Core::ATTR_ERRMODE:
-            break;
+                break;
             case Doctrine_Core::ATTR_CASE:
                 if ($value == Doctrine_Core::CASE_NATURAL) {
                     break;

lib/Doctrine/Adapter/Statement/Oracle.php

@@ -163,7 +163,7 @@ public function bindParam($column, &$variable, $type = null, $length = null, $dr
         switch ($type) {
             case Doctrine_Core::PARAM_STR:
                 $oci_type = SQLT_CHR;
-            break;
+                break;
         }
 
         if (is_integer($column)) {
@@ -317,25 +317,25 @@ public function fetch($fetchStyle = Doctrine_Core::FETCH_BOTH, $cursorOrientatio
                 return oci_fetch_object($this->statement);
             default:
                 throw new Doctrine_Adapter_Exception('This type of fetch is not supported: ' . $fetchStyle);
-/*
-            case Doctrine_Core::FETCH_BOUND:
-            case Doctrine_Core::FETCH_CLASS:
-            case FETCH_CLASSTYPE:
-            case FETCH_COLUMN:
-            case FETCH_FUNC:
-            case FETCH_GROUP:
-            case FETCH_INTO:
-            case FETCH_LAZY:
-            case FETCH_NAMED:
-            case FETCH_SERIALIZE:
-            case FETCH_UNIQUE:
-               case FETCH_ORI_ABS:
-            case FETCH_ORI_FIRST:
-            case FETCH_ORI_LAST:
-            case FETCH_ORI_NEXT:
-            case FETCH_ORI_PRIOR:
-            case FETCH_ORI_REL:
-*/
+                /*
+                            case Doctrine_Core::FETCH_BOUND:
+                            case Doctrine_Core::FETCH_CLASS:
+                            case FETCH_CLASSTYPE:
+                            case FETCH_COLUMN:
+                            case FETCH_FUNC:
+                            case FETCH_GROUP:
+                            case FETCH_INTO:
+                            case FETCH_LAZY:
+                            case FETCH_NAMED:
+                            case FETCH_SERIALIZE:
+                            case FETCH_UNIQUE:
+                               case FETCH_ORI_ABS:
+                            case FETCH_ORI_FIRST:
+                            case FETCH_ORI_LAST:
+                            case FETCH_ORI_NEXT:
+                            case FETCH_ORI_PRIOR:
+                            case FETCH_ORI_REL:
+                */
         }
     }
 
@@ -524,7 +524,7 @@ public function setAttribute($attribute, $value)
     {
         switch ($attribute) {
             case Doctrine_Core::ATTR_ERRMODE:
-            break;
+                break;
             default:
                 throw new Doctrine_Adapter_Exception("Unsupported Attribute: $attribute");
         }
@@ -572,7 +572,7 @@ private function handleError($params = array())
                 // no break
             case Doctrine_Core::ERRMODE_WARNING:
             case Doctrine_Core::ERRMODE_SILENT:
-            break;
+                break;
         }
     }
 

lib/Doctrine/Cli/AnsiColorFormatter.php

@@ -134,7 +134,7 @@ public function formatSection($section, $text, $size = null)
     {
         $width = 9 + strlen($this->format('', 'INFO'));
 
-        return sprintf(">> %-${width}s %s", $this->format($section, 'INFO'), $this->excerpt($text, $size));
+        return sprintf(">> %-{$width}s %s", $this->format($section, 'INFO'), $this->excerpt($text, $size));
     }
 
     /**

lib/Doctrine/Connection.php

@@ -465,7 +465,7 @@ public function __get($name)
                     /** @psalm-var class-string $class */
                     $class                = 'Doctrine_' . ucwords($name) . '_' . $this->getDriverName();
                     $this->modules[$name] = new $class($this);
-                }
+            }
         }
 
         return $this->modules[$name];

lib/Doctrine/Connection/Mssql.php

@@ -447,7 +447,7 @@ protected function replaceBoundParamsWithInlineValuesInQuery($query, array $para
              * @return string
              */
             function ($m) use ($value, $params) {
-                return is_null($value) ? 'NULL' : $this->quote($params[$m[1]]);
+                return is_null($value) ? 'NULL' : (string) $this->quote($params[$m[1]]);
             },
             $query
         );

lib/Doctrine/Connection/UnitOfWork.php

@@ -542,7 +542,7 @@ public function update(Doctrine_Record $record)
                 if ($table->getOption('joinedParents')) {
                     // currrently just for bc!
                     $this->_updateCTIRecord($table, $record);
-                //--
+                    //--
                 } else {
                     $array = $record->getPrepared();
                     $this->conn->update($table, $array, $identifier);
@@ -580,7 +580,7 @@ public function insert(Doctrine_Record $record)
                 if ($table->getOption('joinedParents')) {
                     // just for bc!
                     $this->_insertCTIRecord($table, $record);
-                //--
+                    //--
                 } else {
                     $this->processSingleInsert($record);
                 }

lib/Doctrine/Data/Import.php

@@ -79,7 +79,7 @@ public function doParsing()
                 // If they specified a specific yml file
                 if (end($e) == 'yml') {
                     $array = $mergeFunction($array, Doctrine_Parser::load($dir, $this->getFormat()));
-                // If they specified a directory
+                    // If they specified a directory
                 } elseif (is_dir($dir)) {
                     $it = new RecursiveIteratorIterator(
                         new RecursiveDirectoryIterator($dir),

lib/Doctrine/DataDict/Mssql.php

@@ -87,7 +87,7 @@ public function getNativeDeclaration($field)
                         return 'VARCHAR(' . $length . ')';
                     }
                 }
-                 return 'TEXT';
+                return 'TEXT';
             case 'blob':
                 if (! empty($field['length'])) {
                     $length = $field['length'];
@@ -139,7 +139,7 @@ public function getPortableDeclaration($field)
         switch ($db_type) {
             case 'bit':
                 $type[0] = 'boolean';
-            break;
+                break;
             case 'tinyint':
             case 'smallint':
             case 'bigint':
@@ -148,25 +148,25 @@ public function getPortableDeclaration($field)
                 if ($length == 1) {
                     $type[] = 'boolean';
                 }
-            break;
+                break;
             case 'date':
                 $type[0] = 'date';
-            break;
+                break;
             case 'datetime':
             case 'timestamp':
             case 'smalldatetime':
                 $type[0] = 'timestamp';
-            break;
+                break;
             case 'float':
             case 'real':
             case 'numeric':
                 $type[0] = 'float';
-            break;
+                break;
             case 'decimal':
             case 'money':
             case 'smallmoney':
                 $type[0] = 'decimal';
-            break;
+                break;
             case 'text':
             case 'varchar':
             case 'ntext':
@@ -187,22 +187,22 @@ public function getPortableDeclaration($field)
                 if ($fixed !== false) {
                     $fixed = true;
                 }
-            break;
+                break;
             case 'image':
             case 'varbinary':
                 $type[] = 'blob';
                 $length = null;
-            break;
+                break;
             case 'uniqueidentifier':
                 $type[] = 'string';
                 $length = 36;
-            break;
+                break;
             case 'sql_variant':
             case 'sysname':
             case 'binary':
                 $type[] = 'string';
                 $length = null;
-            break;
+                break;
             default:
                 $type[] = $field['type'];
                 $length = isset($field['length']) ? $field['length']:null;