MAGETWO-21072: Entry point responsiveness

dkvashninbay · dkvashninbay · commit 85f422feced1 · 2015-02-11T13:31:40.000+02:00
- added tests
- broke dependencies
diff --git a/app/etc/di.xml b/app/etc/di.xml
@@ -463,11 +463,18 @@
             <argument name="stateCollection" xsi:type="object" shared="false">Magento\Framework\Mview\View\State\CollectionInterface</argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\App\View\Asset\Publisher" shared="false" />
     <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>
         </arguments>
     </type>
+    <virtualType name="symlinkPublisher" type="Magento\Framework\App\View\Asset\Publisher">
+        <arguments>
+            <argument name="publisher" xsi:type="object">Magento\Framework\App\View\Asset\Publisher\Symlink</argument>
+        </arguments>
+    </virtualType>
     <virtualType name="fallbackResolverSimpleWithGroupedCache" type="Magento\Framework\View\Design\FileResolution\Fallback\Resolver\Simple">
         <arguments>
             <argument name="cache" xsi:type="object">Magento\Framework\View\Design\FileResolution\Fallback\CacheData\Grouped</argument>
diff --git a/dev/tests/unit/testsuite/Magento/Framework/App/View/Asset/Publisher/CopyTest.php b/dev/tests/unit/testsuite/Magento/Framework/App/View/Asset/Publisher/CopyTest.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\App\View\Asset\Publisher;
+
+class CopyTest extends \PHPUnit_Framework_TestCase
+{
+    public function testPublishFile()
+    {
+        $rootDir = $this->getMockBuilder('Magento\Framework\Filesystem\Directory\WriteInterface')
+            ->getMock();
+        $targetDir = $this->getMockBuilder('Magento\Framework\Filesystem\Directory\WriteInterface')
+            ->getMock();
+        $sourcePath = 'source/path/file';
+        $destinationPath = 'destination/path/file';
+
+        $copyPublisher = new Copy;
+        $rootDir->expects($this->once())
+            ->method('copyFile')
+            ->with(
+                $sourcePath,
+                $destinationPath,
+                $targetDir
+            )->willReturn(true);
+
+        $this->assertTrue($copyPublisher->publishFile($rootDir, $targetDir, $sourcePath, $destinationPath));
+    }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Framework/App/View/Asset/Publisher/SymlinkTest.php b/dev/tests/unit/testsuite/Magento/Framework/App/View/Asset/Publisher/SymlinkTest.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\App\View\Asset\Publisher;
+
+
+class SymlinkTest extends \PHPUnit_Framework_TestCase
+{
+    public function testPublishFile()
+    {
+        $rootDir = $this->getMockBuilder('Magento\Framework\Filesystem\Directory\WriteInterface')
+            ->getMock();
+        $targetDir = $this->getMockBuilder('Magento\Framework\Filesystem\Directory\WriteInterface')
+            ->getMock();
+        $sourcePath = 'source/path/file';
+        $destinationPath = 'destination/path/file';
+
+        $copyPublisher = new Symlink;
+        $rootDir->expects($this->once())
+            ->method('createSymlink')
+            ->with(
+                $sourcePath,
+                $destinationPath,
+                $targetDir
+            )->willReturn(true);
+
+        $this->assertTrue($copyPublisher->publishFile($rootDir, $targetDir, $sourcePath, $destinationPath));
+    }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Framework/App/View/Asset/PublisherTest.php b/dev/tests/unit/testsuite/Magento/Framework/App/View/Asset/PublisherTest.php
@@ -11,11 +11,6 @@
 
 class PublisherTest extends \PHPUnit_Framework_TestCase
 {
-    /**
-     * @var \Magento\Framework\App\State|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $appState;
-
     /**
      * @var \Magento\Framework\Filesystem|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -41,11 +36,22 @@ class PublisherTest extends \PHPUnit_Framework_TestCase
      */
     private $object;
 
+    /**
+     * @var Publisher\PublisherInterface |\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $publisherFile;
+
     protected function setUp()
     {
-        $this->appState = $this->getMock('Magento\Framework\App\State', [], [], '', false);
         $this->filesystem = $this->getMock('Magento\Framework\Filesystem', [], [], '', false);
-        $this->object = new Publisher($this->appState, $this->filesystem);
+        $this->publisherFile = $this->getMock(
+            'Magento\Framework\App\View\Asset\Publisher\PublisherInterface',
+            [],
+            [],
+            '',
+            false
+        );
+        $this->object = new Publisher($this->filesystem, $this->publisherFile);
 
         $this->rootDirWrite = $this->getMockForAbstractClass('Magento\Framework\Filesystem\Directory\WriteInterface');
         $this->staticDirRead = $this->getMockForAbstractClass('Magento\Framework\Filesystem\Directory\ReadInterface');
@@ -62,19 +68,8 @@ protected function setUp()
             ]));
     }
 
-    public function testPublishNotAllowed()
-    {
-        $this->appState->expects($this->once())
-            ->method('getMode')
-            ->will($this->returnValue(\Magento\Framework\App\State::MODE_DEVELOPER));
-        $this->assertFalse($this->object->publish($this->getAsset()));
-    }
-
     public function testPublishExistsBefore()
     {
-        $this->appState->expects($this->once())
-            ->method('getMode')
-            ->will($this->returnValue(\Magento\Framework\App\State::MODE_PRODUCTION));
         $this->staticDirRead->expects($this->once())
             ->method('isExist')
             ->with('some/file.ext')
@@ -84,9 +79,6 @@ public function testPublishExistsBefore()
 
     public function testPublish()
     {
-        $this->appState->expects($this->once())
-            ->method('getMode')
-            ->will($this->returnValue(\Magento\Framework\App\State::MODE_PRODUCTION));
         $this->staticDirRead->expects($this->once())
             ->method('isExist')
             ->with('some/file.ext')
@@ -96,9 +88,9 @@ public function testPublish()
             ->method('getRelativePath')
             ->with('/root/some/file.ext')
             ->will($this->returnValue('some/file.ext'));
-        $this->rootDirWrite->expects($this->once())
-            ->method('copyFile')
-            ->with('some/file.ext', 'some/file.ext', $this->staticDirWrite)
+        $this->publisherFile->expects($this->once())
+            ->method('publishFile')
+            ->with($this->rootDirWrite, $this->staticDirWrite, 'some/file.ext', 'some/file.ext')
             ->will($this->returnValue(true));
 
         $this->assertTrue($this->object->publish($this->getAsset()));
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Filesystem/Directory/WriteTest.php b/dev/tests/unit/testsuite/Magento/Framework/Filesystem/Directory/WriteTest.php
@@ -28,6 +28,11 @@ class WriteTest extends \PHPUnit_Framework_TestCase
      */
     protected $fileFactory;
 
+    /**
+     * @var string
+     */
+    protected $path;
+
     /**
      * Set up
      */
@@ -41,10 +46,11 @@ protected function setUp()
             '',
             false
         );
+        $this->path = 'PATH/';
         $this->write = new \Magento\Framework\Filesystem\Directory\Write(
             $this->fileFactory,
             $this->driver,
-            null,
+            $this->path,
             'cool-permissions'
         );
     }
@@ -81,4 +87,66 @@ public function testIsWritable()
         $this->driver->expects($this->once())->method('isWritable')->will($this->returnValue(true));
         $this->assertTrue($this->write->isWritable('correct-path'));
     }
