[PHP8.4] Deprecate implicitly nullable parameter types (#30)

joomla-framework · Aug 16, 2024 · 5383294 · 5383294
1 parent a8c4e7e
commit 5383294
Show file tree

Hide file tree

Showing 20 changed files with 38 additions and 37 deletions.
diff --git a/Tests/DbUnit/DataSet/QueryTable.php b/Tests/DbUnit/DataSet/QueryTable.php
@@ -11,8 +11,8 @@
 
 namespace Joomla\Entity\Tests\DbUnit\DataSet;
 
-use PDO;
 use Joomla\Entity\Tests\DbUnit\Database\Connection;
+use PDO;
 
 /**
  * Provides the functionality to represent a database table.

diff --git a/Tests/DbUnit/Database/Connection.php b/Tests/DbUnit/Database/Connection.php
@@ -11,10 +11,10 @@
 
 namespace Joomla\Entity\Tests\DbUnit\Database;
 
-use PDO;
 use Joomla\Entity\Tests\DbUnit\Database\Metadata\Metadata;
 use Joomla\Entity\Tests\DbUnit\DataSet\IDataSet;
 use Joomla\Entity\Tests\DbUnit\DataSet\ITable;
+use PDO;
 
 /**
  * Provides a basic interface for communicating with a database.
@@ -31,11 +31,11 @@ public function close();
      * names are specified then it will created a dataset over the entire
      * database.
      *
-     * @param array $tableNames
+     * @param array|null $tableNames
      *
      * @return IDataSet
      */
-    public function createDataSet(array $tableNames = null);
+    public function createDataSet(?array $tableNames = null);
 
     /**
      * Creates a table with the result of the specified SQL statement.

diff --git a/Tests/DbUnit/Database/DataSet.php b/Tests/DbUnit/Database/DataSet.php
@@ -40,10 +40,11 @@ class DataSet extends AbstractDataSet
      * Creates the query necessary to pull all of the data from a table.
      *
      * @param ITableMetadata $tableMetaData
+     * @param Connection|null $databaseConnection
      *
      * @return string
      */
-    public static function buildTableSelect(ITableMetadata $tableMetaData, Connection $databaseConnection = null)
+    public static function buildTableSelect(ITableMetadata $tableMetaData, ?Connection $databaseConnection = null)
     {
         if ($tableMetaData->getTableName() == '') {
             $e = new RuntimeException('Empty Table Name');

diff --git a/Tests/DbUnit/Database/DefaultConnection.php b/Tests/DbUnit/Database/DefaultConnection.php
@@ -11,11 +11,11 @@
 
 namespace Joomla\Entity\Tests\DbUnit\Database;
 
-use PDO;
 use Joomla\Entity\Tests\DbUnit\Database\Metadata\AbstractMetadata;
 use Joomla\Entity\Tests\DbUnit\Database\Metadata\Metadata;
 use Joomla\Entity\Tests\DbUnit\DataSet\IDataSet;
 use Joomla\Entity\Tests\DbUnit\DataSet\QueryTable;
+use PDO;
 
 /**
  * Provides a basic interface for communicating with a database.
@@ -81,13 +81,13 @@ public function getSchema()
      * names are specified then it will created a dataset over the entire
      * database.
      *
-     * @param array $tableNames
+     * @param array|null $tableNames
      *
      * @return IDataSet
      *
      * @todo Implement the filtered data set.
      */
-    public function createDataSet(array $tableNames = null)
+    public function createDataSet(?array $tableNames = null)
     {
         if (empty($tableNames)) {
             return new DataSet($this);

diff --git a/Tests/DbUnit/Database/Metadata/AbstractMetadata.php b/Tests/DbUnit/Database/Metadata/AbstractMetadata.php
@@ -11,8 +11,8 @@
 
 namespace Joomla\Entity\Tests\DbUnit\Database\Metadata;
 
-use PDO;
 use Joomla\Entity\Tests\DbUnit\RuntimeException;
+use PDO;
 use ReflectionClass;
 
 /**

diff --git a/Tests/DbUnit/Database/ResultSetTable.php b/Tests/DbUnit/Database/ResultSetTable.php
@@ -11,10 +11,10 @@
 
 namespace Joomla\Entity\Tests\DbUnit\Database;
 
-use PDO;
-use PDOStatement;
 use Joomla\Entity\Tests\DbUnit\DataSet\AbstractTable;
 use Joomla\Entity\Tests\DbUnit\DataSet\DefaultTableMetadata;
+use PDO;
+use PDOStatement;
 
 /**
  * Provides the functionality to represent a database result set as a DBUnit

diff --git a/Tests/DbUnit/Database/Table.php b/Tests/DbUnit/Database/Table.php
@@ -11,9 +11,9 @@
 
 namespace Joomla\Entity\Tests\DbUnit\Database;
 
-use PDO;
 use Joomla\Entity\Tests\DbUnit\DataSet\AbstractTable;
 use Joomla\Entity\Tests\DbUnit\DataSet\ITableMetadata;
+use PDO;
 
 /**
  * Provides the functionality to represent a database table.

diff --git a/Tests/DbUnit/Operation/DeleteAll.php b/Tests/DbUnit/Operation/DeleteAll.php
@@ -11,10 +11,10 @@
 
 namespace Joomla\Entity\Tests\DbUnit\Operation;
 
-use PDOException;
 use Joomla\Entity\Tests\DbUnit\Database\Connection;
 use Joomla\Entity\Tests\DbUnit\DataSet\IDataSet;
 use Joomla\Entity\Tests\DbUnit\DataSet\ITable;
+use PDOException;
 
 /**
  * Deletes all rows from all tables in a dataset.

diff --git a/Tests/DbUnit/Operation/Truncate.php b/Tests/DbUnit/Operation/Truncate.php
@@ -11,11 +11,11 @@
 
 namespace Joomla\Entity\Tests\DbUnit\Operation;
 
-use PDO;
-use PDOException;
 use Joomla\Entity\Tests\DbUnit\Database\Connection;
 use Joomla\Entity\Tests\DbUnit\DataSet\IDataSet;
 use Joomla\Entity\Tests\DbUnit\DataSet\ITable;
+use PDO;
+use PDOException;
 
 /**
  * Executes a truncate against all tables in a dataset.

diff --git a/Tests/DbUnit/TestCaseTrait.php b/Tests/DbUnit/TestCaseTrait.php
@@ -11,7 +11,6 @@
 
 namespace Joomla\Entity\Tests\DbUnit;
 
-use PDO;
 use Joomla\Entity\Tests\DbUnit\Constraint\DataSetIsEqual;
 use Joomla\Entity\Tests\DbUnit\Constraint\TableIsEqual;
 use Joomla\Entity\Tests\DbUnit\Constraint\TableRowCount;
@@ -25,6 +24,7 @@
 use Joomla\Entity\Tests\DbUnit\DataSet\XmlDataSet;
 use Joomla\Entity\Tests\DbUnit\Operation\Factory;
 use Joomla\Entity\Tests\DbUnit\Operation\Operation;
+use PDO;
 
 trait TestCaseTrait
 {

diff --git a/Tests/Helpers/CollectionTest.php b/Tests/Helpers/CollectionTest.php
@@ -7,8 +7,8 @@
 
 namespace Joomla\Entity\Tests\Helpers;
 
-use Joomla\Entity\Tests\Models\User;
 use Joomla\Entity\Helpers\Collection;
+use Joomla\Entity\Tests\Models\User;
 use Joomla\Entity\Tests\Models\UserProfile;
 use Joomla\Entity\Tests\SqliteCase;
 

diff --git a/Tests/ModelHelpers/AttributesTest.php b/Tests/ModelHelpers/AttributesTest.php
@@ -9,9 +9,9 @@
 
 use Joomla\Entity\Exceptions\AttributeNotFoundException;
 use Joomla\Entity\Helpers\Collection;
+use Joomla\Entity\Model;
 use Joomla\Entity\Tests\Models\User;
 use Joomla\Entity\Tests\SqliteCase;
-use Joomla\Entity\Model;
 
 /**
  * @since  1.0

diff --git a/Tests/ModelHelpers/RelationsTest.php b/Tests/ModelHelpers/RelationsTest.php
@@ -9,10 +9,10 @@
 
 namespace Joomla\Entity\Tests\ModelHelpers;
 
+use Joomla\Entity\Model;
 use Joomla\Entity\Tests\Models\Message;
 use Joomla\Entity\Tests\Models\User;
 use Joomla\Entity\Tests\SqliteCase;
-use Joomla\Entity\Model;
 
 /**
  * @since  1.0

diff --git a/src/Helpers/Collection.php b/src/Helpers/Collection.php
@@ -10,13 +10,13 @@
 namespace Joomla\Entity\Helpers;
 
 use ArrayAccess;
+use ArrayIterator;
 use Closure;
 use Countable;
-use Joomla\Entity\Exceptions\JsonEncodingException;
-use JsonSerializable;
 use IteratorAggregate;
-use ArrayIterator;
+use Joomla\Entity\Exceptions\JsonEncodingException;
 use Joomla\Entity\Model;
+use JsonSerializable;
 
 /**
  * Collection Helper class
@@ -241,7 +241,7 @@ public function count()
      * @param   Closure|null  $callback  callback function for sorting
      * @return static
      */
-    public function sort(Closure $callback = null)
+    public function sort(?Closure $callback = null)
     {
         $items = $this->items;
 

diff --git a/src/Model.php b/src/Model.php
@@ -12,12 +12,12 @@
 use ArrayAccess;
 use BadMethodCallException;
 use Closure;
-use Joomla\Entity\Helpers\ArrayHelper;
-use JsonSerializable;
 use Joomla\Database\DatabaseDriver;
-use Joomla\String\Inflector;
+use Joomla\Entity\Helpers\ArrayHelper;
 use Joomla\Entity\Helpers\StringHelper;
+use Joomla\String\Inflector;
 use Joomla\String\Normalise;
+use JsonSerializable;
 
 /**
  * Base Entity class for items

diff --git a/src/ModelHelpers/Attributes.php b/src/ModelHelpers/Attributes.php
@@ -9,15 +9,15 @@
 
 namespace Joomla\Entity\ModelHelpers;
 
-use Joomla\Entity\Exceptions\AttributeNotFoundException;
-use Joomla\String\Normalise;
 use Carbon\Carbon;
 use DateTimeInterface;
-use LogicException;
+use Joomla\Entity\Exceptions\AttributeNotFoundException;
 use Joomla\Entity\Exceptions\JsonEncodingException;
 use Joomla\Entity\Helpers\ArrayHelper;
 use Joomla\Entity\Helpers\StringHelper;
 use Joomla\Entity\Relations\Relation;
+use Joomla\String\Normalise;
+use LogicException;
 
 /**
  * Attribute Trait

diff --git a/src/ModelHelpers/Relations.php b/src/ModelHelpers/Relations.php
@@ -9,12 +9,12 @@
 
 namespace Joomla\Entity\ModelHelpers;
 
+use Joomla\Entity\Helpers\Collection;
 use Joomla\Entity\Helpers\StringHelper;
 use Joomla\Entity\Model;
-use Joomla\Entity\Helpers\Collection;
-use Joomla\Entity\Relations\HasOne;
-use Joomla\Entity\Relations\HasMany;
 use Joomla\Entity\Relations\BelongsTo;
+use Joomla\Entity\Relations\HasMany;
+use Joomla\Entity\Relations\HasOne;
 use Joomla\String\Inflector;
 use Joomla\String\Normalise;
 

diff --git a/src/Query.php b/src/Query.php
@@ -10,15 +10,15 @@
 namespace Joomla\Entity;
 
 use BadMethodCallException;
+use Closure;
+use Joomla\Database\DatabaseDriver;
 use Joomla\Database\ParameterType;
-use Joomla\Entity\Exceptions\RelationNotFoundException;
 use Joomla\Database\Query\LimitableInterface;
 use Joomla\Database\QueryInterface;
-use Joomla\Database\DatabaseDriver;
+use Joomla\Entity\Exceptions\RelationNotFoundException;
 use Joomla\Entity\Helpers\Collection;
 use Joomla\Entity\Helpers\StringHelper;
 use Joomla\Entity\Relations\Relation;
-use Closure;
 
 /**
  * Base Query Class

diff --git a/src/Relations/HasOneOrMany.php b/src/Relations/HasOneOrMany.php
@@ -9,9 +9,9 @@
 
 namespace Joomla\Entity\Relations;
 
+use Joomla\Entity\Helpers\Collection;
 use Joomla\Entity\Model;
 use Joomla\Entity\Query;
-use Joomla\Entity\Helpers\Collection;
 
 /**
  * Joomla Framework Has one or many relation

diff --git a/src/Relations/Relation.php b/src/Relations/Relation.php
@@ -10,9 +10,9 @@
 namespace Joomla\Entity\Relations;
 
 use Closure;
+use Joomla\Entity\Helpers\Collection;
 use Joomla\Entity\Model;
 use Joomla\Entity\Query;
-use Joomla\Entity\Helpers\Collection;
 
 /**
  * Joomla Framework Base relation class