Merge pull request #247 from techdivision/PAC-950

Author: svizevv

CHANGELOG.md

@@ -1,3 +1,13 @@
+# Version 18.1.0
+
+## Features
+
+### PHP 8.4 Compatibility
+
+* Update dependencies
+* Add PHP 8.4 support
+* Replace abandoned `swiftmailer/swiftmailer` with `symfony/mailer`
+
 # Version 18.0.0
 
 ### PHP 8.1 Compatibility

composer.json

@@ -4,22 +4,22 @@
     "license": "MIT",
     "require": {
         "php": "^8.1",
-        "psr/log": "^1.0.0|^2.0.0|^3.0.0",
-        "psr/cache" : "^2.0.0|^3.0.0",
+        "psr/log": "^1.0|^2.0|^3.0",
+        "psr/cache" : "^2.0|^3.0",
         "psr/container": "^1.1.2",
-        "handcraftedinthealps/goodby-csv": "^1.4.2",
+        "handcraftedinthealps/goodby-csv": "^1.4",
         "monolog/monolog": "^2.9|^3.7",
-        "league/event": "^2.2.0",
+        "league/event": "^2.2",
         "ramsey/uuid": "^4.2|^4.7",
-        "swiftmailer/swiftmailer": "v6.3.0",
-        "laminas/laminas-filter": "^2.31.0",
-        "techdivision/import-dbal": "^2.0.0",
-        "techdivision/import-dbal-collection": "^2.0.0",
-        "techdivision/import-cache": "^2.0.0",
-        "techdivision/import-cache-collection": "^2.0.0",
-        "techdivision/import-serializer": "^2.0.0",
-        "techdivision/import-serializer-csv": "^2.0.0",
-        "techdivision/import-configuration": "^6.0.0.",
+        "symfony/mailer": "^5.4|^6.4",
+        "laminas/laminas-filter": "^2.31",
+        "techdivision/import-dbal": "^2.0",
+        "techdivision/import-dbal-collection": "^2.1",
+        "techdivision/import-cache": "^2.0",
+        "techdivision/import-cache-collection": "^2.0",
+        "techdivision/import-serializer": "^2.1",
+        "techdivision/import-serializer-csv": "^2.1",
+        "techdivision/import-configuration": "^6.1",
         "ext-json": "*",
         "ext-zip": "*"
     },

src/Adapter/Goodby/Lexer.php

@@ -43,7 +43,7 @@ class Lexer implements LexerInterface
      *
      * @param \Goodby\CSV\Import\Standard\LexerConfig $config The lexer configuration
      */
