Merge pull request #26 from ytake/develop5.1

use env

.scrutinizer.yml

@@ -1,6 +1,7 @@
 filter:
   excluded_paths:
     - tests/*
+    - src/config/*
 checks:
   php:
     code_rating: true

.travis.yml

@@ -1,14 +1,14 @@
+sudo: false
 language: php
 php:
   - 5.5
   - 5.6
   - hhvm
 services:
   - memcached
-install:
-  - composer self-update
-  - composer install
 before_script:
+  - composer self-update
+  - composer install --prefer-source
   - chmod -R 755 tests/bin/memcached.sh
   - tests/bin/memcached.sh
 script:

composer.json

@@ -22,7 +22,8 @@
     "illuminate/config": "5.*",
     "illuminate/console": "5.*",
     "illuminate/events": "5.*",
-    "smarty/smarty": "3.*"
+    "smarty/smarty": "3.*",
+    "vlucas/phpdotenv": "~1.0"
   },
   "require-dev": {
     "predis/predis": "~1.0",

src/Smarty/Cache/Redis.php

@@ -1,4 +1,14 @@
 <?php
+/**
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 namespace Ytake\LaravelSmarty\Cache;
 
 use Predis\Client;

src/Smarty/Cache/Storage.php

@@ -1,4 +1,14 @@
 <?php
+/**
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 namespace Ytake\LaravelSmarty\Cache;
 
 use Smarty;

src/Smarty/Console/CacheClearCommand.php

@@ -1,4 +1,14 @@
 <?php
+/**
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 namespace Ytake\LaravelSmarty\Console;
 
 use Smarty;
@@ -13,7 +23,7 @@
  */
 class CacheClearCommand extends Command
 {
-    
+
     /** @var Smarty */
     protected $smarty;
 

src/Smarty/Console/ClearCompiledCommand.php

@@ -1,4 +1,14 @@
 <?php
+/**
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 namespace Ytake\LaravelSmarty\Console;
 
 use Smarty;

src/Smarty/Console/OptimizeCommand.php

@@ -1,4 +1,14 @@
 <?php
+/**
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 namespace Ytake\LaravelSmarty\Console;
 
 use Smarty;

src/Smarty/Console/PackageInfoCommand.php

@@ -1,4 +1,14 @@
 <?php
+/**
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 namespace Ytake\LaravelSmarty\Console;
 
 use Smarty;

src/Smarty/Engines/SmartyEngine.php

@@ -1,4 +1,14 @@
 <?php
+/**
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 namespace Ytake\LaravelSmarty\Engines;
 
 use Smarty;

src/Smarty/Exception/MethodNotFoundException.php

@@ -1,4 +1,14 @@
 <?php
+/**
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 namespace Ytake\LaravelSmarty\Exception;
 
 /**

src/Smarty/SmartyCompileServiceProvider.php

@@ -1,4 +1,14 @@
 <?php
+/**
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 namespace Ytake\LaravelSmarty;
 
 use Illuminate\Support\ServiceProvider;

src/Smarty/SmartyConsoleServiceProvider.php

@@ -86,4 +86,4 @@ protected function registerCommands()
         );
     }
 
-}
+}

src/config/ytake-laravel-smarty.php

@@ -10,16 +10,16 @@
     'extension' => 'tpl',
 
     //
-    'debugging' => false,
+    'debugging' => env('SMARTY_DEBUG',false),
 
     // use cache
-    'caching' => false,
+    'caching' => env('SMARTY_CACHING', false),
 
     //
-    'cache_lifetime' => 120,
+    'cache_lifetime' => env('SMARTY_CACHE_LIFE', 120),
 
     //
-    'compile_check' => false,
+    'compile_check' => env('SMARTY_COMPILE_CHECK', false),
 
     // delimiters
     // default "{$smarty}"
@@ -29,14 +29,18 @@
     // path info
     'template_path' => base_path() . '/resources/views',
 
+    // smarty cache directory
     'cache_path' => storage_path() . '/framework/smarty/cache',
 
+    // smarty template compiler
     'compile_path' => storage_path() . '/framework/smarty/compile',
 
+    // smarty plugins
     'plugins_paths' => [
         base_path() . '/resources/smarty/plugins',
     ],
 
+    // somarty configure
     'config_paths' => [
         base_path() . '/resources/smarty/config',
     ],
@@ -45,10 +49,10 @@
      * for develop true
      * for production false
      */
-    'force_compile' => true,
+    'force_compile' => env('SMARTY_FORCE_COMPILE', true),
 
     // smarty cache driver "file", "memcached", "redis"
-    'cache_driver' => 'file',
+    'cache_driver' => env('SMARTY_CACHE_DRIVER', 'file'),
 
     // memcached servers
     'memcached' => [

tests/ConfigureTest.php

@@ -8,7 +8,7 @@ protected function setUp()
         parent::setUp();
         $filesystem = new \Illuminate\Filesystem\Filesystem;
 
-        $items = $filesystem->getRequire(__DIR__ . '/../src/config/ytake-laravel-smarty.php');
+        $items = $filesystem->getRequire(__DIR__ . '/config/config.php');
         $this->config->set('ytake-laravel-smarty', $items);
     }
 

tests/Console/CacheClearCommandTest.php

@@ -16,15 +16,59 @@ public function testInstance()
     {
         $this->assertInstanceOf("Ytake\LaravelSmarty\Console\CacheClearCommand", $this->command);
     }
+
     public function testCommand()
     {
-        $this->command->run(new \Symfony\Component\Console\Input\ArrayInput([]), new \Symfony\Component\Console\Output\NullOutput);
+        $smarty = $this->factory->getSmarty();
+        $smarty->caching = true;
+        ob_start();
+        $smarty->display('test.tpl');
+        ob_get_clean();
+        $output = new \Symfony\Component\Console\Output\BufferedOutput();
+        $this->command->run(
+            new \Symfony\Component\Console\Input\ArrayInput([]),
+            $output
+        );
         $this->assertSame('ytake:smarty-clear-cache', $this->command->getName());
         $this->assertSame("Flush the smarty cache", $this->command->getDescription());
+        $this->assertSame('smarty cache cleared!', trim($output->fetch()));
     }
 
     public function testCommandFile()
     {
-        $this->command->run(new \Symfony\Component\Console\Input\ArrayInput(['--file' => 'test']), new \Symfony\Component\Console\Output\NullOutput);
+        $smarty = $this->factory->getSmarty();
+        $smarty->caching = true;
+        ob_start();
+        $smarty->display('test.tpl');
+        ob_get_clean();
+        $dir = new DirectoryIterator($smarty->getCacheDir());
+        $fileCount = 0;
+        $pathName = null;
+        foreach ($dir as $file) {
+            if(!$file->isDot()) {
+                if($file->getFilename() != '.gitignore') {
+                    $pathName = $file->getPathname();
+                    $fileCount++;
+                }
+            }
+        }
+        $this->assertSame(1, $fileCount);
+        $output = new \Symfony\Component\Console\Output\BufferedOutput();
+        $this->command->run(
+            new \Symfony\Component\Console\Input\ArrayInput(['--file' => 'test.tpl']),
+            $output
+        );
+        $this->assertFileNotExists($pathName);
+        $this->assertSame('specified file was cache cleared!', trim($output->fetch()));
+    }
+
+    public function testNoCacheFile()
+    {
+        $output = new \Symfony\Component\Console\Output\BufferedOutput();
+        $this->command->run(
+            new \Symfony\Component\Console\Input\ArrayInput(['--file' => 'test.tpl']),
+            $output
+        );
+        $this->assertSame('specified file not be found', trim($output->fetch()));
     }
 }

