Merge pull request #244 from koriym/cs

Fix cs
bearsunday · Jul 12, 2017 · d71d192 · d71d192
2 parents c407770 + 79be3cc
commit d71d192
Show file tree

Hide file tree

Showing 35 changed files with 174 additions and 58 deletions.
diff --git a/.php_cs b/.php_cs
@@ -125,5 +125,6 @@ return \PhpCsFixer\Config::create()
     ->setFinder(
         PhpCsFixer\Finder::create()
             ->exclude('tests/Fake')
-            ->in('src')
+            ->exclude('var')
+            ->in(__DIR__)
     )->setLineEnding("\n");
diff --git a/bin/bear.env b/bin/bear.env
diff --git a/docs/demo-app/bootstrap/api.php b/docs/demo-app/bootstrap/api.php
@@ -1,4 +1,8 @@
 <?php
-
+/**
+ * This file is part of the BEAR.Package package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 $context = PHP_SAPI === 'cli' ? 'cli-hal-api-app' : 'prod-hal-api-app';
 require __DIR__ . '/bootstrap.php';
diff --git a/docs/demo-app/bootstrap/bootstrap.php b/docs/demo-app/bootstrap/bootstrap.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * This file is part of the BEAR.Package package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace MyVendor\MyApp;
 
 use BEAR\Package\Bootstrap;

diff --git a/docs/demo-app/bootstrap/web.php b/docs/demo-app/bootstrap/web.php
@@ -1,4 +1,8 @@
 <?php
-
+/**
+ * This file is part of the BEAR.Package package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 $context = PHP_SAPI === 'cli' ? 'cli-hal-app' : 'hal-app';
 require __DIR__ . '/bootstrap.php';
diff --git a/docs/demo-app/src/Module/App.php b/docs/demo-app/src/Module/App.php
@@ -1,5 +1,9 @@
 <?php
-
+/**
+ * This file is part of the BEAR.Package package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace MyVendor\MyApp\Module;
 
 use BEAR\Sunday\Extension\Application\AbstractApp;

diff --git a/docs/demo-app/src/Module/AppModule.php b/docs/demo-app/src/Module/AppModule.php
@@ -1,10 +1,12 @@
 <?php
-
+/**
+ * This file is part of the BEAR.Package package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace MyVendor\MyApp\Module;
 
-use BEAR\AppMeta\AppMeta;
 use BEAR\Package\PackageModule;
-use BEAR\Package\Provide\Router\AuraRouterModule;
 use Ray\Di\AbstractModule;
 
 class AppModule extends AbstractModule

diff --git a/docs/demo-app/src/Resource/App/Contact.php b/docs/demo-app/src/Resource/App/Contact.php
@@ -1,5 +1,9 @@
 <?php
-
+/**
+ * This file is part of the BEAR.Package package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace MyVendor\MyApp\Resource\App;
 
 use BEAR\Resource\ResourceObject;

diff --git a/docs/demo-app/src/Resource/App/User.php b/docs/demo-app/src/Resource/App/User.php
@@ -1,5 +1,9 @@
 <?php
-
+/**
+ * This file is part of the BEAR.Package package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace MyVendor\MyApp\Resource\App;
 
 use BEAR\RepositoryModule\Annotation\Cacheable;

diff --git a/docs/demo-app/src/Resource/App/User/Friend.php b/docs/demo-app/src/Resource/App/User/Friend.php
@@ -1,5 +1,9 @@
 <?php
-
+/**
+ * This file is part of the BEAR.Package package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace MyVendor\MyApp\Resource\App\User;
 
 use BEAR\Resource\ResourceObject;

diff --git a/docs/demo-app/src/Resource/App/Website.php b/docs/demo-app/src/Resource/App/Website.php
@@ -1,5 +1,9 @@
 <?php
-
+/**
+ * This file is part of the BEAR.Package package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace MyVendor\MyApp\Resource\App;
 
 use BEAR\Resource\ResourceObject;

diff --git a/docs/demo-app/src/Resource/Page/Index.php b/docs/demo-app/src/Resource/Page/Index.php
@@ -1,5 +1,9 @@
 <?php
-
+/**
+ * This file is part of the BEAR.Package package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace MyVendor\MyApp\Resource\Page;
 
 use BEAR\Resource\ResourceObject;

diff --git a/docs/demo-app/src/Resource/Page/User.php b/docs/demo-app/src/Resource/Page/User.php
@@ -1,5 +1,9 @@
 <?php
-
+/**
+ * This file is part of the BEAR.Package package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace MyVendor\MyApp\Resource\Page;
 
 use BEAR\Resource\Annotation\Embed;

diff --git a/src-deprecated/ExceptionAsString.php b/src-deprecated/ExceptionAsString.php
@@ -44,7 +44,7 @@ public function detail(\Exception $e, Request $request)
     private function getPhpVariables(array $server)
     {
         if (PHP_SAPI === 'cli') {
-//            return '';
+            //            return '';
         }
 
         return sprintf("\nPHP Variables\n\n\$_SERVER => %s", print_r($server, true)); // @codeCoverageIgnore

diff --git a/src-deprecated/Provide/Error/VndErrorHandler.php b/src-deprecated/Provide/Error/VndErrorHandler.php
@@ -21,7 +21,6 @@
  * vnd.error for BEAR.Package
  *
  * @see https://github.com/blongden/vnd.error
- *
  * @deprecated
  */
 class VndErrorHandler implements ErrorInterface

