Merge remote-tracking branch 'origin/MAGETWO-80908' into MPI-PR24

Author: viktym

app/code/Magento/Braintree/composer.json

@@ -18,7 +18,7 @@
         "magento/module-quote": "101.0.*",
         "magento/module-paypal": "100.2.*",
         "magento/module-ui": "101.0.*",
-        "braintree/braintree_php": "3.25.0"
+        "braintree/braintree_php": "3.28.0"
     },
     "suggest": {
         "magento/module-checkout-agreements": "100.2.*",

app/code/Magento/NewRelicReporting/Console/Command/DeployMarker.php

@@ -48,21 +48,21 @@ protected function configure()
     {
         $this->setName("newrelic:create:deploy-marker");
         $this->setDescription("Check the deploy queue for entries and create an appropriate deploy marker.")
-             ->addArgument(
-                 'message',
-                 InputArgument::REQUIRED,
-                 'Deploy Message?'
-             )
-             ->addArgument(
-                 'changelog',
-                 InputArgument::REQUIRED,
-                 'Change Log?'
-             )
-             ->addArgument(
-                 'user',
-                 InputArgument::OPTIONAL,
-                 'Deployment User'
-             );
+            ->addArgument(
+                'message',
+                InputArgument::REQUIRED,
+                'Deploy Message?'
+            )
+            ->addArgument(
+                'changelog',
+                InputArgument::REQUIRED,
+                'Change Log?'
+            )
+            ->addArgument(
+                'user',
+                InputArgument::OPTIONAL,
+                'Deployment User'
+            );
         parent::configure();
     }
 

app/code/Magento/Tax/Test/Unit/Observer/UpdateProductOptionsObserverTest.php

@@ -3,10 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\Tax\Test\Unit\Observer;
 
-use \Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class UpdateProductOptionsObserverTest extends \PHPUnit\Framework\TestCase
 {
@@ -64,18 +63,18 @@ public function testUpdateProductOptions(
             ->method('getEvent')
             ->will($this->returnValue($eventObject));
 
-         $objectManager = new ObjectManager($this);
-         $taxObserverObject = $objectManager->getObject(
-             \Magento\Tax\Observer\UpdateProductOptionsObserver::class,
-             [
-                 'taxData' => $taxData,
-                 'registry' => $registry,
-             ]
-         );
+        $objectManager = new ObjectManager($this);
+        $taxObserverObject = $objectManager->getObject(
+            \Magento\Tax\Observer\UpdateProductOptionsObserver::class,
+            [
+                'taxData' => $taxData,
+                'registry' => $registry,
+            ]
+        );
 
-         $taxObserverObject->execute($observerObject);
+        $taxObserverObject->execute($observerObject);
 
-         $this->assertEquals($expected, $frameworkObject->getAdditionalOptions());
+        $this->assertEquals($expected, $frameworkObject->getAdditionalOptions());
     }
 
     /**

app/code/Magento/Theme/Model/Design/Backend/File.php

@@ -89,9 +89,9 @@ public function beforeSave()
         $values = $this->getValue();
         $value = reset($values) ?: [];
         if (!isset($value['file'])) {
-             throw new LocalizedException(
-                 __('%1 does not contain field \'file\'', $this->getData('field_config/field'))
-             );
+            throw new LocalizedException(
+                __('%1 does not contain field \'file\'', $this->getData('field_config/field'))
+            );
         }
         if (isset($value['exists'])) {
             $this->setValue($value['file']);

composer.json

@@ -45,12 +45,12 @@
         "pelago/emogrifier": "^2.0.0",
         "tubalmartin/cssmin": "4.1.0",
         "magento/magento-composer-installer": ">=0.1.11",
-        "braintree/braintree_php": "3.25.0",
+        "braintree/braintree_php": "3.28.0",
         "symfony/console": "~2.3, !=2.7.0",
         "symfony/event-dispatcher": "~2.1",
         "symfony/process": "~2.1",
         "phpseclib/phpseclib": "2.0.*",
-        "tedivm/jshrink": "~1.2.0",
+        "tedivm/jshrink": "~1.3.0",
         "magento/composer": "~1.2.0",
         "lib-libxml": "*",
         "ext-ctype": "*",
@@ -71,14 +71,14 @@
         "ext-pdo_mysql": "*",
         "ext-soap": "*",
         "sjparkinson/static-review": "~4.1",
-        "ramsey/uuid": "3.7.1"
+        "ramsey/uuid": "~3.7.1"
     },
     "require-dev": {
         "phpunit/phpunit": "~6.2.0",
-        "squizlabs/php_codesniffer": "3.1.1",
+        "squizlabs/php_codesniffer": "~3.2.1",
         "phpmd/phpmd": "@stable",
         "pdepend/pdepend": "2.5.0",
-        "friendsofphp/php-cs-fixer": "~2.2.0",
+        "friendsofphp/php-cs-fixer": "~2.2.1",
         "lusitanian/oauth": "~0.8.10",
         "sebastian/phpcpd": "2.0.4"
     },