Merge pull request #69 from mlocati-forks/php8.4-fixes

Fix some PHP 8.4 deprecation warnings

Author: aembler

src/PortlandLabs/Concrete5/MigrationTool/Batch/Validator/MessageCollection.php

@@ -30,7 +30,7 @@ public function add($element)
         return parent::add($element);
     }
 
-    public function addMessages(MessageCollection $collection = null)
+    public function addMessages(?MessageCollection $collection = null)
     {
         if (is_object($collection) && count($collection)) {
             foreach ($collection as $message) {

src/PortlandLabs/Concrete5/MigrationTool/Entity/ContentMapper/IgnoredTargetItem.php

@@ -11,7 +11,7 @@
  */
 class IgnoredTargetItem extends TargetItem
 {
-    public function __construct(MapperInterface $mapper = null)
+    public function __construct(?MapperInterface $mapper = null)
     {
         parent::__construct($mapper);
         $this->setItemId(-1);

src/PortlandLabs/Concrete5/MigrationTool/Entity/ContentMapper/ShortDescriptionTargetItem.php

@@ -11,7 +11,7 @@
  */
 class ShortDescriptionTargetItem extends TargetItem
 {
-    public function __construct(MapperInterface $mapper = null)
+    public function __construct(?MapperInterface $mapper = null)
     {
         parent::__construct($mapper);
         $this->setItemId('short_description');

src/PortlandLabs/Concrete5/MigrationTool/Entity/ContentMapper/TargetItem.php

@@ -37,7 +37,7 @@ class TargetItem implements TargetItemInterface
 
     protected $item_name;
 
-    public function __construct(MapperInterface $mapper = null)
+    public function __construct(?MapperInterface $mapper = null)
     {
         if ($mapper) {
             $this->item_type = $mapper->getHandle();

src/PortlandLabs/Concrete5/MigrationTool/Entity/ContentMapper/UnmappedTargetItem.php

@@ -11,7 +11,7 @@
  */
 class UnmappedTargetItem extends TargetItem
 {
-    public function __construct(MapperInterface $mapper = null)
+    public function __construct(?MapperInterface $mapper = null)
     {
         parent::__construct($mapper);
         $this->setItemId(0);

src/PortlandLabs/Concrete5/MigrationTool/Entity/Publisher/Log/Entry.php

@@ -30,7 +30,7 @@ abstract class Entry
      **/
     protected $log;
 
-    public function __construct(LoggableObject $object = null)
+    public function __construct(?LoggableObject $object = null)
     {
         $this->timestamp = new \DateTime();
         if (is_object($object)) {

src/PortlandLabs/Concrete5/MigrationTool/Importer/CIF/Element/Tree.php

@@ -13,7 +13,7 @@ class Tree implements ElementParserInterface
 {
     protected function walk(\SimpleXMLElement $node,
     \PortlandLabs\Concrete5\MigrationTool\Entity\Import\Tree $tree,
-    TreeNode $parent = null)
+    ?TreeNode $parent = null)
     {
         foreach ($node->children() as $child) {
             $n = new TreeNode();

src/PortlandLabs/Concrete5/MigrationTool/Importer/Wordpress/WordpressParser.php

@@ -47,7 +47,7 @@ public function validateUploadedFile(array $file, &$error)
     }
 
     // TODO maybe $file can't be null and we need to reparse the xml inside this function too
-    public function addContentObjectCollectionsToBatch($file = null, Batch $batch)
+    public function addContentObjectCollectionsToBatch($file, Batch $batch)
     {
         $manager = \Core::make('migration/manager/importer/wordpress');
 //        $simplexml = simplexml_load_file($file);

src/PortlandLabs/Concrete5/MigrationTool/Publisher/AttributeKeyCategory/CollectionPublisher.php

@@ -10,7 +10,7 @@
 
 class CollectionPublisher implements PublisherInterface
 {
-    public function publish(AttributeKey $ak, Package $pkg = null)
+    public function publish(AttributeKey $ak, ?Package $pkg = null)
     {
         $key = new \Concrete\Core\Entity\Attribute\Key\PageKey();
         $key->setAttributeKeyHandle($ak->getHandle());

src/PortlandLabs/Concrete5/MigrationTool/Publisher/AttributeKeyCategory/EventPublisher.php

@@ -10,7 +10,7 @@
 
 class EventPublisher implements PublisherInterface
 {
-    public function publish(AttributeKey $ak, Package $pkg = null)
+    public function publish(AttributeKey $ak, ?Package $pkg = null)
     {
         $key = new \Concrete\Core\Entity\Attribute\Key\EventKey();
         $key->setAttributeKeyHandle($ak->getHandle());