Merge branch 'release/2.0.3'

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.0.3] - 2021-09-24
+
+### Fixes
+- Fixes type error when using `csrf_token()` Twig function.
+
 ## [2.0.2] - 2021-09-14
 
 ### Changed

Plugin.php

@@ -6,6 +6,7 @@
 
 use Cms\Classes\CmsController;
 use System\Classes\PluginBase;
+use Throwable;
 use Vdlp\Csrf\Middleware\VerifyCsrfTokenMiddleware;
 use Vdlp\Csrf\ServiceProviders\CsrfServiceProvider;
 
@@ -38,8 +39,12 @@ public function registerMarkupTags(): array
     {
         return [
             'functions' => [
-                'csrf_token' => static function (): string {
-                    return csrf_token();
+                'csrf_token' => static function (): ?string {
+                    try {
+                        return csrf_token();
+                    } catch (Throwable $exception) {
+                        return null;
+                    }
                 },
             ],
         ];

middleware/VerifyCsrfTokenMiddleware.php

@@ -8,6 +8,8 @@
 use Illuminate\Contracts\Encryption\DecryptException;
 use Illuminate\Contracts\Encryption\Encrypter;
 use Illuminate\Contracts\Routing\ResponseFactory;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Redirector;
 use October\Rain\Cookie\Middleware\EncryptCookies;
@@ -34,7 +36,7 @@ public function __construct(
     }
 
     /**
-     * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse|mixed
+     * @return JsonResponse|RedirectResponse|mixed
      * @throws RuntimeException
      */
     public function handle(Request $request, Closure $next)

updates/version.yaml

@@ -5,3 +5,4 @@
 2.0.0: "Support for PHP 7.4 or higher"
 2.0.1: "Fix location of plugin config.php file"
 2.0.2: "Minor improvements -- See: CHANGELOG.md"
+2.0.3: "Fixes type error when using `csrf_token()` Twig function"