PSR-4 conversion. Required a custom auto loader for the Doctrine Anno…

…tations since the default behavior cannot handle a PSR-4 directory structure. A convenient side effect of which is that it is no longer a need to specify annot.srcDir.
danadesrosiers · Jun 15, 2014 · 2f1d9f4 · 2f1d9f4
1 parent 4651f53
commit 2f1d9f4
Show file tree

Hide file tree

Showing 33 changed files with 20 additions and 35 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 vendor
 .idea
+composer.lock
diff --git a/composer.json b/composer.json
@@ -23,8 +23,12 @@
         "symfony/security": "You will need this package to use the `Secure` annotation"
     },
     "autoload": {
-        "psr-0": {
-            "DDesrosiers\\SilexAnnotations\\": "src/",
+        "psr-4": {
+            "DDesrosiers\\SilexAnnotations\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
             "DDesrosiers\\Test\\SilexAnnotations\\": "test/"
         }
     },

diff --git a/...rs/SilexAnnotations/AnnotationService.php → src/AnnotationService.php b/...rs/SilexAnnotations/AnnotationService.php → src/AnnotationService.php
diff --git a/...Annotations/AnnotationServiceProvider.php → src/AnnotationServiceProvider.php b/...Annotations/AnnotationServiceProvider.php → src/AnnotationServiceProvider.php
@@ -28,11 +28,6 @@ class AnnotationServiceProvider implements ServiceProviderInterface
      */
     public function boot(Application $app)
     {
-        AnnotationRegistry::registerAutoloadNamespace(
-                          "DDesrosiers\\SilexAnnotations\\Annotations",
-                          $app['annot.srcDir']
-        );
-
         // Process annotations for any given controllers
         if ($app->offsetExists('annot.controllers') && is_array($app['annot.controllers'])) {
             foreach ($app['annot.controllers'] as $groupName => $controllerGroup) {
@@ -64,13 +59,19 @@ function (Application $app) use ($controllerName) {
      */
     public function register(Application $app)
     {
-        // Need the ability to register annotation namespace early for ControllerProviders
-        if ($app->offsetExists('annot.srcDir')) {
-            AnnotationRegistry::registerAutoloadNamespace(
-                              "DDesrosiers\\SilexAnnotations\\Annotations",
-                              $app['annot.srcDir']
-            );
-        }
+        // A custom auto loader for Doctrine Annotations since it can't handle PSR-4 directory structure
+        AnnotationRegistry::registerLoader(function ($class) {
+            $annotationDir = __DIR__ . "/Annotations";
+            $fqcn_array = explode("\\", $class);
+            $class_name = array_pop($fqcn_array);
+            if (is_file("$annotationDir/$class_name.php"))
+            {
+                /** @noinspection PhpIncludeInspection */
+                require_once "$annotationDir/$class_name.php";
+                return true;
+            }
+            return false;
+        });
 
         // ServiceControllerServiceProvider is required, so register it here so the user doesn't have to.
         $app->register(new ServiceControllerServiceProvider());

diff --git a/...rs/SilexAnnotations/Annotations/After.php → src/Annotations/After.php b/...rs/SilexAnnotations/Annotations/After.php → src/Annotations/After.php
diff --git a/...s/SilexAnnotations/Annotations/Assert.php → src/Annotations/Assert.php b/...s/SilexAnnotations/Annotations/Assert.php → src/Annotations/Assert.php
diff --git a/...s/SilexAnnotations/Annotations/Before.php → src/Annotations/Before.php b/...s/SilexAnnotations/Annotations/Before.php → src/Annotations/Before.php
diff --git a/...ers/SilexAnnotations/Annotations/Bind.php → src/Annotations/Bind.php b/...ers/SilexAnnotations/Annotations/Bind.php → src/Annotations/Bind.php
diff --git a/.../SilexAnnotations/Annotations/Convert.php → src/Annotations/Convert.php b/.../SilexAnnotations/Annotations/Convert.php → src/Annotations/Convert.php
diff --git a/...ers/SilexAnnotations/Annotations/Host.php → src/Annotations/Host.php b/...ers/SilexAnnotations/Annotations/Host.php → src/Annotations/Host.php
diff --git a/...SilexAnnotations/Annotations/Modifier.php → src/Annotations/Modifier.php b/...SilexAnnotations/Annotations/Modifier.php → src/Annotations/Modifier.php
diff --git a/.../SilexAnnotations/Annotations/Request.php → src/Annotations/Request.php b/.../SilexAnnotations/Annotations/Request.php → src/Annotations/Request.php
diff --git a/...exAnnotations/Annotations/RequireHttp.php → src/Annotations/RequireHttp.php b/...exAnnotations/Annotations/RequireHttp.php → src/Annotations/RequireHttp.php
diff --git a/...xAnnotations/Annotations/RequireHttps.php → src/Annotations/RequireHttps.php b/...xAnnotations/Annotations/RequireHttps.php → src/Annotations/RequireHttps.php
diff --git a/...rs/SilexAnnotations/Annotations/Route.php → src/Annotations/Route.php b/...rs/SilexAnnotations/Annotations/Route.php → src/Annotations/Route.php
diff --git a/...notations/Annotations/RouteAnnotation.php → src/Annotations/RouteAnnotation.php b/...notations/Annotations/RouteAnnotation.php → src/Annotations/RouteAnnotation.php
diff --git a/...s/SilexAnnotations/Annotations/Secure.php → src/Annotations/Secure.php b/...s/SilexAnnotations/Annotations/Secure.php → src/Annotations/Secure.php
diff --git a/...rs/SilexAnnotations/Annotations/Value.php → src/Annotations/Value.php b/...rs/SilexAnnotations/Annotations/Value.php → src/Annotations/Value.php
diff --git a/...tations/AnnotationServiceProviderTest.php → test/AnnotationServiceProviderTest.php b/...tations/AnnotationServiceProviderTest.php → test/AnnotationServiceProviderTest.php
@@ -32,7 +32,6 @@ public function testRegisterControllers()
         $this->app->register(
                   new AnnotationServiceProvider(),
                   array(
-                      "annot.srcDir"      => __DIR__ . "/../../../../src",
                       "annot.controllers" => array("DDesrosiers\\Test\\SilexAnnotations\\TestControllerOne")
                   )
         );
@@ -52,7 +51,6 @@ public function testRegisterControllersWithGroups()
         $this->app->register(
                   new AnnotationServiceProvider(),
                   array(
-                      "annot.srcDir"      => __DIR__ . "/../../../../src",
                       "annot.controllers" => array(
                           'group1' => array("DDesrosiers\\Test\\SilexAnnotations\\TestControllerOne"),
                           'group2' => array("DDesrosiers\\Test\\SilexAnnotations\\TestControllerTwo")

diff --git a/...ilexAnnotations/AnnotationServiceTest.php → test/AnnotationServiceTest.php b/...ilexAnnotations/AnnotationServiceTest.php → test/AnnotationServiceTest.php
@@ -35,7 +35,6 @@ public function testServiceController()
         $this->app->register(
                   new AnnotationServiceProvider(),
                   array(
-                      "annot.srcDir"      => __DIR__ . "/../../../../src",
                       "annot.controllers" => array("DDesrosiers\\Test\\SilexAnnotations\\TestController")
                   )
         );
@@ -53,7 +52,6 @@ public function testControllerProvider()
         $this->app->register(
                   new AnnotationServiceProvider(),
                   array(
-                      "annot.srcDir"      => __DIR__ . "/../../../../src",
                       "annot.controllers" => array("DDesrosiers\\Test\\SilexAnnotations\\TestControllerProvider")
                   )
         );
@@ -71,7 +69,6 @@ public function testCacheUsingStringIdentifier()
         $this->app->register(
                   new AnnotationServiceProvider(),
                   array(
-                      "annot.srcDir"      => __DIR__ . "/../../../../src",
                       "annot.cache"       => 'Array',
                       "annot.controllers" => array("DDesrosiers\\Test\\SilexAnnotations\\TestController")
                   )
@@ -87,7 +84,6 @@ public function testCacheUsingImplementationOfCache()
         $this->app->register(
                   new AnnotationServiceProvider(),
                   array(
-                      "annot.srcDir"      => __DIR__ . "/../../../../src",
                       "annot.cache"       => new ApcCache(),
                       "annot.controllers" => array("DDesrosiers\\Test\\SilexAnnotations\\TestController")
                   )
@@ -106,7 +102,6 @@ public function testInvalidCacheString()
         $this->app->register(
                   new AnnotationServiceProvider(),
                   array(
-                      "annot.srcDir"      => __DIR__ . "/../../../../src",
                       "annot.cache"       => 'Fake',
                       "annot.controllers" => array("DDesrosiers\\Test\\SilexAnnotations\\TestController")
                   )
@@ -122,7 +117,6 @@ public function testInvalidCacheClass()
         $this->app->register(
                   new AnnotationServiceProvider(),
                   array(
-                      "annot.srcDir"      => __DIR__ . "/../../../../src",
                       "annot.cache"       => new InvalidCache(),
                       "annot.controllers" => array("DDesrosiers\\Test\\SilexAnnotations\\TestController")
                   )

diff --git a/...ilexAnnotations/Annotations/AfterTest.php → test/Annotations/AfterTest.php b/...ilexAnnotations/Annotations/AfterTest.php → test/Annotations/AfterTest.php
@@ -33,7 +33,6 @@ public function setUp()
         $this->app->register(
                   new AnnotationServiceProvider(),
                   array(
-                      "annot.srcDir"      => __DIR__ . "/../../../../../src",
                       "annot.controllers" => array("DDesrosiers\\Test\\SilexAnnotations\\Annotations\\AfterTestController")
                   )
         );

diff --git a/...lexAnnotations/Annotations/AssertTest.php → test/Annotations/AssertTest.php b/...lexAnnotations/Annotations/AssertTest.php → test/Annotations/AssertTest.php
@@ -32,7 +32,6 @@ public function setUp()
         $this->app->register(
                   new AnnotationServiceProvider(),
                   array(
-                      "annot.srcDir"      => __DIR__ . "/../../../../../src",
                       "annot.controllers" => array("DDesrosiers\\Test\\SilexAnnotations\\Annotations\\AssertTestController")
                   )
         );

diff --git a/...lexAnnotations/Annotations/BeforeTest.php → test/Annotations/BeforeTest.php b/...lexAnnotations/Annotations/BeforeTest.php → test/Annotations/BeforeTest.php
@@ -33,7 +33,6 @@ public function setUp()
         $this->app->register(
                   new AnnotationServiceProvider(),
                   array(
-                      "annot.srcDir"      => __DIR__ . "/../../../../../src",
                       "annot.controllers" => array("DDesrosiers\\Test\\SilexAnnotations\\Annotations\\BeforeTestController")
                   )
         );

diff --git a/...SilexAnnotations/Annotations/BindTest.php → test/Annotations/BindTest.php b/...SilexAnnotations/Annotations/BindTest.php → test/Annotations/BindTest.php
@@ -34,7 +34,6 @@ public function setUp()
         $this->app->register(
                   new AnnotationServiceProvider(),
                   array(
-                      "annot.srcDir"      => __DIR__ . "/../../../../../src",
                       "annot.controllers" => array("DDesrosiers\\Test\\SilexAnnotations\\Annotations\\BindTestController")
                   )
         );

diff --git a/...exAnnotations/Annotations/ConvertTest.php → test/Annotations/ConvertTest.php b/...exAnnotations/Annotations/ConvertTest.php → test/Annotations/ConvertTest.php
@@ -32,7 +32,6 @@ public function setUp()
         $this->app->register(
                   new AnnotationServiceProvider(),
                   array(
-                      "annot.srcDir"      => __DIR__ . "/../../../../../src",
                       "annot.controllers" => array("DDesrosiers\\Test\\SilexAnnotations\\Annotations\\ConvertTestController")
                   )
         );

diff --git a/...SilexAnnotations/Annotations/HostTest.php → test/Annotations/HostTest.php b/...SilexAnnotations/Annotations/HostTest.php → test/Annotations/HostTest.php
@@ -32,7 +32,6 @@ public function setUp()
         $this->app->register(
                   new AnnotationServiceProvider(),
                   array(
-                      "annot.srcDir"      => __DIR__ . "/../../../../../src",
                       "annot.controllers" => array("DDesrosiers\\Test\\SilexAnnotations\\Annotations\\HostTestController")
                   )
         );

diff --git a/...xAnnotations/Annotations/ModifierTest.php → test/Annotations/ModifierTest.php b/...xAnnotations/Annotations/ModifierTest.php → test/Annotations/ModifierTest.php
@@ -33,7 +33,6 @@ public function setUp()
         $this->app->register(
                   new AnnotationServiceProvider(),
                   array(
-                      "annot.srcDir"      => __DIR__ . "/../../../../../src",
                       "annot.controllers" => array("DDesrosiers\\Test\\SilexAnnotations\\Annotations\\ModifierTestController")
                   )
         );

diff --git a/...exAnnotations/Annotations/RequestTest.php → test/Annotations/RequestTest.php b/...exAnnotations/Annotations/RequestTest.php → test/Annotations/RequestTest.php
@@ -34,7 +34,6 @@ public function setUp()
         $this->app->register(
                   new AnnotationServiceProvider(),
                   array(
-                      "annot.srcDir"      => __DIR__ . "/../../../../../src",
                       "annot.controllers" => array("DDesrosiers\\Test\\SilexAnnotations\\Annotations\\RequestTestController")
                   )
         );

diff --git a/...notations/Annotations/RequireHttpTest.php → test/Annotations/RequireHttpTest.php b/...notations/Annotations/RequireHttpTest.php → test/Annotations/RequireHttpTest.php
@@ -33,7 +33,6 @@ public function setUp()
         $this->app->register(
                   new AnnotationServiceProvider(),
                   array(
-                      "annot.srcDir"      => __DIR__ . "/../../../../../src",
                       "annot.controllers" => array("DDesrosiers\\Test\\SilexAnnotations\\Annotations\\RequireHttpTestController")
                   )
         );

diff --git a/...otations/Annotations/RequireHttpsTest.php → test/Annotations/RequireHttpsTest.php b/...otations/Annotations/RequireHttpsTest.php → test/Annotations/RequireHttpsTest.php
@@ -33,7 +33,6 @@ public function setUp()
         $this->app->register(
                   new AnnotationServiceProvider(),
                   array(
-                      "annot.srcDir"      => __DIR__ . "/../../../../../src",
                       "annot.controllers" => array("DDesrosiers\\Test\\SilexAnnotations\\Annotations\\RequireHttpsTestController")
                   )
         );

diff --git a/...ilexAnnotations/Annotations/RouteTest.php → test/Annotations/RouteTest.php b/...ilexAnnotations/Annotations/RouteTest.php → test/Annotations/RouteTest.php
@@ -32,7 +32,6 @@ public function setUp()
         $this->app->register(
                   new AnnotationServiceProvider(),
                   array(
-                      "annot.srcDir"      => __DIR__ . "/../../../../../src",
                       "annot.controllers" => array("DDesrosiers\\Test\\SilexAnnotations\\Annotations\\RouteTestController")
                   )
         );

diff --git a/...lexAnnotations/Annotations/SecureTest.php → test/Annotations/SecureTest.php b/...lexAnnotations/Annotations/SecureTest.php → test/Annotations/SecureTest.php
@@ -33,7 +33,6 @@ public function setUp()
         $this->app->register(
                   new AnnotationServiceProvider(),
                   array(
-                      "annot.srcDir" => __DIR__ . "/../../../../../src",
                       "annot.controllers" => array("DDesrosiers\\Test\\SilexAnnotations\\Annotations\\SecureTestController")
                   )
         );

diff --git a/...ilexAnnotations/Annotations/ValueTest.php → test/Annotations/ValueTest.php b/...ilexAnnotations/Annotations/ValueTest.php → test/Annotations/ValueTest.php
@@ -32,7 +32,6 @@ public function setUp()
         $this->app->register(
                   new AnnotationServiceProvider(),
                   array(
-                      "annot.srcDir"      => __DIR__ . "/../../../../../src",
                       "annot.controllers" => array("DDesrosiers\\Test\\SilexAnnotations\\Annotations\\ValueTestController")
                   )
         );