Merge pull request #91 from koriym/2016

year 2016
bearsunday · Jan 7, 2016 · 8b7fc45 · 8b7fc45
2 parents 51700dd + 6b5fc68
commit 8b7fc45
Show file tree

Hide file tree

Showing 8 changed files with 96 additions and 75 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,17 +1,15 @@
+sudo: false
 language: php
-
 php:
   - 5.5
   - 5.6
   - hhvm
   - 7
-
-install: travis_retry composer install --no-interaction --prefer-source
-
+before_script:
+  - composer self-update
+  - composer install
 script:
- - if [ "$TRAVIS_PHP_VERSION" == "hhvm" ]; then phpunit; fi
- - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then phpunit --coverage-text --coverage-clover=coverage.clover; fi
-
+  - phpunit --coverage-clover=coverage.clover
 after_script:
- - 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
+  - wget https://scrutinizer-ci.com/ocular.phar
+  - php ocular.phar code-coverage:upload --format=php-clover coverage.clover
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2012-2015, Akihito Koriyama <[email protected]>
+Copyright (c) 2012-2016, Akihito Koriyama <[email protected]>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/phpcs.xml b/phpcs.xml
@@ -1,19 +1,24 @@
 <?xml version="1.0"?>
-<ruleset name="BEAR">
-    <description>The BEAR coding standard.</description>
-    <!-- 2. General -->
+<ruleset>
+    <description>The coding standard used for applications using BEAR.Sunday Framework.</description>
     <rule ref="Generic.NamingConventions.UpperCaseConstantName"/>
+    <rule ref="Generic.CodeAnalysis.UnusedFunctionParameter"/>
     <rule ref="Generic.Strings.UnnecessaryStringConcat"/>
-    <!-- Include the whole PSR-2 standard -->
     <rule ref="PSR2">
         <exclude name="Generic.Files.LineLength"/>
+        <exclude name="PSR2.Classes.PropertyDeclaration.Underscore"/>
+        <exclude name="PSR2.Methods.MethodDeclaration.Underscore"/>
     </rule>
     <rule ref="PEAR.Commenting.FunctionComment">
         <exclude name="PEAR.Commenting.FunctionComment.MissingReturn"/>
         <exclude name="PEAR.Commenting.FunctionComment.MissingParamComment"/>
         <exclude name="PEAR.Commenting.FunctionComment.SpacingBeforeTags"/>
         <exclude name="PEAR.Commenting.FunctionComment.MissingParamTag"/>
         <exclude name="PEAR.Commenting.FunctionComment.Missing"/>
+        <exclude name="PEAR.Commenting.FunctionComment.MissingReturn"/>
         <exclude name="PEAR.Commenting.FunctionComment.ParameterCommentsNotAligned"/>
+        <exclude name="PEAR.Commenting.FileComment.Missing"/>
     </rule>
+    <file>src</file>
+    <file>tests</file>
 </ruleset>
diff --git a/phpmd.xml b/phpmd.xml
@@ -1,40 +1,50 @@
-<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">
+<ruleset
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xmlns="http://pmd.sf.net/ruleset/1.0.0"
+        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">
     <!--codesize-->
-    <rule ref="rulesets/codesize.xml/CyclomaticComplexity" />
-    <rule ref="rulesets/codesize.xml/NPathComplexity" />
-    <rule ref="rulesets/codesize.xml/ExcessiveClassComplexity" />
-    <rule ref="rulesets/codesize.xml/ExcessiveClassLength" />
-    <rule ref="rulesets/codesize.xml/ExcessiveMethodLength" />
-    <rule ref="rulesets/codesize.xml/ExcessiveParameterList" />
-    <rule ref="rulesets/codesize.xml/ExcessivePublicCount" />
-    <rule ref="rulesets/codesize.xml/TooManyFields" />
-    <rule ref="rulesets/codesize.xml/TooManyMethods" />
+    <rule ref="rulesets/codesize.xml/CyclomaticComplexity">
+        <properties>
+            <property name="reportLevel" value="20"/>
+        </properties>
+    </rule>
+    <rule ref="rulesets/codesize.xml/NPathComplexity">
+        <properties>
+            <property name="minimum" value="200"/>
+        </properties>
+    </rule>
+    <rule ref="rulesets/codesize.xml/ExcessiveClassComplexity">
+        <properties>
+            <property name="maximum" value="100"/>
+        </properties>
+    </rule>
+    <rule ref="rulesets/codesize.xml/ExcessiveClassLength"/>
+    <rule ref="rulesets/codesize.xml/ExcessiveMethodLength"/>
+    <rule ref="rulesets/codesize.xml/ExcessiveParameterList"/>
+    <rule ref="rulesets/codesize.xml/ExcessivePublicCount"/>
+    <rule ref="rulesets/codesize.xml/TooManyFields"/>
+    <rule ref="rulesets/codesize.xml/TooManyMethods"/>
     <!--design-->
-    <rule ref="rulesets/design.xml/EvalExpression" />
-    <rule ref="rulesets/design.xml/ExitExpression" />
-    <rule ref="rulesets/design.xml/GotoStatement" />
-    <rule ref="rulesets/design.xml/NumberOfChildren" />
-    <rule ref="rulesets/design.xml/DepthOfInheritance" />
-    <rule ref="rulesets/design.xml/CouplingBetweenObjects" />
+    <rule ref="rulesets/design.xml/EvalExpression"/>
+    <rule ref="rulesets/design.xml/ExitExpression"/>
+     <rule ref="rulesets/design.xml/GotoStatement" />
+    <rule ref="rulesets/design.xml/NumberOfChildren"/>
+    <rule ref="rulesets/design.xml/DepthOfInheritance"/>
+    <!-- <rule ref="rulesets/design.xml/CouplingBetweenObjects" /> -->
     <!--naming-->
