PHP 8.4

Author: jaydiablo

.github/workflows/build.yml

@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: [ubuntu-latest]
-        php-versions: ["7.4", "8.0", "8.1", "8.2", "8.3"]
+        php-versions: ["8.1", "8.2", "8.3", "8.4"]
         composer-args: ["", "--prefer-lowest"]
     runs-on: ${{ matrix.operating-system }}
     steps:
@@ -40,7 +40,7 @@ jobs:
       - name: Test
         run: composer test-with-coverage
       - name: Upload Coverage
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         with:

composer.json

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

lib/Doctrine/Cli.php

@@ -74,7 +74,7 @@ class Doctrine_Cli
      * @param array $config
      * @param Doctrine_Cli_Formatter|null $formatter Doctrine_Cli_Formatter
      */
-    public function __construct(array $config = array(), Doctrine_Cli_Formatter $formatter = null)
+    public function __construct(array $config = array(), ?Doctrine_Cli_Formatter $formatter = null)
     {
         $this->setConfig($config);
         $this->setFormatter($formatter ? $formatter : new Doctrine_Cli_AnsiColorFormatter());

lib/Doctrine/Collection.php

@@ -932,7 +932,7 @@ protected function compareRecords($a, $b)
      * @param bool $processDiff
      * @return $this
      */
-    public function save(Doctrine_Connection $conn = null, $processDiff = true)
+    public function save(?Doctrine_Connection $conn = null, $processDiff = true)
     {
         if ($conn == null) {
             $conn = $this->_table->getConnection();
@@ -968,7 +968,7 @@ public function save(Doctrine_Connection $conn = null, $processDiff = true)
      * @param bool $processDiff
      * @return $this
      */
-    public function replace(Doctrine_Connection $conn = null, $processDiff = true)
+    public function replace(?Doctrine_Connection $conn = null, $processDiff = true)
     {
         if ($conn == null) {
             $conn = $this->_table->getConnection();
@@ -1002,7 +1002,7 @@ public function replace(Doctrine_Connection $conn = null, $processDiff = true)
      * @param bool $clearColl
      * @return $this
      */
-    public function delete(Doctrine_Connection $conn = null, $clearColl = true)
+    public function delete(?Doctrine_Connection $conn = null, $clearColl = true)
     {
         if ($conn == null) {
             $conn = $this->_table->getConnection();

lib/Doctrine/Connection/Mssql.php

@@ -142,7 +142,7 @@ public function quoteIdentifier($str, $checkOption = false)
      * @link http://lists.bestpractical.com/pipermail/rt-devel/2005-June/007339.html
      * @return string
      */
-    public function modifyLimitQuery($query, $limit = false, $offset = false, $isManip = false, $isSubQuery = false, Doctrine_Query $queryOrigin = null)
+    public function modifyLimitQuery($query, $limit = false, $offset = false, $isManip = false, $isSubQuery = false, ?Doctrine_Query $queryOrigin = null)
     {
         if ($limit === false || !($limit > 0)) {
             return $query;

lib/Doctrine/Locator.php

@@ -56,7 +56,7 @@ class Doctrine_Locator implements Countable, IteratorAggregate
      * @param array $defaults
      * @return void
      */
-    public function __construct(array $defaults = null)
+    public function __construct(?array $defaults = null)
     {
         if (null !== $defaults) {
             foreach ($defaults as $name => $resource) {

lib/Doctrine/Query.php

@@ -2251,7 +2251,7 @@ public function query($query, $params = array(), $hydrationMode = null)
      *
      * @return Doctrine_Query  Copy of the Doctrine_Query instance.
      */
-    public function copy(Doctrine_Query $query = null)
+    public function copy(?Doctrine_Query $query = null)
     {
         if (! $query) {
             $query = $this;

lib/Doctrine/Query/Abstract.php

@@ -298,8 +298,8 @@ abstract class Doctrine_Query_Abstract
      * @param Doctrine_Hydrator_Abstract|null $hydrator The hydrator that will be used for generating result sets.
      */
     public function __construct(
-        Doctrine_Connection $connection = null,
-        Doctrine_Hydrator_Abstract $hydrator = null
+        ?Doctrine_Connection $connection = null,
+        ?Doctrine_Hydrator_Abstract $hydrator = null
     ) {
         if ($connection === null) {
             $connection = Doctrine_Manager::getInstance()->getCurrentConnection();

lib/Doctrine/Query/Part.php

@@ -45,7 +45,7 @@ abstract class Doctrine_Query_Part
     /**
      * @param Doctrine_Query $query         the query object associated with this parser
      */
-    public function __construct($query, Doctrine_Query_Tokenizer $tokenizer = null)
+    public function __construct($query, ?Doctrine_Query_Tokenizer $tokenizer = null)
     {
         $this->query = $query;
 

lib/Doctrine/RawSql.php

@@ -55,7 +55,7 @@ class Doctrine_RawSql extends Doctrine_Query_Abstract
      * @param Doctrine_Connection $connection The connection object the query will use.
      * @param Doctrine_Hydrator_Abstract $hydrator The hydrator that will be used for generating result sets.
      */
-    public function __construct(Doctrine_Connection $connection = null, Doctrine_Hydrator_Abstract $hydrator = null)
+    public function __construct(?Doctrine_Connection $connection = null, ?Doctrine_Hydrator_Abstract $hydrator = null)
     {
         parent::__construct($connection, $hydrator);