Apply no_prefix update to 5.6 branch

Author: loonytoons

src/Routing/Annotations/Annotations/Controller.php

@@ -34,7 +34,9 @@ public function modifyCollection(EndpointCollection $endpoints, ReflectionClass
     protected function prefixEndpoints(EndpointCollection $endpoints)
     {
         foreach ($endpoints->getAllPaths() as $path) {
-            $path->path = $this->trimPath($this->prefix, $path->path);
+            if (!$path->no_prefix) {
+                $path->path = $this->trimPath($this->prefix, $path->path);
+            }
         }
     }
 

src/Routing/Annotations/Annotations/Route.php

@@ -15,7 +15,7 @@ public function modify(MethodEndpoint $endpoint, ReflectionMethod $method)
     {
         $endpoint->addPath(new Path(
             strtolower(class_basename(get_class($this))), $this->domain, $this->value,
-            $this->as, (array) $this->middleware, (array) $this->where
+            $this->as, (array) $this->middleware, (array) $this->where, $this->no_prefix
         ));
     }
 }

src/Routing/Annotations/Path.php

@@ -11,6 +11,13 @@ class Path extends AbstractPath
      */
     public $as;
 
+    /**
+     * Should the prefix added to the controller be ignored for this particular route
+     *
+     * @var bool
+     */
+    public $no_prefix;
+
     /**
      * Create a new Route Path instance.
      *
@@ -23,13 +30,14 @@ class Path extends AbstractPath
      *
      * @return void
      */
-    public function __construct($verb, $domain, $path, $as, $middleware = [], $where = [])
+    public function __construct($verb, $domain, $path, $as, $middleware = [], $where = [], $no_prefix = false)
     {
         $this->as = $as;
         $this->verb = $verb;
         $this->where = $where;
         $this->domain = $domain;
         $this->middleware = $middleware;
         $this->path = $path == '/' ? '/' : trim($path, '/');
+        $this->no_prefix = $no_prefix;
     }
 }

tests/Routing/RoutingAnnotationScannerTest.php

@@ -22,6 +22,15 @@ public function testAnyAnnotation()
         $this->assertEquals(trim(file_get_contents(__DIR__.'/results/annotation-any.php')), $definition);
     }
 
+    public function testPrefixAnnotation()
+    {
+        require_once __DIR__.'/fixtures/annotations/PrefixController.php';
+        $scanner = $this->makeScanner(['App\Http\Controllers\PrefixController']);
+
+        $definition = str_replace(PHP_EOL, "\n", $scanner->getRouteDefinitions());
+        $this->assertEquals(trim(file_get_contents(__DIR__.'/results/annotation-prefix.php')), $definition);
+    }
+
     /**
      * Construct a route annotation scanner.
      *

tests/Routing/fixtures/annotations/PrefixController.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Controllers;
+
+/**
+ * @Controller(prefix="/any-prefix")
+ */
+class PrefixController
+{
+    /**
+     * @Get("route-with-prefix", as="route.with.prefix")
+    */
+    public function withPrefixAnnotations()
+    {
+    }
+
+    /**
+     * @Get("route-without-prefix", as="route.without.prefix", no_prefix="true")
+    */
+    public function withoutPrefixAnnotations()
+    {
+    }
+}

tests/Routing/results/annotation-prefix.php

@@ -0,0 +1,15 @@
+$router->get('any-prefix/route-with-prefix', [
+	'uses' => 'App\Http\Controllers\PrefixController@withPrefixAnnotations',
+	'as' => 'route.with.prefix',
+	'middleware' => [],
+	'where' => [],
+	'domain' => NULL,
+]);
+
+$router->get('route-without-prefix', [
+	'uses' => 'App\Http\Controllers\PrefixController@withoutPrefixAnnotations',
+	'as' => 'route.without.prefix',
+	'middleware' => [],
+	'where' => [],
+	'domain' => NULL,
+]);