diablomedia · jaydiablo · May 27, 2025 · May 23, 2025 · May 23, 2025
diff --git a/.github/workflows/build.yml b/.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:

diff --git a/composer.json b/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",

diff --git a/lib/Doctrine/Cli.php b/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());

diff --git a/lib/Doctrine/Collection.php b/lib/Doctrine/Collection.php
@@ -932,7 +932,7 @@
      * @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 @@
      * @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 @@
      * @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();

diff --git a/lib/Doctrine/Connection/Mssql.php b/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;

diff --git a/lib/Doctrine/Locator.php b/lib/Doctrine/Locator.php
@@ -56,7 +56,7 @@
      * @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) {

diff --git a/lib/Doctrine/Query.php b/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;

diff --git a/lib/Doctrine/Query/Abstract.php b/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();

diff --git a/lib/Doctrine/Query/Part.php b/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;
 

diff --git a/lib/Doctrine/RawSql.php b/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);
 

diff --git a/lib/Doctrine/Record.php b/lib/Doctrine/Record.php
@@ -1846,7 +1846,7 @@ public function resetPendingUnlinks()
      * @throws Exception                    if record is not valid and validation is active
      * @return void
      */
-    public function save(Doctrine_Connection $conn = null)
+    public function save(?Doctrine_Connection $conn = null)
     {
         if ($conn === null) {
             $conn = $this->_table->getConnection();
@@ -1863,7 +1863,7 @@ public function save(Doctrine_Connection $conn = null)
      * @param Doctrine_Connection $conn                 optional connection parameter
      * @return bool TRUE if the record was saved sucessfully without errors, FALSE otherwise.
      */
-    public function trySave(Doctrine_Connection $conn = null)
+    public function trySave(?Doctrine_Connection $conn = null)
     {
         try {
             $this->save($conn);
@@ -1890,7 +1890,7 @@ public function trySave(Doctrine_Connection $conn = null)
      * @throws Doctrine_Connection_Exception        if something fails at database level
      * @return bool
      */
-    public function replace(Doctrine_Connection $conn = null)
+    public function replace(?Doctrine_Connection $conn = null)
     {
         if ($conn === null) {
             $conn = $this->_table->getConnection();
@@ -2339,7 +2339,7 @@ public function getIterator()
      *
      * @return boolean      true if successful
      */
-    public function delete(Doctrine_Connection $conn = null)
+    public function delete(?Doctrine_Connection $conn = null)
     {
         if ($conn == null) {
             $conn = $this->_table->getConnection();

diff --git a/lib/Doctrine/Table.php b/lib/Doctrine/Table.php
@@ -2068,7 +2068,7 @@ public function enumIndex($fieldName, $value)
      * @param Doctrine_Record $record   record to consider; if it does not exists, it is created
      * @return Doctrine_Validator_ErrorStack $errorStack
      */
-    public function validateField($fieldName, $value, Doctrine_Record $record = null)
+    public function validateField($fieldName, $value, ?Doctrine_Record $record = null)
     {
         if ($record instanceof Doctrine_Record) {
             $errorStack = $record->getErrorStack();
@@ -2221,7 +2221,7 @@ public function removeColumn($fieldName)
      *
      * @return array numeric array
      */
-    public function getColumnNames(array $fieldNames = null)
+    public function getColumnNames(?array $fieldNames = null)
     {
         if ($fieldNames === null) {
             return array_keys($this->_columns);

diff --git a/lib/Doctrine/Transaction.php b/lib/Doctrine/Transaction.php
@@ -490,7 +490,6 @@ private function removeSavePoints($savepoint)
      *                  SERIALIZABLE (prevents phantom reads)
      *
      * @throws Doctrine_Transaction_Exception           if the feature is not supported by the driver
-     * @throws PDOException                             if something fails at the PDO level
      * @return PDOStatement|Doctrine_Adapter_Statement_Interface
      */
     public function setIsolation($isolation)
@@ -507,7 +506,6 @@ public function setIsolation($isolation)
      * but not fetching it
      *
      * @throws Doctrine_Transaction_Exception           if the feature is not supported by the driver
-     * @throws PDOException                             if something fails at the PDO level
      * @return string                                   returns the current session transaction isolation level
      */
     public function getIsolation()

diff --git a/lib/Doctrine/Transaction/Mysql.php b/lib/Doctrine/Transaction/Mysql.php
@@ -129,7 +129,7 @@ public function getIsolation()
     {
         // Mysql 5.7.20 added `@@transaction_isolation` as an alias for `@@tx_isolation`
         // Mysql 8.0.0 removes `@@tx_isolation`
-        if (version_compare($this->mysqlVersion, '5.7.20', '>=')) {
+        if (version_compare((string) $this->mysqlVersion, '5.7.20', '>=')) {
             return $this->conn->fetchOne('SELECT @@transaction_isolation');
         }
 

diff --git a/lib/Doctrine/Tree/Interface.php b/lib/Doctrine/Tree/Interface.php
@@ -38,7 +38,7 @@ interface Doctrine_Tree_Interface
      * @param Doctrine_Record $record                    instance of Doctrine_Record
      * @return Doctrine_Record
      */
-    public function createRoot(Doctrine_Record $record = null);
+    public function createRoot(?Doctrine_Record $record = null);
 
     /**
      * returns root node

diff --git a/lib/Doctrine/Tree/NestedSet.php b/lib/Doctrine/Tree/NestedSet.php
@@ -93,7 +93,7 @@ public function setTableDefinition()
      * @param Doctrine_Record $record        instance of Doctrine_Record
      * @return Doctrine_Record
      */
-    public function createRoot(Doctrine_Record $record = null)
+    public function createRoot(?Doctrine_Record $record = null)
     {
         if ($this->getAttribute('hasManyRoots')) {
             if (! $record || (! $record->exists() && ! $record->getNode()->getRootValue())