+
+
+    public function testCreateSymlinkTargetDirectoryExists()
+    {
+        $targetDir = $this->getMockBuilder('Magento\Framework\Filesystem\Directory\WriteInterface')
+            ->getMock();
+        $targetDir->driver = $this->driver;
+        $sourcePath = 'source/path/file';
+        $destinationDirectory = 'destination/path';
+        $destinationFile = $destinationDirectory . '/' . 'file';
+
+        $this->assertIsFileExpectation($sourcePath);
+        $this->driver->expects($this->once())
+            ->method('getParentDirectory')
+            ->with($destinationFile)
+            ->willReturn($destinationDirectory);
+        $targetDir->expects($this->once())
+            ->method('isExist')
+            ->with($destinationDirectory)
+            ->willReturn(true);
+        $targetDir->expects($this->once())
+            ->method('getAbsolutePath')
+            ->with($destinationFile)
+            ->willReturn($this->getAbsolutePath($destinationFile));
+        $this->driver->expects($this->once())
+            ->method('symlink')
+            ->with(
+                $this->getAbsolutePath($sourcePath),
+                $this->getAbsolutePath($destinationFile),
+                $targetDir->driver
+            )->willReturn(true);
+
+        $this->assertTrue($this->write->createSymlink($sourcePath, $destinationFile, $targetDir));
+    }
+
+    /**
+     * Assert is file expectation
+     *
+     * @param string $path
+     */
+    private function assertIsFileExpectation($path)
+    {
+        $this->driver->expects($this->any())
+            ->method('getAbsolutePath')
+            ->with($this->path, $path)
+            ->willReturn($this->getAbsolutePath($path));
+        $this->driver->expects($this->any())
+            ->method('isFile')
+            ->with($this->getAbsolutePath($path))
+            ->willReturn(true);
+    }
+
+    /**
+     * Returns expected absolute path to file
+     *
+     * @param string $path
+     * @return string
+     */
+    private function getAbsolutePath($path)
+    {
+        return $this->path . $path;
+    }
 }