diff --git a/tests/BootstrapTest.php b/tests/BootstrapTest.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * This file is part of the BEAR.Package package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace BEAR\Package;
 
 use BEAR\AppMeta\AppMeta;
@@ -8,7 +13,6 @@
 use BEAR\Sunday\Extension\Application\AppInterface;
 use BEAR\Sunday\Provide\Transfer\HttpResponder;
 use Doctrine\Common\Cache\ArrayCache;
-use Doctrine\Common\Cache\FilesystemCache;
 use Doctrine\Common\Cache\VoidCache;
 use FakeVendor\HelloWorld\Module\AppModule;
 

diff --git a/tests/Context/ApiModuleTest.php b/tests/Context/ApiModuleTest.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * This file is part of the BEAR.Package package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace BEAR\Package\Context;
 
 use BEAR\Sunday\Annotation\DefaultSchemeHost;

diff --git a/tests/Context/HalModuleTest.php b/tests/Context/HalModuleTest.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * This file is part of the BEAR.Package package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace BEAR\Package\Context;
 
 use BEAR\Package\Provide\Representation\HalRenderer;

diff --git a/tests/Context/ProdModuleTest.php b/tests/Context/ProdModuleTest.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * This file is part of the BEAR.Package package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace BEAR\Package\Context;
 
 use BEAR\AppMeta\AppMeta;

diff --git a/tests/NewAppTest.php b/tests/NewAppTest.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * This file is part of the BEAR.Package package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace BEAR\Package;
 
 use BEAR\AppMeta\AppMeta;

diff --git a/tests/Provide/Error/DevStatusTest.php b/tests/Provide/Error/DevStatusTest.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * This file is part of the BEAR.Package package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace BEAR\Package\Provide\Error;
 
 use BEAR\Resource\Exception\BadRequestException;
@@ -23,21 +28,21 @@ public function setUp()
     public function testRuntimeException()
     {
         $e = new \RuntimeException();
-        $status =  new Status($e);
+        $status = new Status($e);
         $this->assertSame(503, $status->code);
     }
 
     public function testBadRequest()
     {
         $e = new BadRequestException;
-        $status =  new Status($e);
+        $status = new Status($e);
         $this->assertSame(400, $status->code);
     }
 
     public function testNotFound()
     {
         $e = new ResourceNotFoundException('/__not_found__');
-        $status =  new Status($e);
+        $status = new Status($e);
         $this->assertSame(404, $status->code);
     }
 }
