Merge remote-tracking branch 'mainline/2.3-develop' into fix-packaging-mq

Author: vrann

app/code/Magento/Version/Controller/Index/Index.php

@@ -39,9 +39,12 @@ public function __construct(Context $context, ProductMetadataInterface $productM
      */
     public function execute()
     {
-        $versionParts = explode('.', $this->productMetadata->getVersion());
-        if (!isset($versionParts[0]) || !isset($versionParts[1])) {
-            return ; // Major and minor version are not set - return empty response
+        $version = $this->productMetadata->getVersion();
+        $versionParts = explode('.', $version);
+        if ((!isset($versionParts[0]) || !isset($versionParts[1]))
+            || $this->isGitBasedInstallation($version)
+        ) {
+            return;
         }
         $majorMinorVersion = $versionParts[0] . '.' . $versionParts[1];
         $this->getResponse()->setBody(
@@ -50,4 +53,16 @@ public function execute()
             $this->productMetadata->getEdition() . ')'
         );
     }
+
+    /**
+     * Check if provided version is generated by Git-based Magento instance.
+     *
+     * @param string $fullVersion
+     * @return bool
+     */
+    private function isGitBasedInstallation($fullVersion)
+    {
+        $versionParts = explode('-', $fullVersion);
+        return (isset($versionParts[0]) && $versionParts[0] == 'dev');
+    }
 }

app/design/adminhtml/Magento/backend/web/css/source/_components.less

@@ -23,4 +23,4 @@
 @import 'components/_image-uploader.less';
 @import 'components/_slider.less';
 @import 'components/_url_input.less';
-@import '../../../../../../../../lib/web/jquery/spectrum/_color-picker.less';
+@import 'components/_color-picker.less';

lib/web/jquery/spectrum/_color-picker.less renamed to app/design/adminhtml/Magento/backend/web/css/source/components/_color-picker.less

@@ -20,8 +20,8 @@ public function testIndexAction()
         $edition = $productMetadata->getEdition();
 
         $fullVersion = $productMetadata->getVersion();
-        $versionParts = explode('.', $fullVersion);
-        if (isset($versionParts[1]) && isset($versionParts[0])) {
+        if ($this->isComposerBasedInstallation($fullVersion)) {
+            $versionParts = explode('.', $fullVersion);
             $majorMinor = $versionParts[0] . '.' . $versionParts[1];
 
             // Response must contain Major.Minor version, product name, and edition
@@ -36,4 +36,10 @@ public function testIndexAction()
             $this->assertEmpty($body);
         }
     }
+
+    private function isComposerBasedInstallation($fullVersion)
+    {
+        $versionParts = explode('-', $fullVersion);
+        return !(isset($versionParts[0]) && $versionParts[0] == 'dev');
+    }
 }