MAGETWO-21072: Entry point responsiveness

- added materialization strategy

Author: dkvashninbay

app/etc/di.xml

@@ -508,12 +508,20 @@
     <type name="Magento\Framework\App\StaticResource">
         <arguments>
             <argument name="response" xsi:type="object" shared="false">Magento\Core\Model\File\Storage\Response</argument>
-            <argument name="publisher" xsi:type="object">symlinkPublisher</argument>
+            <argument name="publisher" xsi:type="object">developerPublisher</argument>
         </arguments>
     </type>
-    <virtualType name="symlinkPublisher" type="Magento\Framework\App\View\Asset\Publisher">
+    <virtualType name="developerPublisher" type="Magento\Framework\App\View\Asset\Publisher">
         <arguments>
-            <argument name="publisher" xsi:type="object">Magento\Framework\App\View\Asset\Publisher\Symlink</argument>
+            <argument name="materializationStrategyFactory" xsi:type="object">developerMaterialization</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="developerMaterialization" type="Magento\Framework\App\View\Asset\MaterializationStrategy\Factory">
+        <arguments>
+            <argument name="strategiesList" xsi:type="array">
+                <item name="view_preprocessed" xsi:type="object">Magento\Framework\App\View\Asset\MaterializationStrategy\Symlink</item>
+                <item name="default" xsi:type="object">Magento\Framework\App\View\Asset\MaterializationStrategy\Copy</item>
+            </argument>
         </arguments>
     </virtualType>
     <virtualType name="fallbackResolverSimpleWithGroupedCache" type="Magento\Framework\View\Design\FileResolution\Fallback\Resolver\Simple">

lib/internal/Magento/Framework/App/View/Asset/Publisher/Copy.php renamed to lib/internal/Magento/Framework/App/View/Asset/MaterializationStrategy/Copy.php

@@ -4,11 +4,12 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Framework\App\View\Asset\Publisher;
+namespace Magento\Framework\App\View\Asset\MaterializationStrategy;
 
 use Magento\Framework\Filesystem\Directory\WriteInterface;
+use Magento\Framework\View\Asset;
 
-class Copy implements PublisherInterface
+class Copy implements StrategyInterface
 {
     /**
      * Publish file
@@ -27,4 +28,15 @@ public function publishFile(
     ) {
         return $rootDir->copyFile($sourcePath, $destinationPath, $targetDir);
     }
+
+    /**
+     * Whether the strategy can be applied
+     *
+     * @param Asset\LocalInterface $asset
+     * @return bool
+     */
+    public function isSupported(Asset\LocalInterface $asset)
+    {
+        return true;
+    }
 }

lib/internal/Magento/Framework/App/View/Asset/MaterializationStrategy/Factory.php

@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\App\View\Asset\MaterializationStrategy;
+
+use Magento\Framework\View\Asset;
+
+class Factory
+{
+    /**
+     * Object Manager instance
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    protected $_objectManager;
+
+    /**
+     * Strategies list
+     *
+     * @var array
+     */
+    protected $strategiesList;
+
+    /**
+     * Default strategy key
+     */
+    const DEFAULT_STRATEGY = 'Magento\Framework\App\View\Asset\MaterializationStrategy\Copy';
+
+    /**
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param StrategyInterface[] $strategiesList
+     */
+    public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager, $strategiesList = [])
+    {
+        $this->_objectManager = $objectManager;
+        $this->strategiesList = $strategiesList;
+    }
+
+    /**
+     * Create materialization strategy basing on asset
+     *
+     * @param Asset\LocalInterface $asset
+     * @return StrategyInterface
+     *
+     * @throws \LogicException
+     */
+    public function create(Asset\LocalInterface $asset)
+    {
+        if (empty($this->strategiesList)) {
+            $this->strategiesList[] = $this->_objectManager->get(self::DEFAULT_STRATEGY);
+        }
+
+        foreach ($this->strategiesList as $strategy) {
+            if ($strategy->isSupported($asset)) {
+                return $strategy;
+            }
+        }
+
+        throw new \LogicException(__('No materialization strategy is supported'));
+    }
+}

lib/internal/Magento/Framework/App/View/Asset/Publisher/PublisherInterface.php renamed to lib/internal/Magento/Framework/App/View/Asset/MaterializationStrategy/StrategyInterface.php

@@ -4,11 +4,12 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Framework\App\View\Asset\Publisher;
+namespace Magento\Framework\App\View\Asset\MaterializationStrategy;
 
 use Magento\Framework\Filesystem\Directory\WriteInterface;
+use Magento\Framework\View\Asset;
 
-interface PublisherInterface
+interface StrategyInterface
 {
     /**
      * Publish file
@@ -25,4 +26,12 @@ public function publishFile(
         $sourcePath,
         $destinationPath
     );
+
+    /**
+     * Whether the strategy can be applied
+     *
+     * @param Asset\LocalInterface $asset
+     * @return bool
+     */
+    public function isSupported(Asset\LocalInterface $asset);
 }

lib/internal/Magento/Framework/App/View/Asset/Publisher/Symlink.php renamed to lib/internal/Magento/Framework/App/View/Asset/MaterializationStrategy/Symlink.php

@@ -4,11 +4,12 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Framework\App\View\Asset\Publisher;
+namespace Magento\Framework\App\View\Asset\MaterializationStrategy;
 
 use Magento\Framework\Filesystem\Directory\WriteInterface;
+use Magento\Framework\View\Asset;
 
-class Symlink implements PublisherInterface
+class Symlink implements StrategyInterface
 {
     /**
      * Publish file
@@ -27,4 +28,20 @@ public function publishFile(
     ) {
         return $rootDir->createSymlink($sourcePath, $destinationPath, $targetDir);
     }
+
+    /**
+     * Whether the strategy can be applied
+     *
+     * @param Asset\LocalInterface $asset
+     * @return bool
+     */
+    public function isSupported(Asset\LocalInterface $asset)
+    {
+        $sourceParts = explode('/', $asset->getSourceFile());
+        if (in_array(Asset\Source::TMP_MATERIALIZATION_DIR, $sourceParts)) {
+            return false;
+        }
+
+        return true;
+    }
 }

lib/internal/Magento/Framework/App/View/Asset/Publisher.php

@@ -20,20 +20,20 @@ class Publisher
     protected $filesystem;
 
     /**
-     * @var Publisher\PublisherInterface
+     * @var MaterializationStrategy\Factory
      */
-    private $publisher;
+    private $materializationStrategyFactory;
 
     /**
      * @param \Magento\Framework\Filesystem $filesystem
-     * @param Publisher\PublisherInterface $publisher
+     * @param MaterializationStrategy\Factory $materializationStrategyFactory
      */
     public function __construct(
         \Magento\Framework\Filesystem $filesystem,
-        Publisher\PublisherInterface $publisher
+        MaterializationStrategy\Factory $materializationStrategyFactory
     ) {
         $this->filesystem = $filesystem;
-        $this->publisher = $publisher;
+        $this->materializationStrategyFactory = $materializationStrategyFactory;
     }
 
     /**
@@ -61,6 +61,7 @@ private function publishAsset(Asset\LocalInterface $asset)
         $rootDir = $this->filesystem->getDirectoryWrite(DirectoryList::ROOT);
         $source = $rootDir->getRelativePath($asset->getSourceFile());
         $destination = $asset->getPath();
-        return $this->publisher->publishFile($rootDir, $targetDir, $source, $destination);
+        $strategy = $this->materializationStrategyFactory->create($asset);
+        return $strategy->publishFile($rootDir, $targetDir, $source, $destination);
     }
 }