Merge pull request #5708 from samsonasik/make-context-nullable

samsonasik · web-flow · commit eb09acd1bd0b · 2022-02-19T07:02:27.000+07:00
Make CodeIgniter::context nullable to handle access before initialization
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
@@ -149,7 +149,7 @@ class CodeIgniter
      *
      * @phpstan-var 'php-cli'|'spark'|'web'
      */
-    protected string $context;
+    protected ?string $context = null;
 
     /**
      * Constructor.
diff --git a/system/Test/Mock/MockCodeIgniter.php b/system/Test/Mock/MockCodeIgniter.php
@@ -15,7 +15,7 @@
 
 class MockCodeIgniter extends CodeIgniter
 {
-    protected string $context = 'web';
+    protected ?string $context = 'web';
 
     protected function callExit($code)
     {

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ class CodeIgniter`
`149`	`149`	`*`
`150`	`150`	`* @phpstan-var 'php-cli'\|'spark'\|'web'`
`151`	`151`	`*/`
`152`		`- protected string $context;`
	`152`	`+ protected ?string $context = null;`
`153`	`153`
`154`	`154`	`/**`
`155`	`155`	`* Constructor.`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`
`16`	`16`	`class MockCodeIgniter extends CodeIgniter`
`17`	`17`	`{`
`18`		`- protected string $context = 'web';`
	`18`	`+ protected ?string $context = 'web';`
`19`	`19`
`20`	`20`	`protected function callExit($code)`
`21`	`21`	`{`