diff --git a/dev/tools/Magento/Tools/View/Deployer.php b/dev/tools/Magento/Tools/View/Deployer.php
@@ -9,6 +9,7 @@
 use Magento\Framework\App\ObjectManagerFactory;
 use Magento\Framework\App\View\Deployment\Version;
 use Magento\Framework\Test\Utility\Files;
+use Magento\Framework\App\View\Asset\Publisher;
 
 /**
  * A service for deploying Magento static view files for production mode
@@ -35,7 +36,7 @@ class Deployer
     /** @var \Magento\Framework\View\Asset\Repository */
     private $assetRepo;
 
-    /** @var \Magento\Framework\App\View\Asset\Publisher */
+    /** @var Publisher */
     private $assetPublisher;
 
     /** @var bool */
@@ -170,7 +171,11 @@ private function emulateApplicationArea($areaCode)
         $configLoader = $objectManager->get('Magento\Framework\App\ObjectManager\ConfigLoader');
         $objectManager->configure($configLoader->load($areaCode));
         $this->assetRepo = $objectManager->get('Magento\Framework\View\Asset\Repository');
-        $this->assetPublisher = $objectManager->get('Magento\Framework\App\View\Asset\Publisher');
+
+        $this->assetPublisher = $objectManager->create(
+            'Magento\Framework\App\View\Asset\Publisher',
+            ['publisher' => new Publisher\Copy()]
+        );
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/App/StaticResource.php b/lib/internal/Magento/Framework/App/StaticResource.php
@@ -30,7 +30,7 @@ class StaticResource implements \Magento\Framework\AppInterface
     private $request;
 
     /**
-     * @var View\Asset\Publisher\Symlink
+     * @var View\Asset\Publisher
      */
     private $publisher;
 
@@ -62,7 +62,7 @@ class StaticResource implements \Magento\Framework\AppInterface
      * @param State $state
      * @param Response\FileInterface $response
      * @param Request\Http $request
