refactor: Use strtolower with str_contains/str_**_with as replacement for stripos#9414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
paulbalandan merged 2 commits into from
Jan 17, 2025
Merged

refactor: Use strtolower with str_contains/str_**_with as replacement for stripos#9414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfcfb1b
Use `modernize_stripos` option
paulbalandan Jan 17, 2025
cc88723
Fix impossible conditional in test
paulbalandan Jan 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions .php-cs-fixer.dist.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,17 +40,7 @@
]);

$overrides = [
'get_class_to_class_keyword' => true,
'trailing_comma_in_multiline' => [
'after_heredoc' => true,
'elements' => [
'arguments',
'array_destructuring',
'arrays',
'match',
'parameters',
],
],
'modernize_strpos' => ['modernize_stripos' => true],
];

$options = [
Expand Down
2 changes: 1 addition & 1 deletion system/Database/Forge.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1061,7 +1061,7 @@ protected function _attributeUnique(array &$attributes, array &$field)
protected function _attributeAutoIncrement(array &$attributes, array &$field)
{
if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true
&& stripos($field['type'], 'int') !== false
&& str_contains(strtolower($field['type']), 'int')
) {
$field['auto_increment'] = ' AUTO_INCREMENT';
}
Expand Down
2 changes: 1 addition & 1 deletion system/Database/OCI8/Forge.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -184,7 +184,7 @@ protected function _alterTable(string $alterType, string $table, $processedField
protected function _attributeAutoIncrement(array &$attributes, array &$field)
{
if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true
&& stripos($field['type'], 'NUMBER') !== false
&& str_contains(strtolower($field['type']), 'number')
&& version_compare($this->db->getVersion(), '12.1', '>=')
) {
$field['auto_increment'] = ' GENERATED BY DEFAULT ON NULL AS IDENTITY';
Expand Down
2 changes: 1 addition & 1 deletion system/Database/Postgre/Forge.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,7 +154,7 @@ protected function _processColumn(array $processedField): string
protected function _attributeType(array &$attributes)
{
// Reset field lengths for data types that don't support it
if (isset($attributes['CONSTRAINT']) && stripos($attributes['TYPE'], 'int') !== false) {
if (isset($attributes['CONSTRAINT']) && str_contains(strtolower($attributes['TYPE']), 'int')) {
$attributes['CONSTRAINT'] = null;
}

Expand Down
4 changes: 2 additions & 2 deletions system/Database/SQLSRV/Forge.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -360,7 +360,7 @@ protected function _processColumn(array $processedField): string
protected function _attributeType(array &$attributes)
{
// Reset field lengths for data types that don't support it
if (isset($attributes['CONSTRAINT']) && stripos($attributes['TYPE'], 'int') !== false) {
if (isset($attributes['CONSTRAINT']) && str_contains(strtolower($attributes['TYPE']), 'int')) {
$attributes['CONSTRAINT'] = null;
}

Expand DownExpand Up@@ -412,7 +412,7 @@ protected function _attributeType(array &$attributes)
*/
protected function _attributeAutoIncrement(array &$attributes, array &$field)
{
if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true && stripos($field['type'], 'INT') !== false) {
if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true && str_contains(strtolower($field['type']), strtolower('INT'))) {
$field['auto_increment'] = ' IDENTITY(1,1)';
}
}
Expand Down
2 changes: 1 addition & 1 deletion system/Database/SQLite3/Forge.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -226,7 +226,7 @@ protected function _attributeAutoIncrement(array &$attributes, array &$field)
if (
! empty($attributes['AUTO_INCREMENT'])
&& $attributes['AUTO_INCREMENT'] === true
&& stripos($field['type'], 'int') !== false
&& str_contains(strtolower($field['type']), 'int')
) {
$field['type'] = 'INTEGER PRIMARY KEY';
$field['default'] = '';
Expand Down
14 changes: 7 additions & 7 deletions system/Helpers/form_helper.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,10 +49,10 @@ function form_open(string $action = '', $attributes = [], array $hidden = []): s

$attributes = stringify_attributes($attributes);

if (stripos($attributes, 'method=') === false) {
if (! str_contains(strtolower($attributes), 'method=')) {
$attributes .= ' method="post"';
}
if (stripos($attributes, 'accept-charset=') === false) {
if (! str_contains(strtolower($attributes), 'accept-charset=')) {
$config = config(App::class);
$attributes .= ' accept-charset="' . strtolower($config->charset) . '"';
}
Expand All@@ -62,7 +62,7 @@ function form_open(string $action = '', $attributes = [], array $hidden = []): s
// Add CSRF field if enabled, but leave it out for GET requests and requests to external websites
$before = service('filters')->getFilters()['before'];

if ((in_array('csrf', $before, true) || array_key_exists('csrf', $before)) && str_contains($action, base_url()) && stripos($form, 'method="get"') === false) {
if ((in_array('csrf', $before, true) || array_key_exists('csrf', $before)) && str_contains($action, base_url()) && ! str_contains(strtolower($form), strtolower('method="get"'))) {
$form .= csrf_field($csrfId ?? null);
}

Expand DownExpand Up@@ -223,11 +223,11 @@ function form_textarea($data = '', string $value = '', $extra = ''): string
}

// Unsets default rows and cols if defined in extra field as array or string.
if ((is_array($extra) && array_key_exists('rows', $extra)) || (is_string($extra) && stripos(preg_replace('/\s+/', '', $extra), 'rows=') !== false)) {
if ((is_array($extra) && array_key_exists('rows', $extra)) || (is_string($extra) && str_contains(strtolower(preg_replace('/\s+/', '', $extra)), 'rows='))) {
unset($defaults['rows']);
}

if ((is_array($extra) && array_key_exists('cols', $extra)) || (is_string($extra) && stripos(preg_replace('/\s+/', '', $extra), 'cols=') !== false)) {
if ((is_array($extra) && array_key_exists('cols', $extra)) || (is_string($extra) && str_contains(strtolower(preg_replace('/\s+/', '', $extra)), 'cols='))) {
unset($defaults['cols']);
}

Expand All@@ -248,7 +248,7 @@ function form_multiselect($name = '', array $options = [], array $selected = [],
{
$extra = stringify_attributes($extra);

if (stripos($extra, 'multiple') === false) {
if (! str_contains(strtolower($extra), strtolower('multiple'))) {
$extra .= ' multiple="multiple"';
}

Expand DownExpand Up@@ -305,7 +305,7 @@ function form_dropdown($data = '', $options = [], $selected = [], $extra = ''):
}

$extra = stringify_attributes($extra);
$multiple = (count($selected) > 1 && stripos($extra, 'multiple') === false) ? ' multiple="multiple"' : '';
$multiple = (count($selected) > 1 && ! str_contains(strtolower($extra), 'multiple')) ? ' multiple="multiple"' : '';
$form = '<select ' . rtrim(parse_form_attributes($data, $defaults)) . $extra . $multiple . ">\n";

foreach ($options as $key => $val) {
Expand Down
2 changes: 1 addition & 1 deletion system/Test/CIUnitTestCase.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -516,7 +516,7 @@ protected function getHeaderEmitted(string $header, bool $ignoreCase = false, st

foreach (xdebug_get_headers() as $emittedHeader) {
$found = $ignoreCase
? (stripos($emittedHeader, $header) === 0)
? (str_starts_with(strtolower($emittedHeader), strtolower($header)))
: (str_starts_with($emittedHeader, $header));

if ($found) {
Expand Down
4 changes: 2 additions & 2 deletions system/Test/Fabricator.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -379,12 +379,12 @@ protected function guessFormatter($field): string

// Check some common partials
foreach (['email', 'name', 'title', 'text', 'date', 'url'] as $term) {
if (stripos($field, $term) !== false) {
if (str_contains(strtolower($field), strtolower($term))) {
return $term;
}
}

if (stripos($field, 'phone') !== false) {
if (str_contains(strtolower($field), 'phone')) {
return 'phoneNumber';
}

Expand Down
4 changes: 2 additions & 2 deletions tests/system/Cache/CacheFactoryTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -96,8 +96,8 @@ public function testHandlesBadHandler(): void

$this->config->handler = 'dummy';

if (stripos('win', php_uname()) === 0) {
$this->assertTrue(true); // can't test properly if we are on Windows
if (is_windows()) {
$this->markTestSkipped('Cannot test this properly on Windows.');
} else {
$this->assertInstanceOf(DummyHandler::class, $this->cacheFactory->getHandler($this->config, 'wincache', 'wincache'));
}
Expand Down
7 changes: 1 addition & 6 deletions utils/phpstan-baseline/method.alreadyNarrowedType.neon
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
# total 17 errors
# total 16 errors

parameters:
ignoreErrors:
Expand All@@ -12,11 +12,6 @@ parameters:
count: 2
path: ../../tests/system/CLI/CLITest.php

-
message: '#^Call to method PHPUnit\\Framework\\Assert\:\:assertTrue\(\) with true will always evaluate to true\.$#'
count: 1
path: ../../tests/system/Cache/CacheFactoryTest.php

-
message: '#^Call to method PHPUnit\\Framework\\Assert\:\:assertTrue\(\) with true will always evaluate to true\.$#'
count: 1
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
refactor: Use strtolower with str_contains/str_**_with as replacement for stripos#9414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

paulbalandan
merged 2 commits into

from

Jan 17, 2025
 Merged


refactor: Use strtolower with str_contains/str_**_with as replacement for stripos#9414
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
dfcfb1b

Use `modernize_stripos` option


paulbalandan Jan 17, 2025
cc88723

Fix impossible conditional in test


paulbalandan Jan 17, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 1 addition & 11 deletions
.php-cs-fixer.dist.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,17 +40,7 @@
 ]);

$overrides = [
 'get_class_to_class_keyword' => true,
 'trailing_comma_in_multiline' => [
 'after_heredoc' => true,
 'elements' => [
 'arguments',
 'array_destructuring',
 'arrays',
 'match',
 'parameters',
 ],
 ],
 'modernize_strpos' => ['modernize_stripos' => true],
];

$options = [
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1061,7 +1061,7 @@ protected function _attributeUnique(array &$attributes, array &$field)
 protected function _attributeAutoIncrement(array &$attributes, array &$field)
 {
 if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true
 && stripos($field['type'], 'int') !== false
 && str_contains(strtolower($field['type']), 'int')
 ) {
 $field['auto_increment'] = ' AUTO_INCREMENT';
 }
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/OCI8/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -184,7 +184,7 @@ protected function _alterTable(string $alterType, string $table, $processedField
 protected function _attributeAutoIncrement(array &$attributes, array &$field)
 {
 if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true
 && stripos($field['type'], 'NUMBER') !== false
 && str_contains(strtolower($field['type']), 'number')
 && version_compare($this->db->getVersion(), '12.1', '>=')
 ) {
 $field['auto_increment'] = ' GENERATED BY DEFAULT ON NULL AS IDENTITY';
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/Postgre/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -154,7 +154,7 @@ protected function _processColumn(array $processedField): string
 protected function _attributeType(array &$attributes)
 {
 // Reset field lengths for data types that don't support it
 if (isset($attributes['CONSTRAINT']) && stripos($attributes['TYPE'], 'int') !== false) {
 if (isset($attributes['CONSTRAINT']) && str_contains(strtolower($attributes['TYPE']), 'int')) {
 $attributes['CONSTRAINT'] = null;
 }

Expand Down

4 changes: 2 additions & 2 deletions
system/Database/SQLSRV/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -360,7 +360,7 @@ protected function _processColumn(array $processedField): string
 protected function _attributeType(array &$attributes)
 {
 // Reset field lengths for data types that don't support it
 if (isset($attributes['CONSTRAINT']) && stripos($attributes['TYPE'], 'int') !== false) {
 if (isset($attributes['CONSTRAINT']) && str_contains(strtolower($attributes['TYPE']), 'int')) {
 $attributes['CONSTRAINT'] = null;
 }

Expand DownExpand Up@@ -412,7 +412,7 @@ protected function _attributeType(array &$attributes)
 */
 protected function _attributeAutoIncrement(array &$attributes, array &$field)
 {
 if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true && stripos($field['type'], 'INT') !== false) {
 if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true && str_contains(strtolower($field['type']), strtolower('INT'))) {
 $field['auto_increment'] = ' IDENTITY(1,1)';
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/SQLite3/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -226,7 +226,7 @@ protected function _attributeAutoIncrement(array &$attributes, array &$field)
 if (
 ! empty($attributes['AUTO_INCREMENT'])
 && $attributes['AUTO_INCREMENT'] === true
 && stripos($field['type'], 'int') !== false
 && str_contains(strtolower($field['type']), 'int')
 ) {
 $field['type'] = 'INTEGER PRIMARY KEY';
 $field['default'] = '';
Expand Down

14 changes: 7 additions & 7 deletions
system/Helpers/form_helper.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,10 +49,10 @@ function form_open(string $action = '', $attributes = [], array $hidden = []): s

 $attributes = stringify_attributes($attributes);

 if (stripos($attributes, 'method=') === false) {
 if (! str_contains(strtolower($attributes), 'method=')) {
 $attributes .= ' method="post"';
 }
 if (stripos($attributes, 'accept-charset=') === false) {
 if (! str_contains(strtolower($attributes), 'accept-charset=')) {
 $config = config(App::class);
 $attributes .= ' accept-charset="' . strtolower($config->charset) . '"';
 }
Expand All@@ -62,7 +62,7 @@ function form_open(string $action = '', $attributes = [], array $hidden = []): s
 // Add CSRF field if enabled, but leave it out for GET requests and requests to external websites
 $before = service('filters')->getFilters()['before'];

 if ((in_array('csrf', $before, true) || array_key_exists('csrf', $before)) && str_contains($action, base_url()) && stripos($form, 'method="get"') === false) {
 if ((in_array('csrf', $before, true) || array_key_exists('csrf', $before)) && str_contains($action, base_url()) && ! str_contains(strtolower($form), strtolower('method="get"'))) {
 $form .= csrf_field($csrfId ?? null);
 }

Expand DownExpand Up@@ -223,11 +223,11 @@ function form_textarea($data = '', string $value = '', $extra = ''): string
 }

 // Unsets default rows and cols if defined in extra field as array or string.
 if ((is_array($extra) && array_key_exists('rows', $extra)) || (is_string($extra) && stripos(preg_replace('/\s+/', '', $extra), 'rows=') !== false)) {
 if ((is_array($extra) && array_key_exists('rows', $extra)) || (is_string($extra) && str_contains(strtolower(preg_replace('/\s+/', '', $extra)), 'rows='))) {
 unset($defaults['rows']);
 }

 if ((is_array($extra) && array_key_exists('cols', $extra)) || (is_string($extra) && stripos(preg_replace('/\s+/', '', $extra), 'cols=') !== false)) {
 if ((is_array($extra) && array_key_exists('cols', $extra)) || (is_string($extra) && str_contains(strtolower(preg_replace('/\s+/', '', $extra)), 'cols='))) {
 unset($defaults['cols']);
 }

Expand All@@ -248,7 +248,7 @@ function form_multiselect($name = '', array $options = [], array $selected = [],
 {
 $extra = stringify_attributes($extra);

 if (stripos($extra, 'multiple') === false) {
 if (! str_contains(strtolower($extra), strtolower('multiple'))) {
 $extra .= ' multiple="multiple"';
 }

Expand DownExpand Up@@ -305,7 +305,7 @@ function form_dropdown($data = '', $options = [], $selected = [], $extra = ''):
 }

 $extra = stringify_attributes($extra);
 $multiple = (count($selected) > 1 && stripos($extra, 'multiple') === false) ? ' multiple="multiple"' : '';
 $multiple = (count($selected) > 1 && ! str_contains(strtolower($extra), 'multiple')) ? ' multiple="multiple"' : '';
 $form = '<select ' . rtrim(parse_form_attributes($data, $defaults)) . $extra . $multiple . ">\n";

 foreach ($options as $key => $val) {
Expand Down

2 changes: 1 addition & 1 deletion
system/Test/CIUnitTestCase.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -516,7 +516,7 @@ protected function getHeaderEmitted(string $header, bool $ignoreCase = false, st

 foreach (xdebug_get_headers() as $emittedHeader) {
 $found = $ignoreCase
 ? (stripos($emittedHeader, $header) === 0)
 ? (str_starts_with(strtolower($emittedHeader), strtolower($header)))
 : (str_starts_with($emittedHeader, $header));

 if ($found) {
Expand Down

4 changes: 2 additions & 2 deletions
system/Test/Fabricator.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -379,12 +379,12 @@ protected function guessFormatter($field): string

 // Check some common partials
 foreach (['email', 'name', 'title', 'text', 'date', 'url'] as $term) {
 if (stripos($field, $term) !== false) {
 if (str_contains(strtolower($field), strtolower($term))) {
 return $term;
 }
 }

 if (stripos($field, 'phone') !== false) {
 if (str_contains(strtolower($field), 'phone')) {
 return 'phoneNumber';
 }

Expand Down

4 changes: 2 additions & 2 deletions
tests/system/Cache/CacheFactoryTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,8 +96,8 @@ public function testHandlesBadHandler(): void

 $this->config->handler = 'dummy';

 if (stripos('win', php_uname()) === 0) {
 $this->assertTrue(true); // can't test properly if we are on Windows
 if (is_windows()) {
 $this->markTestSkipped('Cannot test this properly on Windows.');
 } else {
 $this->assertInstanceOf(DummyHandler::class, $this->cacheFactory->getHandler($this->config, 'wincache', 'wincache'));
 }
Expand Down

7 changes: 1 addition & 6 deletions
utils/phpstan-baseline/method.alreadyNarrowedType.neon

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
# total 17 errors
# total 16 errors

parameters:
 ignoreErrors:
Expand All@@ -12,11 +12,6 @@ parameters:
 count: 2
 path: ../../tests/system/CLI/CLITest.php

 -
 message: '#^Call to method PHPUnit\\Framework\\Assert\:\:assertTrue\(\) with true will always evaluate to true\.$#'
 count: 1
 path: ../../tests/system/Cache/CacheFactoryTest.php

 -
 message: '#^Call to method PHPUnit\\Framework\\Assert\:\:assertTrue\(\) with true will always evaluate to true\.$#'
 count: 1
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor: Use strtolower with str_contains/str_**_with as replacement for stripos#9414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

paulbalandan
merged 2 commits into

from

Jan 17, 2025
 Merged


refactor: Use strtolower with str_contains/str_**_with as replacement for stripos#9414
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
dfcfb1b

Use `modernize_stripos` option


paulbalandan Jan 17, 2025
cc88723

Fix impossible conditional in test


paulbalandan Jan 17, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 1 addition & 11 deletions
.php-cs-fixer.dist.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,17 +40,7 @@
 ]);

$overrides = [
 'get_class_to_class_keyword' => true,
 'trailing_comma_in_multiline' => [
 'after_heredoc' => true,
 'elements' => [
 'arguments',
 'array_destructuring',
 'arrays',
 'match',
 'parameters',
 ],
 ],
 'modernize_strpos' => ['modernize_stripos' => true],
];

$options = [
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1061,7 +1061,7 @@ protected function _attributeUnique(array &$attributes, array &$field)
 protected function _attributeAutoIncrement(array &$attributes, array &$field)
 {
 if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true
 && stripos($field['type'], 'int') !== false
 && str_contains(strtolower($field['type']), 'int')
 ) {
 $field['auto_increment'] = ' AUTO_INCREMENT';
 }
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/OCI8/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -184,7 +184,7 @@ protected function _alterTable(string $alterType, string $table, $processedField
 protected function _attributeAutoIncrement(array &$attributes, array &$field)
 {
 if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true
 && stripos($field['type'], 'NUMBER') !== false
 && str_contains(strtolower($field['type']), 'number')
 && version_compare($this->db->getVersion(), '12.1', '>=')
 ) {
 $field['auto_increment'] = ' GENERATED BY DEFAULT ON NULL AS IDENTITY';
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/Postgre/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -154,7 +154,7 @@ protected function _processColumn(array $processedField): string
 protected function _attributeType(array &$attributes)
 {
 // Reset field lengths for data types that don't support it
 if (isset($attributes['CONSTRAINT']) && stripos($attributes['TYPE'], 'int') !== false) {
 if (isset($attributes['CONSTRAINT']) && str_contains(strtolower($attributes['TYPE']), 'int')) {
 $attributes['CONSTRAINT'] = null;
 }

Expand Down

4 changes: 2 additions & 2 deletions
system/Database/SQLSRV/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -360,7 +360,7 @@ protected function _processColumn(array $processedField): string
 protected function _attributeType(array &$attributes)
 {
 // Reset field lengths for data types that don't support it
 if (isset($attributes['CONSTRAINT']) && stripos($attributes['TYPE'], 'int') !== false) {
 if (isset($attributes['CONSTRAINT']) && str_contains(strtolower($attributes['TYPE']), 'int')) {
 $attributes['CONSTRAINT'] = null;
 }

Expand DownExpand Up@@ -412,7 +412,7 @@ protected function _attributeType(array &$attributes)
 */
 protected function _attributeAutoIncrement(array &$attributes, array &$field)
 {
 if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true && stripos($field['type'], 'INT') !== false) {
 if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true && str_contains(strtolower($field['type']), strtolower('INT'))) {
 $field['auto_increment'] = ' IDENTITY(1,1)';
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/SQLite3/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -226,7 +226,7 @@ protected function _attributeAutoIncrement(array &$attributes, array &$field)
 if (
 ! empty($attributes['AUTO_INCREMENT'])
 && $attributes['AUTO_INCREMENT'] === true
 && stripos($field['type'], 'int') !== false
 && str_contains(strtolower($field['type']), 'int')
 ) {
 $field['type'] = 'INTEGER PRIMARY KEY';
 $field['default'] = '';
Expand Down

14 changes: 7 additions & 7 deletions
system/Helpers/form_helper.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,10 +49,10 @@ function form_open(string $action = '', $attributes = [], array $hidden = []): s

 $attributes = stringify_attributes($attributes);

 if (stripos($attributes, 'method=') === false) {
 if (! str_contains(strtolower($attributes), 'method=')) {
 $attributes .= ' method="post"';
 }
 if (stripos($attributes, 'accept-charset=') === false) {
 if (! str_contains(strtolower($attributes), 'accept-charset=')) {
 $config = config(App::class);
 $attributes .= ' accept-charset="' . strtolower($config->charset) . '"';
 }
Expand All@@ -62,7 +62,7 @@ function form_open(string $action = '', $attributes = [], array $hidden = []): s
 // Add CSRF field if enabled, but leave it out for GET requests and requests to external websites
 $before = service('filters')->getFilters()['before'];

 if ((in_array('csrf', $before, true) || array_key_exists('csrf', $before)) && str_contains($action, base_url()) && stripos($form, 'method="get"') === false) {
 if ((in_array('csrf', $before, true) || array_key_exists('csrf', $before)) && str_contains($action, base_url()) && ! str_contains(strtolower($form), strtolower('method="get"'))) {
 $form .= csrf_field($csrfId ?? null);
 }

Expand DownExpand Up@@ -223,11 +223,11 @@ function form_textarea($data = '', string $value = '', $extra = ''): string
 }

 // Unsets default rows and cols if defined in extra field as array or string.
 if ((is_array($extra) && array_key_exists('rows', $extra)) || (is_string($extra) && stripos(preg_replace('/\s+/', '', $extra), 'rows=') !== false)) {
 if ((is_array($extra) && array_key_exists('rows', $extra)) || (is_string($extra) && str_contains(strtolower(preg_replace('/\s+/', '', $extra)), 'rows='))) {
 unset($defaults['rows']);
 }

 if ((is_array($extra) && array_key_exists('cols', $extra)) || (is_string($extra) && stripos(preg_replace('/\s+/', '', $extra), 'cols=') !== false)) {
 if ((is_array($extra) && array_key_exists('cols', $extra)) || (is_string($extra) && str_contains(strtolower(preg_replace('/\s+/', '', $extra)), 'cols='))) {
 unset($defaults['cols']);
 }

Expand All@@ -248,7 +248,7 @@ function form_multiselect($name = '', array $options = [], array $selected = [],
 {
 $extra = stringify_attributes($extra);

 if (stripos($extra, 'multiple') === false) {
 if (! str_contains(strtolower($extra), strtolower('multiple'))) {
 $extra .= ' multiple="multiple"';
 }

Expand DownExpand Up@@ -305,7 +305,7 @@ function form_dropdown($data = '', $options = [], $selected = [], $extra = ''):
 }

 $extra = stringify_attributes($extra);
 $multiple = (count($selected) > 1 && stripos($extra, 'multiple') === false) ? ' multiple="multiple"' : '';
 $multiple = (count($selected) > 1 && ! str_contains(strtolower($extra), 'multiple')) ? ' multiple="multiple"' : '';
 $form = '<select ' . rtrim(parse_form_attributes($data, $defaults)) . $extra . $multiple . ">\n";

 foreach ($options as $key => $val) {
Expand Down

2 changes: 1 addition & 1 deletion
system/Test/CIUnitTestCase.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -516,7 +516,7 @@ protected function getHeaderEmitted(string $header, bool $ignoreCase = false, st

 foreach (xdebug_get_headers() as $emittedHeader) {
 $found = $ignoreCase
 ? (stripos($emittedHeader, $header) === 0)
 ? (str_starts_with(strtolower($emittedHeader), strtolower($header)))
 : (str_starts_with($emittedHeader, $header));

 if ($found) {
Expand Down

4 changes: 2 additions & 2 deletions
system/Test/Fabricator.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -379,12 +379,12 @@ protected function guessFormatter($field): string

 // Check some common partials
 foreach (['email', 'name', 'title', 'text', 'date', 'url'] as $term) {
 if (stripos($field, $term) !== false) {
 if (str_contains(strtolower($field), strtolower($term))) {
 return $term;
 }
 }

 if (stripos($field, 'phone') !== false) {
 if (str_contains(strtolower($field), 'phone')) {
 return 'phoneNumber';
 }

Expand Down

4 changes: 2 additions & 2 deletions
tests/system/Cache/CacheFactoryTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,8 +96,8 @@ public function testHandlesBadHandler(): void

 $this->config->handler = 'dummy';

 if (stripos('win', php_uname()) === 0) {
 $this->assertTrue(true); // can't test properly if we are on Windows
 if (is_windows()) {
 $this->markTestSkipped('Cannot test this properly on Windows.');
 } else {
 $this->assertInstanceOf(DummyHandler::class, $this->cacheFactory->getHandler($this->config, 'wincache', 'wincache'));
 }
Expand Down

7 changes: 1 addition & 6 deletions
utils/phpstan-baseline/method.alreadyNarrowedType.neon

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
# total 17 errors
# total 16 errors

parameters:
 ignoreErrors:
Expand All@@ -12,11 +12,6 @@ parameters:
 count: 2
 path: ../../tests/system/CLI/CLITest.php

 -
 message: '#^Call to method PHPUnit\\Framework\\Assert\:\:assertTrue\(\) with true will always evaluate to true\.$#'
 count: 1
 path: ../../tests/system/Cache/CacheFactoryTest.php

 -
 message: '#^Call to method PHPUnit\\Framework\\Assert\:\:assertTrue\(\) with true will always evaluate to true\.$#'
 count: 1
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor: Use strtolower with str_contains/str_**_with as replacement for stripos#9414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

paulbalandan
merged 2 commits into

from

Jan 17, 2025
 Merged


refactor: Use strtolower with str_contains/str_**_with as replacement for stripos#9414
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
dfcfb1b

Use `modernize_stripos` option


paulbalandan Jan 17, 2025
cc88723

Fix impossible conditional in test


paulbalandan Jan 17, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 1 addition & 11 deletions
.php-cs-fixer.dist.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,17 +40,7 @@
 ]);

$overrides = [
 'get_class_to_class_keyword' => true,
 'trailing_comma_in_multiline' => [
 'after_heredoc' => true,
 'elements' => [
 'arguments',
 'array_destructuring',
 'arrays',
 'match',
 'parameters',
 ],
 ],
 'modernize_strpos' => ['modernize_stripos' => true],
];

$options = [
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1061,7 +1061,7 @@ protected function _attributeUnique(array &$attributes, array &$field)
 protected function _attributeAutoIncrement(array &$attributes, array &$field)
 {
 if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true
 && stripos($field['type'], 'int') !== false
 && str_contains(strtolower($field['type']), 'int')
 ) {
 $field['auto_increment'] = ' AUTO_INCREMENT';
 }
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/OCI8/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -184,7 +184,7 @@ protected function _alterTable(string $alterType, string $table, $processedField
 protected function _attributeAutoIncrement(array &$attributes, array &$field)
 {
 if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true
 && stripos($field['type'], 'NUMBER') !== false
 && str_contains(strtolower($field['type']), 'number')
 && version_compare($this->db->getVersion(), '12.1', '>=')
 ) {
 $field['auto_increment'] = ' GENERATED BY DEFAULT ON NULL AS IDENTITY';
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/Postgre/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -154,7 +154,7 @@ protected function _processColumn(array $processedField): string
 protected function _attributeType(array &$attributes)
 {
 // Reset field lengths for data types that don't support it
 if (isset($attributes['CONSTRAINT']) && stripos($attributes['TYPE'], 'int') !== false) {
 if (isset($attributes['CONSTRAINT']) && str_contains(strtolower($attributes['TYPE']), 'int')) {
 $attributes['CONSTRAINT'] = null;
 }

Expand Down

4 changes: 2 additions & 2 deletions
system/Database/SQLSRV/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -360,7 +360,7 @@ protected function _processColumn(array $processedField): string
 protected function _attributeType(array &$attributes)
 {
 // Reset field lengths for data types that don't support it
 if (isset($attributes['CONSTRAINT']) && stripos($attributes['TYPE'], 'int') !== false) {
 if (isset($attributes['CONSTRAINT']) && str_contains(strtolower($attributes['TYPE']), 'int')) {
 $attributes['CONSTRAINT'] = null;
 }

Expand DownExpand Up@@ -412,7 +412,7 @@ protected function _attributeType(array &$attributes)
 */
 protected function _attributeAutoIncrement(array &$attributes, array &$field)
 {
 if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true && stripos($field['type'], 'INT') !== false) {
 if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true && str_contains(strtolower($field['type']), strtolower('INT'))) {
 $field['auto_increment'] = ' IDENTITY(1,1)';
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/SQLite3/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -226,7 +226,7 @@ protected function _attributeAutoIncrement(array &$attributes, array &$field)
 if (
 ! empty($attributes['AUTO_INCREMENT'])
 && $attributes['AUTO_INCREMENT'] === true
 && stripos($field['type'], 'int') !== false
 && str_contains(strtolower($field['type']), 'int')
 ) {
 $field['type'] = 'INTEGER PRIMARY KEY';
 $field['default'] = '';
Expand Down

14 changes: 7 additions & 7 deletions
system/Helpers/form_helper.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,10 +49,10 @@ function form_open(string $action = '', $attributes = [], array $hidden = []): s

 $attributes = stringify_attributes($attributes);

 if (stripos($attributes, 'method=') === false) {
 if (! str_contains(strtolower($attributes), 'method=')) {
 $attributes .= ' method="post"';
 }
 if (stripos($attributes, 'accept-charset=') === false) {
 if (! str_contains(strtolower($attributes), 'accept-charset=')) {
 $config = config(App::class);
 $attributes .= ' accept-charset="' . strtolower($config->charset) . '"';
 }
Expand All@@ -62,7 +62,7 @@ function form_open(string $action = '', $attributes = [], array $hidden = []): s
 // Add CSRF field if enabled, but leave it out for GET requests and requests to external websites
 $before = service('filters')->getFilters()['before'];

 if ((in_array('csrf', $before, true) || array_key_exists('csrf', $before)) && str_contains($action, base_url()) && stripos($form, 'method="get"') === false) {
 if ((in_array('csrf', $before, true) || array_key_exists('csrf', $before)) && str_contains($action, base_url()) && ! str_contains(strtolower($form), strtolower('method="get"'))) {
 $form .= csrf_field($csrfId ?? null);
 }

Expand DownExpand Up@@ -223,11 +223,11 @@ function form_textarea($data = '', string $value = '', $extra = ''): string
 }

 // Unsets default rows and cols if defined in extra field as array or string.
 if ((is_array($extra) && array_key_exists('rows', $extra)) || (is_string($extra) && stripos(preg_replace('/\s+/', '', $extra), 'rows=') !== false)) {
 if ((is_array($extra) && array_key_exists('rows', $extra)) || (is_string($extra) && str_contains(strtolower(preg_replace('/\s+/', '', $extra)), 'rows='))) {
 unset($defaults['rows']);
 }

 if ((is_array($extra) && array_key_exists('cols', $extra)) || (is_string($extra) && stripos(preg_replace('/\s+/', '', $extra), 'cols=') !== false)) {
 if ((is_array($extra) && array_key_exists('cols', $extra)) || (is_string($extra) && str_contains(strtolower(preg_replace('/\s+/', '', $extra)), 'cols='))) {
 unset($defaults['cols']);
 }

Expand All@@ -248,7 +248,7 @@ function form_multiselect($name = '', array $options = [], array $selected = [],
 {
 $extra = stringify_attributes($extra);

 if (stripos($extra, 'multiple') === false) {
 if (! str_contains(strtolower($extra), strtolower('multiple'))) {
 $extra .= ' multiple="multiple"';
 }

Expand DownExpand Up@@ -305,7 +305,7 @@ function form_dropdown($data = '', $options = [], $selected = [], $extra = ''):
 }

 $extra = stringify_attributes($extra);
 $multiple = (count($selected) > 1 && stripos($extra, 'multiple') === false) ? ' multiple="multiple"' : '';
 $multiple = (count($selected) > 1 && ! str_contains(strtolower($extra), 'multiple')) ? ' multiple="multiple"' : '';
 $form = '<select ' . rtrim(parse_form_attributes($data, $defaults)) . $extra . $multiple . ">\n";

 foreach ($options as $key => $val) {
Expand Down

2 changes: 1 addition & 1 deletion
system/Test/CIUnitTestCase.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -516,7 +516,7 @@ protected function getHeaderEmitted(string $header, bool $ignoreCase = false, st

 foreach (xdebug_get_headers() as $emittedHeader) {
 $found = $ignoreCase
 ? (stripos($emittedHeader, $header) === 0)
 ? (str_starts_with(strtolower($emittedHeader), strtolower($header)))
 : (str_starts_with($emittedHeader, $header));

 if ($found) {
Expand Down

4 changes: 2 additions & 2 deletions
system/Test/Fabricator.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -379,12 +379,12 @@ protected function guessFormatter($field): string

 // Check some common partials
 foreach (['email', 'name', 'title', 'text', 'date', 'url'] as $term) {
 if (stripos($field, $term) !== false) {
 if (str_contains(strtolower($field), strtolower($term))) {
 return $term;
 }
 }

 if (stripos($field, 'phone') !== false) {
 if (str_contains(strtolower($field), 'phone')) {
 return 'phoneNumber';
 }

Expand Down

4 changes: 2 additions & 2 deletions
tests/system/Cache/CacheFactoryTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,8 +96,8 @@ public function testHandlesBadHandler(): void

 $this->config->handler = 'dummy';

 if (stripos('win', php_uname()) === 0) {
 $this->assertTrue(true); // can't test properly if we are on Windows
 if (is_windows()) {
 $this->markTestSkipped('Cannot test this properly on Windows.');
 } else {
 $this->assertInstanceOf(DummyHandler::class, $this->cacheFactory->getHandler($this->config, 'wincache', 'wincache'));
 }
Expand Down

7 changes: 1 addition & 6 deletions
utils/phpstan-baseline/method.alreadyNarrowedType.neon

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
# total 17 errors
# total 16 errors

parameters:
 ignoreErrors:
Expand All@@ -12,11 +12,6 @@ parameters:
 count: 2
 path: ../../tests/system/CLI/CLITest.php

 -
 message: '#^Call to method PHPUnit\\Framework\\Assert\:\:assertTrue\(\) with true will always evaluate to true\.$#'
 count: 1
 path: ../../tests/system/Cache/CacheFactoryTest.php

 -
 message: '#^Call to method PHPUnit\\Framework\\Assert\:\:assertTrue\(\) with true will always evaluate to true\.$#'
 count: 1
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
refactor: Use strtolower with str_contains/str_**_with as replacement for stripos#9414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

paulbalandan
merged 2 commits into

from

Jan 17, 2025
 Merged


refactor: Use strtolower with str_contains/str_**_with as replacement for stripos#9414
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
dfcfb1b

Use `modernize_stripos` option


paulbalandan Jan 17, 2025
cc88723

Fix impossible conditional in test


paulbalandan Jan 17, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 1 addition & 11 deletions
.php-cs-fixer.dist.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,17 +40,7 @@
 ]);

$overrides = [
 'get_class_to_class_keyword' => true,
 'trailing_comma_in_multiline' => [
 'after_heredoc' => true,
 'elements' => [
 'arguments',
 'array_destructuring',
 'arrays',
 'match',
 'parameters',
 ],
 ],
 'modernize_strpos' => ['modernize_stripos' => true],
];

$options = [
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1061,7 +1061,7 @@ protected function _attributeUnique(array &$attributes, array &$field)
 protected function _attributeAutoIncrement(array &$attributes, array &$field)
 {
 if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true
 && stripos($field['type'], 'int') !== false
 && str_contains(strtolower($field['type']), 'int')
 ) {
 $field['auto_increment'] = ' AUTO_INCREMENT';
 }
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/OCI8/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -184,7 +184,7 @@ protected function _alterTable(string $alterType, string $table, $processedField
 protected function _attributeAutoIncrement(array &$attributes, array &$field)
 {
 if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true
 && stripos($field['type'], 'NUMBER') !== false
 && str_contains(strtolower($field['type']), 'number')
 && version_compare($this->db->getVersion(), '12.1', '>=')
 ) {
 $field['auto_increment'] = ' GENERATED BY DEFAULT ON NULL AS IDENTITY';
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/Postgre/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -154,7 +154,7 @@ protected function _processColumn(array $processedField): string
 protected function _attributeType(array &$attributes)
 {
 // Reset field lengths for data types that don't support it
 if (isset($attributes['CONSTRAINT']) && stripos($attributes['TYPE'], 'int') !== false) {
 if (isset($attributes['CONSTRAINT']) && str_contains(strtolower($attributes['TYPE']), 'int')) {
 $attributes['CONSTRAINT'] = null;
 }

Expand Down

4 changes: 2 additions & 2 deletions
system/Database/SQLSRV/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -360,7 +360,7 @@ protected function _processColumn(array $processedField): string
 protected function _attributeType(array &$attributes)
 {
 // Reset field lengths for data types that don't support it
 if (isset($attributes['CONSTRAINT']) && stripos($attributes['TYPE'], 'int') !== false) {
 if (isset($attributes['CONSTRAINT']) && str_contains(strtolower($attributes['TYPE']), 'int')) {
 $attributes['CONSTRAINT'] = null;
 }

Expand DownExpand Up@@ -412,7 +412,7 @@ protected function _attributeType(array &$attributes)
 */
 protected function _attributeAutoIncrement(array &$attributes, array &$field)
 {
 if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true && stripos($field['type'], 'INT') !== false) {
 if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true && str_contains(strtolower($field['type']), strtolower('INT'))) {
 $field['auto_increment'] = ' IDENTITY(1,1)';
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/SQLite3/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -226,7 +226,7 @@ protected function _attributeAutoIncrement(array &$attributes, array &$field)
 if (
 ! empty($attributes['AUTO_INCREMENT'])
 && $attributes['AUTO_INCREMENT'] === true
 && stripos($field['type'], 'int') !== false
 && str_contains(strtolower($field['type']), 'int')
 ) {
 $field['type'] = 'INTEGER PRIMARY KEY';
 $field['default'] = '';
Expand Down

14 changes: 7 additions & 7 deletions
system/Helpers/form_helper.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,10 +49,10 @@ function form_open(string $action = '', $attributes = [], array $hidden = []): s

 $attributes = stringify_attributes($attributes);

 if (stripos($attributes, 'method=') === false) {
 if (! str_contains(strtolower($attributes), 'method=')) {
 $attributes .= ' method="post"';
 }
 if (stripos($attributes, 'accept-charset=') === false) {
 if (! str_contains(strtolower($attributes), 'accept-charset=')) {
 $config = config(App::class);
 $attributes .= ' accept-charset="' . strtolower($config->charset) . '"';
 }
Expand All@@ -62,7 +62,7 @@ function form_open(string $action = '', $attributes = [], array $hidden = []): s
 // Add CSRF field if enabled, but leave it out for GET requests and requests to external websites
 $before = service('filters')->getFilters()['before'];

 if ((in_array('csrf', $before, true) || array_key_exists('csrf', $before)) && str_contains($action, base_url()) && stripos($form, 'method="get"') === false) {
 if ((in_array('csrf', $before, true) || array_key_exists('csrf', $before)) && str_contains($action, base_url()) && ! str_contains(strtolower($form), strtolower('method="get"'))) {
 $form .= csrf_field($csrfId ?? null);
 }

Expand DownExpand Up@@ -223,11 +223,11 @@ function form_textarea($data = '', string $value = '', $extra = ''): string
 }

 // Unsets default rows and cols if defined in extra field as array or string.
 if ((is_array($extra) && array_key_exists('rows', $extra)) || (is_string($extra) && stripos(preg_replace('/\s+/', '', $extra), 'rows=') !== false)) {
 if ((is_array($extra) && array_key_exists('rows', $extra)) || (is_string($extra) && str_contains(strtolower(preg_replace('/\s+/', '', $extra)), 'rows='))) {
 unset($defaults['rows']);
 }

 if ((is_array($extra) && array_key_exists('cols', $extra)) || (is_string($extra) && stripos(preg_replace('/\s+/', '', $extra), 'cols=') !== false)) {
 if ((is_array($extra) && array_key_exists('cols', $extra)) || (is_string($extra) && str_contains(strtolower(preg_replace('/\s+/', '', $extra)), 'cols='))) {
 unset($defaults['cols']);
 }

Expand All@@ -248,7 +248,7 @@ function form_multiselect($name = '', array $options = [], array $selected = [],
 {
 $extra = stringify_attributes($extra);

 if (stripos($extra, 'multiple') === false) {
 if (! str_contains(strtolower($extra), strtolower('multiple'))) {
 $extra .= ' multiple="multiple"';
 }

Expand DownExpand Up@@ -305,7 +305,7 @@ function form_dropdown($data = '', $options = [], $selected = [], $extra = ''):
 }

 $extra = stringify_attributes($extra);
 $multiple = (count($selected) > 1 && stripos($extra, 'multiple') === false) ? ' multiple="multiple"' : '';
 $multiple = (count($selected) > 1 && ! str_contains(strtolower($extra), 'multiple')) ? ' multiple="multiple"' : '';
 $form = '<select ' . rtrim(parse_form_attributes($data, $defaults)) . $extra . $multiple . ">\n";

 foreach ($options as $key => $val) {
Expand Down

2 changes: 1 addition & 1 deletion
system/Test/CIUnitTestCase.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -516,7 +516,7 @@ protected function getHeaderEmitted(string $header, bool $ignoreCase = false, st

 foreach (xdebug_get_headers() as $emittedHeader) {
 $found = $ignoreCase
 ? (stripos($emittedHeader, $header) === 0)
 ? (str_starts_with(strtolower($emittedHeader), strtolower($header)))
 : (str_starts_with($emittedHeader, $header));

 if ($found) {
Expand Down

4 changes: 2 additions & 2 deletions
system/Test/Fabricator.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -379,12 +379,12 @@ protected function guessFormatter($field): string

 // Check some common partials
 foreach (['email', 'name', 'title', 'text', 'date', 'url'] as $term) {
 if (stripos($field, $term) !== false) {
 if (str_contains(strtolower($field), strtolower($term))) {
 return $term;
 }
 }

 if (stripos($field, 'phone') !== false) {
 if (str_contains(strtolower($field), 'phone')) {
 return 'phoneNumber';
 }

Expand Down

4 changes: 2 additions & 2 deletions
tests/system/Cache/CacheFactoryTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,8 +96,8 @@ public function testHandlesBadHandler(): void

 $this->config->handler = 'dummy';

 if (stripos('win', php_uname()) === 0) {
 $this->assertTrue(true); // can't test properly if we are on Windows
 if (is_windows()) {
 $this->markTestSkipped('Cannot test this properly on Windows.');
 } else {
 $this->assertInstanceOf(DummyHandler::class, $this->cacheFactory->getHandler($this->config, 'wincache', 'wincache'));
 }
Expand Down

7 changes: 1 addition & 6 deletions
utils/phpstan-baseline/method.alreadyNarrowedType.neon

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
# total 17 errors
# total 16 errors

parameters:
 ignoreErrors:
Expand All@@ -12,11 +12,6 @@ parameters:
 count: 2
 path: ../../tests/system/CLI/CLITest.php

 -
 message: '#^Call to method PHPUnit\\Framework\\Assert\:\:assertTrue\(\) with true will always evaluate to true\.$#'
 count: 1
 path: ../../tests/system/Cache/CacheFactoryTest.php

 -
 message: '#^Call to method PHPUnit\\Framework\\Assert\:\:assertTrue\(\) with true will always evaluate to true\.$#'
 count: 1
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor: Use strtolower with str_contains/str_**_with as replacement for stripos#9414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

paulbalandan
merged 2 commits into

from

Jan 17, 2025
 Merged


refactor: Use strtolower with str_contains/str_**_with as replacement for stripos#9414
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
dfcfb1b

Use `modernize_stripos` option


paulbalandan Jan 17, 2025
cc88723

Fix impossible conditional in test


paulbalandan Jan 17, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 1 addition & 11 deletions
.php-cs-fixer.dist.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,17 +40,7 @@
 ]);

$overrides = [
 'get_class_to_class_keyword' => true,
 'trailing_comma_in_multiline' => [
 'after_heredoc' => true,
 'elements' => [
 'arguments',
 'array_destructuring',
 'arrays',
 'match',
 'parameters',
 ],
 ],
 'modernize_strpos' => ['modernize_stripos' => true],
];

$options = [
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1061,7 +1061,7 @@ protected function _attributeUnique(array &$attributes, array &$field)
 protected function _attributeAutoIncrement(array &$attributes, array &$field)
 {
 if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true
 && stripos($field['type'], 'int') !== false
 && str_contains(strtolower($field['type']), 'int')
 ) {
 $field['auto_increment'] = ' AUTO_INCREMENT';
 }
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/OCI8/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -184,7 +184,7 @@ protected function _alterTable(string $alterType, string $table, $processedField
 protected function _attributeAutoIncrement(array &$attributes, array &$field)
 {
 if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true
 && stripos($field['type'], 'NUMBER') !== false
 && str_contains(strtolower($field['type']), 'number')
 && version_compare($this->db->getVersion(), '12.1', '>=')
 ) {
 $field['auto_increment'] = ' GENERATED BY DEFAULT ON NULL AS IDENTITY';
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/Postgre/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -154,7 +154,7 @@ protected function _processColumn(array $processedField): string
 protected function _attributeType(array &$attributes)
 {
 // Reset field lengths for data types that don't support it
 if (isset($attributes['CONSTRAINT']) && stripos($attributes['TYPE'], 'int') !== false) {
 if (isset($attributes['CONSTRAINT']) && str_contains(strtolower($attributes['TYPE']), 'int')) {
 $attributes['CONSTRAINT'] = null;
 }

Expand Down

4 changes: 2 additions & 2 deletions
system/Database/SQLSRV/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -360,7 +360,7 @@ protected function _processColumn(array $processedField): string
 protected function _attributeType(array &$attributes)
 {
 // Reset field lengths for data types that don't support it
 if (isset($attributes['CONSTRAINT']) && stripos($attributes['TYPE'], 'int') !== false) {
 if (isset($attributes['CONSTRAINT']) && str_contains(strtolower($attributes['TYPE']), 'int')) {
 $attributes['CONSTRAINT'] = null;
 }

Expand DownExpand Up@@ -412,7 +412,7 @@ protected function _attributeType(array &$attributes)
 */
 protected function _attributeAutoIncrement(array &$attributes, array &$field)
 {
 if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true && stripos($field['type'], 'INT') !== false) {
 if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true && str_contains(strtolower($field['type']), strtolower('INT'))) {
 $field['auto_increment'] = ' IDENTITY(1,1)';
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/SQLite3/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -226,7 +226,7 @@ protected function _attributeAutoIncrement(array &$attributes, array &$field)
 if (
 ! empty($attributes['AUTO_INCREMENT'])
 && $attributes['AUTO_INCREMENT'] === true
 && stripos($field['type'], 'int') !== false
 && str_contains(strtolower($field['type']), 'int')
 ) {
 $field['type'] = 'INTEGER PRIMARY KEY';
 $field['default'] = '';
Expand Down

14 changes: 7 additions & 7 deletions
system/Helpers/form_helper.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,10 +49,10 @@ function form_open(string $action = '', $attributes = [], array $hidden = []): s

 $attributes = stringify_attributes($attributes);

 if (stripos($attributes, 'method=') === false) {
 if (! str_contains(strtolower($attributes), 'method=')) {
 $attributes .= ' method="post"';
 }
 if (stripos($attributes, 'accept-charset=') === false) {
 if (! str_contains(strtolower($attributes), 'accept-charset=')) {
 $config = config(App::class);
 $attributes .= ' accept-charset="' . strtolower($config->charset) . '"';
 }
Expand All@@ -62,7 +62,7 @@ function form_open(string $action = '', $attributes = [], array $hidden = []): s
 // Add CSRF field if enabled, but leave it out for GET requests and requests to external websites
 $before = service('filters')->getFilters()['before'];

 if ((in_array('csrf', $before, true) || array_key_exists('csrf', $before)) && str_contains($action, base_url()) && stripos($form, 'method="get"') === false) {
 if ((in_array('csrf', $before, true) || array_key_exists('csrf', $before)) && str_contains($action, base_url()) && ! str_contains(strtolower($form), strtolower('method="get"'))) {
 $form .= csrf_field($csrfId ?? null);
 }

Expand DownExpand Up@@ -223,11 +223,11 @@ function form_textarea($data = '', string $value = '', $extra = ''): string
 }

 // Unsets default rows and cols if defined in extra field as array or string.
 if ((is_array($extra) && array_key_exists('rows', $extra)) || (is_string($extra) && stripos(preg_replace('/\s+/', '', $extra), 'rows=') !== false)) {
 if ((is_array($extra) && array_key_exists('rows', $extra)) || (is_string($extra) && str_contains(strtolower(preg_replace('/\s+/', '', $extra)), 'rows='))) {
 unset($defaults['rows']);
 }

 if ((is_array($extra) && array_key_exists('cols', $extra)) || (is_string($extra) && stripos(preg_replace('/\s+/', '', $extra), 'cols=') !== false)) {
 if ((is_array($extra) && array_key_exists('cols', $extra)) || (is_string($extra) && str_contains(strtolower(preg_replace('/\s+/', '', $extra)), 'cols='))) {
 unset($defaults['cols']);
 }

Expand All@@ -248,7 +248,7 @@ function form_multiselect($name = '', array $options = [], array $selected = [],
 {
 $extra = stringify_attributes($extra);

 if (stripos($extra, 'multiple') === false) {
 if (! str_contains(strtolower($extra), strtolower('multiple'))) {
 $extra .= ' multiple="multiple"';
 }

Expand DownExpand Up@@ -305,7 +305,7 @@ function form_dropdown($data = '', $options = [], $selected = [], $extra = ''):
 }

 $extra = stringify_attributes($extra);
 $multiple = (count($selected) > 1 && stripos($extra, 'multiple') === false) ? ' multiple="multiple"' : '';
 $multiple = (count($selected) > 1 && ! str_contains(strtolower($extra), 'multiple')) ? ' multiple="multiple"' : '';
 $form = '<select ' . rtrim(parse_form_attributes($data, $defaults)) . $extra . $multiple . ">\n";

 foreach ($options as $key => $val) {
Expand Down

2 changes: 1 addition & 1 deletion
system/Test/CIUnitTestCase.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -516,7 +516,7 @@ protected function getHeaderEmitted(string $header, bool $ignoreCase = false, st

 foreach (xdebug_get_headers() as $emittedHeader) {
 $found = $ignoreCase
 ? (stripos($emittedHeader, $header) === 0)
 ? (str_starts_with(strtolower($emittedHeader), strtolower($header)))
 : (str_starts_with($emittedHeader, $header));

 if ($found) {
Expand Down

4 changes: 2 additions & 2 deletions
system/Test/Fabricator.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -379,12 +379,12 @@ protected function guessFormatter($field): string

 // Check some common partials
 foreach (['email', 'name', 'title', 'text', 'date', 'url'] as $term) {
 if (stripos($field, $term) !== false) {
 if (str_contains(strtolower($field), strtolower($term))) {
 return $term;
 }
 }

 if (stripos($field, 'phone') !== false) {
 if (str_contains(strtolower($field), 'phone')) {
 return 'phoneNumber';
 }

Expand Down

4 changes: 2 additions & 2 deletions
tests/system/Cache/CacheFactoryTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,8 +96,8 @@ public function testHandlesBadHandler(): void

 $this->config->handler = 'dummy';

 if (stripos('win', php_uname()) === 0) {
 $this->assertTrue(true); // can't test properly if we are on Windows
 if (is_windows()) {
 $this->markTestSkipped('Cannot test this properly on Windows.');
 } else {
 $this->assertInstanceOf(DummyHandler::class, $this->cacheFactory->getHandler($this->config, 'wincache', 'wincache'));
 }
Expand Down

7 changes: 1 addition & 6 deletions
utils/phpstan-baseline/method.alreadyNarrowedType.neon

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
# total 17 errors
# total 16 errors

parameters:
 ignoreErrors:
Expand All@@ -12,11 +12,6 @@ parameters:
 count: 2
 path: ../../tests/system/CLI/CLITest.php

 -
 message: '#^Call to method PHPUnit\\Framework\\Assert\:\:assertTrue\(\) with true will always evaluate to true\.$#'
 count: 1
 path: ../../tests/system/Cache/CacheFactoryTest.php

 -
 message: '#^Call to method PHPUnit\\Framework\\Assert\:\:assertTrue\(\) with true will always evaluate to true\.$#'
 count: 1
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor: Use strtolower with str_contains/str_**_with as replacement for stripos#9414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

paulbalandan
merged 2 commits into

from

Jan 17, 2025
 Merged


refactor: Use strtolower with str_contains/str_**_with as replacement for stripos#9414
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
dfcfb1b

Use `modernize_stripos` option


paulbalandan Jan 17, 2025
cc88723

Fix impossible conditional in test


paulbalandan Jan 17, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 1 addition & 11 deletions
.php-cs-fixer.dist.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,17 +40,7 @@
 ]);

$overrides = [
 'get_class_to_class_keyword' => true,
 'trailing_comma_in_multiline' => [
 'after_heredoc' => true,
 'elements' => [
 'arguments',
 'array_destructuring',
 'arrays',
 'match',
 'parameters',
 ],
 ],
 'modernize_strpos' => ['modernize_stripos' => true],
];

$options = [
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1061,7 +1061,7 @@ protected function _attributeUnique(array &$attributes, array &$field)
 protected function _attributeAutoIncrement(array &$attributes, array &$field)
 {
 if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true
 && stripos($field['type'], 'int') !== false
 && str_contains(strtolower($field['type']), 'int')
 ) {
 $field['auto_increment'] = ' AUTO_INCREMENT';
 }
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/OCI8/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -184,7 +184,7 @@ protected function _alterTable(string $alterType, string $table, $processedField
 protected function _attributeAutoIncrement(array &$attributes, array &$field)
 {
 if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true
 && stripos($field['type'], 'NUMBER') !== false
 && str_contains(strtolower($field['type']), 'number')
 && version_compare($this->db->getVersion(), '12.1', '>=')
 ) {
 $field['auto_increment'] = ' GENERATED BY DEFAULT ON NULL AS IDENTITY';
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/Postgre/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -154,7 +154,7 @@ protected function _processColumn(array $processedField): string
 protected function _attributeType(array &$attributes)
 {
 // Reset field lengths for data types that don't support it
 if (isset($attributes['CONSTRAINT']) && stripos($attributes['TYPE'], 'int') !== false) {
 if (isset($attributes['CONSTRAINT']) && str_contains(strtolower($attributes['TYPE']), 'int')) {
 $attributes['CONSTRAINT'] = null;
 }

Expand Down

4 changes: 2 additions & 2 deletions
system/Database/SQLSRV/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -360,7 +360,7 @@ protected function _processColumn(array $processedField): string
 protected function _attributeType(array &$attributes)
 {
 // Reset field lengths for data types that don't support it
 if (isset($attributes['CONSTRAINT']) && stripos($attributes['TYPE'], 'int') !== false) {
 if (isset($attributes['CONSTRAINT']) && str_contains(strtolower($attributes['TYPE']), 'int')) {
 $attributes['CONSTRAINT'] = null;
 }

Expand DownExpand Up@@ -412,7 +412,7 @@ protected function _attributeType(array &$attributes)
 */
 protected function _attributeAutoIncrement(array &$attributes, array &$field)
 {
 if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true && stripos($field['type'], 'INT') !== false) {
 if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true && str_contains(strtolower($field['type']), strtolower('INT'))) {
 $field['auto_increment'] = ' IDENTITY(1,1)';
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/SQLite3/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -226,7 +226,7 @@ protected function _attributeAutoIncrement(array &$attributes, array &$field)
 if (
 ! empty($attributes['AUTO_INCREMENT'])
 && $attributes['AUTO_INCREMENT'] === true
 && stripos($field['type'], 'int') !== false
 && str_contains(strtolower($field['type']), 'int')
 ) {
 $field['type'] = 'INTEGER PRIMARY KEY';
 $field['default'] = '';
Expand Down

14 changes: 7 additions & 7 deletions
system/Helpers/form_helper.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,10 +49,10 @@ function form_open(string $action = '', $attributes = [], array $hidden = []): s

 $attributes = stringify_attributes($attributes);

 if (stripos($attributes, 'method=') === false) {
 if (! str_contains(strtolower($attributes), 'method=')) {
 $attributes .= ' method="post"';
 }
 if (stripos($attributes, 'accept-charset=') === false) {
 if (! str_contains(strtolower($attributes), 'accept-charset=')) {
 $config = config(App::class);
 $attributes .= ' accept-charset="' . strtolower($config->charset) . '"';
 }
Expand All@@ -62,7 +62,7 @@ function form_open(string $action = '', $attributes = [], array $hidden = []): s
 // Add CSRF field if enabled, but leave it out for GET requests and requests to external websites
 $before = service('filters')->getFilters()['before'];

 if ((in_array('csrf', $before, true) || array_key_exists('csrf', $before)) && str_contains($action, base_url()) && stripos($form, 'method="get"') === false) {
 if ((in_array('csrf', $before, true) || array_key_exists('csrf', $before)) && str_contains($action, base_url()) && ! str_contains(strtolower($form), strtolower('method="get"'))) {
 $form .= csrf_field($csrfId ?? null);
 }

Expand DownExpand Up@@ -223,11 +223,11 @@ function form_textarea($data = '', string $value = '', $extra = ''): string
 }

 // Unsets default rows and cols if defined in extra field as array or string.
 if ((is_array($extra) && array_key_exists('rows', $extra)) || (is_string($extra) && stripos(preg_replace('/\s+/', '', $extra), 'rows=') !== false)) {
 if ((is_array($extra) && array_key_exists('rows', $extra)) || (is_string($extra) && str_contains(strtolower(preg_replace('/\s+/', '', $extra)), 'rows='))) {
 unset($defaults['rows']);
 }

 if ((is_array($extra) && array_key_exists('cols', $extra)) || (is_string($extra) && stripos(preg_replace('/\s+/', '', $extra), 'cols=') !== false)) {
 if ((is_array($extra) && array_key_exists('cols', $extra)) || (is_string($extra) && str_contains(strtolower(preg_replace('/\s+/', '', $extra)), 'cols='))) {
 unset($defaults['cols']);
 }

Expand All@@ -248,7 +248,7 @@ function form_multiselect($name = '', array $options = [], array $selected = [],
 {
 $extra = stringify_attributes($extra);

 if (stripos($extra, 'multiple') === false) {
 if (! str_contains(strtolower($extra), strtolower('multiple'))) {
 $extra .= ' multiple="multiple"';
 }

Expand DownExpand Up@@ -305,7 +305,7 @@ function form_dropdown($data = '', $options = [], $selected = [], $extra = ''):
 }

 $extra = stringify_attributes($extra);
 $multiple = (count($selected) > 1 && stripos($extra, 'multiple') === false) ? ' multiple="multiple"' : '';
 $multiple = (count($selected) > 1 && ! str_contains(strtolower($extra), 'multiple')) ? ' multiple="multiple"' : '';
 $form = '<select ' . rtrim(parse_form_attributes($data, $defaults)) . $extra . $multiple . ">\n";

 foreach ($options as $key => $val) {
Expand Down

2 changes: 1 addition & 1 deletion
system/Test/CIUnitTestCase.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -516,7 +516,7 @@ protected function getHeaderEmitted(string $header, bool $ignoreCase = false, st

 foreach (xdebug_get_headers() as $emittedHeader) {
 $found = $ignoreCase
 ? (stripos($emittedHeader, $header) === 0)
 ? (str_starts_with(strtolower($emittedHeader), strtolower($header)))
 : (str_starts_with($emittedHeader, $header));

 if ($found) {
Expand Down

4 changes: 2 additions & 2 deletions
system/Test/Fabricator.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -379,12 +379,12 @@ protected function guessFormatter($field): string

 // Check some common partials
 foreach (['email', 'name', 'title', 'text', 'date', 'url'] as $term) {
 if (stripos($field, $term) !== false) {
 if (str_contains(strtolower($field), strtolower($term))) {
 return $term;
 }
 }

 if (stripos($field, 'phone') !== false) {
 if (str_contains(strtolower($field), 'phone')) {
 return 'phoneNumber';
 }

Expand Down

4 changes: 2 additions & 2 deletions
tests/system/Cache/CacheFactoryTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,8 +96,8 @@ public function testHandlesBadHandler(): void

 $this->config->handler = 'dummy';

 if (stripos('win', php_uname()) === 0) {
 $this->assertTrue(true); // can't test properly if we are on Windows
 if (is_windows()) {
 $this->markTestSkipped('Cannot test this properly on Windows.');
 } else {
 $this->assertInstanceOf(DummyHandler::class, $this->cacheFactory->getHandler($this->config, 'wincache', 'wincache'));
 }
Expand Down

7 changes: 1 addition & 6 deletions
utils/phpstan-baseline/method.alreadyNarrowedType.neon

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
# total 17 errors
# total 16 errors

parameters:
 ignoreErrors:
Expand All@@ -12,11 +12,6 @@ parameters:
 count: 2
 path: ../../tests/system/CLI/CLITest.php

 -
 message: '#^Call to method PHPUnit\\Framework\\Assert\:\:assertTrue\(\) with true will always evaluate to true\.$#'
 count: 1
 path: ../../tests/system/Cache/CacheFactoryTest.php

 -
 message: '#^Call to method PHPUnit\\Framework\\Assert\:\:assertTrue\(\) with true will always evaluate to true\.$#'
 count: 1
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
refactor: Use strtolower with str_contains/str_**_with as replacement for stripos#9414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

paulbalandan
merged 2 commits into

from

Jan 17, 2025
 Merged


refactor: Use strtolower with str_contains/str_**_with as replacement for stripos#9414
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
dfcfb1b

Use `modernize_stripos` option


paulbalandan Jan 17, 2025
cc88723

Fix impossible conditional in test


paulbalandan Jan 17, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 1 addition & 11 deletions
.php-cs-fixer.dist.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,17 +40,7 @@
 ]);

$overrides = [
 'get_class_to_class_keyword' => true,
 'trailing_comma_in_multiline' => [
 'after_heredoc' => true,
 'elements' => [
 'arguments',
 'array_destructuring',
 'arrays',
 'match',
 'parameters',
 ],
 ],
 'modernize_strpos' => ['modernize_stripos' => true],
];

$options = [
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1061,7 +1061,7 @@ protected function _attributeUnique(array &$attributes, array &$field)
 protected function _attributeAutoIncrement(array &$attributes, array &$field)
 {
 if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true
 && stripos($field['type'], 'int') !== false
 && str_contains(strtolower($field['type']), 'int')
 ) {
 $field['auto_increment'] = ' AUTO_INCREMENT';
 }
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/OCI8/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -184,7 +184,7 @@ protected function _alterTable(string $alterType, string $table, $processedField
 protected function _attributeAutoIncrement(array &$attributes, array &$field)
 {
 if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true
 && stripos($field['type'], 'NUMBER') !== false
 && str_contains(strtolower($field['type']), 'number')
 && version_compare($this->db->getVersion(), '12.1', '>=')
 ) {
 $field['auto_increment'] = ' GENERATED BY DEFAULT ON NULL AS IDENTITY';
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/Postgre/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -154,7 +154,7 @@ protected function _processColumn(array $processedField): string
 protected function _attributeType(array &$attributes)
 {
 // Reset field lengths for data types that don't support it
 if (isset($attributes['CONSTRAINT']) && stripos($attributes['TYPE'], 'int') !== false) {
 if (isset($attributes['CONSTRAINT']) && str_contains(strtolower($attributes['TYPE']), 'int')) {
 $attributes['CONSTRAINT'] = null;
 }

Expand Down

4 changes: 2 additions & 2 deletions
system/Database/SQLSRV/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -360,7 +360,7 @@ protected function _processColumn(array $processedField): string
 protected function _attributeType(array &$attributes)
 {
 // Reset field lengths for data types that don't support it
 if (isset($attributes['CONSTRAINT']) && stripos($attributes['TYPE'], 'int') !== false) {
 if (isset($attributes['CONSTRAINT']) && str_contains(strtolower($attributes['TYPE']), 'int')) {
 $attributes['CONSTRAINT'] = null;
 }

Expand DownExpand Up@@ -412,7 +412,7 @@ protected function _attributeType(array &$attributes)
 */
 protected function _attributeAutoIncrement(array &$attributes, array &$field)
 {
 if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true && stripos($field['type'], 'INT') !== false) {
 if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true && str_contains(strtolower($field['type']), strtolower('INT'))) {
 $field['auto_increment'] = ' IDENTITY(1,1)';
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/SQLite3/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -226,7 +226,7 @@ protected function _attributeAutoIncrement(array &$attributes, array &$field)
 if (
 ! empty($attributes['AUTO_INCREMENT'])
 && $attributes['AUTO_INCREMENT'] === true
 && stripos($field['type'], 'int') !== false
 && str_contains(strtolower($field['type']), 'int')
 ) {
 $field['type'] = 'INTEGER PRIMARY KEY';
 $field['default'] = '';
Expand Down

14 changes: 7 additions & 7 deletions
system/Helpers/form_helper.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,10 +49,10 @@ function form_open(string $action = '', $attributes = [], array $hidden = []): s

 $attributes = stringify_attributes($attributes);

 if (stripos($attributes, 'method=') === false) {
 if (! str_contains(strtolower($attributes), 'method=')) {
 $attributes .= ' method="post"';
 }
 if (stripos($attributes, 'accept-charset=') === false) {
 if (! str_contains(strtolower($attributes), 'accept-charset=')) {
 $config = config(App::class);
 $attributes .= ' accept-charset="' . strtolower($config->charset) . '"';
 }
Expand All@@ -62,7 +62,7 @@ function form_open(string $action = '', $attributes = [], array $hidden = []): s
 // Add CSRF field if enabled, but leave it out for GET requests and requests to external websites
 $before = service('filters')->getFilters()['before'];

 if ((in_array('csrf', $before, true) || array_key_exists('csrf', $before)) && str_contains($action, base_url()) && stripos($form, 'method="get"') === false) {
 if ((in_array('csrf', $before, true) || array_key_exists('csrf', $before)) && str_contains($action, base_url()) && ! str_contains(strtolower($form), strtolower('method="get"'))) {
 $form .= csrf_field($csrfId ?? null);
 }

Expand DownExpand Up@@ -223,11 +223,11 @@ function form_textarea($data = '', string $value = '', $extra = ''): string
 }

 // Unsets default rows and cols if defined in extra field as array or string.
 if ((is_array($extra) && array_key_exists('rows', $extra)) || (is_string($extra) && stripos(preg_replace('/\s+/', '', $extra), 'rows=') !== false)) {
 if ((is_array($extra) && array_key_exists('rows', $extra)) || (is_string($extra) && str_contains(strtolower(preg_replace('/\s+/', '', $extra)), 'rows='))) {
 unset($defaults['rows']);
 }

 if ((is_array($extra) && array_key_exists('cols', $extra)) || (is_string($extra) && stripos(preg_replace('/\s+/', '', $extra), 'cols=') !== false)) {
 if ((is_array($extra) && array_key_exists('cols', $extra)) || (is_string($extra) && str_contains(strtolower(preg_replace('/\s+/', '', $extra)), 'cols='))) {
 unset($defaults['cols']);
 }

Expand All@@ -248,7 +248,7 @@ function form_multiselect($name = '', array $options = [], array $selected = [],
 {
 $extra = stringify_attributes($extra);

 if (stripos($extra, 'multiple') === false) {
 if (! str_contains(strtolower($extra), strtolower('multiple'))) {
 $extra .= ' multiple="multiple"';
 }

Expand DownExpand Up@@ -305,7 +305,7 @@ function form_dropdown($data = '', $options = [], $selected = [], $extra = ''):
 }

 $extra = stringify_attributes($extra);
 $multiple = (count($selected) > 1 && stripos($extra, 'multiple') === false) ? ' multiple="multiple"' : '';
 $multiple = (count($selected) > 1 && ! str_contains(strtolower($extra), 'multiple')) ? ' multiple="multiple"' : '';
 $form = '<select ' . rtrim(parse_form_attributes($data, $defaults)) . $extra . $multiple . ">\n";

 foreach ($options as $key => $val) {
Expand Down

2 changes: 1 addition & 1 deletion
system/Test/CIUnitTestCase.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -516,7 +516,7 @@ protected function getHeaderEmitted(string $header, bool $ignoreCase = false, st

 foreach (xdebug_get_headers() as $emittedHeader) {
 $found = $ignoreCase
 ? (stripos($emittedHeader, $header) === 0)
 ? (str_starts_with(strtolower($emittedHeader), strtolower($header)))
 : (str_starts_with($emittedHeader, $header));

 if ($found) {
Expand Down

4 changes: 2 additions & 2 deletions
system/Test/Fabricator.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -379,12 +379,12 @@ protected function guessFormatter($field): string

 // Check some common partials
 foreach (['email', 'name', 'title', 'text', 'date', 'url'] as $term) {
 if (stripos($field, $term) !== false) {
 if (str_contains(strtolower($field), strtolower($term))) {
 return $term;
 }
 }

 if (stripos($field, 'phone') !== false) {
 if (str_contains(strtolower($field), 'phone')) {
 return 'phoneNumber';
 }

Expand Down

4 changes: 2 additions & 2 deletions
tests/system/Cache/CacheFactoryTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,8 +96,8 @@ public function testHandlesBadHandler(): void

 $this->config->handler = 'dummy';

 if (stripos('win', php_uname()) === 0) {
 $this->assertTrue(true); // can't test properly if we are on Windows
 if (is_windows()) {
 $this->markTestSkipped('Cannot test this properly on Windows.');
 } else {
 $this->assertInstanceOf(DummyHandler::class, $this->cacheFactory->getHandler($this->config, 'wincache', 'wincache'));
 }
Expand Down

7 changes: 1 addition & 6 deletions
utils/phpstan-baseline/method.alreadyNarrowedType.neon

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
# total 17 errors
# total 16 errors

parameters:
 ignoreErrors:
Expand All@@ -12,11 +12,6 @@ parameters:
 count: 2
 path: ../../tests/system/CLI/CLITest.php

 -
 message: '#^Call to method PHPUnit\\Framework\\Assert\:\:assertTrue\(\) with true will always evaluate to true\.$#'
 count: 1
 path: ../../tests/system/Cache/CacheFactoryTest.php

 -
 message: '#^Call to method PHPUnit\\Framework\\Assert\:\:assertTrue\(\) with true will always evaluate to true\.$#'
 count: 1
Expand Down