Merge pull request #3 from ray-di/stable

koriym · koriym · commit 416fcfe7eeef · 2015-05-19T23:32:28.000+09:00
cleanup for stable release
diff --git a/.php_cs b/.php_cs
@@ -1,20 +1,39 @@
 <?php
-$config = Symfony\CS\Config\Config::create();
-$config->level(null);
-$config->fixers(
-    array(
-        'indentation',
-        'linefeed',
-        'trailing_spaces',
-        'short_tag',
-        'visibility',
-        'php_closing_tag',
-        'braces',
-        'function_declaration',
-        'psr0',
-        'elseif',
-        'eof_ending',
-        'unused_use',
-    )
+$finder = Symfony\CS\Finder\DefaultFinder::create()
+->in(__DIR__);
+
+$config = Symfony\CS\Config\Config::create()
+->level(Symfony\CS\FixerInterface::PSR2_LEVEL)
+->finder($finder)
+->fixers(
+    [
+        'blankline_after_open_tag',
+        'extra_empty_lines',
+        'no_blank_lines_after_class_opening',
+        'no_empty_lines_after_phpdocs',
+        'operators_spaces',
+        'duplicate_semicolon',
+        'namespace_no_leading_whitespace',
+        'phpdoc_indent',
+        'phpdoc_no_empty_return',
+        'phpdoc_no_package',
+        'phpdoc_params',
+        'phpdoc_separation',
+        'phpdoc_to_comment',
+        'phpdoc_trim',
+        'phpdoc_var_without_name',
+        'remove_leading_slash_use',
+        'remove_lines_between_uses',
+        'return',
+        'single_array_no_trailing_comma',
+        'single_quote',
+        'spaces_before_semicolon',
+        'spaces_cast',
+        'standardize_not_equal',
+        'ternary_spaces',
+        'whitespacy_lines',
+        'ordered_use',
+        'short_array_syntax'
+    ]
 );
 return $config;
diff --git a/.travis.yml b/.travis.yml
@@ -4,13 +4,14 @@ php:
   - 5.5
   - 5.6
   - hhvm
+  - 7
 
-before_script:
- - wget https://scrutinizer-ci.com/ocular.phar
- - composer install --prefer-source
+install: travis_retry composer install --no-interaction --prefer-source
 
 script:
- - phpunit --coverage-text --coverage-clover=coverage.clover
+ - if [ "$TRAVIS_PHP_VERSION" == "hhvm" ]; then phpunit; fi
+ - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then phpunit --coverage-text --coverage-clover=coverage.clover; fi
 
 after_script:
- - php ocular.phar code-coverage:upload --format=php-clover coverage.clover
+ - wget https://scrutinizer-ci.com/ocular.phar
+ - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Akihito Koriyama
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+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.
diff --git a/Licence.txt b/Licence.txt
diff --git a/composer.json b/composer.json
@@ -2,9 +2,13 @@
     "name": "ray/web-param-module",
     "description":"Binds the value(s) of a web context to method parameter.",
     "keywords":[
-      "Ray.Di Module", "Web context", "Testability"
+        "Ray.Di Module", "Web context", "Testability"
     ],
-    "license": "BSD-3-Clause",
+    "license": "MIT",
+    "require": {
+        "ray/di": "~2.0",
+        "doctrine/cache": "~1.0"
+    },
     "autoload":{
         "psr-4":{
             "Ray\\WebContextParam\\": "src/"
@@ -16,16 +20,5 @@
             "Ray\\WebContextParam\\": "tests/",
             "Ray\\WebContextParam\\": "tests/Fake"
         }
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
-    "extra": {
-        "branch-alias": {
-            "dev-develop": "0.1.x-dev"
-        }
-    },
-    "require": {
-        "ray/di": "~2.0@dev",
-        "doctrine/cache": "~1.0"
     }
 }
diff --git a/phpmd.xml b/phpmd.xml
@@ -1,7 +1,9 @@
-<ruleset xmlns="http://pmd.sf.net/ruleset/1.0.0"
+<ruleset
+         xmlns="http://pmd.sf.net/ruleset/1.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
          xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
+    <description>PHP.Skeleton rule set</description>
     <!--codesize-->
     <rule ref="rulesets/codesize.xml/CyclomaticComplexity" />
     <rule ref="rulesets/codesize.xml/NPathComplexity" />
diff --git a/src/Annotation/AbstractWebContextParam.php b/src/Annotation/AbstractWebContextParam.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * This file is part of the Ray.WebContextParam
+ * This file is part of the Ray.WebContextParam.
  *
- * @license http://opensource.org/licenses/bsd-license.php BSD
+ * @license http://opensource.org/licenses/bsd-license.php MIT
  */
 namespace Ray\WebContextParam\Annotation;
 
diff --git a/src/Annotation/CookieParam.php b/src/Annotation/CookieParam.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * This file is part of the Ray.WebContextParam
+ * This file is part of the Ray.WebContextParam.
  *
- * @license http://opensource.org/licenses/bsd-license.php BSD
+ * @license http://opensource.org/licenses/bsd-license.php MIT
  */
 namespace Ray\WebContextParam\Annotation;
 
diff --git a/src/Annotation/EnvParam.php b/src/Annotation/EnvParam.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * This file is part of the Ray.WebContextParam
+ * This file is part of the Ray.WebContextParam.
  *
- * @license http://opensource.org/licenses/bsd-license.php BSD
+ * @license http://opensource.org/licenses/bsd-license.php MIT
  */
 namespace Ray\WebContextParam\Annotation;
 
diff --git a/src/Annotation/FormParam.php b/src/Annotation/FormParam.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * This file is part of the Ray.WebContextParam
+ * This file is part of the Ray.WebContextParam.
  *
- * @license http://opensource.org/licenses/bsd-license.php BSD
+ * @license http://opensource.org/licenses/bsd-license.php MIT
  */
 namespace Ray\WebContextParam\Annotation;
 
diff --git a/src/Annotation/QueryParam.php b/src/Annotation/QueryParam.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * This file is part of the Ray.WebContextParam
+ * This file is part of the Ray.WebContextParam.
  *
- * @license http://opensource.org/licenses/bsd-license.php BSD
+ * @license http://opensource.org/licenses/bsd-license.php MIT
  */
 namespace Ray\WebContextParam\Annotation;
 
diff --git a/src/Annotation/ServerParam.php b/src/Annotation/ServerParam.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * This file is part of the Ray.WebContextParam
+ * This file is part of the Ray.WebContextParam.
  *
- * @license http://opensource.org/licenses/bsd-license.php BSD
+ * @license http://opensource.org/licenses/bsd-license.php MIT
  */
 namespace Ray\WebContextParam\Annotation;
 
diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * This file is part of the Ray.WebContextParam
+ * This file is part of the Ray.WebContextParam.
  *
- * @license http://opensource.org/licenses/bsd-license.php BSD
+ * @license http://opensource.org/licenses/bsd-license.php MIT
  */
 namespace Ray\WebContextParam\Exception;
 
diff --git a/src/Exception/LogicException.php b/src/Exception/LogicException.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * This file is part of the Ray.WebContextParam
+ * This file is part of the Ray.WebContextParam.
  *
- * @license http://opensource.org/licenses/bsd-license.php BSD
+ * @license http://opensource.org/licenses/bsd-license.php MIT
  */
 namespace Ray\WebContextParam\Exception;
 
diff --git a/src/Exception/NotFoundArgumentException.php b/src/Exception/NotFoundArgumentException.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * This file is part of the Ray.WebContextParam
+ * This file is part of the Ray.WebContextParam.
  *
- * @license http://opensource.org/licenses/bsd-license.php BSD
+ * @license http://opensource.org/licenses/bsd-license.php MIT
  */
 namespace Ray\WebContextParam\Exception;
 
diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * This file is part of the Ray.WebContextParam
+ * This file is part of the Ray.WebContextParam.
  *
- * @license http://opensource.org/licenses/bsd-license.php BSD
+ * @license http://opensource.org/licenses/bsd-license.php MIT
  */
 namespace Ray\WebContextParam\Exception;
 
diff --git a/src/WebContext.php b/src/WebContext.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * This file is part of the Ray.WebContextParam
+ * This file is part of the Ray.WebContextParam.
  *
- * @license http://opensource.org/licenses/bsd-license.php BSD
+ * @license http://opensource.org/licenses/bsd-license.php MIT
  */
 namespace Ray\WebContextParam;
 
diff --git a/src/WebContextInterface.php b/src/WebContextInterface.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * This file is part of the Ray.WebContextParam
+ * This file is part of the Ray.WebContextParam.
  *
- * @license http://opensource.org/licenses/bsd-license.php BSD
+ * @license http://opensource.org/licenses/bsd-license.php MIT
  */
 namespace Ray\WebContextParam;
 
diff --git a/src/WebContextParamInterceptor.php b/src/WebContextParamInterceptor.php
@@ -1,16 +1,16 @@
 <?php
 /**
- * This file is part of the Ray.WebContextParam
+ * This file is part of the Ray.WebContextParam.
  *
- * @license http://opensource.org/licenses/bsd-license.php BSD
+ * @license http://opensource.org/licenses/bsd-license.php MIT
  */
 namespace Ray\WebContextParam;
 
 use Doctrine\Common\Annotations\Reader;
 use Doctrine\Common\Cache\Cache;
+use Ray\Aop\Arguments;
 use Ray\Aop\MethodInterceptor;
 use Ray\Aop\MethodInvocation;
-use Ray\Aop\Arguments;
 use Ray\WebContextParam\Annotation\AbstractWebContextParam;
 use Ray\WebContextParam\Exception\NotFoundArgumentException;
 
@@ -55,12 +55,11 @@ public function invoke(MethodInvocation $invocation)
             $this->cache->save($id, $meta);
         }
         $parameters = $invocation->getMethod()->getParameters();
