Merge pull request #119 from koriym/cs

bear/cs coding standard
bearsunday · Oct 17, 2018 · 3d5a539 · 3d5a539
2 parents 2593ab1 + bf37c01
commit 3d5a539
Show file tree

Hide file tree

Showing 36 changed files with 38 additions and 313 deletions.
diff --git a/.php_cs b/.php_cs
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -0,0 +1 @@
+vendor/bear/cs/php7.0/.php_cs.dist
diff --git a/composer.json b/composer.json
@@ -26,7 +26,8 @@
       "psr/log": "^1.0.2"
   },
   "require-dev": {
-      "phpunit/phpunit": "^6.5"
+      "phpunit/phpunit": "^6.5",
+      "bear/cs": "1.0.0"
   },
   "autoload": {
       "psr-4": {

diff --git a/src/Annotation/DefaultSchemeHost.php b/src/Annotation/DefaultSchemeHost.php
@@ -1,11 +1,7 @@
 <?php
 
 declare(strict_types=1);
-/**
- * This file is part of the BEAR.Sunday package.
- *
- * @license http://opensource.org/licenses/MIT MIT
- */
+
 namespace BEAR\Sunday\Annotation;
 
 use Ray\Di\Di\Qualifier;

diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
@@ -1,11 +1,7 @@
 <?php
 
 declare(strict_types=1);
-/**
- * This file is part of the BEAR.Sunday package.
- *
- * @license http://opensource.org/licenses/MIT MIT
- */
+
 namespace BEAR\Sunday\Exception;
 
 interface ExceptionInterface

diff --git a/src/Exception/LogicException.php b/src/Exception/LogicException.php
@@ -1,11 +1,7 @@
 <?php
 
 declare(strict_types=1);
-/**
- * This file is part of the BEAR.Sunday package.
- *
- * @license http://opensource.org/licenses/MIT MIT
- */
+
 namespace BEAR\Sunday\Exception;
 
 class LogicException extends \LogicException implements ExceptionInterface

diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
@@ -1,11 +1,7 @@
 <?php
 
 declare(strict_types=1);
-/**
- * This file is part of the BEAR.Sunday package.
- *
- * @license http://opensource.org/licenses/MIT MIT
- */
+
 namespace BEAR\Sunday\Exception;
 
 class RuntimeException extends \RuntimeException implements ExceptionInterface

diff --git a/src/Extension/Application/AbstractApp.php b/src/Extension/Application/AbstractApp.php
@@ -1,11 +1,7 @@
 <?php
 
 declare(strict_types=1);
-/**
- * This file is part of the BEAR.Sunday package.
- *
- * @license http://opensource.org/licenses/MIT MIT
- */
+
 namespace BEAR\Sunday\Extension\Application;
 
 use BEAR\Resource\ResourceInterface;

diff --git a/src/Extension/Application/AppInterface.php b/src/Extension/Application/AppInterface.php
@@ -1,11 +1,7 @@
 <?php
 
 declare(strict_types=1);
-/**
- * This file is part of the BEAR.Sunday package.
- *
- * @license http://opensource.org/licenses/MIT MIT
- */
+
 namespace BEAR\Sunday\Extension\Application;
 
 use BEAR\Sunday\Extension\ExtensionInterface;

diff --git a/src/Extension/Error/ErrorInterface.php b/src/Extension/Error/ErrorInterface.php
@@ -1,11 +1,7 @@
 <?php
 
 declare(strict_types=1);
-/**
- * This file is part of the BEAR.Sunday package.
- *
- * @license http://opensource.org/licenses/MIT MIT
- */
+
 namespace BEAR\Sunday\Extension\Error;
 
 use BEAR\Sunday\Extension\Router\RouterMatch as Request;
@@ -15,17 +11,12 @@ interface ErrorInterface
     /**
      * Handle exception
      *
-     * @param \Exception $e
-     * @param Request    $request
-     *
      * @return self
      */
     public function handle(\Exception $e, Request $request);
 
     /**
      * Error page transfer
-     *
-     * @return void
      */
     public function transfer();
 }
diff --git a/src/Extension/Error/NullError.php b/src/Extension/Error/NullError.php
@@ -1,11 +1,7 @@
 <?php
 
 declare(strict_types=1);
-/**
- * This file is part of the BEAR.Sunday package.
- *
- * @license http://opensource.org/licenses/MIT MIT
- */
+
 namespace BEAR\Sunday\Extension\Error;
 
 use BEAR\Sunday\Extension\Router\RouterMatch as Request;

diff --git a/src/Extension/ExtensionInterface.php b/src/Extension/ExtensionInterface.php
@@ -1,11 +1,7 @@
 <?php
 
 declare(strict_types=1);
-/**
- * This file is part of the BEAR.Sunday package.
- *
- * @license http://opensource.org/licenses/MIT MIT
- */
+
 namespace BEAR\Sunday\Extension;
 
 interface ExtensionInterface

diff --git a/src/Extension/Router/NullMatch.php b/src/Extension/Router/NullMatch.php
@@ -1,11 +1,7 @@
 <?php
 
 declare(strict_types=1);
-/**
- * This file is part of the BEAR.Sunday package.
- *
- * @license http://opensource.org/licenses/MIT MIT
- */
+
 namespace BEAR\Sunday\Extension\Router;
 
 class NullMatch extends RouterMatch

diff --git a/src/Extension/Router/RouterInterface.php b/src/Extension/Router/RouterInterface.php
@@ -1,11 +1,7 @@
 <?php
 
 declare(strict_types=1);
-/**
- * This file is part of the BEAR.Sunday package.
- *
- * @license http://opensource.org/licenses/MIT MIT
- */
+
 namespace BEAR\Sunday\Extension\Router;
 
 use BEAR\Sunday\Extension\ExtensionInterface;
@@ -24,7 +20,7 @@ public function match(array $globals, array $server);
      * @param string $name the route name to look up
      * @param array  $data the data to interpolate into the URI; data keys map to param tokens in the path
      *
-     * @return string|false returns a URI when it finds a name, or boolean false if there is no route name
+     * @return false|string returns a URI when it finds a name, or boolean false if there is no route name
      */
     public function generate($name, $data);
 }
