Merge pull request #3884 from magento-arcticfoxes/2.3.1-qwerty-pr

[2.3.1-qwerty] Sync with 2.3.1-release

Author: joanhe

app/code/Magento/Braintree/Controller/Paypal/Review.php

@@ -13,11 +13,12 @@
 use Magento\Braintree\Model\Paypal\Helper\QuoteUpdater;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\App\Action\HttpGetActionInterface;
 
 /**
  * Class Review
  */
-class Review extends AbstractAction implements HttpPostActionInterface
+class Review extends AbstractAction implements HttpPostActionInterface, HttpGetActionInterface
 {
     /**
      * @var QuoteUpdater

app/code/Magento/CatalogAnalytics/composer.json

@@ -4,7 +4,8 @@
     "require": {
         "php": "~7.1.3||~7.2.0",
         "magento/framework": "*",
-        "magento/module-catalog": "*"
+        "magento/module-catalog": "*",
+        "magento/module-analytics": "*"
     },
     "type": "magento2-module",
     "license": [

app/code/Magento/CustomerAnalytics/composer.json

@@ -4,7 +4,8 @@
     "require": {
         "php": "~7.1.3||~7.2.0",
         "magento/framework": "*",
-        "magento/module-customer": "*"
+        "magento/module-customer": "*",
+        "magento/module-analytics": "*"
     },
     "type": "magento2-module",
     "license": [

app/code/Magento/GiftMessage/Model/CompositeConfigProvider.php

@@ -7,6 +7,9 @@
 
 use Magento\Checkout\Model\ConfigProviderInterface;
 
+/**
+ * Class CompositeConfigProvider
+ */
 class CompositeConfigProvider implements ConfigProviderInterface
 {
     /**
@@ -18,13 +21,13 @@ class CompositeConfigProvider implements ConfigProviderInterface
      * @param ConfigProviderInterface[] $configProviders
      */
     public function __construct(
-        array $configProviders
+        array $configProviders = []
     ) {
         $this->configProviders = $configProviders;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getConfig()
     {

app/code/Magento/QuoteAnalytics/composer.json

@@ -4,7 +4,8 @@
     "require": {
         "php": "~7.1.3||~7.2.0",
         "magento/framework": "*",
-        "magento/module-quote": "*"
+        "magento/module-quote": "*",
+        "magento/module-analytics": "*"
     },
     "type": "magento2-module",
     "license": [

app/code/Magento/ReviewAnalytics/composer.json

@@ -4,7 +4,8 @@
     "require": {
         "php": "~7.1.3||~7.2.0",
         "magento/framework": "*",
-        "magento/module-review": "*"
+        "magento/module-review": "*",
+        "magento/module-analytics": "*"
     },
     "type": "magento2-module",
     "license": [

app/code/Magento/SalesAnalytics/composer.json

@@ -4,7 +4,8 @@
     "require": {
         "php": "~7.1.3||~7.2.0",
         "magento/framework": "*",
-        "magento/module-sales": "*"
+        "magento/module-sales": "*",
+        "magento/module-analytics": "*"
     },
     "type": "magento2-module",
     "license": [

app/code/Magento/WishlistAnalytics/composer.json

@@ -4,7 +4,8 @@
     "require": {
         "php": "~7.1.3||~7.2.0",
         "magento/framework": "*",
-        "magento/module-wishlist": "*"
+        "magento/module-wishlist": "*",
+        "magento/module-analytics": "*"
     },
     "type": "magento2-module",
     "license": [

dev/tests/integration/testsuite/Magento/Braintree/Controller/Paypal/ReviewTest.php

@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Braintree\Controller\Paypal;
+
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\TestFramework\TestCase\AbstractController;
+
+/**
+ * ReviewTest
+ */
+class ReviewTest extends AbstractController
+{
+    /**
+     * @var Review
+     */
+    private $controller;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->controller = $this->_objectManager->create(Review::class);
+    }
+
+    /**
+     * Test controller implements correct interfaces
+     *
+     */
+    public function testInterfaceImplementation()
+    {
+        $this->assertInstanceOf(HttpGetActionInterface::class, $this->controller);
+        $this->assertInstanceOf(HttpPostActionInterface::class, $this->controller);
+    }
+}

dev/tests/static/framework/Magento/TestFramework/Dependency/AnalyticsConfigRule.php

@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Dependency;
+
+/**
+ * Class provides dependency rule for analytics.xml config file.
+ */
+class AnalyticsConfigRule implements RuleInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function getDependencyInfo($currentModule, $fileType, $file, &$contents)
+    {
+        if ('config' != $fileType || !preg_match('#.*/analytics\.xml$#', $file)) {
+            return [];
+        }
+
+        $dependenciesInfo = [];
+        if (preg_match_all('#<[customProvider|reportProvider][^>]*class=[\'"]([^\'"]+)[\'"]#i', $contents, $matches)) {
+            $classes = array_pop($matches);
+            foreach ($classes as $class) {
+                $classParts = explode('\\', $class);
+                $module = implode('\\', array_slice($classParts, 0, 2));
+                if (strtolower($currentModule) !== strtolower($module)) {
+                    $dependenciesInfo[] = [
+                        'module' => $module,
+                        'type' => RuleInterface::TYPE_HARD,
+                        'source' => $file,
+                    ];
+                }
+            }
+        }
+
+        return $dependenciesInfo;
+    }
+}