Added craft 4 support

.gitignore

@@ -1,2 +1,3 @@
 .DS_Store
-/vendor
+/vendor
+composer.lock

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 2.0.0-beta.1 - 2022-03-08
+### Changed
+- Added craft 4 support
+
 ## 1.3.1 - 2021-01-19
 ### Fixes
 - Don't break twig when `enabled` setting is false. Thanks to @clarknelson

composer.json

@@ -22,7 +22,8 @@
         }
     ],
     "require": {
-        "craftcms/cms": "^3.0.0"
+        "php": "^8.0.2",
+        "craftcms/cms": "^4.0.0-alpha"
     },
     "autoload": {
         "psr-4": {

src/Plugin.php

@@ -18,15 +18,9 @@
 
 class Plugin extends CraftPlugin
 {
-    /**
-     * @var ContentSecurityPolicy
-     */
-    public static $plugin;
+    public static Plugin $plugin;
 
-    /**
-     * @var string
-     */
-    public $schemaVersion = '1.0.0';
+    public string $schemaVersion = '1.0.0';
 
     /**
      * Init the plugin.
@@ -62,8 +56,9 @@ function (Event $event) {
 
         // Prevent loading when debug toolbar is on.
         $user = Craft::$app->getUser()->getIdentity();
+
         if ($user instanceof User && $user->getPreference('enableDebugToolbarForSite')) return;
-
+        
         Event::on(
             View::class,
             View::EVENT_END_PAGE,
@@ -80,7 +75,7 @@ function (Event $event) {
     /**
      * @inheritdoc
      */
-    protected function createSettingsModel()
+    protected function createSettingsModel(): Settings
     {
         return new Settings();
     }

src/models/Settings.php

@@ -37,7 +37,7 @@ class Settings extends Model
     public $manifestSrc = [];
     public $navigateTo = [];
 
-    public function rules()
+    public function rules(): array
     {
         return [
             [['enabled'], 'boolean'],

src/services/Headers.php

@@ -113,9 +113,10 @@ public function setHeaders()
 
         $cspValue = join('; ', $cspValues);
 
-        Craft::$app->response->headers->add('Content-Security-Policy', $cspValue . ';');
-        Craft::$app->response->headers->add('X-Content-Security-Policy', $cspValue . ';');
-        Craft::$app->response->headers->add('X-WebKit-CSP', $cspValue . ';');
+        Craft::$app->getResponse()->getHeaders()
+            ->set('Content-Security-Policy', $cspValue . ';')
+            ->set('X-Content-Security-Policy', $cspValue . ';')
+            ->set('X-WebKit-CSP', $cspValue . ';');
     }
 
     /**

src/twigextensions/ContentSecurityPolicyTwigExtension.php

@@ -4,9 +4,10 @@
 
 use born05\contentsecuritypolicy\Plugin;
 
-use Craft;
+use Twig\TwigFunction;
+use Twig\Extension\AbstractExtension;
 
-class ContentSecurityPolicyTwigExtension extends \Twig_Extension
+class ContentSecurityPolicyTwigExtension extends AbstractExtension
 {
     /**
      * @return string
@@ -26,7 +27,7 @@ public function getName()
     public function getFunctions()
     {
         return [
-            new \Twig_SimpleFunction('cspNonce', [$this, 'registerNonce']),
+            new TwigFunction('cspNonce', [$this, 'registerNonce']),
         ];
     }