Merge pull request #66 from fritzmg/remove-trailing-semicolon

Remove trailing semicolon
paragonie · Mar 26, 2023 · 172dc0a · 172dc0a
2 parents acdda0e + 0f1a7f7
commit 172dc0a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/src/CSPBuilder.php b/src/CSPBuilder.php
@@ -149,7 +149,7 @@ public function compile(): string
             $compiled []= 'upgrade-insecure-requests';
         }
 
-        $this->compiled = implode('', $compiled);
+        $this->compiled = rtrim(implode('', $compiled), '; ');
         $this->needsCompile = false;
         return $this->compiled;
     }

diff --git a/test/BasicTest.php b/test/BasicTest.php
@@ -70,6 +70,23 @@ public function testBasicFromData()
         );
     }
 
+    /**
+     * @throws \Exception
+     */
+    public function testNoTrailingSemicolon()
+    {
+        $csp = (new CSPBuilder())
+            ->setSelfAllowed('default-src', true)
+            ->addSource('img-src', 'ytimg.com')
+            ->disableOldBrowserSupport()
+        ;
+
+        $this->assertEquals(
+            "default-src 'self'; img-src ytimg.com",
+            $csp->getCompiledHeader()
+        );
+    }
+
     /**
      * @throws \Exception
      */