Merge pull request #110 from koriym/cleanup

Cleanup
bearsunday · Aug 20, 2017 · 04af5a6 · 04af5a6
2 parents c2e25a6 + 92b855b
commit 04af5a6
Show file tree

Hide file tree

Showing 17 changed files with 18 additions and 264 deletions.
diff --git a/.php_cs b/.php_cs
@@ -125,8 +125,7 @@ return \PhpCsFixer\Config::create()
     ->setFinder(
         PhpCsFixer\Finder::create()
             ->exclude('tests/Fake')
-            ->exclude('src-data')
-            ->exclude('src-deprecated')
+            ->exclude('doc')
             ->in(__DIR__)
     )->setLineEnding("\n")
     ->setUsingCache(false);
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2012-2016 Akihito Koriyama
+Copyright (c) 2012-2017 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

diff --git a/build.xml b/build.xml
diff --git a/composer.json b/composer.json
@@ -6,15 +6,14 @@
         "DI",
         "AOP",
         "REST",
-        "Hypermedia",
-        "Ray"
+        "Hypermedia"
     ],
     "license": "MIT",
     "authors": [
         {
             "name": "Akihito Koriyama",
             "email": "[email protected]",
-            "homepage": "https://koriym.github.io/"
+            "homepage": "https://github.com/koriym"
         },
         {
             "name": "BEAR.Sunday Contributors",
@@ -32,6 +31,9 @@
   "autoload": {
         "psr-4": {
             "BEAR\\Sunday\\": "src/"
+        },
+        "autoload": {
+            "exclude-from-classmap": ["/docs/", "/tests/"]
         }
     },
     "autoload-dev": {

diff --git a/default-app/Resource/App/Greeting.php b/default-app/Resource/App/Greeting.php
diff --git a/default-app/Resource/Page/Index.php b/default-app/Resource/Page/Index.php
diff --git a/default-app/www/index.php b/default-app/www/index.php
diff --git a/docs/demo/MyVendor.Helloworld/README.md → example/README.md b/docs/demo/MyVendor.Helloworld/README.md → example/README.md
diff --git a/docs/demo/MyVendor.Helloworld/bin/index.php → example/bin/index.php b/docs/demo/MyVendor.Helloworld/bin/index.php → example/bin/index.php
@@ -5,14 +5,12 @@
  * @license http://opensource.org/licenses/MIT MIT
  */
 use BEAR\Sunday\Extension\Application\AppInterface;
-use Composer\Autoload\ClassLoader;
 use Doctrine\Common\Annotations\AnnotationRegistry;
 use MyVendor\HelloWorld\AppModule;
 use Ray\Di\Injector;
 
-/* @var $loader ClassLoader*/
-$loader = require dirname(__DIR__) . '/vendor/autoload.php';
-AnnotationRegistry::registerLoader([$loader, 'loadClass']);
+require dirname(__DIR__) . '/vendor/autoload.php';
+AnnotationRegistry::registerLoader('class_exists');
 
 $app = (new Injector(new AppModule))->getInstance(AppInterface::class);
 try {

diff --git a/docs/demo/MyVendor.Helloworld/composer.json → example/composer.json b/docs/demo/MyVendor.Helloworld/composer.json → example/composer.json
@@ -5,7 +5,7 @@
     },
     "autoload": {
         "psr-4": {
-            "MyVendor\\HelloWorld\\": "src/"
+            "MyVendor\\HelloWorld\\": "src"
         }
     },
     "require-dev": {

diff --git a/...demo/MyVendor.Helloworld/phpunit.xml.dist → example/phpunit.xml.dist b/...demo/MyVendor.Helloworld/phpunit.xml.dist → example/phpunit.xml.dist
diff --git a/...demo/MyVendor.Helloworld/public/index.php → example/public/index.php b/...demo/MyVendor.Helloworld/public/index.php → example/public/index.php
@@ -6,14 +6,12 @@
  */
 use BEAR\Sunday\Extension\Application\AbstractApp;
 use BEAR\Sunday\Extension\Application\AppInterface;
-use Composer\Autoload\ClassLoader;
 use Doctrine\Common\Annotations\AnnotationRegistry;
 use MyVendor\HelloWorld\AppModule;
 use Ray\Di\Injector;
 
-/* @var $loader ClassLoader*/
-$loader = require dirname(__DIR__) . '/vendor/autoload.php';
-AnnotationRegistry::registerLoader([$loader, 'loadClass']);
+require dirname(__DIR__) . '/vendor/autoload.php';
+AnnotationRegistry::registerLoader('class_exists');
 
 $app = (new Injector(new AppModule))->getInstance(AppInterface::class);
 /* @var $app AbstractApp */

diff --git a/docs/demo/MyVendor.Helloworld/src/App.php → example/src/App.php b/docs/demo/MyVendor.Helloworld/src/App.php → example/src/App.php
diff --git a/...emo/MyVendor.Helloworld/src/AppModule.php → example/src/AppModule.php b/...emo/MyVendor.Helloworld/src/AppModule.php → example/src/AppModule.php
diff --git a/...or.Helloworld/src/Resource/Page/Index.php → example/src/Resource/Page/Index.php b/...or.Helloworld/src/Resource/Page/Index.php → example/src/Resource/Page/Index.php
@@ -10,7 +10,7 @@
 
 class Index extends ResourceObject
 {
-    public function onGet($name = 'World') : ResourceObject
+    public function onGet(string $name = 'World') : ResourceObject
     {
         $this->body['greeting'] = 'Hello ' . $name;
 

diff --git a/...loworld/tests/Resource/Page/IndexTest.php → example/tests/Resource/Page/IndexTest.php b/...loworld/tests/Resource/Page/IndexTest.php → example/tests/Resource/Page/IndexTest.php
@@ -37,6 +37,10 @@ public function testGet()
         /* @var $page Index */
         $this->assertSame(200, $page->code);
         $this->assertSame('Hello World', $page->body['greeting']);
-        $this->assertSame('{"greeting":"Hello World"}', (string) $page);
+        $expectJson = '{
+    "greeting": "Hello World"
+}
+';
+        $this->assertSame($expectJson, (string) $page);
     }
 }
diff --git a/...o/MyVendor.Helloworld/tests/bootstrap.php → example/tests/bootstrap.php b/...o/MyVendor.Helloworld/tests/bootstrap.php → example/tests/bootstrap.php