diff --git a/src/Extension/Router/RouterMatch.php b/src/Extension/Router/RouterMatch.php
@@ -1,11 +1,7 @@
 <?php
 
 declare(strict_types=1);
-/**
- * This file is part of the BEAR.Sunday package.
- *
- * @license http://opensource.org/licenses/MIT MIT
- */
+
 namespace BEAR\Sunday\Extension\Router;
 
 class RouterMatch
@@ -34,8 +30,7 @@ class RouterMatch
     public function __toString()
     {
         $querySymbol = $this->query ? '?' : '';
-        $string = "{$this->method} {$this->path}{$querySymbol}" . \http_build_query($this->query);
 
-        return $string;
+        return "{$this->method} {$this->path}{$querySymbol}" . \http_build_query($this->query);
     }
 }
diff --git a/src/Extension/Transfer/HttpCacheInterface.php b/src/Extension/Transfer/HttpCacheInterface.php
@@ -1,11 +1,7 @@
 <?php
 
 declare(strict_types=1);
-/**
- * This file is part of the BEAR.Sunday package.
- *
- * @license http://opensource.org/licenses/MIT MIT
- */
+
 namespace BEAR\Sunday\Extension\Transfer;
 
 interface HttpCacheInterface

diff --git a/src/Extension/Transfer/NullHttpCache.php b/src/Extension/Transfer/NullHttpCache.php
@@ -1,11 +1,7 @@
 <?php
 
 declare(strict_types=1);
-/**
- * This file is part of the BEAR.Sunday package.
- *
- * @license http://opensource.org/licenses/MIT MIT
- */
+
 namespace BEAR\Sunday\Extension\Transfer;
 
 final class NullHttpCache implements HttpCacheInterface

diff --git a/src/Extension/Transfer/TransferInterface.php b/src/Extension/Transfer/TransferInterface.php
@@ -1,11 +1,7 @@
 <?php
 
 declare(strict_types=1);
-/**
- * This file is part of the BEAR.Sunday package.
- *
- * @license http://opensource.org/licenses/MIT MIT
- */
+
 namespace BEAR\Sunday\Extension\Transfer;
 
 use BEAR\Resource\TransferInterface as RepresentationTransferInterface;

diff --git a/src/Inject/PsrLoggerInject.php b/src/Inject/PsrLoggerInject.php
@@ -1,11 +1,7 @@
 <?php
 
 declare(strict_types=1);
-/**
- * This file is part of the BEAR.Sunday package.
- *
- * @license http://opensource.org/licenses/MIT MIT
- */
+
 namespace BEAR\Sunday\Inject;
 
 use Psr\Log\LoggerInterface;
@@ -18,8 +14,6 @@ trait PsrLoggerInject
     private $logger;
 
     /**
-     * @param LoggerInterface $logger
-     *
      * @Ray\Di\Di\Inject
      */
     public function setPsrLogger(LoggerInterface $logger)