Merge pull request #78 from eugene-matvejev/improved-composer-handler

RC10 improved composer handler, now it accepts as well absolute paths

Author: Eugene Matvejev

src/ScriptHandler.php

@@ -33,20 +33,26 @@ public static function generateCSS(Event $event)
         static::validateConfiguration($extra);
 
         $processor = new Processor($event->getIO());
-        $currentDirectory = getcwd();
 
         foreach ($extra[static::CONFIG_MAIN_KEY] as $config) {
-            foreach ($config[static::OPTION_KEY_INPUT] as $value) {
-                $processor->attachFiles("{$currentDirectory}/{$value}", "{$currentDirectory}/{$config[static::OPTION_KEY_OUTPUT]}");
+            foreach ($config[static::OPTION_KEY_INPUT] as $inputSource) {
+                $processor->attachFiles(
+                    static::resolvePath($inputSource, getcwd()),
+                    static::resolvePath($config[static::OPTION_KEY_OUTPUT], getcwd())
+                );
             }
 
             $formatter = isset($config[static::OPTION_KEY_FORMATTER]) ? $config[static::OPTION_KEY_FORMATTER] : static::DEFAULT_OPTION_FORMATTER;
-
             $processor->processFiles($formatter);
         }
         $processor->saveOutput();
     }
 
+    protected static function resolvePath($path, $prefix)
+    {
+        return '/' === substr($path, 0, 1) ? $path : "{$prefix}/{$path}";
+    }
+
     /**
      * @param array $config
      *

tests/phpunit/Processor/ProcessorTest.php

@@ -255,8 +255,9 @@ public function saveOutput()
     {
         $processor = new Processor($this->io);
 
-        $expectedOutputFile = $this->getRootDirectory() . '/../var/tests/' . __FUNCTION__ . '.css';
+        $expectedOutputFile = $this->getCacheDirectory() . '/' . __FUNCTION__ . '.css';
         @unlink($expectedOutputFile);
+
         $processor->attachFiles(
             $this->getSharedFixturesDirectory() . '/scss',
             $expectedOutputFile

tests/phpunit/ScriptHandlerTest.php

@@ -2,6 +2,11 @@
 
 namespace EM\CssCompiler\Tests\PHPUnit;
 
+use Composer\Composer;
+use Composer\Config;
+use Composer\IO\IOInterface;
+use Composer\Package\RootPackage;
+use Composer\Script\Event;
 use EM\CssCompiler\ScriptHandler;
 use EM\CssCompiler\Tests\Environment\IntegrationTestSuite;
 
@@ -148,4 +153,46 @@ private function validateOptions($config)
     {
         return $this->invokeMethod(new ScriptHandler(), 'validateOptions', [[$config]]);
     }
+    
+    /*** *************************** INTEGRATION *************************** ***/
+    /**
+     * @see   ScriptHandler::generateCSS
+     * @test
+     */
+    public function generateCSS()
+    {
+        $composer = (new Composer());
+        /** @var RootPackage|\PHPUnit_Framework_MockObject_MockObject $rootPackage */
+        $rootPackage = $this->getMockBuilder(RootPackage::class)
+            ->setConstructorArgs(['css-compiler', 'dev-master', 'dev'])
+            ->setMethods(['getExtra'])
+            ->getMock();
+        /** @var IOInterface|\PHPUnit_Framework_MockObject_MockObject $io */
+        $io = $this->getMockBuilder(IOInterface::class)->getMock();
+
+        $output = $this->getCacheDirectory() . '/' . __FUNCTION__ . '.css';
+        @unlink($output);
+
+        $extra = [
+            'css-compiler' => [
+                [
+                    'format' => 'compact',
+                    'input'  => [
+                        $this->getSharedFixturesDirectory() . '/less'
+                    ],
+                    'output' => $output
+                ]
+            ]
+        ];
+
+        $rootPackage->expects($this->once())
+            ->method('getExtra')
+            ->willReturn($extra);
+        $composer->setPackage($rootPackage);
+
+        $event = new Event('onInstall', $composer, $io);
+
+        ScriptHandler::generateCSS($event);
+        $this->assertFileExists($output);
+    }
 }

tests/shared-enviroment/IntegrationTestSuite.php

@@ -30,15 +30,15 @@ protected function invokeMethod($object, $methodName, array $methodArguments = [
     /**
      * @return string
      */
-    public static function getRootDirectory()
+    protected function getRootDirectory()
     {
         return dirname(__DIR__);
     }
 
     /**
      * @return string
      */
-    public static function getSharedFixturesDirectory()
+    protected function getSharedFixturesDirectory()
     {
         return static::getRootDirectory() . '/shared-fixtures';
     }
@@ -50,8 +50,13 @@ public static function getSharedFixturesDirectory()
      *
      * @return string
      */
-    public static function getSharedFixtureContent(string $filename)
+    protected function getSharedFixtureContent(string $filename)
     {
         return file_get_contents(static::getSharedFixturesDirectory() . "/$filename");
     }
+
+    protected function getCacheDirectory()
+    {
+        return dirname($this->getRootDirectory()) . '/var/cache/tests';
+    }
 }