Merge pull request #35 from ytake/hotfix-session-handler

bug fixed
ytake · Apr 29, 2016 · 7c7c09a · 7c7c09a
2 parents 99a74dd + c0ebbd5
commit 7c7c09a
Show file tree

Hide file tree

Showing 32 changed files with 166 additions and 76 deletions.
diff --git a/.coveralls.yml b/.coveralls.yml
@@ -1,4 +1,3 @@
 service_name: travis-ci
-src_dir: ./
-coverage_clover: tests/logs/clover.xml
-json_path: tests/logs/coveralls-upload.json
+coverage_clover: tests/build/clover.xml
+json_path: tests/build/coveralls-upload.json
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -1,8 +1,9 @@
 filter:
     paths:
-        - src/Smarty/*
+        - src/*
     excluded_paths:
         - tests/*
+        - src/config
 tools:
     php_code_sniffer:
         config:

diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,7 @@ language: php
 php:
   - 5.5
   - 5.6
+  - 7.0
   - hhvm
 services:
   - memcached
@@ -12,7 +13,7 @@ before_script:
   - chmod -R 755 tests/bin/memcached.sh
   - tests/bin/memcached.sh
 script:
-  - chmod -R 777 tests/logs
+  - chmod -R 777 tests/build
   - phpunit
 after_script:
-  - if [[ ${TRAVIS_PHP_VERSION:0:3} == "5.5" ]]; then php vendor/bin/coveralls -v; fi
+  - if [[ ${TRAVIS_PHP_VERSION:0:3} == "5.6" ]]; then php vendor/bin/coveralls -v; fi
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2015 Yuuki Takezawa
+Copyright (c) 2014-2016 Yuuki Takezawa
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/composer.json b/composer.json
@@ -27,9 +27,9 @@
   },
   "require-dev": {
     "predis/predis": "~1.0",
-    "symfony/framework-bundle": "2.*",
-    "symfony/console": "2.*",
-    "phpunit/phpunit": "4.*",
+    "symfony/framework-bundle": "~2.0",
+    "symfony/console": "~2.0",
+    "phpunit/phpunit": "~4.0",
     "mockery/mockery": "*",
     "satooshi/php-coveralls": "*"
   },
@@ -39,12 +39,12 @@
   },
   "autoload": {
     "psr-4": {
-      "Ytake\\LaravelSmarty\\": "src/Smarty"
+      "Ytake\\LaravelSmarty\\": "src"
     }
   },
   "autoload-dev": {
     "files": [
-      "tests/TestCase.php"
+      "tests/SmartyTestCase.php"
     ]
   },
   "minimum-stability": "stable"

diff --git a/phpunit.xml b/phpunit.xml
@@ -17,20 +17,21 @@
     </testsuites>
     <filter>
         <whitelist>
-            <directory>./src/Smarty</directory>
+            <directory>./src</directory>
             <exclude>
-                <file>./src/Smarty/SmartyServiceProvider.php</file>
-                <file>./src/Smarty/SmartyCompileServiceProvider.php</file>
-                <file>./src/Smarty/SmartyConsoleServiceProvider.php</file>
-                <file>./src/Smarty/Cache/KeyValueStorage.php</file>
-                <file>./src/Smarty/Cache/Redis.php</file>
-                <file>./src/Smarty/Cache/Memcached.php</file>
-                <file>./src/Smarty/Exception/MethodNotFoundException.php</file>
+                <directory>./src/config</directory>
+                <file>./src/SmartyServiceProvider.php</file>
+                <file>./src/SmartyCompileServiceProvider.php</file>
+                <file>./src/SmartyConsoleServiceProvider.php</file>
+                <file>./src/Cache/KeyValueStorage.php</file>
+                <file>./src/Cache/Redis.php</file>
+                <file>./src/Cache/Memcached.php</file>
+                <file>./src/Exception/MethodNotFoundException.php</file>
             </exclude>
         </whitelist>
     </filter>
     <logging>
         <log type="coverage-text" target="php://stdout" showUncoveredFiles="false"/>
-        <log type="coverage-clover" target="tests/logs/clover.xml"/>
+        <log type="coverage-clover" target="tests/build/clover.xml"/>
     </logging>
 </phpunit>
diff --git a/src/Smarty/Cache/KeyValueStorage.php → src/Cache/KeyValueStorage.php b/src/Smarty/Cache/KeyValueStorage.php → src/Cache/KeyValueStorage.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -7,15 +8,20 @@
  * 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.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the MIT license.
+ *
+ * Copyright (c) 2014-2016 Yuuki Takezawa
+ *
  */
