update

Author: inhere

src/files/Backup.php

@@ -0,0 +1,85 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: inhere
+ * Date: 2017-03-24
+ * Time: 10:33
+ */
+
+namespace inhere\librarys\files;
+
+/**
+ * Class Backup
+ * @package inhere\librarys\files
+ *
+ * ```
+ * $bk = new Backup;
+ *
+ * ```
+ *
+ */
+class Backup
+{
+//    protected $srcPath = '';
+
+    /**
+     * 备份保存目录
+     * @var string
+     */
+    protected $distPath = '';
+
+    /**
+     * @var array
+     */
+    protected $options = [
+        'max_version' => 5, // 最多保留最近 5 个
+        // 备份文件名
+        // 可用标志
+        // {name} 文件或目录名
+        // {date} 当前日期 'YmdHis'
+        // {time} 当前日期时间戳
+        'filename' => '{name}-{date}',
+        'compress' => 'zip', // 压缩格式 zip gzip phar tgz, 为空 直接拷贝目录备份
+    ];
+
+    protected $finder;
+
+    /**
+     * Backup constructor.
+     * @param $srcPath
+     * @param $distPath
+     * @param $options
+     */
+    public function __construct($srcPath, $distPath, $options = [])
+    {
+        $this->distPath = $distPath;
+
+        $options = array_merge([
+            'sourcePath' => $srcPath,
+            'include' => [],
+            'exclude' => [],
+        ], $options);
+
+        $this->finder = new FileFinder($options);
+    }
+
+    public function dirs()
+    {
+
+    }
+
+    public function files()
+    {
+
+    }
+
+    public function pack()
+    {
+
+    }
+
+    public function clearExpire($name)
+    {
+
+    }
+}

src/files/FileFinder.php

@@ -62,11 +62,11 @@ class FileFinder extends StdBase
     protected $include = [
         'file' => ['README.md'],
         'ext' => [
-            'js','css',
-            'ttf','svg', 'eot', 'woff', 'woff2',
-            'png', 'jpg', 'jpeg', 'gif', 'ico',
+            // 'js','css',
+            // 'ttf','svg', 'eot', 'woff', 'woff2',
+            // 'png', 'jpg', 'jpeg', 'gif', 'ico',
         ],
-        'dir' => [], // ['dist'],
+        'dir' => [], // ['dir'],
     ];
 
     /**

src/files/Compress.php renamed to src/files/Package.php

@@ -9,6 +9,7 @@
 namespace inhere\librarys\files;
 
 use inhere\librarys\exceptions\NotFoundException;
+use inhere\librarys\files\compress\AbstractCompressor;
 use inhere\librarys\helpers\ObjectHelper;
 use inhere\librarys\StdBase;
 use ZipArchive;
@@ -18,7 +19,7 @@
  * Class Compress
  * @package inhere\librarys\files
  */
-class Compress extends FileFinder
+class Package
 {
     /**
      * dir path, wait compress ...
@@ -36,6 +37,11 @@ class Compress extends FileFinder
 
     protected $type = 'zip';
 
+    /**
+     * @var AbstractCompressor
+     */
+    protected $compressor;
+
     /**
      * 包含的可发布的 文件 文件扩展匹配 目录
      * 比 {@see $exlude} 优先级更高
@@ -60,19 +66,12 @@ class Compress extends FileFinder
 //    public function __construct(array $config = [])
 //    {}
 
-    public function reset()
-    {
-        $this->compressedFile = '';
-
-        return parent::reset();
-    }
-
-    public function compress($sourcePath, $compressedFile, $type = self::TYPE_ZIP)
+    public function pack($sourcePath, $saveTo, $type = self::TYPE_ZIP)
     {
 
     }
 
-    public function uncompress()
+    public function unpack($pack, $extractTo)
     {
 
     }

src/files/compress/AbstractCompressor.php

@@ -8,7 +8,7 @@
 
 namespace inhere\librarys\files\compress;
 
-use inhere\librarys\exceptions\InvalidArgumentException;
+use inhere\exceptions\InvalidArgumentException;
 use inhere\librarys\files\FileFinder;
 use inhere\librarys\helpers\ObjectHelper;
 use inhere\librarys\StdBase;

src/files/compress/PharCompressor.php

@@ -12,7 +12,44 @@
  * Class PharCompressor
  * @package inhere\librarys\files\compress
  */
-class PharCompressor
+class PharCompressor extends AbstractCompressor
 {
 
+    /**
+     * @return bool
+     */
+    public function isSupported()
+    {
+        // TODO: Implement isSupported() method.
+    }
+
+    /**
+     * @param string $sourcePath
+     * @param string $archiveFile
+     * @param bool $override
+     * @return bool
+     */
+    public function encode($sourcePath, $archiveFile, $override = true)
+    {
+        // TODO: Implement encode() method.
+    }
+
+    /**
+     * @param string $archiveFile
+     * @param string $extractTo
+     * @param bool $override
+     * @return bool
+     */
+    public function decode($archiveFile, $extractTo = '', $override = true)
+    {
+        // TODO: Implement decode() method.
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getDriver()
+    {
+        // TODO: Implement getDriver() method.
+    }
 }

src/files/compress/TgzCompressor.php

@@ -0,0 +1,17 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: inhere
+ * Date: 16/8/28
+ * Time: 上午2:14
+ */
+
+namespace inhere\librarys\files\compress;
+
+/**
+ * Class TgzCompressor
+ * @package inhere\librarys\files\compress
+ */
+class TgzCompressor extends GzipCompressor
+{
+}

src/functions.php

@@ -21,31 +21,57 @@ function html_minify($body)
     }
 }
 
