wip #5721 @0.5

diff --git a/src/Files/VirtualDirectory.php b/src/Files/VirtualDirectory.php
index 013ce0129389ea6ec6f21045295793a3cd5adb9d..3a40b64fc693e6a5d1e422f972db6dae220ce00f 100644 (file)
--- a/src/Files/VirtualDirectory.php
+++ b/src/Files/VirtualDirectory.php
@@ -86,7 +86,7 @@ class VirtualDirectory
 
             if (!file_exists($to) || filesize($from) !== filesize($to) || filemtime($from) > filemtime($to)) {
                 try {
-                    copy($from, $to);
+                    `cp -p $from $to`;
                 } catch (\Exception $e) {
                     throw new \Exception(sprintf('Failed to copy %s to %s', $from, $to));
                 }

diff --git a/src/Gzip.php b/src/Gzip.php
index 290ebc387426ada8602efa508ac530b94d3bf1f4..65784b51ac3f7d04c20b54c057034e9a1b00cf8a 100644 (file)
--- a/src/Gzip.php
+++ b/src/Gzip.php
@@ -5,89 +5,90 @@ use Cubist\Util\Files\Files;
 
 class Gzip
 {
-       public static function compressIfNotCompressed($filename)
-       {
-               if (file_exists($filename) && file_exists($filename . '.gz')) {
-                       if (filemtime($filename) >= filemtime($filename . '.gz')) {
-                               unlink($filename . '.gz');
-                       } else {
-                               unlink($filename);
-                       }
-               }
 
-               if (file_exists($filename) && !file_exists($filename . '.gz')) {
-                       `gzip $filename`;
-               }
-       }
+    public static function compressIfNotCompressed($filename)
+    {
+        if (file_exists($filename) && file_exists($filename . '.gz')) {
+            if (filemtime($filename) >= filemtime($filename . '.gz')) {
+                unlink($filename . '.gz');
+            } else {
+                unlink($filename);
+            }
+        }
 
-       public static function unlink($filename)
-       {
-               if (file_exists($filename)) {
-                       unlink($filename);
-               }
-               if (file_exists($filename . '.gz')) {
-                       unlink($filename . '.gz');
-               }
-       }
+        if (file_exists($filename) && !file_exists($filename . '.gz')) {
+            `gzip $filename`;
+        }
+    }
 
-       public static function file_exists($filename)
-       {
-               return file_exists($filename . '.gz') || file_exists($filename);
-       }
+    public static function unlink($filename)
+    {
+        if (file_exists($filename)) {
+            unlink($filename);
+        }
+        if (file_exists($filename . '.gz')) {
+            unlink($filename . '.gz');
+        }
+    }
 
-       public static function filemtime($filename)
-       {
-               if (file_exists($filename . '.gz')) {
-                       return filemtime($filename . '.gz');
-               } else if (file_exists($filename)) {
-                       return filemtime($filename);
-               } else {
-                       return false;
-               }
-       }
+    public static function file_exists($filename)
+    {
+        return file_exists($filename . '.gz') || file_exists($filename);
+    }
 
-       public static function file_get_contents($filename)
-       {
-               self::_filename($filename);
-               $fp = self::_fopen($filename, 'rb');
-               $res = stream_get_contents($fp);
-               fclose($fp);
-               return $res;
-       }
+    public static function filemtime($filename)
+    {
+        if (file_exists($filename . '.gz')) {
+            return filemtime($filename . '.gz');
+        } else if (file_exists($filename)) {
+            return filemtime($filename);
+        } else {
+            return false;
+        }
+    }
 
-       public static function file_put_contents($filename, $data, $compression = 7, $mode = 'w')
-       {
-               self::_filename($filename, true);
-               $fp = self::_fopen($filename, $mode, $compression);
-               $res = fwrite($fp, $data);
-               fclose($fp);
-               return $res;
-       }
+    public static function file_get_contents($filename)
+    {
+        self::_filename($filename);
+        $fp = self::fopen($filename);
+        $res = stream_get_contents($fp);
+        fclose($fp);
+        return $res;
+    }
 
-       protected static function _fopen($filename, $mode, $compression = 7)
-       {
-               $protocol = self::_protocol($filename);
-               if ($protocol == 'compress.zlib://') {
-                       $mode .= $compression;
-               }
-               return fopen($protocol . $filename, $mode);
-       }
+    public static function file_put_contents($filename, $data, $compression = 7, $mode = 'w')
+    {
+        self::_filename($filename, true);
+        $fp = self::fopen($filename, $mode, $compression);
+        $res = fwrite($fp, $data);
+        fclose($fp);
+        return $res;
+    }
 
-       protected static function _protocol($filename)
-       {
-               if (Files::getExtension($filename) == 'gz') {
-                       $protocol = 'compress.zlib://';
-               } else {
-                       $protocol = '';
-               }
-               return $protocol;
-       }
+    protected static function fopen($filename, $mode='rb', $compression = 7)
+    {
+        $protocol = self::_protocol($filename);
+        if ($protocol == 'compress.zlib://') {
+            $mode .= $compression;
+        }
+        return fopen($protocol . $filename, $mode);
+    }
 
-       protected static function _filename(&$filename, $forceGzip = false)
-       {
-               if ($forceGzip || (!file_exists($filename) && file_exists($filename . '.gz'))) {
-                       $filename .= '.gz';
-               }
-       }
+    protected static function _protocol($filename)
+    {
+        if (Files::getExtension($filename) == 'gz') {
+            $protocol = 'compress.zlib://';
+        } else {
+            $protocol = '';
+        }
+        return $protocol;
+    }
+
+    protected static function _filename(&$filename, $forceGzip = false)
+    {
+        if ($forceGzip || (!file_exists($filename) && file_exists($filename . '.gz'))) {
+            $filename .= '.gz';
+        }
+    }
 
 }