Merge pull request #4488 from magento-techdivision/php73_update

[Techdivision] Add PHP 7.3 support
magento · Jul 30, 2019 · fc7fb0d · fc7fb0d
2 parents 65cdb4c + 23bd6d3
commit fc7fb0d
Show file tree

Hide file tree

Showing 235 changed files with 1,105 additions and 725 deletions.
diff --git a/app/code/Magento/AdminNotification/composer.json b/app/code/Magento/AdminNotification/composer.json
@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~7.1.3||~7.2.0",
+        "php": "~7.1.3||~7.2.0||~7.3.0",
         "lib-libxml": "*",
         "magento/framework": "*",
         "magento/module-backend": "*",

diff --git a/app/code/Magento/AdvancedPricingImportExport/composer.json b/app/code/Magento/AdvancedPricingImportExport/composer.json
@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~7.1.3||~7.2.0",
+        "php": "~7.1.3||~7.2.0||~7.3.0",
         "magento/framework": "*",
         "magento/module-catalog": "*",
         "magento/module-catalog-import-export": "*",

diff --git a/app/code/Magento/AdvancedSearch/composer.json b/app/code/Magento/AdvancedSearch/composer.json
@@ -13,7 +13,7 @@
         "magento/module-customer": "*",
         "magento/module-search": "*",
         "magento/module-store": "*",