-        $cnt =count($parameters);
+        $cnt = count($parameters);
         for ($i = 0; $i < $cnt; $i++) {
-            $this->setArg($args, $meta ,$i);
+            $this->setArg($args, $meta, $i);
         }
 
-
         return $invocation->proceed();
     }
 
@@ -79,6 +78,12 @@ private function getMeta(\ReflectionMethod $method)
         return $meta;
     }
 
+    /**
+     * @param array $meta
+     * @param int   $i
+     *
+     * @return array
+     */
     private function getParam(array $meta, $i)
     {
         list($globalKey, $key) = $meta[$i];
@@ -90,7 +95,6 @@ private function getParam(array $meta, $i)
         return [false, null];
     }
 
-
     /**
      * @param AbstractWebContextParam $annotation
      * @param \ReflectionMethod       $method
@@ -115,12 +119,12 @@ private function getPos(AbstractWebContextParam $annotation, \ReflectionMethod $
     /**
      * @param Arguments $args
      * @param array     $meta
-     * @param           $i
+     * @param in        $i
      */
-    private function setArg(Arguments $args ,array $meta ,$i)
+    private function setArg(Arguments $args, array $meta, $i)
     {
         if (isset($meta[$i]) && (! isset($args[$i]))) {
-            list($hasParam ,$param) = $this->getParam($meta ,$i);
+            list($hasParam, $param) = $this->getParam($meta, $i);
             if ($hasParam) {
                 $args[$i] = $param;
             }
diff --git a/src/WebContextParamModule.php b/src/WebContextParamModule.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the Ray.AuraSqlModule package
  *
- * @license http://opensource.org/licenses/bsd-license.php BSD
+ * @license http://opensource.org/licenses/bsd-license.php MIT
  */
 namespace Ray\WebContextParam;
 
diff --git a/tests/Fake/FakeConsumer.php b/tests/Fake/FakeConsumer.php
@@ -1,12 +1,11 @@
 <?php
 /**
- * This file is part of the Ray.WebContextParam
+ * This file is part of the Ray.WebContextParam.
  *
- * @license http://opensource.org/licenses/bsd-license.php BSD
+ * @license http://opensource.org/licenses/bsd-license.php MIT
  */
 namespace Ray\WebContextParam;
 
-
 use Ray\WebContextParam\Annotation\QueryParam;
 
 class FakeConsumer
diff --git a/tests/WebContextTest.php b/tests/WebContextTest.php
