Merge branch 'release/1.0.2'

EcomDev · Feb 26, 2016 · 42fb297 · 42fb297
2 parents e888a50 + c77fa96
commit 42fb297
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 111 deletions.
diff --git a/composer.json b/composer.json
@@ -5,8 +5,7 @@
   "description": "Layout Compiler For Magento",
   "require": {
     "php": ">=5.4.0",
-    "magento-hackathon/magento-composer-installer": "*",
-    "symfony/filesystem": ">2.3"
+    "magento-hackathon/magento-composer-installer": "*"
   },
   "require-dev": {
     "magento/core": "1.9.1.0",

diff --git a/composer.lock b/composer.lock
diff --git a/src/app/code/community/EcomDev/LayoutCompiler/etc/config.xml b/src/app/code/community/EcomDev/LayoutCompiler/etc/config.xml
@@ -1,7 +1,7 @@
 <config>
     <modules>
         <EcomDev_LayoutCompiler>
-            <codeVersion>1.0.1</codeVersion>
+            <codeVersion>1.0.2</codeVersion>
         </EcomDev_LayoutCompiler>
     </modules>
     <global>

diff --git a/src/lib/EcomDev/LayoutCompiler/Compiler.php b/src/lib/EcomDev/LayoutCompiler/Compiler.php
@@ -28,13 +28,6 @@ class EcomDev_LayoutCompiler_Compiler
      */
     protected $parsers;
 
-    /**
-     * File system instance
-     *
-     * @var Filesystem
-     */
-    private $fileSystem;
-
     /**
      * Constructs a new compiler instance
      * 
@@ -67,8 +60,6 @@ public function __construct(array $options = array())
                 $this->setParser($key, $value);
             }
         }
-
-        $this->fileSystem = new Filesystem();
     }
 
     /**
@@ -132,7 +123,7 @@ public function compile(SourceInterface $source, MetadataInterface $metadata = n
             }
 
             foreach ($metadata->getHandles() as $handleName) {
-                $this->fileSystem->remove($metadata->getHandlePath($handleName));
+                @unlink($metadata->getHandlePath($handleName));
             }
         }
 
@@ -151,8 +142,8 @@ public function compile(SourceInterface $source, MetadataInterface $metadata = n
             if (isset($result[$handle])) {
                 $fileToSave = $metadata->getHandlePath($handle);
                 $path = dirname($fileToSave);
-                if (!$this->fileSystem->exists($path)) {
-                    $this->fileSystem->mkdir($path, 0755);
+                if (!is_dir($path)) {
+                    mkdir($path, 0755, true);
                 }
 
                 $tmpFile = $path . DIRECTORY_SEPARATOR . uniqid('tempfile');
@@ -172,16 +163,8 @@ public function compile(SourceInterface $source, MetadataInterface $metadata = n
 
                 file_put_contents($tmpFile, $content);
 
-                $this->fileSystem->rename(
-                    $tmpFile,
-                    $fileToSave,
-                    true
-                );
-
-                $this->fileSystem->chmod(
-                    $fileToSave,
-                    0644
-                );
+                rename($tmpFile, $fileToSave);
+                chmod($fileToSave, 0644);
             }
 
         }

diff --git a/src/lib/EcomDev/LayoutCompiler/Index.php b/src/lib/EcomDev/LayoutCompiler/Index.php
@@ -37,22 +37,6 @@ class EcomDev_LayoutCompiler_Index
      */
     private $hexTable;
 
-    /**
-     * File system instance
-     *
-     * @var Filesystem
-     */
-    private $fileSystem;
-
-    /**
-     * Initializes file system instance
-     *
-     */
-    public function __construct()
-    {
-        $this->fileSystem = new Filesystem();
-    }
-
     /**
      * Loads an index by metadata parameters
      *
@@ -214,25 +198,15 @@ public function save(array $parameters)
             $lines[] = sprintf('$this->addMetadata(%s);', var_export($metadata, true));
         }
 
-        if (!$this->fileSystem->exists($this->getSavePath())) {
-            $this->fileSystem->mkdir($this->getSavePath(), 0755);
+        if (!is_dir($this->getSavePath())) {
+            mkdir($this->getSavePath(), 0755, true);
         }
 
         $tmpFile = $this->getSavePath() . DIRECTORY_SEPARATOR . uniqid('tempfile');
         $filePath = $this->getIndexFileName($parameters);
         file_put_contents($tmpFile, "<?php \n" . implode("\n", $lines));
-
-        $this->fileSystem->rename(
-            $tmpFile,
-            $filePath,
-            true
-        );
-
-        $this->fileSystem->chmod(
-            $filePath,
-            0644
-        );
-
+        rename($tmpFile, $filePath);
+        chmod($filePath, 0644);
         return $this;
     }
 }