Merge remote-tracking branch 'origin/bugfix' into bugs

Author: Serhiy Shkolyarenko

dev/tests/api-functional/testsuite/Magento/Bundle/Api/ProductOptionRepositoryTest.php

@@ -147,16 +147,6 @@ public function testAdd()
      */
     public function testUpdate()
     {
-        /** TODO: Remove after MAGETWO-40822 */
-        $isPhpVersionSupported = version_compare(
-            '7.0.0',
-            preg_replace('#^([^~+-]+).*$#', '$1', PHP_VERSION),
-            '>'
-        );
-        if (!$isPhpVersionSupported) {
-            $this->markTestSkipped('MAGETWO-40822');
-        }
-
         $productSku = 'bundle-product';
         $request = [
             'title' => 'someTitle',

dev/tests/integration/testsuite/Magento/Sitemap/Helper/DataTest.php

@@ -14,15 +14,6 @@ class DataTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        // TODO: Remove provided check after PHPMD will support PHP version 7
-        $isSupported = version_compare(
-            '7.0.0',
-            preg_replace('#^([^~+-]+).*$#', '$1', PHP_VERSION),
-            '>'
-        );
-        if (!$isSupported) {
-            $this->markTestSkipped('MAGETWO-40822: PHP7 incompatible');
-        }
         $this->_helper = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
             'Magento\Sitemap\Helper\Data'
         );

dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeMessDetector.php

@@ -46,9 +46,7 @@ public function __construct($rulesetFile, $reportFile)
      */
     public function canRun()
     {
-        /** TODO: Remove provided check after PHPMD will support PHP version 7 */
-        $isPhpVersionSupported = PHP_VERSION_ID < 70000;
-        return class_exists('PHPMD\TextUI\Command') && $isPhpVersionSupported;
+        return class_exists('PHPMD\TextUI\Command');
     }
 
     /**

dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/CodingStandard/Tool/CodeMessDetectorTest.php

@@ -14,15 +14,8 @@ public function testCanRun()
             'some/report/file.xml'
         );
 
-        /** TODO: Remove provided check after PHPMD will support PHP version 7 */
-        $isPhpVersionSupported = version_compare(
-            '7.0.0',
-            preg_replace('#^([^~+-]+).*$#', '$1', PHP_VERSION),
-            '>'
-        );
-
         $this->assertEquals(
-            class_exists('PHPMD\TextUI\Command') && $isPhpVersionSupported,
+            class_exists('PHPMD\TextUI\Command'),
             $messDetector->canRun()
         );
     }

setup/src/Magento/Setup/Controller/Connect.php

@@ -42,7 +42,10 @@ public function __construct(ComposerInformation $composerInformation, ConnectMan
      */
     public function saveAuthJsonAction()
     {
-        $params = Json::decode($this->getRequest()->getContent(), Json::TYPE_ARRAY);
+        $params = [];
+        if ($this->getRequest()->getContent()) {
+            $params = Json::decode($this->getRequest()->getContent(), Json::TYPE_ARRAY);
+        }
         try {
             $userName = isset($params['username']) ? $params['username'] : '';
             $password = isset($params['password']) ? $params['password'] : '';