+if ( !function_exists('value') ) {
+    /**
+     * @param $value
+     * @return mixed
+     *
+     * value(new Class)->xxx
+     */
+    function value($value) {
+        return $value;
+    }
+}
+
+if ( !function_exists('tap') ) {
+    function tap($value, callable $callback) {
+
+        $callback($value);
+
+        return $value;
+    }
+}
+
 if ( !function_exists('cookie') ) {
     /**
      * cookie get or set
      * @param  string|array $name
      * @param  mixed $default
-     * @param array $params
      * @return mixed
      */
-    function cookie($name, $default=null, array $params = [])
+    function cookie($name, $default=null)
     {
         // set, when $name is array
         if ($name && is_array($name) ) {
-            $p = array_merge([
-                'expire'   => null,
-                'path'     => null,
-                'domain'   => null,
-                'secure'   => null,
-                'httponly' => null
-            ],$params);
+            $d = [
+                'value' => '', 'expire' => null, 'path' => null, 'domain' => null, 'secure' => null, 'httpOnly' => null
+            ];
 
-            foreach ($name as $key => $value) {
-                if ($key && $value && is_string($key) && is_scalar($value)) {
-                    $_COOKIE[$key] = $value;
-                    setcookie($key, $value, $p['expire'], $p['path'], $p['domain'], $p['secure'], $p['httponly']);
+            foreach ($name as $n => $value) {
+                if ( !$n || !is_string($n) ) {
+                    continue;
                 }
+
+                if ( is_array($value) ) {
+                    $d = array_merge($d, $value);
+                } elseif (is_scalar($value)) {
+                    $d['value'] = $value;
+                } else {
+                    continue;
+                }
+
+                $_COOKIE[$n] = $d['value'];
+                setcookie($n, $d['value'], $d['expire'], $d['path'], $d['domain'], $d['secure'], $d['httpOnly']);
             }
 
             return $name;

src/traits/TraitUseOption.php

@@ -10,6 +10,8 @@
 
 namespace inhere\librarys\traits;
 
+use inhere\librarys\helpers\ArrayHelper;
+
 /**
  * Class TraitUseOption
  * @package inhere\librarys\traits
@@ -104,7 +106,8 @@ public function getOptions()
     public function setOptions($options, $merge = false)
     {
         if ( $merge ) {
-            $this->options = array_merge($this->options, (array)$options);
+            // $this->options = array_merge($this->options, (array)$options);
+            $this->options = ArrayHelper::merge($this->options, (array)$options);
         } else {
             $this->options = $options;
         }

src/traits/TraitUseSimpleOption.php

@@ -10,6 +10,8 @@
 
 namespace inhere\librarys\traits;
 
+use inhere\librarys\helpers\ArrayHelper;
+
 /**
  * Class TraitUseSimpleOption
  * @package inhere\librarys\traits
@@ -86,7 +88,8 @@ public function getOptions()
     public function setOptions($options, $merge = false)
     {
         if ( $merge ) {
-            $this->options = array_merge($this->options, $options);
+            // $this->options = array_merge($this->options, $options);
+            $this->options = ArrayHelper::merge($this->options, (array)$options);
         } else {
             $this->options = $options;
         }