refactor: Improve comparison with an empty string

neznaika0 · neznaika0 · commit f3a85dea7cb3 · 2024-12-11T22:31:34.000+03:00
diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php
@@ -230,7 +230,7 @@ public static function prompt(string $field, $options = null, $validation = null
         }
 
         if (! is_array($validation)) {
-            $validation = ($validation !== null && $validation !== '') ? explode('|', $validation) : [];
+            $validation = ((string) $validation !== '') ? explode('|', $validation) : [];
         }
 
         if (is_string($options)) {
@@ -441,7 +441,7 @@ protected static function validate(string $field, string $value, $rules): bool
      */
     public static function print(string $text = '', ?string $foreground = null, ?string $background = null)
     {
-        if ($foreground !== null || $background !== null) {
+        if ((string) $foreground !== '' || (string) $background !== '') {
             $text = static::color($text, $foreground, $background);
         }
 
@@ -457,7 +457,7 @@ public static function print(string $text = '', ?string $foreground = null, ?str
      */
     public static function write(string $text = '', ?string $foreground = null, ?string $background = null)
     {
-        if ($foreground !== null || $background !== null) {
+        if ((string) $foreground !== '' || (string) $background !== '') {
             $text = static::color($text, $foreground, $background);
         }
 
@@ -480,7 +480,7 @@ public static function error(string $text, string $foreground = 'light_red', ?st
         $stdout            = static::$isColored;
         static::$isColored = static::hasColorSupport(STDERR);
 
-        if ($foreground !== '' || $background !== null) {
+        if ($foreground !== '' || (string) $background !== '') {
             $text = static::color($text, $foreground, $background);
         }
 
@@ -589,7 +589,7 @@ public static function color(string $text, string $foreground, ?string $backgrou
             throw CLIException::forInvalidColor('foreground', $foreground);
         }
 
-        if ($background !== null && ! array_key_exists($background, static::$background_colors)) {
+        if ((string) $background !== '' && ! array_key_exists($background, static::$background_colors)) {
             throw CLIException::forInvalidColor('background', $background);
         }
 
@@ -637,7 +637,7 @@ private static function getColoredText(string $text, string $foreground, ?string
     {
         $string = "\033[" . static::$foreground_colors[$foreground] . 'm';
 
-        if ($background !== null) {
+        if ((string) $background !== '') {
             $string .= "\033[" . static::$background_colors[$background] . 'm';
         }
 
@@ -654,7 +654,7 @@ private static function getColoredText(string $text, string $foreground, ?string
      */
     public static function strlen(?string $string): int
     {
-        if ($string === null) {
+        if ((string) $string === '') {
             return 0;
         }
 
@@ -835,7 +835,7 @@ public static function showProgress($thisStep = 1, int $totalSteps = 10)
      */
     public static function wrap(?string $string = null, int $max = 0, int $padLeft = 0): string
     {
-        if ($string === null || $string === '') {
+        if ((string) $string === '') {
             return '';
         }
 
diff --git a/system/Common.php b/system/Common.php
@@ -75,7 +75,7 @@ function cache(?string $key = null)
         $cache = service('cache');
 
         // No params - return cache object
-        if ($key === null) {
+        if ((string) $key === '') {
             return $cache;
         }
 
@@ -289,7 +289,7 @@ function csrf_hash(): string
      */
     function csrf_field(?string $id = null): string
     {
-        return '<input type="hidden"' . ($id !== null ? ' id="' . esc($id, 'attr') . '"' : '') . ' name="' . csrf_token() . '" value="' . csrf_hash() . '"' . _solidus() . '>';
+        return '<input type="hidden"' . ((string) $id !== '' ? ' id="' . esc($id, 'attr') . '"' : '') . ' name="' . csrf_token() . '" value="' . csrf_hash() . '"' . _solidus() . '>';
     }
 }
 
@@ -301,7 +301,7 @@ function csrf_field(?string $id = null): string
      */
     function csrf_meta(?string $id = null): string
     {
-        return '<meta' . ($id !== null ? ' id="' . esc($id, 'attr') . '"' : '') . ' name="' . csrf_header() . '" content="' . csrf_hash() . '"' . _solidus() . '>';
+        return '<meta' . ((string) $id !== '' ? ' id="' . esc($id, 'attr') . '"' : '') . ' name="' . csrf_header() . '" content="' . csrf_hash() . '"' . _solidus() . '>';
     }
 }
 
@@ -441,7 +441,7 @@ function esc($data, string $context = 'html', ?string $encoding = null)
                 $escaper = new Escaper($encoding);
             }
 
-            if ($encoding !== null && $escaper->getEncoding() !== $encoding) {
+            if ((string) $encoding !== '' && $escaper->getEncoding() !== $encoding) {
                 $escaper = new Escaper($encoding);
             }
 
@@ -739,13 +739,13 @@ function lang(string $line, array $args = [], ?string $locale = null)
         // Get active locale
         $activeLocale = $language->getLocale();
 
-        if ($locale !== null && $locale !== $activeLocale) {
+        if ((string) $locale !== '' && $locale !== $activeLocale) {
             $language->setLocale($locale);
         }
 
         $lines = $language->getLine($line, $args);
 
-        if ($locale !== null && $locale !== $activeLocale) {
+        if ((string) $locale !== '' && $locale !== $activeLocale) {
             // Reset to active locale
             $language->setLocale($activeLocale);
         }
@@ -849,7 +849,7 @@ function redirect(?string $route = null): RedirectResponse
     {
         $response = service('redirectresponse');
 
-        if ($route !== null) {
+        if ((string) $route !== '') {
             return $response->route($route);
         }
 
@@ -1128,7 +1128,7 @@ function timer(?string $name = null, ?callable $callable = null)
     {
         $timer = service('timer');
 
-        if ($name === null) {
+        if ((string) $name === '') {
             return $timer;
         }
 
diff --git a/system/Database/MigrationRunner.php b/system/Database/MigrationRunner.php
@@ -161,7 +161,7 @@ public function latest(?string $group = null)
 
         $this->ensureTable();
 
-        if ($group !== null) {
+        if ((string) $group !== '') {
             $this->groupFilter = $group;
             $this->setGroup($group);
         }
@@ -326,7 +326,7 @@ public function force(string $path, string $namespace, ?string $group = null)
 
         $this->ensureTable();
 
-        if ($group !== null) {
+        if ((string) $group !== '') {
             $this->groupFilter = $group;
             $this->setGroup($group);
         }
diff --git a/system/Database/MySQLi/Connection.php b/system/Database/MySQLi/Connection.php
@@ -395,7 +395,7 @@ protected function _listTables(bool $prefixLimit = false, ?string $tableName = n
     {
         $sql = 'SHOW TABLES FROM ' . $this->escapeIdentifier($this->database);
 
-        if ($tableName !== null) {
+        if ((string) $tableName !== '') {
             return $sql . ' LIKE ' . $this->escape($tableName);
         }
 
diff --git a/system/Database/SQLite3/Connection.php b/system/Database/SQLite3/Connection.php
@@ -194,7 +194,7 @@ protected function _escapeString(string $str): string
      */
     protected function _listTables(bool $prefixLimit = false, ?string $tableName = null): string
     {
-        if ($tableName !== null) {
+        if ((string) $tableName !== '') {
             return 'SELECT "NAME" FROM "SQLITE_MASTER" WHERE "TYPE" = \'table\''
                    . ' AND "NAME" NOT LIKE \'sqlite!_%\' ESCAPE \'!\''
                    . ' AND "NAME" LIKE ' . $this->escape($tableName);
diff --git a/system/Filters/Filters.php b/system/Filters/Filters.php
@@ -557,7 +557,7 @@ public function enableFilters(array $names, string $when = 'before')
      */
     public function getArguments(?string $key = null)
     {
-        return $key === null ? $this->arguments : $this->arguments[$key];
+        return ((string) $key === '') ? $this->arguments : $this->arguments[$key];
     }
 
     // --------------------------------------------------------------------
diff --git a/system/HTTP/UserAgent.php b/system/HTTP/UserAgent.php
@@ -125,7 +125,7 @@ public function isBrowser(?string $key = null): bool
         }
 
         // No need to be specific, it's a browser
-        if ($key === null) {
+        if ((string) $key === '') {
             return true;
         }
 
@@ -143,7 +143,7 @@ public function isRobot(?string $key = null): bool
         }
 
         // No need to be specific, it's a robot
-        if ($key === null) {
+        if ((string) $key === '') {
             return true;
         }
 
@@ -161,7 +161,7 @@ public function isMobile(?string $key = null): bool
         }
 
         // No need to be specific, it's a mobile
-        if ($key === null) {
+        if ((string) $key === '') {
             return true;
         }
 
diff --git a/system/Model.php b/system/Model.php
@@ -690,7 +690,7 @@ public function builder(?string $table = null)
         // Check for an existing Builder
         if ($this->builder instanceof BaseBuilder) {
             // Make sure the requested table matches the builder
-            if ($table !== null && $this->builder->getTable() !== $table) {
+            if ((string) $table !== '' && $this->builder->getTable() !== $table) {
                 return $this->db->table($table);
             }
 
@@ -704,7 +704,7 @@ public function builder(?string $table = null)
             throw ModelException::forNoPrimaryKey(static::class);
         }
 
-        $table = ($table === null || $table === '') ? $this->table : $table;
+        $table = ((string) $table === '') ? $this->table : $table;
 
         // Ensure we have a good db connection
         if (! $this->db instanceof BaseConnection) {
diff --git a/system/Router/AutoRouter.php b/system/Router/AutoRouter.php
@@ -244,7 +244,7 @@ private function isValidSegment(string $segment): bool
      */
     public function setDirectory(?string $dir = null, bool $append = false, bool $validate = true)
     {
-        if ($dir === null || $dir === '') {
+        if ((string) $dir === '') {
             $this->directory = null;
 
             return;
@@ -260,7 +260,7 @@ public function setDirectory(?string $dir = null, bool $append = false, bool $va
             }
         }
 
-        if (! $append || ($this->directory === null || $this->directory === '')) {
+        if (! $append || ((string) $this->directory === '')) {
             $this->directory = trim($dir, '/') . '/';
         } else {
             $this->directory .= trim($dir, '/') . '/';
@@ -275,7 +275,7 @@ public function setDirectory(?string $dir = null, bool $append = false, bool $va
      */
     public function directory(): string
     {
-        return ($this->directory !== null && $this->directory !== '') ? $this->directory : '';
+        return ((string) $this->directory !== '') ? $this->directory : '';
     }
 
     private function controllerName(): string
diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
@@ -560,7 +560,7 @@ public function shouldAutoRoute(): bool
      */
     public function getRoutes(?string $verb = null, bool $includeWildcard = true): array
     {
-        if ($verb === null || $verb === '') {
+        if ((string) $verb === '') {
             $verb = $this->getHTTPVerb();
         }
 
@@ -609,7 +609,7 @@ public function getRoutesOptions(?string $from = null, ?string $verb = null): ar
     {
         $options = $this->loadRoutesOptions($verb);
 
-        return $from !== null ? $options[$from] ?? [] : $options;
+        return ((string) $from !== '') ? $options[$from] ?? [] : $options;
     }
 
     /**
@@ -1416,14 +1416,14 @@ private function replaceLocale(string $route, ?string $locale = null): string
         }
 
         // Check invalid locale
-        if ($locale !== null) {
+        if ((string) $locale !== '') {
             $config = config(App::class);
             if (! in_array($locale, $config->supportedLocales, true)) {
                 $locale = null;
             }
         }
 
-        if ($locale === null) {
+        if ((string) $locale === '') {
             $locale = service('request')->getLocale();
         }
 

Original file line number	Diff line number	Diff line change
`@@ -230,7 +230,7 @@ public static function prompt(string $field, $options = null, $validation = null`
`230`	`230`	`}`
`231`	`231`
`232`	`232`	`if (! is_array($validation)) {`
`233`		`- $validation = ($validation !== null && $validation !== '') ? explode('\|', $validation) : [];`
	`233`	`+ $validation = ((string) $validation !== '') ? explode('\|', $validation) : [];`
`234`	`234`	`}`
`235`	`235`
`236`	`236`	`if (is_string($options)) {`
`@@ -441,7 +441,7 @@ protected static function validate(string $field, string $value, $rules): bool`
`441`	`441`	`*/`
`442`	`442`	`public static function print(string $text = '', ?string $foreground = null, ?string $background = null)`
`443`	`443`	`{`
`444`		`- if ($foreground !== null \|\| $background !== null) {`
	`444`	`+ if ((string) $foreground !== '' \|\| (string) $background !== '') {`
`445`	`445`	`$text = static::color($text, $foreground, $background);`
`446`	`446`	`}`
`447`	`447`
`@@ -457,7 +457,7 @@ public static function print(string $text = '', ?string $foreground = null, ?str`
`457`	`457`	`*/`
`458`	`458`	`public static function write(string $text = '', ?string $foreground = null, ?string $background = null)`
`459`	`459`	`{`
`460`		`- if ($foreground !== null \|\| $background !== null) {`
	`460`	`+ if ((string) $foreground !== '' \|\| (string) $background !== '') {`
`461`	`461`	`$text = static::color($text, $foreground, $background);`
`462`	`462`	`}`
`463`	`463`
`@@ -480,7 +480,7 @@ public static function error(string $text, string $foreground = 'light_red', ?st`
`480`	`480`	`$stdout = static::$isColored;`
`481`	`481`	`static::$isColored = static::hasColorSupport(STDERR);`
`482`	`482`
`483`		`- if ($foreground !== '' \|\| $background !== null) {`
	`483`	`+ if ($foreground !== '' \|\| (string) $background !== '') {`
`484`	`484`	`$text = static::color($text, $foreground, $background);`
`485`	`485`	`}`
`486`	`486`
`@@ -589,7 +589,7 @@ public static function color(string $text, string $foreground, ?string $backgrou`
`589`	`589`	`throw CLIException::forInvalidColor('foreground', $foreground);`
`590`	`590`	`}`
`591`	`591`
`592`		`- if ($background !== null && ! array_key_exists($background, static::$background_colors)) {`
	`592`	`+ if ((string) $background !== '' && ! array_key_exists($background, static::$background_colors)) {`
`593`	`593`	`throw CLIException::forInvalidColor('background', $background);`
`594`	`594`	`}`
`595`	`595`
`@@ -637,7 +637,7 @@ private static function getColoredText(string $text, string $foreground, ?string`
`637`	`637`	`{`
`638`	`638`	`$string = "\033[" . static::$foreground_colors[$foreground] . 'm';`
`639`	`639`
`640`		`- if ($background !== null) {`
	`640`	`+ if ((string) $background !== '') {`
`641`	`641`	`$string .= "\033[" . static::$background_colors[$background] . 'm';`
`642`	`642`	`}`
`643`	`643`
`@@ -654,7 +654,7 @@ private static function getColoredText(string $text, string $foreground, ?string`
`654`	`654`	`*/`
`655`	`655`	`public static function strlen(?string $string): int`
`656`	`656`	`{`
`657`		`- if ($string === null) {`
	`657`	`+ if ((string) $string === '') {`
`658`	`658`	`return 0;`
`659`	`659`	`}`
`660`	`660`
`@@ -835,7 +835,7 @@ public static function showProgress($thisStep = 1, int $totalSteps = 10)`
`835`	`835`	`*/`
`836`	`836`	`public static function wrap(?string $string = null, int $max = 0, int $padLeft = 0): string`
`837`	`837`	`{`
`838`		`- if ($string === null \|\| $string === '') {`
	`838`	`+ if ((string) $string === '') {`
`839`	`839`	`return '';`
`840`	`840`	`}`
`841`	`841`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ function cache(?string $key = null)`
`75`	`75`	`$cache = service('cache');`
`76`	`76`
`77`	`77`	`// No params - return cache object`
`78`		`- if ($key === null) {`
	`78`	`+ if ((string) $key === '') {`
`79`	`79`	`return $cache;`
`80`	`80`	`}`
`81`	`81`
`@@ -289,7 +289,7 @@ function csrf_hash(): string`
`289`	`289`	`*/`
`290`	`290`	`function csrf_field(?string $id = null): string`
`291`	`291`	`{`
`292`		`- return '<input type="hidden"' . ($id !== null ? ' id="' . esc($id, 'attr') . '"' : '') . ' name="' . csrf_token() . '" value="' . csrf_hash() . '"' . _solidus() . '>';`
	`292`	`+ return '<input type="hidden"' . ((string) $id !== '' ? ' id="' . esc($id, 'attr') . '"' : '') . ' name="' . csrf_token() . '" value="' . csrf_hash() . '"' . _solidus() . '>';`
`293`	`293`	`}`
`294`	`294`	`}`
`295`	`295`
`@@ -301,7 +301,7 @@ function csrf_field(?string $id = null): string`
`301`	`301`	`*/`
`302`	`302`	`function csrf_meta(?string $id = null): string`
`303`	`303`	`{`
`304`		`- return '<meta' . ($id !== null ? ' id="' . esc($id, 'attr') . '"' : '') . ' name="' . csrf_header() . '" content="' . csrf_hash() . '"' . _solidus() . '>';`
	`304`	`+ return '<meta' . ((string) $id !== '' ? ' id="' . esc($id, 'attr') . '"' : '') . ' name="' . csrf_header() . '" content="' . csrf_hash() . '"' . _solidus() . '>';`
`305`	`305`	`}`
`306`	`306`	`}`
`307`	`307`
`@@ -441,7 +441,7 @@ function esc($data, string $context = 'html', ?string $encoding = null)`
`441`	`441`	`$escaper = new Escaper($encoding);`
`442`	`442`	`}`
`443`	`443`
`444`		`- if ($encoding !== null && $escaper->getEncoding() !== $encoding) {`
	`444`	`+ if ((string) $encoding !== '' && $escaper->getEncoding() !== $encoding) {`
`445`	`445`	`$escaper = new Escaper($encoding);`
`446`	`446`	`}`
`447`	`447`
`@@ -739,13 +739,13 @@ function lang(string $line, array $args = [], ?string $locale = null)`
`739`	`739`	`// Get active locale`
`740`	`740`	`$activeLocale = $language->getLocale();`
`741`	`741`
`742`		`- if ($locale !== null && $locale !== $activeLocale) {`
	`742`	`+ if ((string) $locale !== '' && $locale !== $activeLocale) {`
`743`	`743`	`$language->setLocale($locale);`
`744`	`744`	`}`
`745`	`745`
`746`	`746`	`$lines = $language->getLine($line, $args);`
`747`	`747`
`748`		`- if ($locale !== null && $locale !== $activeLocale) {`
	`748`	`+ if ((string) $locale !== '' && $locale !== $activeLocale) {`
`749`	`749`	`// Reset to active locale`
`750`	`750`	`$language->setLocale($activeLocale);`
`751`	`751`	`}`
`@@ -849,7 +849,7 @@ function redirect(?string $route = null): RedirectResponse`
`849`	`849`	`{`
`850`	`850`	`$response = service('redirectresponse');`
`851`	`851`
`852`		`- if ($route !== null) {`
	`852`	`+ if ((string) $route !== '') {`
`853`	`853`	`return $response->route($route);`
`854`	`854`	`}`
`855`	`855`
`@@ -1128,7 +1128,7 @@ function timer(?string $name = null, ?callable $callable = null)`
`1128`	`1128`	`{`
`1129`	`1129`	`$timer = service('timer');`
`1130`	`1130`
`1131`		`- if ($name === null) {`
	`1131`	`+ if ((string) $name === '') {`
`1132`	`1132`	`return $timer;`
`1133`	`1133`	`}`
`1134`	`1134`
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ public function latest(?string $group = null)`
`161`	`161`
`162`	`162`	`$this->ensureTable();`
`163`	`163`
`164`		`- if ($group !== null) {`
	`164`	`+ if ((string) $group !== '') {`
`165`	`165`	`$this->groupFilter = $group;`
`166`	`166`	`$this->setGroup($group);`
`167`	`167`	`}`
`@@ -326,7 +326,7 @@ public function force(string $path, string $namespace, ?string $group = null)`
`326`	`326`
`327`	`327`	`$this->ensureTable();`
`328`	`328`
`329`		`- if ($group !== null) {`
	`329`	`+ if ((string) $group !== '') {`
`330`	`330`	`$this->groupFilter = $group;`
`331`	`331`	`$this->setGroup($group);`
`332`	`332`	`}`
Original file line number	Diff line number	Diff line change
`@@ -395,7 +395,7 @@ protected function _listTables(bool $prefixLimit = false, ?string $tableName = n`
`395`	`395`	`{`
`396`	`396`	`$sql = 'SHOW TABLES FROM ' . $this->escapeIdentifier($this->database);`
`397`	`397`
`398`		`- if ($tableName !== null) {`
	`398`	`+ if ((string) $tableName !== '') {`
`399`	`399`	`return $sql . ' LIKE ' . $this->escape($tableName);`
`400`	`400`	`}`
`401`	`401`
Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ protected function _escapeString(string $str): string`
`194`	`194`	`*/`
`195`	`195`	`protected function _listTables(bool $prefixLimit = false, ?string $tableName = null): string`
`196`	`196`	`{`
`197`		`- if ($tableName !== null) {`
	`197`	`+ if ((string) $tableName !== '') {`
`198`	`198`	`return 'SELECT "NAME" FROM "SQLITE_MASTER" WHERE "TYPE" = \'table\''`
`199`	`199`	`. ' AND "NAME" NOT LIKE \'sqlite!_%\' ESCAPE \'!\''`
`200`	`200`	`. ' AND "NAME" LIKE ' . $this->escape($tableName);`
Original file line number	Diff line number	Diff line change
`@@ -557,7 +557,7 @@ public function enableFilters(array $names, string $when = 'before')`
`557`	`557`	`*/`
`558`	`558`	`public function getArguments(?string $key = null)`
`559`	`559`	`{`
`560`		`- return $key === null ? $this->arguments : $this->arguments[$key];`
	`560`	`+ return ((string) $key === '') ? $this->arguments : $this->arguments[$key];`
`561`	`561`	`}`
`562`	`562`
`563`	`563`	`// --------------------------------------------------------------------`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ public function isBrowser(?string $key = null): bool`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`// No need to be specific, it's a browser`
`128`		`- if ($key === null) {`
	`128`	`+ if ((string) $key === '') {`
`129`	`129`	`return true;`
`130`	`130`	`}`
`131`	`131`
`@@ -143,7 +143,7 @@ public function isRobot(?string $key = null): bool`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`// No need to be specific, it's a robot`
`146`		`- if ($key === null) {`
	`146`	`+ if ((string) $key === '') {`
`147`	`147`	`return true;`
`148`	`148`	`}`
`149`	`149`
`@@ -161,7 +161,7 @@ public function isMobile(?string $key = null): bool`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`// No need to be specific, it's a mobile`
`164`		`- if ($key === null) {`
	`164`	`+ if ((string) $key === '') {`
`165`	`165`	`return true;`
`166`	`166`	`}`
`167`	`167`
Original file line number	Diff line number	Diff line change
`@@ -690,7 +690,7 @@ public function builder(?string $table = null)`
`690`	`690`	`// Check for an existing Builder`
`691`	`691`	`if ($this->builder instanceof BaseBuilder) {`
`692`	`692`	`// Make sure the requested table matches the builder`
`693`		`- if ($table !== null && $this->builder->getTable() !== $table) {`
	`693`	`+ if ((string) $table !== '' && $this->builder->getTable() !== $table) {`
`694`	`694`	`return $this->db->table($table);`
`695`	`695`	`}`
`696`	`696`
`@@ -704,7 +704,7 @@ public function builder(?string $table = null)`
`704`	`704`	`throw ModelException::forNoPrimaryKey(static::class);`
`705`	`705`	`}`
`706`	`706`
`707`		`- $table = ($table === null \|\| $table === '') ? $this->table : $table;`
	`707`	`+ $table = ((string) $table === '') ? $this->table : $table;`
`708`	`708`
`709`	`709`	`// Ensure we have a good db connection`
`710`	`710`	`if (! $this->db instanceof BaseConnection) {`
Original file line number	Diff line number	Diff line change
`@@ -244,7 +244,7 @@ private function isValidSegment(string $segment): bool`
`244`	`244`	`*/`
`245`	`245`	`public function setDirectory(?string $dir = null, bool $append = false, bool $validate = true)`
`246`	`246`	`{`
`247`		`- if ($dir === null \|\| $dir === '') {`
	`247`	`+ if ((string) $dir === '') {`
`248`	`248`	`$this->directory = null;`
`249`	`249`
`250`	`250`	`return;`
`@@ -260,7 +260,7 @@ public function setDirectory(?string $dir = null, bool $append = false, bool $va`
`260`	`260`	`}`
`261`	`261`	`}`
`262`	`262`
`263`		`- if (! $append \|\| ($this->directory === null \|\| $this->directory === '')) {`
	`263`	`+ if (! $append \|\| ((string) $this->directory === '')) {`
`264`	`264`	`$this->directory = trim($dir, '/') . '/';`
`265`	`265`	`} else {`
`266`	`266`	`$this->directory .= trim($dir, '/') . '/';`
`@@ -275,7 +275,7 @@ public function setDirectory(?string $dir = null, bool $append = false, bool $va`
`275`	`275`	`*/`
`276`	`276`	`public function directory(): string`
`277`	`277`	`{`
`278`		`- return ($this->directory !== null && $this->directory !== '') ? $this->directory : '';`
	`278`	`+ return ((string) $this->directory !== '') ? $this->directory : '';`
`279`	`279`	`}`
`280`	`280`
`281`	`281`	`private function controllerName(): string`
Original file line number	Diff line number	Diff line change
`@@ -560,7 +560,7 @@ public function shouldAutoRoute(): bool`
`560`	`560`	`*/`
`561`	`561`	`public function getRoutes(?string $verb = null, bool $includeWildcard = true): array`
`562`	`562`	`{`
`563`		`- if ($verb === null \|\| $verb === '') {`
	`563`	`+ if ((string) $verb === '') {`
`564`	`564`	`$verb = $this->getHTTPVerb();`
`565`	`565`	`}`
`566`	`566`
`@@ -609,7 +609,7 @@ public function getRoutesOptions(?string $from = null, ?string $verb = null): ar`
`609`	`609`	`{`
`610`	`610`	`$options = $this->loadRoutesOptions($verb);`
`611`	`611`
`612`		`- return $from !== null ? $options[$from] ?? [] : $options;`
	`612`	`+ return ((string) $from !== '') ? $options[$from] ?? [] : $options;`
`613`	`613`	`}`
`614`	`614`
`615`	`615`	`/**`
`@@ -1416,14 +1416,14 @@ private function replaceLocale(string $route, ?string $locale = null): string`
`1416`	`1416`	`}`
`1417`	`1417`
`1418`	`1418`	`// Check invalid locale`
`1419`		`- if ($locale !== null) {`
	`1419`	`+ if ((string) $locale !== '') {`
`1420`	`1420`	`$config = config(App::class);`
`1421`	`1421`	`if (! in_array($locale, $config->supportedLocales, true)) {`
`1422`	`1422`	`$locale = null;`
`1423`	`1423`	`}`
`1424`	`1424`	`}`
`1425`	`1425`
`1426`		`- if ($locale === null) {`
	`1426`	`+ if ((string) $locale === '') {`
`1427`	`1427`	`$locale = service('request')->getLocale();`
`1428`	`1428`	`}`
`1429`	`1429`