-     * @param View\Asset\Publisher\Symlink $publisher
+     * @param View\Asset\Publisher $publisher
      * @param \Magento\Framework\View\Asset\Repository $assetRepo
      * @param \Magento\Framework\Module\ModuleList $moduleList
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
@@ -73,7 +73,7 @@ public function __construct(
         State $state,
         Response\FileInterface $response,
         Request\Http $request,
-        View\Asset\Publisher\Symlink $publisher,
+        View\Asset\Publisher $publisher,
         \Magento\Framework\View\Asset\Repository $assetRepo,
         \Magento\Framework\Module\ModuleList $moduleList,
         \Magento\Framework\ObjectManagerInterface $objectManager,
diff --git a/lib/internal/Magento/Framework/App/View/Asset/Publisher.php b/lib/internal/Magento/Framework/App/View/Asset/Publisher.php
@@ -8,33 +8,32 @@
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\View\Asset;
-use Magento\Framework\Filesystem\Directory\WriteInterface;
 
 /**
  * A publishing service for view assets
  */
 class Publisher
 {
     /**
-     * @var \Magento\Framework\App\State
+     * @var \Magento\Framework\Filesystem
      */
-    protected $appState;
+    protected $filesystem;
 
     /**
-     * @var \Magento\Framework\Filesystem
+     * @var Publisher\PublisherInterface
      */
-    protected $filesystem;
+    private $publisher;
 
     /**
-     * @param \Magento\Framework\App\State $appState
      * @param \Magento\Framework\Filesystem $filesystem
+     * @param Publisher\PublisherInterface $publisher
      */
     public function __construct(
-        \Magento\Framework\App\State $appState,
-        \Magento\Framework\Filesystem $filesystem
+        \Magento\Framework\Filesystem $filesystem,
+        Publisher\PublisherInterface $publisher
     ) {
-        $this->appState = $appState;
         $this->filesystem = $filesystem;
+        $this->publisher = $publisher;
     }
 
     /**
@@ -47,28 +46,21 @@ public function publish(Asset\LocalInterface $asset)
             return true;
         }
 
-        $rootDir = $this->filesystem->getDirectoryWrite(DirectoryList::ROOT);
-        $source = $rootDir->getRelativePath($asset->getSourceFile());
-
-        return $this->publishFile(
-            $rootDir,
-            $source,
-            $asset->getPath(),
-            $this->filesystem->getDirectoryWrite(DirectoryList::STATIC_VIEW)
-        );
+        return $this->publishAsset($asset);
     }
 
     /**
-     * Publish file
+     * Publish the asset
      *
-     * @param WriteInterface $rootDir
-     * @param string $source
-     * @param string $destination
-     * @param WriteInterface $dir
+     * @param Asset\LocalInterface $asset
      * @return bool
      */
-    protected function publishFile($rootDir, $source, $destination, $dir)
+    private function publishAsset(Asset\LocalInterface $asset)
     {
-        return $rootDir->copyFile($source, $destination, $dir);
+        $targetDir = $this->filesystem->getDirectoryWrite(DirectoryList::STATIC_VIEW);
+        $rootDir = $this->filesystem->getDirectoryWrite(DirectoryList::ROOT);
+        $source = $rootDir->getRelativePath($asset->getSourceFile());
+        $destination = $asset->getPath();
+        return $this->publisher->publishFile($rootDir, $targetDir, $source, $destination);
     }
 }
diff --git a/lib/internal/Magento/Framework/App/View/Asset/Publisher/Copy.php b/lib/internal/Magento/Framework/App/View/Asset/Publisher/Copy.php
diff --git a/lib/internal/Magento/Framework/App/View/Asset/Publisher/PublisherInterface.php b/lib/internal/Magento/Framework/App/View/Asset/Publisher/PublisherInterface.php
diff --git a/lib/internal/Magento/Framework/App/View/Asset/Publisher/Symlink.php b/lib/internal/Magento/Framework/App/View/Asset/Publisher/Symlink.php
diff --git a/lib/internal/Magento/Framework/Filesystem/Directory/Write.php b/lib/internal/Magento/Framework/Filesystem/Directory/Write.php