-
 namespace Ytake\LaravelSmarty\Cache;
 
 /**
  * Class KeyValueStorage
  *
- * @package Ytake\LaravelSmarty\Smarty\Cache
  * @author yuuki.takezawa<yuuki.takezawa@comnect.jp.net>
+ * @license http://opensource.org/licenses/MIT MIT
  */
 abstract class KeyValueStorage extends \Smarty_CacheResource_KeyValueStore
 {

diff --git a/src/Smarty/Cache/Memcached.php → src/Cache/Memcached.php b/src/Smarty/Cache/Memcached.php → src/Cache/Memcached.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -7,16 +8,20 @@
  * 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.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the MIT license.
+ *
+ * Copyright (c) 2014-2016 Yuuki Takezawa
+ *
  */
-
 namespace Ytake\LaravelSmarty\Cache;
 
 use Memcached as MemcachedExtension;
 
 /**
  * Class Memcached
  *
- * @package Ytake\LaravelSmarty\Cache
  * @author yuuki.takezawa<yuuki.takezawa@comnect.jp.net>
  * @license http://opensource.org/licenses/MIT MIT
  */

diff --git a/src/Smarty/Cache/Redis.php → src/Cache/Redis.php b/src/Smarty/Cache/Redis.php → src/Cache/Redis.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -7,16 +8,20 @@
  * 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.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the MIT license.
+ *
+ * Copyright (c) 2014-2016 Yuuki Takezawa
+ *
  */
-
 namespace Ytake\LaravelSmarty\Cache;
 
 use Predis\Client;
 
 /**
  * Class Redis
  *
- * @package Ytake\LaravelSmarty\Cache
  * @author yuuki.takezawa<yuuki.takezawa@comnect.jp.net>
  * @license http://opensource.org/licenses/MIT MIT
  */

diff --git a/src/Smarty/Cache/Storage.php → src/Cache/Storage.php b/src/Smarty/Cache/Storage.php → src/Cache/Storage.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -7,8 +8,13 @@
  * 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.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the MIT license.
+ *
+ * Copyright (c) 2014-2016 Yuuki Takezawa
+ *
  */
-
 namespace Ytake\LaravelSmarty\Cache;
 
 use Smarty;
@@ -17,7 +23,6 @@
 /**
  * Class Storage
  *
- * @package Ytake\LaravelSmarty\Cache
  * @author yuuki.takezawa<yuuki.takezawa@comnect.jp.net>
  * @license http://opensource.org/licenses/MIT MIT
  */

diff --git a/src/Smarty/Console/CacheClearCommand.php → src/Console/CacheClearCommand.php b/src/Smarty/Console/CacheClearCommand.php → src/Console/CacheClearCommand.php
@@ -8,8 +8,13 @@
  * 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.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the MIT license.
+ *
+ * Copyright (c) 2014-2016 Yuuki Takezawa
+ *
  */
-
 namespace Ytake\LaravelSmarty\Console;
 
 use Smarty;
@@ -19,7 +24,6 @@
 /**
  * Class CacheClearCommand
  *
- * @package Ytake\LaravelSmarty\Console
  * @author yuuki.takezawa<yuuki.takezawa@comnect.jp.net>
  * @license http://opensource.org/licenses/MIT MIT
  */

diff --git a/src/Smarty/Console/ClearCompiledCommand.php → src/Console/ClearCompiledCommand.php b/src/Smarty/Console/ClearCompiledCommand.php → src/Console/ClearCompiledCommand.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -7,8 +8,13 @@
  * 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.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the MIT license.
+ *
+ * Copyright (c) 2014-2016 Yuuki Takezawa
+ *
  */
-
 namespace Ytake\LaravelSmarty\Console;
 
 use Smarty;
@@ -18,7 +24,6 @@
 /**
  * Class ClearCompiledCommand
  *
- * @package Ytake\LaravelSmarty\Console
  * @author yuuki.takezawa<yuuki.takezawa@comnect.jp.net>
  * @license http://opensource.org/licenses/MIT MIT
  */

diff --git a/src/Smarty/Console/OptimizeCommand.php → src/Console/OptimizeCommand.php b/src/Smarty/Console/OptimizeCommand.php → src/Console/OptimizeCommand.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -7,8 +8,13 @@
  * 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.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the MIT license.
+ *
+ * Copyright (c) 2014-2016 Yuuki Takezawa
+ *
  */
-
 namespace Ytake\LaravelSmarty\Console;
 
 use Smarty;
@@ -19,7 +25,6 @@
 /**
  * Class OptimizeCommand
  *
- * @package Ytake\LaravelSmarty\Console
  * @author yuuki.takezawa<yuuki.takezawa@comnect.jp.net>
  * @license http://opensource.org/licenses/MIT MIT
  */

diff --git a/src/Smarty/Console/PackageInfoCommand.php → src/Console/PackageInfoCommand.php b/src/Smarty/Console/PackageInfoCommand.php → src/Console/PackageInfoCommand.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -7,8 +8,13 @@
  * 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.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the MIT license.
+ *
+ * Copyright (c) 2014-2016 Yuuki Takezawa
+ *
  */
-
 namespace Ytake\LaravelSmarty\Console;
 
 use Smarty;
@@ -18,7 +24,6 @@
 /**
  * Class SmartyInfoCommand
  *
- * @package Ytake\LaravelSmarty\Console
  * @author  yuuki.takezawa<yuuki.takezawa@comnect.jp.net>
  * @license http://opensource.org/licenses/MIT MIT
  */