-        "php": "~7.1.3||~7.2.0"
+        "php": "~7.1.3||~7.2.0||~7.3.0"
     },
     "type": "magento2-module",
     "license": [

diff --git a/app/code/Magento/Amqp/composer.json b/app/code/Magento/Amqp/composer.json
@@ -8,7 +8,7 @@
         "magento/framework": "*",
         "magento/framework-amqp": "*",
         "magento/framework-message-queue": "*",
-        "php": "~7.1.3||~7.2.0"
+        "php": "~7.1.3||~7.2.0||~7.3.0"
     },
     "type": "magento2-module",
     "license": [

diff --git a/app/code/Magento/AmqpStore/composer.json b/app/code/Magento/AmqpStore/composer.json
@@ -8,7 +8,7 @@
         "magento/framework": "*",
         "magento/framework-amqp": "*",
         "magento/module-store": "*",
-        "php": "~7.1.3||~7.2.0"
+        "php": "~7.1.3||~7.2.0||~7.3.0"
     },
     "suggest": {
         "magento/module-asynchronous-operations": "*",

diff --git a/app/code/Magento/Analytics/Model/Connector/Http/ResponseResolver.php b/app/code/Magento/Analytics/Model/Connector/Http/ResponseResolver.php
@@ -31,8 +31,9 @@ public function __construct(ConverterInterface $converter, array $responseHandle
     }
 
     /**
-     * @param \Zend_Http_Response $response
+     * Get result from $response.
      *
+     * @param \Zend_Http_Response $response
      * @return bool|string
      */
     public function getResult(\Zend_Http_Response $response)
@@ -41,7 +42,8 @@ public function getResult(\Zend_Http_Response $response)
         $converterMediaType = $this->converter->getContentMediaType();
 
         /** Content-Type header may not only contain media-type declaration */
-        if ($response->getBody() && is_int(strripos($response->getHeader('Content-Type'), $converterMediaType))) {
+        if ($response->getBody()
+            && is_int(strripos($response->getHeader('Content-Type'), (string) $converterMediaType))) {
             $responseBody = $this->converter->fromBody($response->getBody());
         } else {
             $responseBody = [];

diff --git a/app/code/Magento/Analytics/composer.json b/app/code/Magento/Analytics/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-analytics",
     "description": "N/A",
     "require": {
-        "php": "~7.1.3||~7.2.0",
+        "php": "~7.1.3||~7.2.0||~7.3.0",
         "magento/module-backend": "*",
         "magento/module-config": "*",
         "magento/module-integration": "*",

diff --git a/app/code/Magento/AsynchronousOperations/composer.json b/app/code/Magento/AsynchronousOperations/composer.json
@@ -10,7 +10,7 @@
         "magento/module-authorization": "*",
         "magento/module-backend": "*",
         "magento/module-ui": "*",
-        "php": "~7.1.3||~7.2.0"
+        "php": "~7.1.3||~7.2.0||~7.3.0"
     },
     "suggest": {
         "magento/module-admin-notification": "*",

diff --git a/app/code/Magento/Authorization/composer.json b/app/code/Magento/Authorization/composer.json
@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~7.1.3||~7.2.0",
+        "php": "~7.1.3||~7.2.0||~7.3.0",
         "magento/framework": "*",
         "magento/module-backend": "*"
     },

diff --git a/app/code/Magento/Authorizenet/composer.json b/app/code/Magento/Authorizenet/composer.json
@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~7.1.3||~7.2.0",
+        "php": "~7.1.3||~7.2.0||~7.3.0",
         "magento/framework": "*",
         "magento/module-backend": "*",
         "magento/module-catalog": "*",

diff --git a/app/code/Magento/AuthorizenetAcceptjs/composer.json b/app/code/Magento/AuthorizenetAcceptjs/composer.json
@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~7.1.3||~7.2.0",
+        "php": "~7.1.3||~7.2.0||~7.3.0",
         "magento/framework": "*",
         "magento/module-payment": "*",
         "magento/module-sales": "*",

diff --git a/app/code/Magento/AuthorizenetCardinal/composer.json b/app/code/Magento/AuthorizenetCardinal/composer.json
@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~7.1.3||~7.2.0",
+        "php": "~7.1.3||~7.2.0||~7.3.0",
         "magento/module-authorizenet-acceptjs": "*",
         "magento/framework": "*",
         "magento/module-cardinal-commerce": "*",

diff --git a/app/code/Magento/AuthorizenetGraphQl/composer.json b/app/code/Magento/AuthorizenetGraphQl/composer.json
@@ -3,7 +3,7 @@
     "description": "N/A",
     "type": "magento2-module",
     "require": {
-        "php": "~7.1.3||~7.2.0",
+        "php": "~7.1.3||~7.2.0||~7.3.0",
         "magento/framework": "*",
         "magento/module-quote-graph-ql": "*"
     },

diff --git a/app/code/Magento/Backend/App/Area/FrontNameResolver.php b/app/code/Magento/Backend/App/Area/FrontNameResolver.php
@@ -10,10 +10,15 @@
 use Magento\Backend\Setup\ConfigOptionsList;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\RequestInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\Store;
+use Zend\Uri\Uri;
 
 /**
+ * Class to get area front name.
+ *
  * @api
  * @since 100.0.2
  */
@@ -59,19 +64,35 @@ class FrontNameResolver implements \Magento\Framework\App\Area\FrontNameResolver
      */
     private $scopeConfig;
 
+    /**
+     * @var Uri
+     */
+    private $uri;
+
+    /**
+     * @var RequestInterface
+     */
+    private $request;
+
     /**
      * @param \Magento\Backend\App\Config $config
      * @param DeploymentConfig $deploymentConfig
      * @param ScopeConfigInterface $scopeConfig
+     * @param Uri $uri
+     * @param RequestInterface $request
      */
     public function __construct(
         \Magento\Backend\App\Config $config,
         DeploymentConfig $deploymentConfig,
-        ScopeConfigInterface $scopeConfig
+        ScopeConfigInterface $scopeConfig,
+        Uri $uri = null,
+        RequestInterface $request = null
     ) {
         $this->config = $config;
         $this->defaultFrontName = $deploymentConfig->get(ConfigOptionsList::CONFIG_PATH_BACKEND_FRONTNAME);
         $this->scopeConfig = $scopeConfig;
+        $this->uri = $uri ?: ObjectManager::getInstance()->get(Uri::class);
+        $this->request = $request ?: ObjectManager::getInstance()->get(RequestInterface::class);
     }
 
     /**
@@ -104,8 +125,8 @@ public function isHostBackend()
         } else {
             $backendUrl = $this->scopeConfig->getValue(Store::XML_PATH_UNSECURE_BASE_URL, ScopeInterface::SCOPE_STORE);
         }
-        $host = isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : '';
-        return stripos($this->getHostWithPort($backendUrl), $host) !== false;
+        $host = $this->request->getServer('HTTP_HOST', '');
+        return stripos($this->getHostWithPort($backendUrl), (string) $host) !== false;
     }
 
     /**
@@ -116,9 +137,11 @@ public function isHostBackend()
      */
     private function getHostWithPort($url)
     {
-        $scheme = parse_url(trim($url), PHP_URL_SCHEME);
-        $host = parse_url(trim($url), PHP_URL_HOST);
-        $port = parse_url(trim($url), PHP_URL_PORT);
+        $this->uri->parse($url);
+        $scheme = $this->uri->getScheme();
+        $host = $this->uri->getHost();
+        $port = $this->uri->getPort();
+
         if (!$port) {
             $port = isset($this->standardPorts[$scheme]) ? $this->standardPorts[$scheme] : null;
         }

diff --git a/app/code/Magento/Backend/Test/Unit/App/Area/FrontNameResolverTest.php b/app/code/Magento/Backend/Test/Unit/App/Area/FrontNameResolverTest.php
@@ -28,6 +28,16 @@ class FrontNameResolverTest extends \PHPUnit\Framework\TestCase
      */
     protected $scopeConfigMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Zend\Uri\Uri
+     */
+    protected $uri;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\App\Request\Http
+     */
+    protected $request;
+
     /**
      * @var string
      */
@@ -41,9 +51,19 @@ protected function setUp()
             ->method('get')
             ->with(ConfigOptionsList::CONFIG_PATH_BACKEND_FRONTNAME)
             ->will($this->returnValue($this->_defaultFrontName));
+        $this->uri = $this->createMock(\Zend\Uri\Uri::class);
+
+        $this->request = $this->createMock(\Magento\Framework\App\Request\Http::class);
+
         $this->configMock = $this->createMock(\Magento\Backend\App\Config::class);
         $this->scopeConfigMock = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
-        $this->model = new FrontNameResolver($this->configMock, $deploymentConfigMock, $this->scopeConfigMock);
+        $this->model = new FrontNameResolver(
+            $this->configMock,
+            $deploymentConfigMock,
+            $this->scopeConfigMock,
+            $this->uri,
+            $this->request
+        );
     }
 
     public function testIfCustomPathUsed()
@@ -93,7 +113,6 @@ public function testIfCustomPathNotUsed()
      */
     public function testIsHostBackend($url, $host, $useCustomAdminUrl, $customAdminUrl, $expectedValue)
     {
-        $_SERVER['HTTP_HOST'] = $host;
         $this->scopeConfigMock->expects($this->exactly(2))
             ->method('getValue')
             ->will(
@@ -115,6 +134,41 @@ public function testIsHostBackend($url, $host, $useCustomAdminUrl, $customAdminU
                     ]
                 )
             );
+
+        $this->request->expects($this->any())
+            ->method('getServer')
+            ->will($this->returnValue($host));
+
+        $urlParts = [];
+        $this->uri->expects($this->once())
+            ->method('parse')
+            ->willReturnCallback(
+                function ($url) use (&$urlParts) {
+                    $urlParts = parse_url($url);
+                }
+            );
+        $this->uri->expects($this->once())
+            ->method('getScheme')
+            ->willReturnCallback(
+                function () use (&$urlParts) {
+                    return array_key_exists('scheme', $urlParts) ? $urlParts['scheme'] : '';
+                }
+            );
+        $this->uri->expects($this->once())
+            ->method('getHost')
+            ->willReturnCallback(
+                function () use (&$urlParts) {
+                    return array_key_exists('host', $urlParts) ? $urlParts['host'] : '';
+                }
+            );
+        $this->uri->expects($this->once())
+            ->method('getPort')
+            ->willReturnCallback(
+                function () use (&$urlParts) {
+                    return array_key_exists('port', $urlParts) ? $urlParts['port'] : '';
+                }
+            );
+
         $this->assertEquals($this->model->isHostBackend(), $expectedValue);
     }
 

diff --git a/app/code/Magento/Backend/composer.json b/app/code/Magento/Backend/composer.json
@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-      "php": "~7.1.3||~7.2.0",
+      "php": "~7.1.3||~7.2.0||~7.3.0",
       "magento/framework": "*",
       "magento/module-backup": "*",
       "magento/module-catalog": "*",

diff --git a/app/code/Magento/Backup/composer.json b/app/code/Magento/Backup/composer.json
@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~7.1.3||~7.2.0",
+        "php": "~7.1.3||~7.2.0||~7.3.0",
         "magento/framework": "*",
         "magento/module-backend": "*",
         "magento/module-cron": "*",

diff --git a/app/code/Magento/Braintree/Model/LocaleResolver.php b/app/code/Magento/Braintree/Model/LocaleResolver.php
@@ -87,7 +87,7 @@ public function getLocale()
         $locale = $this->localeMap[$this->resolver->getLocale()] ?? $this->resolver->getLocale();
         $allowedLocales = $this->config->getValue('supported_locales');
 
-        return strpos($allowedLocales, $locale) !== false ? $locale : 'en_US';
+        return strpos($allowedLocales, (string) $locale) !== false ? $locale : 'en_US';
     }
 
     /**

diff --git a/app/code/Magento/Braintree/composer.json b/app/code/Magento/Braintree/composer.json
@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~7.1.3||~7.2.0",
+        "php": "~7.1.3||~7.2.0||~7.3.0",
         "braintree/braintree_php": "3.35.0",
         "magento/framework": "*",
         "magento/magento-composer-installer": "*",

diff --git a/app/code/Magento/Bundle/composer.json b/app/code/Magento/Bundle/composer.json
@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~7.1.3||~7.2.0",
+        "php": "~7.1.3||~7.2.0||~7.3.0",
         "magento/framework": "*",
         "magento/module-backend": "*",
         "magento/module-catalog": "*",

diff --git a/app/code/Magento/BundleGraphQl/composer.json b/app/code/Magento/BundleGraphQl/composer.json
@@ -3,7 +3,7 @@
     "description": "N/A",
     "type": "magento2-module",
     "require": {
-        "php": "~7.1.3||~7.2.0",
+        "php": "~7.1.3||~7.2.0||~7.3.0",
         "magento/module-catalog": "*",
         "magento/module-bundle": "*",
         "magento/module-catalog-graph-ql": "*",

diff --git a/app/code/Magento/BundleImportExport/composer.json b/app/code/Magento/BundleImportExport/composer.json
@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~7.1.3||~7.2.0",
+        "php": "~7.1.3||~7.2.0||~7.3.0",
         "magento/framework": "*",
         "magento/module-bundle": "*",
         "magento/module-store": "*",

diff --git a/app/code/Magento/CacheInvalidate/composer.json b/app/code/Magento/CacheInvalidate/composer.json
@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~7.1.3||~7.2.0",
+        "php": "~7.1.3||~7.2.0||~7.3.0",
         "magento/framework": "*",
         "magento/module-page-cache": "*"
     },

diff --git a/app/code/Magento/Captcha/composer.json b/app/code/Magento/Captcha/composer.json
@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~7.1.3||~7.2.0",
+        "php": "~7.1.3||~7.2.0||~7.3.0",
         "magento/framework": "*",
         "magento/module-backend": "*",
         "magento/module-checkout": "*",

diff --git a/app/code/Magento/CardinalCommerce/composer.json b/app/code/Magento/CardinalCommerce/composer.json
@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~7.1.3||~7.2.0",
+        "php": "~7.1.3||~7.2.0||~7.3.0",
         "magento/framework": "*",
         "magento/module-checkout": "*",
         "magento/module-payment": "*",