tests/Console/CompiledClearCommandTest.php

@@ -18,8 +18,49 @@ public function testInstance()
     }
     public function testCommand()
     {
-        $this->command->run(new \Symfony\Component\Console\Input\ArrayInput([]), new \Symfony\Component\Console\Output\NullOutput);
+        $this->command->run(
+            new \Symfony\Component\Console\Input\ArrayInput([]),
+            new \Symfony\Component\Console\Output\NullOutput
+        );
         $this->assertSame("Remove the compiled smarty file", $this->command->getDescription());
         $this->assertNotNull($this->command->getSynopsis());
     }
+
+    public function testCleaCompile()
+    {
+        $smarty = $this->factory->getSmarty();
+        $smarty->force_compile = true;
+        ob_start();
+        $smarty->display('test.tpl');
+        ob_get_clean();
+        $dir = new DirectoryIterator($smarty->getCompileDir());
+        $fileCount = 0;
+        $pathName = null;
+        foreach ($dir as $file) {
+            if(!$file->isDot()) {
+                if($file->getFilename() != '.gitignore') {
+                    $pathName = $file->getPathname();
+                    $fileCount++;
+                }
+            }
+        }
+        $this->assertSame(1, $fileCount);
+        $output = new \Symfony\Component\Console\Output\BufferedOutput();
+        $this->command->run(
+            new \Symfony\Component\Console\Input\ArrayInput([]),
+            $output
+        );
+        $this->assertFileNotExists($pathName);
+        $this->assertSame('done.', trim($output->fetch()));
+    }
+
+    public function testNotExistsFiles()
+    {
+        $output = new \Symfony\Component\Console\Output\BufferedOutput();
+        $this->command->run(
+            new \Symfony\Component\Console\Input\ArrayInput(['--file' => 'testing']),
+            $output
+        );
+        $this->assertEmpty(trim($output->fetch()));
+    }
 }