Merge branch 'ACP2E-517' of https://github.com/magento-l3/magento2ce into PR-2022-03-11

Author: Anna Bukatar

app/code/Magento/Deploy/Package/Processor/PreProcessor/Less.php

@@ -3,17 +3,18 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Deploy\Package\Processor\PreProcessor;
 
 use Magento\Deploy\Console\DeployStaticOptions;
 use Magento\Deploy\Package\Package;
 use Magento\Deploy\Package\PackageFile;
 use Magento\Deploy\Package\Processor\ProcessorInterface;
 use Magento\Deploy\Service\DeployStaticFile;
-use Magento\Framework\View\Asset\PreProcessor\FileNameResolver;
-use Magento\Framework\View\Asset\Minification;
 use Magento\Framework\Css\PreProcessor\Instruction\Import;
+use Magento\Framework\View\Asset\Minification;
 use Magento\Framework\View\Asset\NotationResolver;
+use Magento\Framework\View\Asset\PreProcessor\FileNameResolver;
 use Magento\Framework\View\Asset\Repository;
 
 /**
@@ -67,10 +68,10 @@ class Less implements ProcessorInterface
      * @param Minification $minification
      */
     public function __construct(
-        FileNameResolver $fileNameResolver,
+        FileNameResolver        $fileNameResolver,
         NotationResolver\Module $notationResolver,
-        DeployStaticFile $deployStaticFile,
-        Minification $minification
+        DeployStaticFile        $deployStaticFile,
+        Minification            $minification
     ) {
         $this->fileNameResolver = $fileNameResolver;
         $this->notationResolver = $notationResolver;
@@ -139,8 +140,10 @@ private function hasOverrides(PackageFile $parentFile, Package $package)
     }
 
     /**
-     * @param string  $fileName
-     * @param string  $parentFile
+     * Checks if there is a LESS file in current package which used for generating given CSS from parent package
+     *
+     * @param string $fileName
+     * @param string $parentFile
      * @param array $map
      * @return bool
      */
@@ -151,7 +154,9 @@ private function inParentFiles($fileName, $parentFile, $map)
                 return true;
             } else {
                 foreach ($map[$parentFile] as $pFile) {
-                    return $this->inParentFiles($fileName, $pFile, $map);
+                    if ($this->inParentFiles($fileName, $pFile, $map)) {
+                        return true;
+                    }
                 }
             }
         }