diff --git a/tests/Provide/Error/DevVndErrorPageTest.php b/tests/Provide/Error/DevVndErrorPageTest.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * This file is part of the BEAR.Package package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace BEAR\Package\Provide\Error;
 
 use BEAR\Sunday\Extension\Router\RouterMatch;
@@ -25,13 +30,11 @@ public function testToString()
         $this->assertSame(500, $this->page->code);
         $this->assertArrayHasKey('content-type', $this->page->headers);
         $this->assertSame('application/vnd.error+json', $this->page->headers['content-type']);
-        $this->assertSame('{
+        $this->assertContains('{
     "message": "Internal Server Error",
     "logref": "{logref}",
     "request": "get /",
     "exceptions": "LogicException(bear)",
-    "file": "' . __FILE__ . '(16)"
-}
-', $this->page->view);
+    "file": "' . __FILE__, $this->page->view);
     }
 }
diff --git a/tests/Provide/Error/ErrorHandlerTest.php b/tests/Provide/Error/ErrorHandlerTest.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * This file is part of the BEAR.Package package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace BEAR\Package\Provide\Error;
 
 use BEAR\AppMeta\AppMeta;
@@ -41,7 +46,6 @@ public function testHandle()
      */
     public function testTransfer(ErrorHandler $handler)
     {
-
         $handler->transfer();
         $this->assertSame(500, FakeHttpResponder::$code);
         $this->assertSame(['content-type' => 'application/vnd.error+json'], FakeHttpResponder::$headers);

diff --git a/tests/Provide/Error/ErrorPageTest.php b/tests/Provide/Error/ErrorPageTest.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * This file is part of the BEAR.Package package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace BEAR\Package\Provide\Error;
 
 class ErrorPageTest extends \PHPUnit_Framework_TestCase

diff --git a/tests/Provide/Error/ProdVndErrorPageTest.php b/tests/Provide/Error/ProdVndErrorPageTest.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * This file is part of the BEAR.Package package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace BEAR\Package\Provide\Error;
 
 use BEAR\Sunday\Extension\Router\RouterMatch;

diff --git a/tests/Provide/Logger/PsrLoggerModuleTest.php b/tests/Provide/Logger/PsrLoggerModuleTest.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * This file is part of the BEAR.Package package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace BEAR\Package;
 
 use BEAR\AppMeta\AppMeta;

diff --git a/tests/Provide/Representation/HalRendererTest.php b/tests/Provide/Representation/HalRendererTest.php
@@ -1,9 +1,12 @@
 <?php
+/**
+ * This file is part of the BEAR.Package package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace BEAR\Package;
 
 use BEAR\Package\Provide\Representation\HalRenderer;
-use BEAR\Package\Provide\Router\HttpMethodParams;
-use BEAR\Package\Provide\Router\WebRouter;
 use BEAR\Resource\ResourceInterface;
 use BEAR\Resource\Uri;
 use Doctrine\Common\Annotations\AnnotationReader;

diff --git a/tests/Provide/Router/CliRouterTest.php b/tests/Provide/Router/CliRouterTest.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * This file is part of the BEAR.Package package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace BEAR\Package\Provide\Router;
 
 use Aura\Cli\CliFactory;

diff --git a/tests/Provide/Router/HttpMethodParamsTest.php b/tests/Provide/Router/HttpMethodParamsTest.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * This file is part of the BEAR.Package package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace BEAR\Package\Provide\Router;
 
 class HttpMethodParamsTest extends \PHPUnit_Framework_TestCase

diff --git a/tests/Provide/Router/RouterCollectionTest.php b/tests/Provide/Router/RouterCollectionTest.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * This file is part of the BEAR.Package package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Provide\Router;
 
 use BEAR\Package\FakeWebRouter;

diff --git a/tests/Provide/Router/WebRouterTest.php b/tests/Provide/Router/WebRouterTest.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * This file is part of the BEAR.Package package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace BEAR\Package\Provide\Router;
 
 class WebRouterTest extends \PHPUnit_Framework_TestCase