Fixes for PHP 8.4 compatibility

Author: rhoerr

Api/Data/CardInterface.php

@@ -61,7 +61,7 @@ public function setMethodInstance($method);
      */
     public function setCustomer(
         \Magento\Customer\Api\Data\CustomerInterface $customer,
-        \Magento\Payment\Model\InfoInterface $payment = null
+        ?\Magento\Payment\Model\InfoInterface $payment = null
     );
 
     /**

Model/AbstractGateway.php

@@ -161,7 +161,7 @@ public function __construct(
         \ParadoxLabs\TokenBase\Model\Gateway\ResponseFactory $responseFactory,
         \Magento\Framework\HTTP\ZendClientFactory $httpClientFactory,
         array $data = [],
-        \Magento\Framework\HTTP\ClientInterfaceFactory $communicatorFactory = null
+        ?\Magento\Framework\HTTP\ClientInterfaceFactory $communicatorFactory = null
     ) {
         $this->helper           = $helper;
         $this->responseFactory  = $responseFactory;

Model/Api/GraphQL/DeleteCard.php

@@ -84,8 +84,8 @@ public function resolve(
         \Magento\Framework\GraphQl\Config\Element\Field $field,
         $context,
         \Magento\Framework\GraphQl\Schema\Type\ResolveInfo $info,
-        array $value = null,
-        array $args = null
+        ?array $value = null,
+        ?array $args = null
     ) {
         if (!isset($args['hash']) || empty($args['hash'])) {
             throw new GraphQlInputException(__('Card "hash" value must be specified'));

Model/Api/GraphQL/GetCards.php

@@ -90,8 +90,8 @@ public function resolve(
         \Magento\Framework\GraphQl\Config\Element\Field $field,
         $context,
         \Magento\Framework\GraphQl\Schema\Type\ResolveInfo $info,
-        array $value = null,
-        array $args = null
+        ?array $value = null,
+        ?array $args = null
     ) {
         $this->graphQL->authenticate($context, true);
 

Model/Api/GraphQL/GetCheckoutConfig.php

@@ -82,8 +82,8 @@ public function resolve(
         \Magento\Framework\GraphQl\Config\Element\Field $field,
         $context,
         \Magento\Framework\GraphQl\Schema\Type\ResolveInfo $info,
-        array $value = null,
-        array $args = null
+        ?array $value = null,
+        ?array $args = null
     ) {
         // Validate
         $this->graphQL->authenticate($context);

Model/Api/GraphQL/UpdateCard.php

@@ -117,8 +117,8 @@ public function resolve(
         \Magento\Framework\GraphQl\Config\Element\Field $field,
         $context,
         \Magento\Framework\GraphQl\Schema\Type\ResolveInfo $info,
-        array $value = null,
-        array $args = null
+        ?array $value = null,
+        ?array $args = null
     ) {
         $this->graphQL->authenticate($context);
 

Model/Card.php

@@ -149,8 +149,8 @@ class Card extends \Magento\Framework\Model\AbstractExtensibleModel implements
      * @param \Magento\Framework\Api\ExtensionAttributesFactory $extensionFactory
      * @param \Magento\Framework\Api\AttributeValueFactory $customAttributeFactory
      * @param Card\Context $cardContext
-     * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
-     * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
+     * @param \Magento\Framework\Model\ResourceModel\AbstractResource|null $resource
+     * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
      * @param array $data
      */
     public function __construct(
@@ -159,8 +159,8 @@ public function __construct(
         \Magento\Framework\Api\ExtensionAttributesFactory $extensionFactory,
         \Magento\Framework\Api\AttributeValueFactory $customAttributeFactory,
         \ParadoxLabs\TokenBase\Model\Card\Context $cardContext,
-        \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
-        \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
+        ?\Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
+        ?\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
         array $data = []
     ) {
         parent::__construct(
@@ -258,7 +258,7 @@ public function getTypeInstance()
      */
     public function setCustomer(
         \Magento\Customer\Api\Data\CustomerInterface $customer,
-        InfoInterface $payment = null
+        ?InfoInterface $payment = null
     ) {
         if ($customer->getEmail() != '') {
             $this->setCustomerEmail($customer->getEmail());

Observer/AdminNotification/Feed.php

@@ -52,8 +52,8 @@ class Feed extends \Magento\AdminNotification\Model\Feed
      * @param \ParadoxLabs\TokenBase\Helper\Data $helper
      * @param \Magento\Framework\Module\Dir $moduleDir
      * @param \Magento\Framework\Filesystem\Io\File $fileHandler
-     * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
-     * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
+     * @param \Magento\Framework\Model\ResourceModel\AbstractResource|null $resource
+     * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
      * @param array $data
      */
     public function __construct(
@@ -68,8 +68,8 @@ public function __construct(
         \ParadoxLabs\TokenBase\Helper\Data $helper,
         \Magento\Framework\Module\Dir $moduleDir,
         \Magento\Framework\Filesystem\Io\File $fileHandler,
-        \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
-        \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
+        ?\Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
+        ?\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
         array $data = []
     ) {
         $this->helper = $helper;

Observer/ValidatePaymentObserver.php

@@ -36,7 +36,7 @@ class ValidatePaymentObserver implements \Magento\Framework\Event\ObserverInterf
      * @param \Magento\Payment\Gateway\Validator\ValidatorPoolInterface|null $validatorPool
      */
     public function __construct(
-        \Magento\Payment\Gateway\Validator\ValidatorPoolInterface $validatorPool = null
+        ?\Magento\Payment\Gateway\Validator\ValidatorPoolInterface $validatorPool = null
     ) {
         $this->validatorPool = $validatorPool;
     }

Plugin/Checkout/Model/GuestPaymentInformationManagement/Plugin.php

@@ -92,7 +92,7 @@ public function aroundSavePaymentInformationAndPlaceOrder(
         $cartId,
         $email,
         \Magento\Quote\Api\Data\PaymentInterface $paymentMethod,
-        \Magento\Quote\Api\Data\AddressInterface $billingAddress = null
+        ?\Magento\Quote\Api\Data\AddressInterface $billingAddress = null
     ) {
         try {
             return $proceed($cartId, $email, $paymentMethod, $billingAddress);