-    <rule ref="rulesets/naming.xml/ConstantNamingConventions" />
-    <rule ref="rulesets/naming.xml/BooleanGetMethodName" />
+    <rule ref="rulesets/naming.xml/ConstantNamingConventions"/>
+    <rule ref="rulesets/naming.xml/BooleanGetMethodName"/>
     <!--unusedcode-->
-    <rule ref="rulesets/unusedcode.xml/UnusedFormalParameter" />
-    <rule ref="rulesets/unusedcode.xml/UnusedLocalVariable" />
-    <rule ref="rulesets/unusedcode.xml/UnusedPrivateField" />
-    <rule ref="rulesets/unusedcode.xml/UnusedPrivateMethod" />
+    <rule ref="rulesets/unusedcode.xml/UnusedFormalParameter"/>
+    <rule ref="rulesets/unusedcode.xml/UnusedLocalVariable"/>
+    <rule ref="rulesets/unusedcode.xml/UnusedPrivateField"/>
+    <rule ref="rulesets/unusedcode.xml/UnusedPrivateMethod"/>
     <!--controversial-->
-    <rule ref="rulesets/controversial.xml/Superglobals" />
-    <rule ref="rulesets/controversial.xml/CamelCaseClassName" />
-    <rule ref="rulesets/controversial.xml/CamelCasePropertyName" />
-    <rule ref="rulesets/controversial.xml/CamelCaseMethodName" />
-    <rule ref="rulesets/controversial.xml/CamelCaseParameterName" />
-    <rule ref="rulesets/controversial.xml/CamelCaseVariableName" />
+    <rule ref="rulesets/controversial.xml/CamelCaseClassName"/>
+    <rule ref="rulesets/controversial.xml/CamelCasePropertyName"/>
+    <rule ref="rulesets/controversial.xml/CamelCaseMethodName"/>
     <!--cleancode-->
-    <rule ref="rulesets/cleancode.xml/BooleanArgumentFlag" />
-    <rule ref="rulesets/cleancode.xml/ElseExpression" />
+    <rule ref="rulesets/cleancode.xml/BooleanArgumentFlag"/>
+    <!-- <rule ref="rulesets/cleancode.xml/ElseExpression" /> -->
 </ruleset>
diff --git a/src/Module/Constant/NamedModule.php b/src/Module/Constant/NamedModule.php
@@ -6,6 +6,7 @@
  */
 namespace BEAR\Sunday\Module\Constant;
 
+use BEAR\Sunday\FakeApplication;
 use Ray\Di\AbstractModule;
 
 class NamedModule extends AbstractModule
@@ -29,6 +30,7 @@ public function __construct(array $names)
      */
     protected function configure()
     {
+        $this->bind(FakeApplication::class);
         foreach ($this->names as $annotatedWith => $instance) {
             $this->bind()->annotatedWith($annotatedWith)->toInstance($instance);
         }

diff --git a/src/Provide/Transfer/HttpResponder.php b/src/Provide/Transfer/HttpResponder.php
@@ -16,6 +16,7 @@ class HttpResponder implements TransferInterface
      */
     public function __invoke(ResourceObject $resourceObject, array $server)
     {
+        unset($server);
         // render
         $body = (string) $resourceObject;
 

diff --git a/tests/Fake/FakeApplication.php b/tests/Fake/FakeApplication.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace BEAR\Sunday;
+
+use Ray\Di\Di\Inject;
+use Ray\Di\Di\Named;
+
+class FakeApplication
+{
+    public $dir;
+    public $id;
+
+    /**
+     * @Inject
+     * @Named("path")
+     */
+    public function setPath($dir)
+    {
+        $this->dir = $dir;
+    }
+
+    /**
+     * @Inject
+     * @Named("id")
+     */
+    public function setId($id)
+    {
+        $this->id = $id;
+    }
+}
diff --git a/tests/Module/Constant/NamedModuleTest.php b/tests/Module/Constant/NamedModuleTest.php
@@ -2,38 +2,13 @@
 
 namespace BEAR\Sunday\Module\Constant;
 
-use Ray\Di\Di\Inject;
-use Ray\Di\Di\Named;
 use Ray\Di\Injector;
-
-class Application
-{
-    public $dir;
-    public $id;
-
-    /**
-     * @Inject
-     * @Named("path")
-     */
-    public function setPath($dir)
-    {
-        $this->dir = $dir;
-    }
-
-    /**
-     * @Inject
-     * @Named("id")
-     */
-    public function setId($id)
-    {
-        $this->id = $id;
-    }
-}
+use BEAR\Sunday\FakeApplication;
 
 class ConstantModuleTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var Application
+     * @var FakeApplication
      */
     private $app;
 
@@ -43,7 +18,7 @@ protected function setUp()
             'path' => __DIR__,
             'id' => 'bear'
         ];
-        $this->app = (new Injector(new NamedModule($names)))->getInstance(__NAMESPACE__ .'\Application');
+        $this->app = (new Injector(new NamedModule($names)))->getInstance(FakeApplication::class);
     }
 
     public function testNamed()