Extract shouldContinue check.

Firesphere · Jul 20, 2019 · 194f3f4 · 194f3f4
1 parent 7d5ae91
commit 194f3f4
Showing 1 changed file with 18 additions and 7 deletions.
diff --git a/src/View/CSPBackend.php b/src/View/CSPBackend.php
@@ -222,14 +222,9 @@ public function includeInHTML($content): string
         }
 
         // Skip if content isn't injectable, or there is nothing to inject
-        $tagsAvailable = preg_match('#</head\b#', $content);
-        $hasFiles = count($this->css) ||
-            count($this->javascript) ||
-            count($this->customCSS) ||
-            count($this->customScript) ||
-            count($this->customHeadTags);
+        $shouldContinue = $this->shouldContinue($content);
 
-        if (!$tagsAvailable || !$hasFiles) {
+        if ($shouldContinue) {
             return $content;
         }
         $requirements = '';
@@ -320,4 +315,20 @@ public static function setUsesNonce(bool $usesNonce): void
     {
         self::$usesNonce = $usesNonce;
     }
+
+    /**
+     * @param $content
+     * @return bool
+     */
+    protected function shouldContinue($content): bool
+    {
+        $tagsAvailable = preg_match('#</head\b#', $content);
+        $hasFiles = count($this->css) ||
+            count($this->javascript) ||
+            count($this->customCSS) ||
+            count($this->customScript) ||
+            count($this->customHeadTags);
+
+        return $tagsAvailable && $hasFiles;
+    }
 }