Merge pull request #4136 from MGatner/stanfix

PHPStan Fixes
codeigniter4 · Jan 22, 2021 · 2da3a86 · 2da3a86
2 parents a6b542a + 3429928
commit 2da3a86
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/test-phpstan.yml b/.github/workflows/test-phpstan.yml
@@ -10,6 +10,7 @@ on:
     paths:
       - 'app/**'
       - 'system/**'
+      - composer.json
       - phpstan.neon.dist
   push:
     branches:
@@ -18,6 +19,7 @@ on:
     paths:
       - 'app/**'
       - 'system/**'
+      - composer.json
       - phpstan.neon.dist
 
 jobs:

diff --git a/app/Config/App.php b/app/Config/App.php
@@ -303,7 +303,7 @@ class App extends BaseConfig
 	 * (empty string) means no SameSite attribute will be set on cookies. If
 	 * set to `None`, `$cookieSecure` must also be set.
 	 *
-	 * @var string
+       * @var string 'Lax'|'None'|'Strict'
 	 */
 	public $cookieSameSite = 'Lax';
 

diff --git a/app/Config/Security.php b/app/Config/Security.php
@@ -86,7 +86,7 @@ class Security extends BaseConfig
 	 * Defaults to `Lax` as recommended in this link:
 	 * @see https://portswigger.net/web-security/csrf/samesite-cookies
 	 *
-	 * @var string
+       * @var string 'Lax'|'None'|'Strict'
 	 */
 	public $samesite = 'Lax';
 }
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
@@ -234,7 +234,6 @@ protected function initializeKint()
 		// If we have KINT_DIR it means it's already loaded via composer
 		if (! defined('KINT_DIR'))
 		{
-			// @phpstan-ignore-next-line
 			spl_autoload_register(function ($class) {
 				$class = explode('\\', $class);
 

diff --git a/system/Security/Security.php b/system/Security/Security.php
@@ -99,7 +99,7 @@ class Security implements SecurityInterface
 	 * Defaults to `Lax` as recommended in this link:
 	 * @see https://portswigger.net/web-security/csrf/samesite-cookies
 	 *
-	 * @var string
+       * @var string 'Lax'|'None'|'Strict'
 	 */
 	protected $samesite = 'Lax';
 

diff --git a/system/Session/Session.php b/system/Session/Session.php
@@ -125,7 +125,7 @@ class Session implements SessionInterface
 	 * Cookie SameSite setting as described in RFC6265
 	 * Must be 'None', 'Lax' or 'Strict'.
 	 *
-	 * @var string
+       * @var string 'Lax'|'None'|'Strict'
 	 */
 	protected $cookieSameSite = 'Lax';