Merge pull request #8 from learn-symfony/master

sync with main repository

Author: Eugene Matvejev

.gitignore

@@ -1,2 +1,4 @@
 var/
+bin/
 vendor/
+composer.lock

.scrutinizer.yml

@@ -11,10 +11,13 @@ build:
     environment:
         php:
             version: "7.0.4"
-#    tests:
-#        override:
-#            -
-#                command: "php bin/phpunit -c phpunit.xml --colors=always --verbose --coverage-clover=coverage.xml"
-#                coverage:
-#                    file: "coverage.xml"
-#                    format: "php-clover"
+    tests:
+        override:
+            -
+                command: "composer validate"
+        override:
+            -
+                command: "php bin/phpunit -c phpunit.xml --colors=always --verbose --coverage-clover=coverage.xml"
+                coverage:
+                    file: "coverage.xml"
+                    format: "php-clover"

.travis.yml

@@ -1,22 +1,14 @@
-language: php
-#
-#sudo: false
-#
-#cache:
-#    directories:
-#        - $HOME/.composer/cache/files
-#
-#matrix:
-#    include:
-##        - php: 5.6
-#        - php: 7.0
-#        - php: hhvm
-#
-#before_script:
-#    - if [ "$DEPENDENCIES" = "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi;
-#    - composer update $COMPOSER_FLAGS
-#
-#script: phpunit --coverage-text --coverage-clover=coverage.clover
-#
-#after_script:
-#    - wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover coverage.clover
+language: "php"
+php:
+    - "5.6"
+    - "7.0.4"
+    - "hhvm"
+
+before_script:
+    - "composer install --no-progress --no-interaction"
+
+script:
+    - "php bin/phpunit -c phpunit.xml --colors=always --verbose --coverage-clover=coverage.xml"
+
+after_success:
+    - "bash <(curl -s https://codecov.io/bash)"

composer.json

@@ -11,23 +11,31 @@
     ],
     "autoload": {
         "psr-4": {
-            "EM\\CssCompiler\\Handler\\": "",
             "EM\\CssCompiler\\": "src/"
-        }
+        },
+        "classmap": [
+            "ScriptHandler.php"
+        ]
     },
     "autoload-dev": {
         "psr-4": {
-            "EM\\Tests\\CssCompiler\\": "tests/"
-        }
+            "EM\\Tests\\PHPUnit\\": "tests/phpunit"
+        },
+        "classmap": [
+            "tests/shared-enviroment/IntegrationTestSuite.php"
+        ]
+    },
+    "config": {
+        "bin-dir": "bin/"
     },
     "require": {
-        "php": ">= 5.5.9 || 7.0.0 - 7.0.4 || >= 7.0.6",
+        "php": ">= 5.6.0 || 7.0.0 - 7.0.4 || >= 7.0.6",
         "leafo/lessphp": "^0.5",
         "leafo/scssphp": "@dev",
         "leafo/scssphp-compass": "@dev"
     },
     "require-dev": {
         "composer/composer": "^1.1",
-        "phpunit/phpunit": "^4.8"
+        "phpunit/phpunit": "^5.3"
     }
 }

src/Container/File.php

@@ -6,19 +6,16 @@
 
 class File
 {
-    const TYPE_SCSS    = 'scss';
-    const TYPE_SASS    = 'sass';
-    const TYPE_COMPASS = 'compass';
-    const TYPE_LESS    = 'less';
-    const TYPE_UNKNOWN = 'unknown';
-    /**
-     * @var string[]
-     */
-    private static $extensions = [
-        self::TYPE_SCSS,
-        self::TYPE_SASS,
+    const TYPE_UNKNOWN    = 'unknown';
+    const TYPE_COMPASS    = 'compass';
+    const TYPE_SASS       = 'sass';
+    const TYPE_SCSS       = 'scss';
+    const TYPE_LESS       = 'less';
+    static $supportedTypes = [
         self::TYPE_COMPASS,
-        self::TYPE_LESS,
+        self::TYPE_SASS,
+        self::TYPE_SCSS,
+        self::TYPE_LESS
     ];
     /**
      * @var string
@@ -51,28 +48,10 @@ public function __construct($sourcePath, $outputPath)
         $this->outputPath = $outputPath;
     }
 
-    public function getSourcePath()
-    {
-        return $this->sourcePath;
-    }
-
-    /**
-     * @param string $path
-     *
-     * @return File
-     */
-    public function setSourcePath($path)
-    {
-        $this->sourcePath = $path;
-        $this->detectSourceTypeFromPath($path);
-
-        return $this;
-    }
-
     /**
      * @return string
      */
-    public function getOutputPath() 
+    public function getOutputPath()
     {
         return $this->outputPath;
     }
@@ -113,13 +92,44 @@ public function setSourceContent($content)
      * @return File
      * @throws FileException
      */
-    public function setSourceContentFromSourcePath() 
+    public function setSourceContentFromSourcePath()
     {
         $this->sourceContent = $this->readSourceContentByPath();
 
         return $this;
     }
 
+    /**
+     * @return string
+     * @throws FileException
+     */
+    protected function readSourceContentByPath()
+    {
+        if (!file_exists($this->getSourcePath())) {
+            throw new FileException("file: {$this->sourcePath} doesn't exists");
+        }
+
+        return file_get_contents($this->getSourcePath());
+    }
+
+    public function getSourcePath()
+    {
+        return $this->sourcePath;
+    }
+
+    /**
+     * @param string $path
+     *
+     * @return File
+     */
+    public function setSourcePath($path)
+    {
+        $this->sourcePath = $path;
+        $this->type = $this->detectSourceTypeFromPath($path);
+
+        return $this;
+    }
+
     /**
      * @return string
      */
@@ -133,7 +143,7 @@ public function getParsedContent()
      *
      * @return File
      */
-    public function setParsedContent($content) 
+    public function setParsedContent($content)
     {
         $this->parsedContent = $content;
 
@@ -143,7 +153,7 @@ public function setParsedContent($content)
     /**
      * @return string
      */
-    public function getType() 
+    public function getType()
     {
         return $this->type;
     }
@@ -162,29 +172,15 @@ public function setType($type)
 
     /**
      * @param string $path
-     * 
-     * @return void
-     */
-    private function detectSourceTypeFromPath($path)
-    {
-        $extension = strtolower(pathinfo($path, PATHINFO_EXTENSION));
-        if (in_array($extension, static::$extensions)) {
-            $this->type = $extension;
-        } else {
-            $this->type = static::TYPE_UNKNOWN;
-        }
-    }
-
-    /**
+     *
      * @return string
-     * @throws FileException
      */
-    private function readSourceContentByPath()
+    protected function detectSourceTypeFromPath($path)
     {
-        if (!file_exists($this->getSourcePath())) {
-            throw new FileException("file: {$this->sourcePath} doesn't exists");
-        }
+        $extension = strtolower(pathinfo($path, PATHINFO_EXTENSION));
 
-        return file_get_contents($this->getSourcePath());
+        return in_array($extension, static::$supportedTypes)
+            ? $extension
+            : static::TYPE_UNKNOWN;
     }
 }