Merge pull request #11 from reindert-vetter/hotfix/fix-permit-on-string

Fix "Attempt to assign property "permit" on string"
reindert-vetter · Dec 21, 2021 · a777b41 · a777b41
2 parents 44a4b0c + ecea3f1
commit a777b41
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/src/Collection/MiddlewareCollection.php b/src/Collection/MiddlewareCollection.php
@@ -76,6 +76,9 @@ public function permitVersionStatement(): self
     {
         foreach ($this->flatten() as $pipe) {
             if (method_exists($pipe, 'permitted')) {
+                if (is_string($pipe)) {
+                    $pipe = new $pipe();
+                }
                 /** @var \ReindertVetter\ApiVersionControl\Concerns\VersionStatement $pipe */
                 /** @noinspection PhpUndefinedFieldInspection */
                 $pipe->permit = true;

diff --git a/src/Middleware/ApiVersionControl.php b/src/Middleware/ApiVersionControl.php
@@ -25,8 +25,8 @@ public function __construct(array $config = null)
     public function handle(Request $request, Closure $next): SymfonyResponse
     {
         $pipes = MiddlewareCollection::createFromConfig($request, $this->config)
-            ->permitVersionStatement()
             ->filterByVersionCompare()
+            ->permitVersionStatement()
             ->flatten()
             ->rejectNonPipe()
             ->unique()

diff --git a/test/Unit/StatementVersion/VersionStatementTest.php b/test/Unit/StatementVersion/VersionStatementTest.php
@@ -38,6 +38,15 @@ public function testNotPermitVersionStatement(): void
         $this->assertFalse(MockVersionStatementSecond::permitted());
     }
 
+    public function testPermitVersionStatementStringClass(): void
+    {
+        $goodVersionStatement = MockVersionStatementFirst::class;
+        $middlewareCollection = new MiddlewareCollection([$goodVersionStatement]);
+        $middlewareCollection->permitVersionStatement();
+
+        $this->assertFalse(MockVersionStatementSecond::permitted());
+    }
+
     public function testRejectVersionStatement(): void
     {
         $middlewareCollection = new MiddlewareCollection(