Add PHP 8.1 Support

Author: srenon

Controller/Adminhtml/Customer/Index.php

@@ -15,10 +15,10 @@
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Framework\Controller\Result\Json;
 use Magento\Framework\Controller\Result\JsonFactory;
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Api\OrderCustomerManagementInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Store\Model\App\Emulation;
 use MagePal\GuestToCustomer\Helper\Data;
 
 /**
@@ -62,6 +62,11 @@ class Index extends Action
      */
     private $authSession;
 
+    /**
+     * @var Emulation
+     */
+    private $emulation;
+
     /**
      * Index constructor.
      * @param Context $context
@@ -81,7 +86,8 @@ public function __construct(
         OrderCustomerManagementInterface $orderCustomerService,
         JsonFactory $resultJsonFactory,
         Session $authSession,
-        Data $helperData
+        Data $helperData,
+        Emulation $emulation
     ) {
         parent::__construct($context);
 
@@ -92,6 +98,7 @@ public function __construct(
         $this->customerRepository = $customerRepository;
         $this->authSession = $authSession;
         $this->helperData = $helperData;
+        $this->emulation = $emulation;
     }
 
     /**
@@ -110,7 +117,9 @@ public function execute()
         if ($orderId && $order->getEntityId()) {
             try {
                 if ($this->accountManagement->isEmailAvailable($order->getCustomerEmail())) {
+                    $this->emulation->startEnvironmentEmulation($order->getStoreId(), 'adminhtml');
                     $customer = $this->orderCustomerService->create($orderId);
+                    $this->emulation->stopEnvironmentEmulation();
                 } elseif ($this->helperData->isMergeIfCustomerAlreadyExists()) {
                     $customer = $this->customerRepository->get($order->getCustomerEmail());
                 } else {
@@ -153,6 +162,11 @@ protected function _isAllowed()
         return $this->_authorization->isAllowed('MagePal_GuestToCustomer::guesttocustomer');
     }
 
+    /**
+     * @param $hasError
+     * @param $message
+     * @return array
+     */
     protected function getMessage($hasError, $message)
     {
         return [

composer.json

@@ -26,13 +26,13 @@
         }
     ],
     "require": {
-        "php": "~5.6.0|7.0.2|7.0.4|~7.0.6|~7.1.0|~7.1.3|~7.2.0|~7.3.0|~7.4.0",
+        "php": "~5.6.0|7.0.2|7.0.4|~7.0.6|~7.1.0|~7.1.3|~7.2.0|~7.3.0|~7.4.0|~8.1.0",
         "magento/module-backend": "100.0.*|100.1.*|100.2.*|101.0.*|102.0.*",
         "magento/framework": "100.0.*|100.1.*|101.0.*|102.0.*|103.0.*",
         "magepal/magento2-core": ">=1.1.11"
     },
     "type": "magento2-module",
-    "version": "1.3.0",
+    "version": "1.3.1",
     "autoload": {
         "files": [
             "registration.php"