-    public function __construct(LexerConfig $config = null)
+    public function __construct(?LexerConfig $config = null)
     {
 
         // query whether or not a configuration has been passed

src/Adapter/SerializerAwareAdapterInterface.php

@@ -48,7 +48,7 @@ public function explode($value = null, $delimiter = null);
      *
      * @return string|null The compatected value
      */
-    public function implode(array $value = null, $delimiter = null);
+    public function implode(?array $value = null, $delimiter = null);
 
     /**
      * Serializes the elements of the passed array.
@@ -57,7 +57,7 @@ public function implode(array $value = null, $delimiter = null);
      *
      * @return string The serialized array
      */
-    public function serialize(array $unserialized = null);
+    public function serialize(?array $unserialized = null);
 
     /**
      * Unserializes the elements of the passed string.

src/Adapter/SerializerTrait.php

@@ -80,7 +80,7 @@ public function explode($value = null, $delimiter = null)
      *
      * @return string|null The compatected value
      */
-    public function implode(array $value = null, $delimiter = null)
+    public function implode(?array $value = null, $delimiter = null)
     {
         return $this->getSerializer()->implode($value, $delimiter);
     }
@@ -93,7 +93,7 @@ public function implode(array $value = null, $delimiter = null)
      *
      * @return string The serialized array
      */
-    public function serialize(array $unserialized = null, $delimiter = null)
+    public function serialize(?array $unserialized = null, $delimiter = null)
     {
         return $this->getSerializer()->serialize($unserialized, $delimiter);
     }

src/Callbacks/AbstractBooleanCallback.php

@@ -50,7 +50,7 @@ abstract class AbstractBooleanCallback extends AbstractCallback
      *
      * @return mixed The modified value
      */
-    public function handle(AttributeCodeAndValueAwareObserverInterface $observer = null)
+    public function handle(?AttributeCodeAndValueAwareObserverInterface $observer = null)
     {
 
         // set the observer
@@ -100,7 +100,7 @@ public function handle(AttributeCodeAndValueAwareObserverInterface $observer = n
             // return NULL, if NO value can be mapped to a boolean representation
             return;
         }
-        
+
         // throw an exception if the attribute is not available
         throw new \Exception(
             $this->appendExceptionSuffix(

src/Callbacks/AbstractCallback.php

@@ -14,6 +14,7 @@
 
 namespace TechDivision\Import\Callbacks;
 
+use Exception;
 use TechDivision\Import\Observers\ObserverInterface;
 
 /**
@@ -108,14 +109,14 @@ protected function appendExceptionSuffix($message = null, $filename = null, $lin
      * line number and column name and use it for a detailed exception message.
      *
      * @param string     $columnName The column name that should be resolved
-     * @param \Exception $parent     The exception we want to wrap
+     * @param Exception|null $parent     The exception we want to wrap
      * @param string     $className  The class name of the exception type we want to wrap the parent one
      *
-     * @return \Exception the wrapped exception
+     * @return Exception the wrapped exception
      */
     protected function wrapException(
         $columnName,
-        \Exception $parent = null,
+        ?Exception $parent = null,
         $className = '\TechDivision\Import\Exceptions\WrappedColumnException'
     ) {
         return $this->getSubject()->wrapException($columnName, $parent, $className);
@@ -130,7 +131,7 @@ protected function isDebugMode()
     {
         return $this->getSubject()->isDebugMode();
     }
-    
+
     /**
      * Queries whether or not strict mode is enabled or not, default is True.
      * Backward compatibility
@@ -181,7 +182,7 @@ protected function mergeAttributesRecursive(array $status)
      *
      * @return mixed|null The, almost formatted, value
      */
-    protected function getValue($name, $default = null, callable $callback = null)
+    protected function getValue($name, $default = null, ?callable $callback = null)
     {
         return $this->getSubject()->getValue($name, $default, $callback);
     }
@@ -192,7 +193,7 @@ protected function getValue($name, $default = null, callable $callback = null)
      * @param string $storeViewCode The store view code to return the store ID for
      *
      * @return integer The ID of the store with the passed ID
-     * @throws \Exception Is thrown, if the store with the actual code is not available
+     * @throws Exception Is thrown, if the store with the actual code is not available
      */
     protected function getStoreId($storeViewCode)
     {
@@ -206,7 +207,7 @@ protected function getStoreId($storeViewCode)
      * @param string|null $default The default store view code to use, if no store view code is set in the CSV file
      *
      * @return integer The ID of the actual store
-     * @throws \Exception Is thrown, if the store with the actual code is not available
+     * @throws Exception Is thrown, if the store with the actual code is not available
      */
     protected function getRowStoreId($default = null)
     {

src/Callbacks/AbstractMultiselectCallback.php

@@ -38,7 +38,7 @@ abstract class AbstractMultiselectCallback extends AbstractEavAwareCallback
      *
      * @return mixed The modified value
      */
-    public function handle(AttributeCodeAndValueAwareObserverInterface $observer = null)
+    public function handle(?AttributeCodeAndValueAwareObserverInterface $observer = null)
     {
 
         // set the observer

src/Callbacks/AbstractSelectCallback.php

@@ -38,7 +38,7 @@ abstract class AbstractSelectCallback extends AbstractEavAwareCallback
      *
      * @return mixed The modified value
      */
-    public function handle(AttributeCodeAndValueAwareObserverInterface $observer = null)
+    public function handle(?AttributeCodeAndValueAwareObserverInterface $observer = null)
     {
 
         // set the observer
@@ -100,7 +100,7 @@ public function handle(AttributeCodeAndValueAwareObserverInterface $observer = n
             // return NULL, if the value can't be mapped to an option
             return;
         }
-        
+
         // throw an exception if the attribute is NOT
         // available and we're in strict mode
         throw new \Exception(

src/Exceptions/InvalidDataException.php

@@ -34,9 +34,9 @@ class InvalidDataException extends \Exception
      *
      * @param string         $message  [optional] The Exception message to throw.
      * @param int            $code     [optional] The Exception code.
-     * @param null|Throwable $previous [optional] The previous throwable used for the exception chaining.
+     * @param Throwable|null $previous [optional] The previous throwable used for the exception chaining.
      */
-    public function __construct($message = "", $code = self::INVALID_DATA_CODE, Throwable $previous = null)
+    public function __construct($message = "", $code = self::INVALID_DATA_CODE, ?Throwable $previous = null)
     {
         parent::__construct($message, $code, $previous);
     }