@@ -171,12 +176,14 @@ private function buildMap($filePath, $packagePath, $contentType)
         $content = $this->deployStaticFile->readTmpFile($filePath, $packagePath);
         $replaceCallback = function ($matchedContent) use ($filePath, $packagePath, $contentType) {
             $matchedFileId = $matchedContent['path'];
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
             if (!pathinfo($matchedContent['path'], PATHINFO_EXTENSION)) {
                 $matchedFileId .= '.' . $contentType;
             }
             if (strpos($matchedFileId, Repository::FILE_ID_SEPARATOR) !== false) {
                 $basePath = $packagePath;
             } else {
+                // phpcs:ignore Magento2.Functions.DiscouragedFunction
                 $basePath = pathinfo($filePath, PATHINFO_DIRNAME);
             }
             $resolvedPath = str_replace(Repository::FILE_ID_SEPARATOR, '/', $matchedFileId);

dev/tests/integration/testsuite/Magento/Deploy/DeployTest.php

@@ -79,7 +79,7 @@ class DeployTest extends \PHPUnit\Framework\TestCase
         Options::NO_HTML_MINIFY => false,
         Options::AREA => ['frontend'],
         Options::EXCLUDE_AREA => ['none'],
-        Options::THEME => ['Magento/zoom1', 'Magento/zoom2', 'Magento/zoom3'],
+        Options::THEME => ['Magento/zoom1', 'Magento/zoom2', 'Magento/zoom3', 'Vendor/parent', 'Vendor/child'],
         Options::EXCLUDE_THEME => ['none'],
         Options::LANGUAGE => ['en_US', 'fr_FR', 'pl_PL'],
         Options::EXCLUDE_LANGUAGE => ['none'],
@@ -147,7 +147,10 @@ public function testDeploy()
         $this->assertLessPreProcessor($actualFileContent);
         $this->assertCssUrlFixerPostProcessor($actualFileContent);
 
-        foreach (['Magento/zoom1', 'Magento/zoom2', 'Magento/zoom3'] as $theme) {
+        $actualFileContent = $this->staticDir->readFile('frontend/Vendor/child/default/css/styles-m.css');
+        $this->assertCssFromChildTheme($actualFileContent);
+
+        foreach (['Magento/zoom1', 'Magento/zoom2', 'Magento/zoom3', 'Vendor/parent', 'Vendor/child'] as $theme) {
             $this->assertBundleSize($theme);
             $this->assertExcluded($theme, $this->config->getExcludedFiles());
             $this->assertExcluded($theme, $this->config->getExcludedDir());
@@ -162,7 +165,7 @@ public function testDeploy()
      */
     private function assertFileExistsIsGenerated($fileName)
     {
-        foreach (['Magento/zoom1', 'Magento/zoom2', 'Magento/zoom3'] as $theme) {
+        foreach (['Magento/zoom1', 'Magento/zoom2', 'Magento/zoom3', 'Vendor/parent', 'Vendor/child'] as $theme) {
             foreach ($this->options[Options::LANGUAGE] as $locale) {
                 $this->assertFileExists(
                     $this->staticDir->getAbsolutePath(
@@ -213,6 +216,21 @@ private function assertCssUrlFixerPostProcessor($actualRootCssContent)
         $this->assertStringContainsString('color:#111', $actualRootCssContent);
     }
 
+    /**
+     * Assert CSS from child post-processor
+     *
+     * @param $actualRootCssContent
+     * @return void
+     */
+    private function assertCssFromChildTheme($actualRootCssContent)
+    {
+        //assert CssUrlFixer fix urls
+        $this->assertStringContainsString(
+            'super-test-class-for-easy-find',
+            $actualRootCssContent
+        );
+    }
+
     /**
      * Assert correct bundle size according to configuration set in view.xml
      *

dev/tests/integration/testsuite/Magento/Deploy/_files/Vendor/child/registration.php

@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::THEME, 'frontend/Vendor/child', __DIR__);

dev/tests/integration/testsuite/Magento/Deploy/_files/Vendor/child/theme.xml

@@ -0,0 +1,10 @@
+<!--
+  ~ /**
+  ~ * Copyright © Magento, Inc. All rights reserved.
+  ~ * See COPYING.txt for license details.
+  ~ */
+  -->
+<theme xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Config/etc/theme.xsd">
+    <title>Vendor Child</title>
+    <parent>Vendor/parent</parent>
+</theme>

dev/tests/integration/testsuite/Magento/Deploy/_files/Vendor/child/web/css/source/_extend-child.less

@@ -0,0 +1,5 @@
+& when (@media-common = true) {
+    .super-test-class-for-easy-find {
+        text-align: right;
+    }
+}

dev/tests/integration/testsuite/Magento/Deploy/_files/Vendor/parent/registration.php

@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::THEME, 'frontend/Vendor/parent', __DIR__);

dev/tests/integration/testsuite/Magento/Deploy/_files/Vendor/parent/theme.xml

@@ -0,0 +1,10 @@
+<!--
+  ~ /**
+  ~ * Copyright © Magento, Inc. All rights reserved.
+  ~ * See COPYING.txt for license details.
+  ~ */
+  -->
+<theme xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Config/etc/theme.xsd">
+    <title>Vendor Parent</title>
+    <parent>Magento/blank</parent>
+</theme>

dev/tests/integration/testsuite/Magento/Deploy/_files/Vendor/parent/web/css/source/_extend-child.less

@@ -0,0 +1,2 @@
+// This is overridden in B2B theme
+// https://devdocs.magento.com/guides/v2.4/frontend-dev-guide/css-guide/css_quick_guide_approach.html

dev/tests/integration/testsuite/Magento/Deploy/_files/Vendor/parent/web/css/source/_extend.less

@@ -0,0 +1,2 @@
+@import '_extend-child.less';
+

dev/tests/integration/testsuite/Magento/Deploy/_files/theme.php

@@ -38,7 +38,7 @@ function rcopy($src, $destination)
         foreach ($iterator as $file) {
             if ($file->isFile()) {
                 copy($file->getRealPath(), $destination . '/' . $file->getFilename());
-            } else if (!$file->isDot() && $file->isDir()) {
+            } elseif (!$file->isDot() && $file->isDir()) {
                 rcopy($file->getRealPath(), $destination . '/' . $file);
             }
         }
@@ -48,10 +48,6 @@ function rcopy($src, $destination)
 /** @var ComponentRegistrar $registrar */
 $registrar = $objectManager->get(ComponentRegistrar::class);
 
-//rcopy(
-//    __DIR__ . '/zoom1',
-//    $appDir->getAbsolutePath() . 'design/frontend/Magento/zoom1'
-//);
 if (!$registrar->getPath(ComponentRegistrar::THEME, 'frontend/Magento/zoom1')) {
     ComponentRegistrar::register(
         ComponentRegistrar::THEME,
@@ -60,10 +56,6 @@ function rcopy($src, $destination)
     );
 }
 
-//rcopy(
-//    __DIR__ . '/zoom2',
-//    $appDir->getAbsolutePath() . 'design/frontend/Magento/zoom2'
-//);
 if (!$registrar->getPath(ComponentRegistrar::THEME, 'frontend/Magento/zoom2')) {
     ComponentRegistrar::register(
         ComponentRegistrar::THEME,
@@ -72,10 +64,6 @@ function rcopy($src, $destination)
     );
 }
 
-//rcopy(
-//    __DIR__ . '/zoom3',
-//    $appDir->getAbsolutePath() . 'design/frontend/Magento/zoom3'
-//);
 if (!$registrar->getPath(ComponentRegistrar::THEME, 'frontend/Magento/zoom3')) {
     ComponentRegistrar::register(
         ComponentRegistrar::THEME,
@@ -84,6 +72,22 @@ function rcopy($src, $destination)
     );
 }
 
+if (!$registrar->getPath(ComponentRegistrar::THEME, 'frontend/Vendor/parent')) {
+    ComponentRegistrar::register(
+        ComponentRegistrar::THEME,
+        'frontend/Vendor/parent',
+        __DIR__ . '/Vendor/parent'
+    );
+}
+
+if (!$registrar->getPath(ComponentRegistrar::THEME, 'frontend/Vendor/child')) {
+    ComponentRegistrar::register(
+        ComponentRegistrar::THEME,
+        'frontend/Vendor/child',
+        __DIR__ . '/Vendor/child'
+    );
+}
+
 /** @var \Magento\Theme\Model\Theme\Registration $themeRegistration */
 $themeRegistration = $objectManager->get(\Magento\Theme\Model\Theme\Registration::class);
 $themeRegistration->register();