Merge remote-tracking branch 'origin/2.3-develop' into MC-17934

Author: DianaRusin

CHANGELOG.md

@@ -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": "*",

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",
         "magento/framework": "*",
         "magento/module-catalog": "*",
         "magento/module-catalog-import-export": "*",

app/code/Magento/AdvancedPricingImportExport/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": [

app/code/Magento/AdvancedSearch/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": [

app/code/Magento/Amqp/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": "*",

app/code/Magento/AmqpStore/composer.json

@@ -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 = [];

app/code/Magento/Analytics/Model/Connector/Http/ResponseResolver.php

@@ -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": "*",

app/code/Magento/Analytics/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": "*",

app/code/Magento/AsynchronousOperations/composer.json

@@ -40,7 +40,7 @@ class Role extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Authorization\Model\ResourceModel\Role\Collection $resourceCollection
      * @param array $data
      */
-    public function __construct(
+    public function __construct( //phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod
         \Magento\Framework\Model\Context $context,
         \Magento\Framework\Registry $registry,
         \Magento\Authorization\Model\ResourceModel\Role $resource,
@@ -52,28 +52,18 @@ public function __construct(
 
     /**
      * @inheritDoc
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __sleep()
     {
-        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-
         $properties = parent::__sleep();
         return array_diff($properties, ['_resource', '_resourceCollection']);
     }
 
     /**
      * @inheritDoc
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __wakeup()
     {
-        trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
-
         parent::__wakeup();
         $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
         $this->_resource = $objectManager->get(\Magento\Authorization\Model\ResourceModel\Role::class);