refactor: enable ClosureReturnTypeRector#9187

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
samsonasik merged 2 commits into from
Sep 10, 2024
Merged

refactor: enable ClosureReturnTypeRector #9187

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
3f29f28
refactor: enable ClosureReturnTypeRector
samsonasik Sep 10, 2024
8ecbf0d
Fix cs
samsonasik Sep 10, 2024
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
2 changes: 2 additions & 0 deletions rector.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@
use Rector\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector;
use Rector\TypeDeclaration\Rector\ClassMethod\ReturnNeverTypeRector;
use Rector\TypeDeclaration\Rector\Closure\AddClosureVoidReturnTypeWhereNoReturnRector;
use Rector\TypeDeclaration\Rector\Closure\ClosureReturnTypeRector;
use Rector\TypeDeclaration\Rector\Empty_\EmptyOnNullableObjectToInstanceOfRector;
use Rector\TypeDeclaration\Rector\Function_\AddFunctionVoidReturnTypeWhereNoReturnRector;
use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromAssignsRector;
Expand DownExpand Up@@ -217,6 +218,7 @@
AddFunctionVoidReturnTypeWhereNoReturnRector::class,
AddMethodCallBasedStrictParamTypeRector::class,
TypedPropertyFromAssignsRector::class,
ClosureReturnTypeRector::class,
])
->withConfiguredRule(StringClassNameToClassConstantRector::class, [
// keep '\\' prefix string on string '\Foo\Bar'
Expand Down
6 changes: 3 additions & 3 deletions system/Database/OCI8/Builder.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,12 +109,12 @@ protected function _replace(string $table, array $keys, array $values): string
{
$fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);

$uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames) {
$uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
$hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

return ($index->type === 'PRIMARY') && $hasAllFields;
});
$replaceableFields = array_filter($keys, static function ($columnName) use ($uniqueIndexes) {
$replaceableFields = array_filter($keys, static function ($columnName) use ($uniqueIndexes): bool {
foreach ($uniqueIndexes as $index) {
if (in_array(trim($columnName, '"'), $index->fields, true)) {
return false;
Expand DownExpand Up@@ -344,7 +344,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
if (empty($constraints)) {
$fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);

$uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames) {
$uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
$hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

return ($index->type === 'PRIMARY' || $index->type === 'UNIQUE') && $hasAllFields;
Expand Down
2 changes: 1 addition & 1 deletion system/Database/OCI8/PreparedQuery.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -113,7 +113,7 @@ public function parameterize(string $sql): string
// Track our current value
$count = 0;

return preg_replace_callback('/\?/', static function ($matches) use (&$count) {
return preg_replace_callback('/\?/', static function ($matches) use (&$count): string {
return ':' . ($count++);
}, $sql);
}
Expand Down
6 changes: 3 additions & 3 deletions system/Database/Postgre/Builder.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -368,7 +368,7 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
$sql .= 'WHERE ' . implode(
' AND ',
array_map(
static function ($key, $value) use ($table, $alias, $that) {
static function ($key, $value) use ($table, $alias, $that): string|RawSql {
if ($value instanceof RawSql && is_string($key)) {
return $table . '.' . $key . ' = ' . $value;
}
Expand DownExpand Up@@ -463,7 +463,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
$constraints = $this->QBOptions['constraints'] ?? [];

if (empty($constraints)) {
$allIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames) {
$allIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
$hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

return ($index->type === 'UNIQUE' || $index->type === 'PRIMARY') && $hasAllFields;
Expand DownExpand Up@@ -575,7 +575,7 @@ protected function _deleteBatch(string $table, array $keys, array $values): stri
$sql .= 'WHERE ' . implode(
' AND ',
array_map(
static function ($key, $value) use ($table, $alias, $that) {
static function ($key, $value) use ($table, $alias, $that): RawSql|string {
if ($value instanceof RawSql) {
return $value;
}
Expand Down
2 changes: 1 addition & 1 deletion system/Database/Postgre/PreparedQuery.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -119,7 +119,7 @@ public function parameterize(string $sql): string
// Track our current value
$count = 0;

return preg_replace_callback('/\?/', static function () use (&$count) {
return preg_replace_callback('/\?/', static function () use (&$count): string {
$count++;

return "\${$count}";
Expand Down
4 changes: 2 additions & 2 deletions system/Database/SQLSRV/Builder.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -699,15 +699,15 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
if (empty($constraints)) {
$tableIndexes = $this->db->getIndexData($table);

$uniqueIndexes = array_filter($tableIndexes, static function ($index) use ($fieldNames) {
$uniqueIndexes = array_filter($tableIndexes, static function ($index) use ($fieldNames): bool {
$hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

return $index->type === 'PRIMARY' && $hasAllFields;
});

// if no primary found then look for unique - since indexes have no order
if ($uniqueIndexes === []) {
$uniqueIndexes = array_filter($tableIndexes, static function ($index) use ($fieldNames) {
$uniqueIndexes = array_filter($tableIndexes, static function ($index) use ($fieldNames): bool {
$hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

return $index->type === 'UNIQUE' && $hasAllFields;
Expand Down
2 changes: 1 addition & 1 deletion system/Database/SQLite3/Builder.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
if (empty($constraints)) {
$fieldNames = array_map(static fn ($columnName) => trim($columnName, '`'), $keys);

$allIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames) {
$allIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
$hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

return ($index->type === 'PRIMARY' || $index->type === 'UNIQUE') && $hasAllFields;
Expand Down
2 changes: 1 addition & 1 deletion system/Debug/Toolbar/Collectors/Database.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,7 @@ protected function formatTimelineData(): array
public function display(): array
{
$data = [];
$data['queries'] = array_map(static function (array $query) {
$data['queries'] = array_map(static function (array $query): array {
$isDuplicate = $query['duplicate'] === true;

$firstNonSystemLine = '';
Expand Down
2 changes: 1 addition & 1 deletion system/Events/Events.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -84,7 +84,7 @@ public static function initialize()
$files = service('locator')->search('Config/Events.php');
}

$files = array_filter(array_map(static function (string $file) {
$files = array_filter(array_map(static function (string $file): false|string {
if (is_file($file)) {
return realpath($file) ?: $file;
}
Expand Down
2 changes: 1 addition & 1 deletion system/HTTP/ContentSecurityPolicy.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -713,7 +713,7 @@ protected function generateNonces(ResponseInterface $response)
$pattern = '/(' . preg_quote($this->styleNonceTag, '/')
. '|' . preg_quote($this->scriptNonceTag, '/') . ')/';

$body = preg_replace_callback($pattern, function ($match) {
$body = preg_replace_callback($pattern, function ($match): string {
$nonce = $match[0] === $this->styleNonceTag ? $this->getStyleNonce() : $this->getScriptNonce();

return "nonce=\"{$nonce}\"";
Expand Down
2 changes: 1 addition & 1 deletion system/HTTP/Negotiate.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -233,7 +233,7 @@ public function parseHeader(string $header): array
}

// Sort to get the highest results first
usort($results, static function ($a, $b) {
usort($results, static function ($a, $b): int {
if ($a['q'] === $b['q']) {
$aAst = substr_count($a['value'], '*');
$bAst = substr_count($b['value'], '*');
Expand Down
2 changes: 1 addition & 1 deletion system/Helpers/Array/ArrayHelper.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -307,7 +307,7 @@ public static function recursiveCount(array $array, int $counter = 0): int
*/
public static function sortValuesByNatural(array &$array, $sortByIndex = null): bool
{
return usort($array, static function ($currentValue, $nextValue) use ($sortByIndex) {
return usort($array, static function ($currentValue, $nextValue) use ($sortByIndex): int {
if ($sortByIndex !== null) {
return strnatcmp((string) $currentValue[$sortByIndex], (string) $nextValue[$sortByIndex]);
}
Expand Down
2 changes: 1 addition & 1 deletion system/Router/Router.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -433,7 +433,7 @@ protected function checkRoutes(string $uri): bool
// Is this route supposed to redirect to another?
if ($this->collection->isRedirect($routeKey)) {
// replacing matched route groups with references: post/([0-9]+) -> post/$1
$redirectTo = preg_replace_callback('/(\([^\(]+\))/', static function () {
$redirectTo = preg_replace_callback('/(\([^\(]+\))/', static function (): string {
static $i = 1;

return '$' . $i++;
Expand Down
2 changes: 1 addition & 1 deletion system/View/Parser.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -534,7 +534,7 @@ protected function replaceSingle($pattern, $content, $template, bool $escape = f
$content = (string) $content;

// Replace the content in the template
return preg_replace_callback($pattern, function ($matches) use ($content, $escape) {
return preg_replace_callback($pattern, function ($matches) use ($content, $escape): string {
// Check for {! !} syntax to not escape this one.
if (
str_starts_with($matches[0], $this->leftDelimiter . '!')
Expand Down
2 changes: 1 addition & 1 deletion tests/system/Commands/Utilities/NamespacesTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ protected function tearDown(): void
*/
protected function getBuffer()
{
return preg_replace_callback('/(\|\s*[^|]+\s*\|\s*)(.*?)(\s*\|\s*[^|]+\s*\|)/', static function (array $matches) {
return preg_replace_callback('/(\|\s*[^|]+\s*\|\s*)(.*?)(\s*\|\s*[^|]+\s*\|)/', static function (array $matches): string {
$matches[2] = str_replace(DIRECTORY_SEPARATOR, '/', $matches[2]);

return $matches[1] . $matches[2] . $matches[3];
Expand Down
4 changes: 2 additions & 2 deletions tests/system/DataConverter/DataConverterTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -570,7 +570,7 @@ public function testReconstructObjectWithClosure(): void
'created_at' => 'datetime',
'updated_at' => 'datetime',
];
$reconstructor = static function ($array) {
$reconstructor = static function ($array): User {
$user = new User();
$user->fill($array);

Expand DownExpand Up@@ -667,7 +667,7 @@ public function testExtractWithClosure(): void
'created_at' => 'datetime',
'updated_at' => 'datetime',
];
$extractor = static function ($obj) {
$extractor = static function ($obj): array {
$array['id'] = $obj->id;
$array['name'] = $obj->name;
$array['created_at'] = $obj->created_at;
Expand Down
2 changes: 1 addition & 1 deletion tests/system/Debug/TimerTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,7 @@ public function testRecordFunctionNoReturn(): void
public function testRecordFunctionWithReturn(): void
{
$timer = new Timer();
$returnValue = $timer->record('longjohn', static function () {
$returnValue = $timer->record('longjohn', static function (): string {
usleep(100000);

return 'test';
Expand Down
6 changes: 3 additions & 3 deletions tests/system/Events/EventsTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -121,7 +121,7 @@ public function testCancelEvent(): void

// This should cancel the flow of events, and leave
// $result = 1.
Events::on('foo', static function ($arg) use (&$result) {
Events::on('foo', static function ($arg) use (&$result): bool {
$result = 1;

return false;
Expand All@@ -138,14 +138,14 @@ public function testPriority(): void
{
$result = 0;

Events::on('foo', static function () use (&$result) {
Events::on('foo', static function () use (&$result): bool {
$result = 1;

return false;
}, EVENT_PRIORITY_NORMAL);
// Since this has a higher priority, it will
// run first.
Events::on('foo', static function () use (&$result) {
Events::on('foo', static function () use (&$result): bool {
$result = 2;

return false;
Expand Down
2 changes: 1 addition & 1 deletion tests/system/Test/FeatureTestTraitTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -152,7 +152,7 @@ public function testCallValidationTwice(): void
[
'POST',
'section/create',
static function () {
static function (): string {
$validation = Services::validation();
$validation->setRule('title', 'title', 'required|min_length[3]');

Expand Down
2 changes: 1 addition & 1 deletion tests/system/Validation/ValidationTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -311,7 +311,7 @@ public function testClosureRuleWithParamError(): void
$this->validation->setRules([
'foo' => [
'required',
static function ($value, $data, &$error, $field) {
static function ($value, $data, &$error, $field): bool {
if ($value !== 'abc') {
$error = 'The ' . $field . ' value is not "abc"';

Expand Down
6 changes: 3 additions & 3 deletions tests/system/View/ParserTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -806,7 +806,7 @@ public function testParserPluginClosure(): void

public function testParserPluginParams(): void
{
$this->parser->addPlugin('growth', static function ($str, array $params) {
$this->parser->addPlugin('growth', static function ($str, array $params): string {
$step = $params['step'] ?? 1;
$count = $params['count'] ?? 2;

Expand DownExpand Up@@ -853,7 +853,7 @@ public function testParserSingleTagWithSingleParams(): void

public function testParserSingleTagWithQuotedParams(): void
{
$this->parser->addPlugin('count', static function (array $params = []) {
$this->parser->addPlugin('count', static function (array $params = []): string {
$out = '';

foreach ($params as $index => $param) {
Expand All@@ -870,7 +870,7 @@ public function testParserSingleTagWithQuotedParams(): void

public function testParserSingleTagWithNamedParams(): void
{
$this->parser->addPlugin('read_params', static function (array $params = []) {
$this->parser->addPlugin('read_params', static function (array $params = []): string {
$out = '';

foreach ($params as $index => $param) {
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: enable ClosureReturnTypeRector#9187

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

samsonasik
merged 2 commits into

from

Sep 10, 2024
 Merged


refactor: enable ClosureReturnTypeRector
#9187
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
3f29f28

refactor: enable ClosureReturnTypeRector


samsonasik Sep 10, 2024
8ecbf0d

Fix cs


samsonasik Sep 10, 2024

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


2 changes: 2 additions & 0 deletions
rector.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@
use Rector\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector;
use Rector\TypeDeclaration\Rector\ClassMethod\ReturnNeverTypeRector;
use Rector\TypeDeclaration\Rector\Closure\AddClosureVoidReturnTypeWhereNoReturnRector;
use Rector\TypeDeclaration\Rector\Closure\ClosureReturnTypeRector;
use Rector\TypeDeclaration\Rector\Empty_\EmptyOnNullableObjectToInstanceOfRector;
use Rector\TypeDeclaration\Rector\Function_\AddFunctionVoidReturnTypeWhereNoReturnRector;
use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromAssignsRector;
Expand DownExpand Up@@ -217,6 +218,7 @@
 AddFunctionVoidReturnTypeWhereNoReturnRector::class,
 AddMethodCallBasedStrictParamTypeRector::class,
 TypedPropertyFromAssignsRector::class,
 ClosureReturnTypeRector::class,
 ])
 ->withConfiguredRule(StringClassNameToClassConstantRector::class, [
 // keep '\\' prefix string on string '\Foo\Bar'
Expand Down

6 changes: 3 additions & 3 deletions
system/Database/OCI8/Builder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,12 +109,12 @@ protected function _replace(string $table, array $keys, array $values): string
 {
 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);

 $uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames) {
 $uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

 return ($index->type === 'PRIMARY') && $hasAllFields;
 });
 $replaceableFields = array_filter($keys, static function ($columnName) use ($uniqueIndexes) {
 $replaceableFields = array_filter($keys, static function ($columnName) use ($uniqueIndexes): bool {
 foreach ($uniqueIndexes as $index) {
 if (in_array(trim($columnName, '"'), $index->fields, true)) {
 return false;
Expand DownExpand Up@@ -344,7 +344,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 if (empty($constraints)) {
 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);

 $uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames) {
 $uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

 return ($index->type === 'PRIMARY' || $index->type === 'UNIQUE') && $hasAllFields;
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -113,7 +113,7 @@ public function parameterize(string $sql): string
 // Track our current value
 $count = 0;

 return preg_replace_callback('/\?/', static function ($matches) use (&$count) {
 return preg_replace_callback('/\?/', static function ($matches) use (&$count): string {
 return ':' . ($count++);
 }, $sql);
 }
Expand Down

6 changes: 3 additions & 3 deletions
system/Database/Postgre/Builder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -368,7 +368,7 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $sql .= 'WHERE ' . implode(
 ' AND ',
 array_map(
 static function ($key, $value) use ($table, $alias, $that) {
 static function ($key, $value) use ($table, $alias, $that): string|RawSql {
 if ($value instanceof RawSql && is_string($key)) {
 return $table . '.' . $key . ' = ' . $value;
 }
Expand DownExpand Up@@ -463,7 +463,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $constraints = $this->QBOptions['constraints'] ?? [];

 if (empty($constraints)) {
 $allIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames) {
 $allIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

 return ($index->type === 'UNIQUE' || $index->type === 'PRIMARY') && $hasAllFields;
Expand DownExpand Up@@ -575,7 +575,7 @@ protected function _deleteBatch(string $table, array $keys, array $values): stri
 $sql .= 'WHERE ' . implode(
 ' AND ',
 array_map(
 static function ($key, $value) use ($table, $alias, $that) {
 static function ($key, $value) use ($table, $alias, $that): RawSql|string {
 if ($value instanceof RawSql) {
 return $value;
 }
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,7 +119,7 @@ public function parameterize(string $sql): string
 // Track our current value
 $count = 0;

 return preg_replace_callback('/\?/', static function () use (&$count) {
 return preg_replace_callback('/\?/', static function () use (&$count): string {
 $count++;

 return "\${$count}";
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -699,15 +699,15 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 if (empty($constraints)) {
 $tableIndexes = $this->db->getIndexData($table);

 $uniqueIndexes = array_filter($tableIndexes, static function ($index) use ($fieldNames) {
 $uniqueIndexes = array_filter($tableIndexes, static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

 return $index->type === 'PRIMARY' && $hasAllFields;
 });

 // if no primary found then look for unique - since indexes have no order
 if ($uniqueIndexes === []) {
 $uniqueIndexes = array_filter($tableIndexes, static function ($index) use ($fieldNames) {
 $uniqueIndexes = array_filter($tableIndexes, static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

 return $index->type === 'UNIQUE' && $hasAllFields;
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 if (empty($constraints)) {
 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '`'), $keys);

 $allIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames) {
 $allIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

 return ($index->type === 'PRIMARY' || $index->type === 'UNIQUE') && $hasAllFields;
Expand Down

2 changes: 1 addition & 1 deletion
system/Debug/Toolbar/Collectors/Database.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,7 @@ protected function formatTimelineData(): array
 public function display(): array
 {
 $data = [];
 $data['queries'] = array_map(static function (array $query) {
 $data['queries'] = array_map(static function (array $query): array {
 $isDuplicate = $query['duplicate'] === true;

 $firstNonSystemLine = '';
Expand Down

2 changes: 1 addition & 1 deletion
system/Events/Events.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,7 +84,7 @@ public static function initialize()
 $files = service('locator')->search('Config/Events.php');
 }

 $files = array_filter(array_map(static function (string $file) {
 $files = array_filter(array_map(static function (string $file): false|string {
 if (is_file($file)) {
 return realpath($file) ?: $file;
 }
Expand Down

2 changes: 1 addition & 1 deletion
system/HTTP/ContentSecurityPolicy.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -713,7 +713,7 @@ protected function generateNonces(ResponseInterface $response)
 $pattern = '/(' . preg_quote($this->styleNonceTag, '/')
 . '|' . preg_quote($this->scriptNonceTag, '/') . ')/';

 $body = preg_replace_callback($pattern, function ($match) {
 $body = preg_replace_callback($pattern, function ($match): string {
 $nonce = $match[0] === $this->styleNonceTag ? $this->getStyleNonce() : $this->getScriptNonce();

 return "nonce=\"{$nonce}\"";
Expand Down

2 changes: 1 addition & 1 deletion
system/HTTP/Negotiate.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -233,7 +233,7 @@ public function parseHeader(string $header): array
 }

 // Sort to get the highest results first
 usort($results, static function ($a, $b) {
 usort($results, static function ($a, $b): int {
 if ($a['q'] === $b['q']) {
 $aAst = substr_count($a['value'], '*');
 $bAst = substr_count($b['value'], '*');
Expand Down

2 changes: 1 addition & 1 deletion
system/Helpers/Array/ArrayHelper.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -307,7 +307,7 @@ public static function recursiveCount(array $array, int $counter = 0): int
 */
 public static function sortValuesByNatural(array &$array, $sortByIndex = null): bool
 {
 return usort($array, static function ($currentValue, $nextValue) use ($sortByIndex) {
 return usort($array, static function ($currentValue, $nextValue) use ($sortByIndex): int {
 if ($sortByIndex !== null) {
 return strnatcmp((string) $currentValue[$sortByIndex], (string) $nextValue[$sortByIndex]);
 }
Expand Down

2 changes: 1 addition & 1 deletion
system/Router/Router.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -433,7 +433,7 @@ protected function checkRoutes(string $uri): bool
 // Is this route supposed to redirect to another?
 if ($this->collection->isRedirect($routeKey)) {
 // replacing matched route groups with references: post/([0-9]+) -> post/$1
 $redirectTo = preg_replace_callback('/(\([^\(]+\))/', static function () {
 $redirectTo = preg_replace_callback('/(\([^\(]+\))/', static function (): string {
 static $i = 1;

 return '$' . $i++;
Expand Down

2 changes: 1 addition & 1 deletion
system/View/Parser.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -534,7 +534,7 @@ protected function replaceSingle($pattern, $content, $template, bool $escape = f
 $content = (string) $content;

 // Replace the content in the template
 return preg_replace_callback($pattern, function ($matches) use ($content, $escape) {
 return preg_replace_callback($pattern, function ($matches) use ($content, $escape): string {
 // Check for {! !} syntax to not escape this one.
 if (
 str_starts_with($matches[0], $this->leftDelimiter . '!')
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/Utilities/NamespacesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ protected function tearDown(): void
 */
 protected function getBuffer()
 {
 return preg_replace_callback('/(\|\s*[^|]+\s*\|\s*)(.*?)(\s*\|\s*[^|]+\s*\|)/', static function (array $matches) {
 return preg_replace_callback('/(\|\s*[^|]+\s*\|\s*)(.*?)(\s*\|\s*[^|]+\s*\|)/', static function (array $matches): string {
 $matches[2] = str_replace(DIRECTORY_SEPARATOR, '/', $matches[2]);

 return $matches[1] . $matches[2] . $matches[3];
Expand Down

4 changes: 2 additions & 2 deletions
tests/system/DataConverter/DataConverterTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -570,7 +570,7 @@ public function testReconstructObjectWithClosure(): void
 'created_at' => 'datetime',
 'updated_at' => 'datetime',
 ];
 $reconstructor = static function ($array) {
 $reconstructor = static function ($array): User {
 $user = new User();
 $user->fill($array);

Expand DownExpand Up@@ -667,7 +667,7 @@ public function testExtractWithClosure(): void
 'created_at' => 'datetime',
 'updated_at' => 'datetime',
 ];
 $extractor = static function ($obj) {
 $extractor = static function ($obj): array {
 $array['id'] = $obj->id;
 $array['name'] = $obj->name;
 $array['created_at'] = $obj->created_at;
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Debug/TimerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,7 @@ public function testRecordFunctionNoReturn(): void
 public function testRecordFunctionWithReturn(): void
 {
 $timer = new Timer();
 $returnValue = $timer->record('longjohn', static function () {
 $returnValue = $timer->record('longjohn', static function (): string {
 usleep(100000);

 return 'test';
Expand Down

6 changes: 3 additions & 3 deletions
tests/system/Events/EventsTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -121,7 +121,7 @@ public function testCancelEvent(): void

 // This should cancel the flow of events, and leave
 // $result = 1.
 Events::on('foo', static function ($arg) use (&$result) {
 Events::on('foo', static function ($arg) use (&$result): bool {
 $result = 1;

 return false;
Expand All@@ -138,14 +138,14 @@ public function testPriority(): void
 {
 $result = 0;

 Events::on('foo', static function () use (&$result) {
 Events::on('foo', static function () use (&$result): bool {
 $result = 1;

 return false;
 }, EVENT_PRIORITY_NORMAL);
 // Since this has a higher priority, it will
 // run first.
 Events::on('foo', static function () use (&$result) {
 Events::on('foo', static function () use (&$result): bool {
 $result = 2;

 return false;
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -152,7 +152,7 @@ public function testCallValidationTwice(): void
 [
 'POST',
 'section/create',
 static function () {
 static function (): string {
 $validation = Services::validation();
 $validation->setRule('title', 'title', 'required|min_length[3]');

Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Validation/ValidationTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -311,7 +311,7 @@ public function testClosureRuleWithParamError(): void
 $this->validation->setRules([
 'foo' => [
 'required',
 static function ($value, $data, &$error, $field) {
 static function ($value, $data, &$error, $field): bool {
 if ($value !== 'abc') {
 $error = 'The ' . $field . ' value is not "abc"';

Expand Down

6 changes: 3 additions & 3 deletions
tests/system/View/ParserTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -806,7 +806,7 @@ public function testParserPluginClosure(): void

 public function testParserPluginParams(): void
 {
 $this->parser->addPlugin('growth', static function ($str, array $params) {
 $this->parser->addPlugin('growth', static function ($str, array $params): string {
 $step = $params['step'] ?? 1;
 $count = $params['count'] ?? 2;

Expand DownExpand Up@@ -853,7 +853,7 @@ public function testParserSingleTagWithSingleParams(): void

 public function testParserSingleTagWithQuotedParams(): void
 {
 $this->parser->addPlugin('count', static function (array $params = []) {
 $this->parser->addPlugin('count', static function (array $params = []): string {
 $out = '';

 foreach ($params as $index => $param) {
Expand All@@ -870,7 +870,7 @@ public function testParserSingleTagWithQuotedParams(): void

 public function testParserSingleTagWithNamedParams(): void
 {
 $this->parser->addPlugin('read_params', static function (array $params = []) {
 $this->parser->addPlugin('read_params', static function (array $params = []): string {
 $out = '';

 foreach ($params as $index => $param) {
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: enable ClosureReturnTypeRector#9187

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

samsonasik
merged 2 commits into

from

Sep 10, 2024
 Merged


refactor: enable ClosureReturnTypeRector
#9187
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
3f29f28

refactor: enable ClosureReturnTypeRector


samsonasik Sep 10, 2024
8ecbf0d

Fix cs


samsonasik Sep 10, 2024

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


2 changes: 2 additions & 0 deletions
rector.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@
use Rector\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector;
use Rector\TypeDeclaration\Rector\ClassMethod\ReturnNeverTypeRector;
use Rector\TypeDeclaration\Rector\Closure\AddClosureVoidReturnTypeWhereNoReturnRector;
use Rector\TypeDeclaration\Rector\Closure\ClosureReturnTypeRector;
use Rector\TypeDeclaration\Rector\Empty_\EmptyOnNullableObjectToInstanceOfRector;
use Rector\TypeDeclaration\Rector\Function_\AddFunctionVoidReturnTypeWhereNoReturnRector;
use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromAssignsRector;
Expand DownExpand Up@@ -217,6 +218,7 @@
 AddFunctionVoidReturnTypeWhereNoReturnRector::class,
 AddMethodCallBasedStrictParamTypeRector::class,
 TypedPropertyFromAssignsRector::class,
 ClosureReturnTypeRector::class,
 ])
 ->withConfiguredRule(StringClassNameToClassConstantRector::class, [
 // keep '\\' prefix string on string '\Foo\Bar'
Expand Down

6 changes: 3 additions & 3 deletions
system/Database/OCI8/Builder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,12 +109,12 @@ protected function _replace(string $table, array $keys, array $values): string
 {
 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);

 $uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames) {
 $uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

 return ($index->type === 'PRIMARY') && $hasAllFields;
 });
 $replaceableFields = array_filter($keys, static function ($columnName) use ($uniqueIndexes) {
 $replaceableFields = array_filter($keys, static function ($columnName) use ($uniqueIndexes): bool {
 foreach ($uniqueIndexes as $index) {
 if (in_array(trim($columnName, '"'), $index->fields, true)) {
 return false;
Expand DownExpand Up@@ -344,7 +344,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 if (empty($constraints)) {
 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);

 $uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames) {
 $uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

 return ($index->type === 'PRIMARY' || $index->type === 'UNIQUE') && $hasAllFields;
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -113,7 +113,7 @@ public function parameterize(string $sql): string
 // Track our current value
 $count = 0;

 return preg_replace_callback('/\?/', static function ($matches) use (&$count) {
 return preg_replace_callback('/\?/', static function ($matches) use (&$count): string {
 return ':' . ($count++);
 }, $sql);
 }
Expand Down

6 changes: 3 additions & 3 deletions
system/Database/Postgre/Builder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -368,7 +368,7 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $sql .= 'WHERE ' . implode(
 ' AND ',
 array_map(
 static function ($key, $value) use ($table, $alias, $that) {
 static function ($key, $value) use ($table, $alias, $that): string|RawSql {
 if ($value instanceof RawSql && is_string($key)) {
 return $table . '.' . $key . ' = ' . $value;
 }
Expand DownExpand Up@@ -463,7 +463,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $constraints = $this->QBOptions['constraints'] ?? [];

 if (empty($constraints)) {
 $allIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames) {
 $allIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

 return ($index->type === 'UNIQUE' || $index->type === 'PRIMARY') && $hasAllFields;
Expand DownExpand Up@@ -575,7 +575,7 @@ protected function _deleteBatch(string $table, array $keys, array $values): stri
 $sql .= 'WHERE ' . implode(
 ' AND ',
 array_map(
 static function ($key, $value) use ($table, $alias, $that) {
 static function ($key, $value) use ($table, $alias, $that): RawSql|string {
 if ($value instanceof RawSql) {
 return $value;
 }
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,7 +119,7 @@ public function parameterize(string $sql): string
 // Track our current value
 $count = 0;

 return preg_replace_callback('/\?/', static function () use (&$count) {
 return preg_replace_callback('/\?/', static function () use (&$count): string {
 $count++;

 return "\${$count}";
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -699,15 +699,15 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 if (empty($constraints)) {
 $tableIndexes = $this->db->getIndexData($table);

 $uniqueIndexes = array_filter($tableIndexes, static function ($index) use ($fieldNames) {
 $uniqueIndexes = array_filter($tableIndexes, static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

 return $index->type === 'PRIMARY' && $hasAllFields;
 });

 // if no primary found then look for unique - since indexes have no order
 if ($uniqueIndexes === []) {
 $uniqueIndexes = array_filter($tableIndexes, static function ($index) use ($fieldNames) {
 $uniqueIndexes = array_filter($tableIndexes, static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

 return $index->type === 'UNIQUE' && $hasAllFields;
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 if (empty($constraints)) {
 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '`'), $keys);

 $allIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames) {
 $allIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

 return ($index->type === 'PRIMARY' || $index->type === 'UNIQUE') && $hasAllFields;
Expand Down

2 changes: 1 addition & 1 deletion
system/Debug/Toolbar/Collectors/Database.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,7 @@ protected function formatTimelineData(): array
 public function display(): array
 {
 $data = [];
 $data['queries'] = array_map(static function (array $query) {
 $data['queries'] = array_map(static function (array $query): array {
 $isDuplicate = $query['duplicate'] === true;

 $firstNonSystemLine = '';
Expand Down

2 changes: 1 addition & 1 deletion
system/Events/Events.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,7 +84,7 @@ public static function initialize()
 $files = service('locator')->search('Config/Events.php');
 }

 $files = array_filter(array_map(static function (string $file) {
 $files = array_filter(array_map(static function (string $file): false|string {
 if (is_file($file)) {
 return realpath($file) ?: $file;
 }
Expand Down

2 changes: 1 addition & 1 deletion
system/HTTP/ContentSecurityPolicy.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -713,7 +713,7 @@ protected function generateNonces(ResponseInterface $response)
 $pattern = '/(' . preg_quote($this->styleNonceTag, '/')
 . '|' . preg_quote($this->scriptNonceTag, '/') . ')/';

 $body = preg_replace_callback($pattern, function ($match) {
 $body = preg_replace_callback($pattern, function ($match): string {
 $nonce = $match[0] === $this->styleNonceTag ? $this->getStyleNonce() : $this->getScriptNonce();

 return "nonce=\"{$nonce}\"";
Expand Down

2 changes: 1 addition & 1 deletion
system/HTTP/Negotiate.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -233,7 +233,7 @@ public function parseHeader(string $header): array
 }

 // Sort to get the highest results first
 usort($results, static function ($a, $b) {
 usort($results, static function ($a, $b): int {
 if ($a['q'] === $b['q']) {
 $aAst = substr_count($a['value'], '*');
 $bAst = substr_count($b['value'], '*');
Expand Down

2 changes: 1 addition & 1 deletion
system/Helpers/Array/ArrayHelper.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -307,7 +307,7 @@ public static function recursiveCount(array $array, int $counter = 0): int
 */
 public static function sortValuesByNatural(array &$array, $sortByIndex = null): bool
 {
 return usort($array, static function ($currentValue, $nextValue) use ($sortByIndex) {
 return usort($array, static function ($currentValue, $nextValue) use ($sortByIndex): int {
 if ($sortByIndex !== null) {
 return strnatcmp((string) $currentValue[$sortByIndex], (string) $nextValue[$sortByIndex]);
 }
Expand Down

2 changes: 1 addition & 1 deletion
system/Router/Router.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -433,7 +433,7 @@ protected function checkRoutes(string $uri): bool
 // Is this route supposed to redirect to another?
 if ($this->collection->isRedirect($routeKey)) {
 // replacing matched route groups with references: post/([0-9]+) -> post/$1
 $redirectTo = preg_replace_callback('/(\([^\(]+\))/', static function () {
 $redirectTo = preg_replace_callback('/(\([^\(]+\))/', static function (): string {
 static $i = 1;

 return '$' . $i++;
Expand Down

2 changes: 1 addition & 1 deletion
system/View/Parser.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -534,7 +534,7 @@ protected function replaceSingle($pattern, $content, $template, bool $escape = f
 $content = (string) $content;

 // Replace the content in the template
 return preg_replace_callback($pattern, function ($matches) use ($content, $escape) {
 return preg_replace_callback($pattern, function ($matches) use ($content, $escape): string {
 // Check for {! !} syntax to not escape this one.
 if (
 str_starts_with($matches[0], $this->leftDelimiter . '!')
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/Utilities/NamespacesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ protected function tearDown(): void
 */
 protected function getBuffer()
 {
 return preg_replace_callback('/(\|\s*[^|]+\s*\|\s*)(.*?)(\s*\|\s*[^|]+\s*\|)/', static function (array $matches) {
 return preg_replace_callback('/(\|\s*[^|]+\s*\|\s*)(.*?)(\s*\|\s*[^|]+\s*\|)/', static function (array $matches): string {
 $matches[2] = str_replace(DIRECTORY_SEPARATOR, '/', $matches[2]);

 return $matches[1] . $matches[2] . $matches[3];
Expand Down

4 changes: 2 additions & 2 deletions
tests/system/DataConverter/DataConverterTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -570,7 +570,7 @@ public function testReconstructObjectWithClosure(): void
 'created_at' => 'datetime',
 'updated_at' => 'datetime',
 ];
 $reconstructor = static function ($array) {
 $reconstructor = static function ($array): User {
 $user = new User();
 $user->fill($array);

Expand DownExpand Up@@ -667,7 +667,7 @@ public function testExtractWithClosure(): void
 'created_at' => 'datetime',
 'updated_at' => 'datetime',
 ];
 $extractor = static function ($obj) {
 $extractor = static function ($obj): array {
 $array['id'] = $obj->id;
 $array['name'] = $obj->name;
 $array['created_at'] = $obj->created_at;
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Debug/TimerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,7 @@ public function testRecordFunctionNoReturn(): void
 public function testRecordFunctionWithReturn(): void
 {
 $timer = new Timer();
 $returnValue = $timer->record('longjohn', static function () {
 $returnValue = $timer->record('longjohn', static function (): string {
 usleep(100000);

 return 'test';
Expand Down

6 changes: 3 additions & 3 deletions
tests/system/Events/EventsTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -121,7 +121,7 @@ public function testCancelEvent(): void

 // This should cancel the flow of events, and leave
 // $result = 1.
 Events::on('foo', static function ($arg) use (&$result) {
 Events::on('foo', static function ($arg) use (&$result): bool {
 $result = 1;

 return false;
Expand All@@ -138,14 +138,14 @@ public function testPriority(): void
 {
 $result = 0;

 Events::on('foo', static function () use (&$result) {
 Events::on('foo', static function () use (&$result): bool {
 $result = 1;

 return false;
 }, EVENT_PRIORITY_NORMAL);
 // Since this has a higher priority, it will
 // run first.
 Events::on('foo', static function () use (&$result) {
 Events::on('foo', static function () use (&$result): bool {
 $result = 2;

 return false;
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -152,7 +152,7 @@ public function testCallValidationTwice(): void
 [
 'POST',
 'section/create',
 static function () {
 static function (): string {
 $validation = Services::validation();
 $validation->setRule('title', 'title', 'required|min_length[3]');

Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Validation/ValidationTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -311,7 +311,7 @@ public function testClosureRuleWithParamError(): void
 $this->validation->setRules([
 'foo' => [
 'required',
 static function ($value, $data, &$error, $field) {
 static function ($value, $data, &$error, $field): bool {
 if ($value !== 'abc') {
 $error = 'The ' . $field . ' value is not "abc"';

Expand Down

6 changes: 3 additions & 3 deletions
tests/system/View/ParserTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -806,7 +806,7 @@ public function testParserPluginClosure(): void

 public function testParserPluginParams(): void
 {
 $this->parser->addPlugin('growth', static function ($str, array $params) {
 $this->parser->addPlugin('growth', static function ($str, array $params): string {
 $step = $params['step'] ?? 1;
 $count = $params['count'] ?? 2;

Expand DownExpand Up@@ -853,7 +853,7 @@ public function testParserSingleTagWithSingleParams(): void

 public function testParserSingleTagWithQuotedParams(): void
 {
 $this->parser->addPlugin('count', static function (array $params = []) {
 $this->parser->addPlugin('count', static function (array $params = []): string {
 $out = '';

 foreach ($params as $index => $param) {
Expand All@@ -870,7 +870,7 @@ public function testParserSingleTagWithQuotedParams(): void

 public function testParserSingleTagWithNamedParams(): void
 {
 $this->parser->addPlugin('read_params', static function (array $params = []) {
 $this->parser->addPlugin('read_params', static function (array $params = []): string {
 $out = '';

 foreach ($params as $index => $param) {
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: enable ClosureReturnTypeRector#9187

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

samsonasik
merged 2 commits into

from

Sep 10, 2024
 Merged


refactor: enable ClosureReturnTypeRector
#9187
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
3f29f28

refactor: enable ClosureReturnTypeRector


samsonasik Sep 10, 2024
8ecbf0d

Fix cs


samsonasik Sep 10, 2024

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


2 changes: 2 additions & 0 deletions
rector.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@
use Rector\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector;
use Rector\TypeDeclaration\Rector\ClassMethod\ReturnNeverTypeRector;
use Rector\TypeDeclaration\Rector\Closure\AddClosureVoidReturnTypeWhereNoReturnRector;
use Rector\TypeDeclaration\Rector\Closure\ClosureReturnTypeRector;
use Rector\TypeDeclaration\Rector\Empty_\EmptyOnNullableObjectToInstanceOfRector;
use Rector\TypeDeclaration\Rector\Function_\AddFunctionVoidReturnTypeWhereNoReturnRector;
use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromAssignsRector;
Expand DownExpand Up@@ -217,6 +218,7 @@
 AddFunctionVoidReturnTypeWhereNoReturnRector::class,
 AddMethodCallBasedStrictParamTypeRector::class,
 TypedPropertyFromAssignsRector::class,
 ClosureReturnTypeRector::class,
 ])
 ->withConfiguredRule(StringClassNameToClassConstantRector::class, [
 // keep '\\' prefix string on string '\Foo\Bar'
Expand Down

6 changes: 3 additions & 3 deletions
system/Database/OCI8/Builder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,12 +109,12 @@ protected function _replace(string $table, array $keys, array $values): string
 {
 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);

 $uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames) {
 $uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

 return ($index->type === 'PRIMARY') && $hasAllFields;
 });
 $replaceableFields = array_filter($keys, static function ($columnName) use ($uniqueIndexes) {
 $replaceableFields = array_filter($keys, static function ($columnName) use ($uniqueIndexes): bool {
 foreach ($uniqueIndexes as $index) {
 if (in_array(trim($columnName, '"'), $index->fields, true)) {
 return false;
Expand DownExpand Up@@ -344,7 +344,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 if (empty($constraints)) {
 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);

 $uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames) {
 $uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

 return ($index->type === 'PRIMARY' || $index->type === 'UNIQUE') && $hasAllFields;
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -113,7 +113,7 @@ public function parameterize(string $sql): string
 // Track our current value
 $count = 0;

 return preg_replace_callback('/\?/', static function ($matches) use (&$count) {
 return preg_replace_callback('/\?/', static function ($matches) use (&$count): string {
 return ':' . ($count++);
 }, $sql);
 }
Expand Down

6 changes: 3 additions & 3 deletions
system/Database/Postgre/Builder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -368,7 +368,7 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $sql .= 'WHERE ' . implode(
 ' AND ',
 array_map(
 static function ($key, $value) use ($table, $alias, $that) {
 static function ($key, $value) use ($table, $alias, $that): string|RawSql {
 if ($value instanceof RawSql && is_string($key)) {
 return $table . '.' . $key . ' = ' . $value;
 }
Expand DownExpand Up@@ -463,7 +463,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $constraints = $this->QBOptions['constraints'] ?? [];

 if (empty($constraints)) {
 $allIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames) {
 $allIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

 return ($index->type === 'UNIQUE' || $index->type === 'PRIMARY') && $hasAllFields;
Expand DownExpand Up@@ -575,7 +575,7 @@ protected function _deleteBatch(string $table, array $keys, array $values): stri
 $sql .= 'WHERE ' . implode(
 ' AND ',
 array_map(
 static function ($key, $value) use ($table, $alias, $that) {
 static function ($key, $value) use ($table, $alias, $that): RawSql|string {
 if ($value instanceof RawSql) {
 return $value;
 }
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,7 +119,7 @@ public function parameterize(string $sql): string
 // Track our current value
 $count = 0;

 return preg_replace_callback('/\?/', static function () use (&$count) {
 return preg_replace_callback('/\?/', static function () use (&$count): string {
 $count++;

 return "\${$count}";
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -699,15 +699,15 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 if (empty($constraints)) {
 $tableIndexes = $this->db->getIndexData($table);

 $uniqueIndexes = array_filter($tableIndexes, static function ($index) use ($fieldNames) {
 $uniqueIndexes = array_filter($tableIndexes, static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

 return $index->type === 'PRIMARY' && $hasAllFields;
 });

 // if no primary found then look for unique - since indexes have no order
 if ($uniqueIndexes === []) {
 $uniqueIndexes = array_filter($tableIndexes, static function ($index) use ($fieldNames) {
 $uniqueIndexes = array_filter($tableIndexes, static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

 return $index->type === 'UNIQUE' && $hasAllFields;
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 if (empty($constraints)) {
 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '`'), $keys);

 $allIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames) {
 $allIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

 return ($index->type === 'PRIMARY' || $index->type === 'UNIQUE') && $hasAllFields;
Expand Down

2 changes: 1 addition & 1 deletion
system/Debug/Toolbar/Collectors/Database.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,7 @@ protected function formatTimelineData(): array
 public function display(): array
 {
 $data = [];
 $data['queries'] = array_map(static function (array $query) {
 $data['queries'] = array_map(static function (array $query): array {
 $isDuplicate = $query['duplicate'] === true;

 $firstNonSystemLine = '';
Expand Down

2 changes: 1 addition & 1 deletion
system/Events/Events.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,7 +84,7 @@ public static function initialize()
 $files = service('locator')->search('Config/Events.php');
 }

 $files = array_filter(array_map(static function (string $file) {
 $files = array_filter(array_map(static function (string $file): false|string {
 if (is_file($file)) {
 return realpath($file) ?: $file;
 }
Expand Down

2 changes: 1 addition & 1 deletion
system/HTTP/ContentSecurityPolicy.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -713,7 +713,7 @@ protected function generateNonces(ResponseInterface $response)
 $pattern = '/(' . preg_quote($this->styleNonceTag, '/')
 . '|' . preg_quote($this->scriptNonceTag, '/') . ')/';

 $body = preg_replace_callback($pattern, function ($match) {
 $body = preg_replace_callback($pattern, function ($match): string {
 $nonce = $match[0] === $this->styleNonceTag ? $this->getStyleNonce() : $this->getScriptNonce();

 return "nonce=\"{$nonce}\"";
Expand Down

2 changes: 1 addition & 1 deletion
system/HTTP/Negotiate.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -233,7 +233,7 @@ public function parseHeader(string $header): array
 }

 // Sort to get the highest results first
 usort($results, static function ($a, $b) {
 usort($results, static function ($a, $b): int {
 if ($a['q'] === $b['q']) {
 $aAst = substr_count($a['value'], '*');
 $bAst = substr_count($b['value'], '*');
Expand Down

2 changes: 1 addition & 1 deletion
system/Helpers/Array/ArrayHelper.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -307,7 +307,7 @@ public static function recursiveCount(array $array, int $counter = 0): int
 */
 public static function sortValuesByNatural(array &$array, $sortByIndex = null): bool
 {
 return usort($array, static function ($currentValue, $nextValue) use ($sortByIndex) {
 return usort($array, static function ($currentValue, $nextValue) use ($sortByIndex): int {
 if ($sortByIndex !== null) {
 return strnatcmp((string) $currentValue[$sortByIndex], (string) $nextValue[$sortByIndex]);
 }
Expand Down

2 changes: 1 addition & 1 deletion
system/Router/Router.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -433,7 +433,7 @@ protected function checkRoutes(string $uri): bool
 // Is this route supposed to redirect to another?
 if ($this->collection->isRedirect($routeKey)) {
 // replacing matched route groups with references: post/([0-9]+) -> post/$1
 $redirectTo = preg_replace_callback('/(\([^\(]+\))/', static function () {
 $redirectTo = preg_replace_callback('/(\([^\(]+\))/', static function (): string {
 static $i = 1;

 return '$' . $i++;
Expand Down

2 changes: 1 addition & 1 deletion
system/View/Parser.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -534,7 +534,7 @@ protected function replaceSingle($pattern, $content, $template, bool $escape = f
 $content = (string) $content;

 // Replace the content in the template
 return preg_replace_callback($pattern, function ($matches) use ($content, $escape) {
 return preg_replace_callback($pattern, function ($matches) use ($content, $escape): string {
 // Check for {! !} syntax to not escape this one.
 if (
 str_starts_with($matches[0], $this->leftDelimiter . '!')
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/Utilities/NamespacesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ protected function tearDown(): void
 */
 protected function getBuffer()
 {
 return preg_replace_callback('/(\|\s*[^|]+\s*\|\s*)(.*?)(\s*\|\s*[^|]+\s*\|)/', static function (array $matches) {
 return preg_replace_callback('/(\|\s*[^|]+\s*\|\s*)(.*?)(\s*\|\s*[^|]+\s*\|)/', static function (array $matches): string {
 $matches[2] = str_replace(DIRECTORY_SEPARATOR, '/', $matches[2]);

 return $matches[1] . $matches[2] . $matches[3];
Expand Down

4 changes: 2 additions & 2 deletions
tests/system/DataConverter/DataConverterTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -570,7 +570,7 @@ public function testReconstructObjectWithClosure(): void
 'created_at' => 'datetime',
 'updated_at' => 'datetime',
 ];
 $reconstructor = static function ($array) {
 $reconstructor = static function ($array): User {
 $user = new User();
 $user->fill($array);

Expand DownExpand Up@@ -667,7 +667,7 @@ public function testExtractWithClosure(): void
 'created_at' => 'datetime',
 'updated_at' => 'datetime',
 ];
 $extractor = static function ($obj) {
 $extractor = static function ($obj): array {
 $array['id'] = $obj->id;
 $array['name'] = $obj->name;
 $array['created_at'] = $obj->created_at;
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Debug/TimerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,7 @@ public function testRecordFunctionNoReturn(): void
 public function testRecordFunctionWithReturn(): void
 {
 $timer = new Timer();
 $returnValue = $timer->record('longjohn', static function () {
 $returnValue = $timer->record('longjohn', static function (): string {
 usleep(100000);

 return 'test';
Expand Down

6 changes: 3 additions & 3 deletions
tests/system/Events/EventsTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -121,7 +121,7 @@ public function testCancelEvent(): void

 // This should cancel the flow of events, and leave
 // $result = 1.
 Events::on('foo', static function ($arg) use (&$result) {
 Events::on('foo', static function ($arg) use (&$result): bool {
 $result = 1;

 return false;
Expand All@@ -138,14 +138,14 @@ public function testPriority(): void
 {
 $result = 0;

 Events::on('foo', static function () use (&$result) {
 Events::on('foo', static function () use (&$result): bool {
 $result = 1;

 return false;
 }, EVENT_PRIORITY_NORMAL);
 // Since this has a higher priority, it will
 // run first.
 Events::on('foo', static function () use (&$result) {
 Events::on('foo', static function () use (&$result): bool {
 $result = 2;

 return false;
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -152,7 +152,7 @@ public function testCallValidationTwice(): void
 [
 'POST',
 'section/create',
 static function () {
 static function (): string {
 $validation = Services::validation();
 $validation->setRule('title', 'title', 'required|min_length[3]');

Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Validation/ValidationTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -311,7 +311,7 @@ public function testClosureRuleWithParamError(): void
 $this->validation->setRules([
 'foo' => [
 'required',
 static function ($value, $data, &$error, $field) {
 static function ($value, $data, &$error, $field): bool {
 if ($value !== 'abc') {
 $error = 'The ' . $field . ' value is not "abc"';

Expand Down

6 changes: 3 additions & 3 deletions
tests/system/View/ParserTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -806,7 +806,7 @@ public function testParserPluginClosure(): void

 public function testParserPluginParams(): void
 {
 $this->parser->addPlugin('growth', static function ($str, array $params) {
 $this->parser->addPlugin('growth', static function ($str, array $params): string {
 $step = $params['step'] ?? 1;
 $count = $params['count'] ?? 2;

Expand DownExpand Up@@ -853,7 +853,7 @@ public function testParserSingleTagWithSingleParams(): void

 public function testParserSingleTagWithQuotedParams(): void
 {
 $this->parser->addPlugin('count', static function (array $params = []) {
 $this->parser->addPlugin('count', static function (array $params = []): string {
 $out = '';

 foreach ($params as $index => $param) {
Expand All@@ -870,7 +870,7 @@ public function testParserSingleTagWithQuotedParams(): void

 public function testParserSingleTagWithNamedParams(): void
 {
 $this->parser->addPlugin('read_params', static function (array $params = []) {
 $this->parser->addPlugin('read_params', static function (array $params = []): string {
 $out = '';

 foreach ($params as $index => $param) {
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: enable ClosureReturnTypeRector#9187

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

samsonasik
merged 2 commits into

from

Sep 10, 2024
 Merged


refactor: enable ClosureReturnTypeRector
#9187
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
3f29f28

refactor: enable ClosureReturnTypeRector


samsonasik Sep 10, 2024
8ecbf0d

Fix cs


samsonasik Sep 10, 2024

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


2 changes: 2 additions & 0 deletions
rector.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@
use Rector\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector;
use Rector\TypeDeclaration\Rector\ClassMethod\ReturnNeverTypeRector;
use Rector\TypeDeclaration\Rector\Closure\AddClosureVoidReturnTypeWhereNoReturnRector;
use Rector\TypeDeclaration\Rector\Closure\ClosureReturnTypeRector;
use Rector\TypeDeclaration\Rector\Empty_\EmptyOnNullableObjectToInstanceOfRector;
use Rector\TypeDeclaration\Rector\Function_\AddFunctionVoidReturnTypeWhereNoReturnRector;
use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromAssignsRector;
Expand DownExpand Up@@ -217,6 +218,7 @@
 AddFunctionVoidReturnTypeWhereNoReturnRector::class,
 AddMethodCallBasedStrictParamTypeRector::class,
 TypedPropertyFromAssignsRector::class,
 ClosureReturnTypeRector::class,
 ])
 ->withConfiguredRule(StringClassNameToClassConstantRector::class, [
 // keep '\\' prefix string on string '\Foo\Bar'
Expand Down

6 changes: 3 additions & 3 deletions
system/Database/OCI8/Builder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,12 +109,12 @@ protected function _replace(string $table, array $keys, array $values): string
 {
 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);

 $uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames) {
 $uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

 return ($index->type === 'PRIMARY') && $hasAllFields;
 });
 $replaceableFields = array_filter($keys, static function ($columnName) use ($uniqueIndexes) {
 $replaceableFields = array_filter($keys, static function ($columnName) use ($uniqueIndexes): bool {
 foreach ($uniqueIndexes as $index) {
 if (in_array(trim($columnName, '"'), $index->fields, true)) {
 return false;
Expand DownExpand Up@@ -344,7 +344,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 if (empty($constraints)) {
 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);

 $uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames) {
 $uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

 return ($index->type === 'PRIMARY' || $index->type === 'UNIQUE') && $hasAllFields;
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -113,7 +113,7 @@ public function parameterize(string $sql): string
 // Track our current value
 $count = 0;

 return preg_replace_callback('/\?/', static function ($matches) use (&$count) {
 return preg_replace_callback('/\?/', static function ($matches) use (&$count): string {
 return ':' . ($count++);
 }, $sql);
 }
Expand Down

6 changes: 3 additions & 3 deletions
system/Database/Postgre/Builder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -368,7 +368,7 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $sql .= 'WHERE ' . implode(
 ' AND ',
 array_map(
 static function ($key, $value) use ($table, $alias, $that) {
 static function ($key, $value) use ($table, $alias, $that): string|RawSql {
 if ($value instanceof RawSql && is_string($key)) {
 return $table . '.' . $key . ' = ' . $value;
 }
Expand DownExpand Up@@ -463,7 +463,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $constraints = $this->QBOptions['constraints'] ?? [];

 if (empty($constraints)) {
 $allIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames) {
 $allIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

 return ($index->type === 'UNIQUE' || $index->type === 'PRIMARY') && $hasAllFields;
Expand DownExpand Up@@ -575,7 +575,7 @@ protected function _deleteBatch(string $table, array $keys, array $values): stri
 $sql .= 'WHERE ' . implode(
 ' AND ',
 array_map(
 static function ($key, $value) use ($table, $alias, $that) {
 static function ($key, $value) use ($table, $alias, $that): RawSql|string {
 if ($value instanceof RawSql) {
 return $value;
 }
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,7 +119,7 @@ public function parameterize(string $sql): string
 // Track our current value
 $count = 0;

 return preg_replace_callback('/\?/', static function () use (&$count) {
 return preg_replace_callback('/\?/', static function () use (&$count): string {
 $count++;

 return "\${$count}";
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -699,15 +699,15 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 if (empty($constraints)) {
 $tableIndexes = $this->db->getIndexData($table);

 $uniqueIndexes = array_filter($tableIndexes, static function ($index) use ($fieldNames) {
 $uniqueIndexes = array_filter($tableIndexes, static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

 return $index->type === 'PRIMARY' && $hasAllFields;
 });

 // if no primary found then look for unique - since indexes have no order
 if ($uniqueIndexes === []) {
 $uniqueIndexes = array_filter($tableIndexes, static function ($index) use ($fieldNames) {
 $uniqueIndexes = array_filter($tableIndexes, static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

 return $index->type === 'UNIQUE' && $hasAllFields;
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 if (empty($constraints)) {
 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '`'), $keys);

 $allIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames) {
 $allIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

 return ($index->type === 'PRIMARY' || $index->type === 'UNIQUE') && $hasAllFields;
Expand Down

2 changes: 1 addition & 1 deletion
system/Debug/Toolbar/Collectors/Database.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,7 @@ protected function formatTimelineData(): array
 public function display(): array
 {
 $data = [];
 $data['queries'] = array_map(static function (array $query) {
 $data['queries'] = array_map(static function (array $query): array {
 $isDuplicate = $query['duplicate'] === true;

 $firstNonSystemLine = '';
Expand Down

2 changes: 1 addition & 1 deletion
system/Events/Events.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,7 +84,7 @@ public static function initialize()
 $files = service('locator')->search('Config/Events.php');
 }

 $files = array_filter(array_map(static function (string $file) {
 $files = array_filter(array_map(static function (string $file): false|string {
 if (is_file($file)) {
 return realpath($file) ?: $file;
 }
Expand Down

2 changes: 1 addition & 1 deletion
system/HTTP/ContentSecurityPolicy.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -713,7 +713,7 @@ protected function generateNonces(ResponseInterface $response)
 $pattern = '/(' . preg_quote($this->styleNonceTag, '/')
 . '|' . preg_quote($this->scriptNonceTag, '/') . ')/';

 $body = preg_replace_callback($pattern, function ($match) {
 $body = preg_replace_callback($pattern, function ($match): string {
 $nonce = $match[0] === $this->styleNonceTag ? $this->getStyleNonce() : $this->getScriptNonce();

 return "nonce=\"{$nonce}\"";
Expand Down

2 changes: 1 addition & 1 deletion
system/HTTP/Negotiate.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -233,7 +233,7 @@ public function parseHeader(string $header): array
 }

 // Sort to get the highest results first
 usort($results, static function ($a, $b) {
 usort($results, static function ($a, $b): int {
 if ($a['q'] === $b['q']) {
 $aAst = substr_count($a['value'], '*');
 $bAst = substr_count($b['value'], '*');
Expand Down

2 changes: 1 addition & 1 deletion
system/Helpers/Array/ArrayHelper.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -307,7 +307,7 @@ public static function recursiveCount(array $array, int $counter = 0): int
 */
 public static function sortValuesByNatural(array &$array, $sortByIndex = null): bool
 {
 return usort($array, static function ($currentValue, $nextValue) use ($sortByIndex) {
 return usort($array, static function ($currentValue, $nextValue) use ($sortByIndex): int {
 if ($sortByIndex !== null) {
 return strnatcmp((string) $currentValue[$sortByIndex], (string) $nextValue[$sortByIndex]);
 }
Expand Down

2 changes: 1 addition & 1 deletion
system/Router/Router.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -433,7 +433,7 @@ protected function checkRoutes(string $uri): bool
 // Is this route supposed to redirect to another?
 if ($this->collection->isRedirect($routeKey)) {
 // replacing matched route groups with references: post/([0-9]+) -> post/$1
 $redirectTo = preg_replace_callback('/(\([^\(]+\))/', static function () {
 $redirectTo = preg_replace_callback('/(\([^\(]+\))/', static function (): string {
 static $i = 1;

 return '$' . $i++;
Expand Down

2 changes: 1 addition & 1 deletion
system/View/Parser.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -534,7 +534,7 @@ protected function replaceSingle($pattern, $content, $template, bool $escape = f
 $content = (string) $content;

 // Replace the content in the template
 return preg_replace_callback($pattern, function ($matches) use ($content, $escape) {
 return preg_replace_callback($pattern, function ($matches) use ($content, $escape): string {
 // Check for {! !} syntax to not escape this one.
 if (
 str_starts_with($matches[0], $this->leftDelimiter . '!')
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/Utilities/NamespacesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ protected function tearDown(): void
 */
 protected function getBuffer()
 {
 return preg_replace_callback('/(\|\s*[^|]+\s*\|\s*)(.*?)(\s*\|\s*[^|]+\s*\|)/', static function (array $matches) {
 return preg_replace_callback('/(\|\s*[^|]+\s*\|\s*)(.*?)(\s*\|\s*[^|]+\s*\|)/', static function (array $matches): string {
 $matches[2] = str_replace(DIRECTORY_SEPARATOR, '/', $matches[2]);

 return $matches[1] . $matches[2] . $matches[3];
Expand Down

4 changes: 2 additions & 2 deletions
tests/system/DataConverter/DataConverterTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -570,7 +570,7 @@ public function testReconstructObjectWithClosure(): void
 'created_at' => 'datetime',
 'updated_at' => 'datetime',
 ];
 $reconstructor = static function ($array) {
 $reconstructor = static function ($array): User {
 $user = new User();
 $user->fill($array);

Expand DownExpand Up@@ -667,7 +667,7 @@ public function testExtractWithClosure(): void
 'created_at' => 'datetime',
 'updated_at' => 'datetime',
 ];
 $extractor = static function ($obj) {
 $extractor = static function ($obj): array {
 $array['id'] = $obj->id;
 $array['name'] = $obj->name;
 $array['created_at'] = $obj->created_at;
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Debug/TimerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,7 @@ public function testRecordFunctionNoReturn(): void
 public function testRecordFunctionWithReturn(): void
 {
 $timer = new Timer();
 $returnValue = $timer->record('longjohn', static function () {
 $returnValue = $timer->record('longjohn', static function (): string {
 usleep(100000);

 return 'test';
Expand Down

6 changes: 3 additions & 3 deletions
tests/system/Events/EventsTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -121,7 +121,7 @@ public function testCancelEvent(): void

 // This should cancel the flow of events, and leave
 // $result = 1.
 Events::on('foo', static function ($arg) use (&$result) {
 Events::on('foo', static function ($arg) use (&$result): bool {
 $result = 1;

 return false;
Expand All@@ -138,14 +138,14 @@ public function testPriority(): void
 {
 $result = 0;

 Events::on('foo', static function () use (&$result) {
 Events::on('foo', static function () use (&$result): bool {
 $result = 1;

 return false;
 }, EVENT_PRIORITY_NORMAL);
 // Since this has a higher priority, it will
 // run first.
 Events::on('foo', static function () use (&$result) {
 Events::on('foo', static function () use (&$result): bool {
 $result = 2;

 return false;
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -152,7 +152,7 @@ public function testCallValidationTwice(): void
 [
 'POST',
 'section/create',
 static function () {
 static function (): string {
 $validation = Services::validation();
 $validation->setRule('title', 'title', 'required|min_length[3]');

Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Validation/ValidationTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -311,7 +311,7 @@ public function testClosureRuleWithParamError(): void
 $this->validation->setRules([
 'foo' => [
 'required',
 static function ($value, $data, &$error, $field) {
 static function ($value, $data, &$error, $field): bool {
 if ($value !== 'abc') {
 $error = 'The ' . $field . ' value is not "abc"';

Expand Down

6 changes: 3 additions & 3 deletions
tests/system/View/ParserTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -806,7 +806,7 @@ public function testParserPluginClosure(): void

 public function testParserPluginParams(): void
 {
 $this->parser->addPlugin('growth', static function ($str, array $params) {
 $this->parser->addPlugin('growth', static function ($str, array $params): string {
 $step = $params['step'] ?? 1;
 $count = $params['count'] ?? 2;

Expand DownExpand Up@@ -853,7 +853,7 @@ public function testParserSingleTagWithSingleParams(): void

 public function testParserSingleTagWithQuotedParams(): void
 {
 $this->parser->addPlugin('count', static function (array $params = []) {
 $this->parser->addPlugin('count', static function (array $params = []): string {
 $out = '';

 foreach ($params as $index => $param) {
Expand All@@ -870,7 +870,7 @@ public function testParserSingleTagWithQuotedParams(): void

 public function testParserSingleTagWithNamedParams(): void
 {
 $this->parser->addPlugin('read_params', static function (array $params = []) {
 $this->parser->addPlugin('read_params', static function (array $params = []): string {
 $out = '';

 foreach ($params as $index => $param) {
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: enable ClosureReturnTypeRector#9187

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

samsonasik
merged 2 commits into

from

Sep 10, 2024
 Merged


refactor: enable ClosureReturnTypeRector
#9187
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
3f29f28

refactor: enable ClosureReturnTypeRector


samsonasik Sep 10, 2024
8ecbf0d

Fix cs


samsonasik Sep 10, 2024

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


2 changes: 2 additions & 0 deletions
rector.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@
use Rector\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector;
use Rector\TypeDeclaration\Rector\ClassMethod\ReturnNeverTypeRector;
use Rector\TypeDeclaration\Rector\Closure\AddClosureVoidReturnTypeWhereNoReturnRector;
use Rector\TypeDeclaration\Rector\Closure\ClosureReturnTypeRector;
use Rector\TypeDeclaration\Rector\Empty_\EmptyOnNullableObjectToInstanceOfRector;
use Rector\TypeDeclaration\Rector\Function_\AddFunctionVoidReturnTypeWhereNoReturnRector;
use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromAssignsRector;
Expand DownExpand Up@@ -217,6 +218,7 @@
 AddFunctionVoidReturnTypeWhereNoReturnRector::class,
 AddMethodCallBasedStrictParamTypeRector::class,
 TypedPropertyFromAssignsRector::class,
 ClosureReturnTypeRector::class,
 ])
 ->withConfiguredRule(StringClassNameToClassConstantRector::class, [
 // keep '\\' prefix string on string '\Foo\Bar'
Expand Down

6 changes: 3 additions & 3 deletions
system/Database/OCI8/Builder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,12 +109,12 @@ protected function _replace(string $table, array $keys, array $values): string
 {
 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);

 $uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames) {
 $uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

 return ($index->type === 'PRIMARY') && $hasAllFields;
 });
 $replaceableFields = array_filter($keys, static function ($columnName) use ($uniqueIndexes) {
 $replaceableFields = array_filter($keys, static function ($columnName) use ($uniqueIndexes): bool {
 foreach ($uniqueIndexes as $index) {
 if (in_array(trim($columnName, '"'), $index->fields, true)) {
 return false;
Expand DownExpand Up@@ -344,7 +344,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 if (empty($constraints)) {
 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);

 $uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames) {
 $uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

 return ($index->type === 'PRIMARY' || $index->type === 'UNIQUE') && $hasAllFields;
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -113,7 +113,7 @@ public function parameterize(string $sql): string
 // Track our current value
 $count = 0;

 return preg_replace_callback('/\?/', static function ($matches) use (&$count) {
 return preg_replace_callback('/\?/', static function ($matches) use (&$count): string {
 return ':' . ($count++);
 }, $sql);
 }
Expand Down

6 changes: 3 additions & 3 deletions
system/Database/Postgre/Builder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -368,7 +368,7 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $sql .= 'WHERE ' . implode(
 ' AND ',
 array_map(
 static function ($key, $value) use ($table, $alias, $that) {
 static function ($key, $value) use ($table, $alias, $that): string|RawSql {
 if ($value instanceof RawSql && is_string($key)) {
 return $table . '.' . $key . ' = ' . $value;
 }
Expand DownExpand Up@@ -463,7 +463,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $constraints = $this->QBOptions['constraints'] ?? [];

 if (empty($constraints)) {
 $allIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames) {
 $allIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

 return ($index->type === 'UNIQUE' || $index->type === 'PRIMARY') && $hasAllFields;
Expand DownExpand Up@@ -575,7 +575,7 @@ protected function _deleteBatch(string $table, array $keys, array $values): stri
 $sql .= 'WHERE ' . implode(
 ' AND ',
 array_map(
 static function ($key, $value) use ($table, $alias, $that) {
 static function ($key, $value) use ($table, $alias, $that): RawSql|string {
 if ($value instanceof RawSql) {
 return $value;
 }
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,7 +119,7 @@ public function parameterize(string $sql): string
 // Track our current value
 $count = 0;

 return preg_replace_callback('/\?/', static function () use (&$count) {
 return preg_replace_callback('/\?/', static function () use (&$count): string {
 $count++;

 return "\${$count}";
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -699,15 +699,15 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 if (empty($constraints)) {
 $tableIndexes = $this->db->getIndexData($table);

 $uniqueIndexes = array_filter($tableIndexes, static function ($index) use ($fieldNames) {
 $uniqueIndexes = array_filter($tableIndexes, static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

 return $index->type === 'PRIMARY' && $hasAllFields;
 });

 // if no primary found then look for unique - since indexes have no order
 if ($uniqueIndexes === []) {
 $uniqueIndexes = array_filter($tableIndexes, static function ($index) use ($fieldNames) {
 $uniqueIndexes = array_filter($tableIndexes, static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

 return $index->type === 'UNIQUE' && $hasAllFields;
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 if (empty($constraints)) {
 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '`'), $keys);

 $allIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames) {
 $allIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

 return ($index->type === 'PRIMARY' || $index->type === 'UNIQUE') && $hasAllFields;
Expand Down

2 changes: 1 addition & 1 deletion
system/Debug/Toolbar/Collectors/Database.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,7 @@ protected function formatTimelineData(): array
 public function display(): array
 {
 $data = [];
 $data['queries'] = array_map(static function (array $query) {
 $data['queries'] = array_map(static function (array $query): array {
 $isDuplicate = $query['duplicate'] === true;

 $firstNonSystemLine = '';
Expand Down

2 changes: 1 addition & 1 deletion
system/Events/Events.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,7 +84,7 @@ public static function initialize()
 $files = service('locator')->search('Config/Events.php');
 }

 $files = array_filter(array_map(static function (string $file) {
 $files = array_filter(array_map(static function (string $file): false|string {
 if (is_file($file)) {
 return realpath($file) ?: $file;
 }
Expand Down

2 changes: 1 addition & 1 deletion
system/HTTP/ContentSecurityPolicy.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -713,7 +713,7 @@ protected function generateNonces(ResponseInterface $response)
 $pattern = '/(' . preg_quote($this->styleNonceTag, '/')
 . '|' . preg_quote($this->scriptNonceTag, '/') . ')/';

 $body = preg_replace_callback($pattern, function ($match) {
 $body = preg_replace_callback($pattern, function ($match): string {
 $nonce = $match[0] === $this->styleNonceTag ? $this->getStyleNonce() : $this->getScriptNonce();

 return "nonce=\"{$nonce}\"";
Expand Down

2 changes: 1 addition & 1 deletion
system/HTTP/Negotiate.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -233,7 +233,7 @@ public function parseHeader(string $header): array
 }

 // Sort to get the highest results first
 usort($results, static function ($a, $b) {
 usort($results, static function ($a, $b): int {
 if ($a['q'] === $b['q']) {
 $aAst = substr_count($a['value'], '*');
 $bAst = substr_count($b['value'], '*');
Expand Down

2 changes: 1 addition & 1 deletion
system/Helpers/Array/ArrayHelper.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -307,7 +307,7 @@ public static function recursiveCount(array $array, int $counter = 0): int
 */
 public static function sortValuesByNatural(array &$array, $sortByIndex = null): bool
 {
 return usort($array, static function ($currentValue, $nextValue) use ($sortByIndex) {
 return usort($array, static function ($currentValue, $nextValue) use ($sortByIndex): int {
 if ($sortByIndex !== null) {
 return strnatcmp((string) $currentValue[$sortByIndex], (string) $nextValue[$sortByIndex]);
 }
Expand Down

2 changes: 1 addition & 1 deletion
system/Router/Router.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -433,7 +433,7 @@ protected function checkRoutes(string $uri): bool
 // Is this route supposed to redirect to another?
 if ($this->collection->isRedirect($routeKey)) {
 // replacing matched route groups with references: post/([0-9]+) -> post/$1
 $redirectTo = preg_replace_callback('/(\([^\(]+\))/', static function () {
 $redirectTo = preg_replace_callback('/(\([^\(]+\))/', static function (): string {
 static $i = 1;

 return '$' . $i++;
Expand Down

2 changes: 1 addition & 1 deletion
system/View/Parser.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -534,7 +534,7 @@ protected function replaceSingle($pattern, $content, $template, bool $escape = f
 $content = (string) $content;

 // Replace the content in the template
 return preg_replace_callback($pattern, function ($matches) use ($content, $escape) {
 return preg_replace_callback($pattern, function ($matches) use ($content, $escape): string {
 // Check for {! !} syntax to not escape this one.
 if (
 str_starts_with($matches[0], $this->leftDelimiter . '!')
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/Utilities/NamespacesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ protected function tearDown(): void
 */
 protected function getBuffer()
 {
 return preg_replace_callback('/(\|\s*[^|]+\s*\|\s*)(.*?)(\s*\|\s*[^|]+\s*\|)/', static function (array $matches) {
 return preg_replace_callback('/(\|\s*[^|]+\s*\|\s*)(.*?)(\s*\|\s*[^|]+\s*\|)/', static function (array $matches): string {
 $matches[2] = str_replace(DIRECTORY_SEPARATOR, '/', $matches[2]);

 return $matches[1] . $matches[2] . $matches[3];
Expand Down

4 changes: 2 additions & 2 deletions
tests/system/DataConverter/DataConverterTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -570,7 +570,7 @@ public function testReconstructObjectWithClosure(): void
 'created_at' => 'datetime',
 'updated_at' => 'datetime',
 ];
 $reconstructor = static function ($array) {
 $reconstructor = static function ($array): User {
 $user = new User();
 $user->fill($array);

Expand DownExpand Up@@ -667,7 +667,7 @@ public function testExtractWithClosure(): void
 'created_at' => 'datetime',
 'updated_at' => 'datetime',
 ];
 $extractor = static function ($obj) {
 $extractor = static function ($obj): array {
 $array['id'] = $obj->id;
 $array['name'] = $obj->name;
 $array['created_at'] = $obj->created_at;
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Debug/TimerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,7 @@ public function testRecordFunctionNoReturn(): void
 public function testRecordFunctionWithReturn(): void
 {
 $timer = new Timer();
 $returnValue = $timer->record('longjohn', static function () {
 $returnValue = $timer->record('longjohn', static function (): string {
 usleep(100000);

 return 'test';
Expand Down

6 changes: 3 additions & 3 deletions
tests/system/Events/EventsTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -121,7 +121,7 @@ public function testCancelEvent(): void

 // This should cancel the flow of events, and leave
 // $result = 1.
 Events::on('foo', static function ($arg) use (&$result) {
 Events::on('foo', static function ($arg) use (&$result): bool {
 $result = 1;

 return false;
Expand All@@ -138,14 +138,14 @@ public function testPriority(): void
 {
 $result = 0;

 Events::on('foo', static function () use (&$result) {
 Events::on('foo', static function () use (&$result): bool {
 $result = 1;

 return false;
 }, EVENT_PRIORITY_NORMAL);
 // Since this has a higher priority, it will
 // run first.
 Events::on('foo', static function () use (&$result) {
 Events::on('foo', static function () use (&$result): bool {
 $result = 2;

 return false;
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -152,7 +152,7 @@ public function testCallValidationTwice(): void
 [
 'POST',
 'section/create',
 static function () {
 static function (): string {
 $validation = Services::validation();
 $validation->setRule('title', 'title', 'required|min_length[3]');

Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Validation/ValidationTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -311,7 +311,7 @@ public function testClosureRuleWithParamError(): void
 $this->validation->setRules([
 'foo' => [
 'required',
 static function ($value, $data, &$error, $field) {
 static function ($value, $data, &$error, $field): bool {
 if ($value !== 'abc') {
 $error = 'The ' . $field . ' value is not "abc"';

Expand Down

6 changes: 3 additions & 3 deletions
tests/system/View/ParserTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -806,7 +806,7 @@ public function testParserPluginClosure(): void

 public function testParserPluginParams(): void
 {
 $this->parser->addPlugin('growth', static function ($str, array $params) {
 $this->parser->addPlugin('growth', static function ($str, array $params): string {
 $step = $params['step'] ?? 1;
 $count = $params['count'] ?? 2;

Expand DownExpand Up@@ -853,7 +853,7 @@ public function testParserSingleTagWithSingleParams(): void

 public function testParserSingleTagWithQuotedParams(): void
 {
 $this->parser->addPlugin('count', static function (array $params = []) {
 $this->parser->addPlugin('count', static function (array $params = []): string {
 $out = '';

 foreach ($params as $index => $param) {
Expand All@@ -870,7 +870,7 @@ public function testParserSingleTagWithQuotedParams(): void

 public function testParserSingleTagWithNamedParams(): void
 {
 $this->parser->addPlugin('read_params', static function (array $params = []) {
 $this->parser->addPlugin('read_params', static function (array $params = []): string {
 $out = '';

 foreach ($params as $index => $param) {
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: enable ClosureReturnTypeRector#9187

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

samsonasik
merged 2 commits into

from

Sep 10, 2024
 Merged


refactor: enable ClosureReturnTypeRector
#9187
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
3f29f28

refactor: enable ClosureReturnTypeRector


samsonasik Sep 10, 2024
8ecbf0d

Fix cs


samsonasik Sep 10, 2024

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


2 changes: 2 additions & 0 deletions
rector.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@
use Rector\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector;
use Rector\TypeDeclaration\Rector\ClassMethod\ReturnNeverTypeRector;
use Rector\TypeDeclaration\Rector\Closure\AddClosureVoidReturnTypeWhereNoReturnRector;
use Rector\TypeDeclaration\Rector\Closure\ClosureReturnTypeRector;
use Rector\TypeDeclaration\Rector\Empty_\EmptyOnNullableObjectToInstanceOfRector;
use Rector\TypeDeclaration\Rector\Function_\AddFunctionVoidReturnTypeWhereNoReturnRector;
use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromAssignsRector;
Expand DownExpand Up@@ -217,6 +218,7 @@
 AddFunctionVoidReturnTypeWhereNoReturnRector::class,
 AddMethodCallBasedStrictParamTypeRector::class,
 TypedPropertyFromAssignsRector::class,
 ClosureReturnTypeRector::class,
 ])
 ->withConfiguredRule(StringClassNameToClassConstantRector::class, [
 // keep '\\' prefix string on string '\Foo\Bar'
Expand Down

6 changes: 3 additions & 3 deletions
system/Database/OCI8/Builder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,12 +109,12 @@ protected function _replace(string $table, array $keys, array $values): string
 {
 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);

 $uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames) {
 $uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

 return ($index->type === 'PRIMARY') && $hasAllFields;
 });
 $replaceableFields = array_filter($keys, static function ($columnName) use ($uniqueIndexes) {
 $replaceableFields = array_filter($keys, static function ($columnName) use ($uniqueIndexes): bool {
 foreach ($uniqueIndexes as $index) {
 if (in_array(trim($columnName, '"'), $index->fields, true)) {
 return false;
Expand DownExpand Up@@ -344,7 +344,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 if (empty($constraints)) {
 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);

 $uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames) {
 $uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

 return ($index->type === 'PRIMARY' || $index->type === 'UNIQUE') && $hasAllFields;
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -113,7 +113,7 @@ public function parameterize(string $sql): string
 // Track our current value
 $count = 0;

 return preg_replace_callback('/\?/', static function ($matches) use (&$count) {
 return preg_replace_callback('/\?/', static function ($matches) use (&$count): string {
 return ':' . ($count++);
 }, $sql);
 }
Expand Down

6 changes: 3 additions & 3 deletions
system/Database/Postgre/Builder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -368,7 +368,7 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $sql .= 'WHERE ' . implode(
 ' AND ',
 array_map(
 static function ($key, $value) use ($table, $alias, $that) {
 static function ($key, $value) use ($table, $alias, $that): string|RawSql {
 if ($value instanceof RawSql && is_string($key)) {
 return $table . '.' . $key . ' = ' . $value;
 }
Expand DownExpand Up@@ -463,7 +463,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $constraints = $this->QBOptions['constraints'] ?? [];

 if (empty($constraints)) {
 $allIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames) {
 $allIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

 return ($index->type === 'UNIQUE' || $index->type === 'PRIMARY') && $hasAllFields;
Expand DownExpand Up@@ -575,7 +575,7 @@ protected function _deleteBatch(string $table, array $keys, array $values): stri
 $sql .= 'WHERE ' . implode(
 ' AND ',
 array_map(
 static function ($key, $value) use ($table, $alias, $that) {
 static function ($key, $value) use ($table, $alias, $that): RawSql|string {
 if ($value instanceof RawSql) {
 return $value;
 }
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,7 +119,7 @@ public function parameterize(string $sql): string
 // Track our current value
 $count = 0;

 return preg_replace_callback('/\?/', static function () use (&$count) {
 return preg_replace_callback('/\?/', static function () use (&$count): string {
 $count++;

 return "\${$count}";
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -699,15 +699,15 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 if (empty($constraints)) {
 $tableIndexes = $this->db->getIndexData($table);

 $uniqueIndexes = array_filter($tableIndexes, static function ($index) use ($fieldNames) {
 $uniqueIndexes = array_filter($tableIndexes, static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

 return $index->type === 'PRIMARY' && $hasAllFields;
 });

 // if no primary found then look for unique - since indexes have no order
 if ($uniqueIndexes === []) {
 $uniqueIndexes = array_filter($tableIndexes, static function ($index) use ($fieldNames) {
 $uniqueIndexes = array_filter($tableIndexes, static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

 return $index->type === 'UNIQUE' && $hasAllFields;
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 if (empty($constraints)) {
 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '`'), $keys);

 $allIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames) {
 $allIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

 return ($index->type === 'PRIMARY' || $index->type === 'UNIQUE') && $hasAllFields;
Expand Down

2 changes: 1 addition & 1 deletion
system/Debug/Toolbar/Collectors/Database.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,7 @@ protected function formatTimelineData(): array
 public function display(): array
 {
 $data = [];
 $data['queries'] = array_map(static function (array $query) {
 $data['queries'] = array_map(static function (array $query): array {
 $isDuplicate = $query['duplicate'] === true;

 $firstNonSystemLine = '';
Expand Down

2 changes: 1 addition & 1 deletion
system/Events/Events.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,7 +84,7 @@ public static function initialize()
 $files = service('locator')->search('Config/Events.php');
 }

 $files = array_filter(array_map(static function (string $file) {
 $files = array_filter(array_map(static function (string $file): false|string {
 if (is_file($file)) {
 return realpath($file) ?: $file;
 }
Expand Down

2 changes: 1 addition & 1 deletion
system/HTTP/ContentSecurityPolicy.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -713,7 +713,7 @@ protected function generateNonces(ResponseInterface $response)
 $pattern = '/(' . preg_quote($this->styleNonceTag, '/')
 . '|' . preg_quote($this->scriptNonceTag, '/') . ')/';

 $body = preg_replace_callback($pattern, function ($match) {
 $body = preg_replace_callback($pattern, function ($match): string {
 $nonce = $match[0] === $this->styleNonceTag ? $this->getStyleNonce() : $this->getScriptNonce();

 return "nonce=\"{$nonce}\"";
Expand Down

2 changes: 1 addition & 1 deletion
system/HTTP/Negotiate.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -233,7 +233,7 @@ public function parseHeader(string $header): array
 }

 // Sort to get the highest results first
 usort($results, static function ($a, $b) {
 usort($results, static function ($a, $b): int {
 if ($a['q'] === $b['q']) {
 $aAst = substr_count($a['value'], '*');
 $bAst = substr_count($b['value'], '*');
Expand Down

2 changes: 1 addition & 1 deletion
system/Helpers/Array/ArrayHelper.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -307,7 +307,7 @@ public static function recursiveCount(array $array, int $counter = 0): int
 */
 public static function sortValuesByNatural(array &$array, $sortByIndex = null): bool
 {
 return usort($array, static function ($currentValue, $nextValue) use ($sortByIndex) {
 return usort($array, static function ($currentValue, $nextValue) use ($sortByIndex): int {
 if ($sortByIndex !== null) {
 return strnatcmp((string) $currentValue[$sortByIndex], (string) $nextValue[$sortByIndex]);
 }
Expand Down

2 changes: 1 addition & 1 deletion
system/Router/Router.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -433,7 +433,7 @@ protected function checkRoutes(string $uri): bool
 // Is this route supposed to redirect to another?
 if ($this->collection->isRedirect($routeKey)) {
 // replacing matched route groups with references: post/([0-9]+) -> post/$1
 $redirectTo = preg_replace_callback('/(\([^\(]+\))/', static function () {
 $redirectTo = preg_replace_callback('/(\([^\(]+\))/', static function (): string {
 static $i = 1;

 return '$' . $i++;
Expand Down

2 changes: 1 addition & 1 deletion
system/View/Parser.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -534,7 +534,7 @@ protected function replaceSingle($pattern, $content, $template, bool $escape = f
 $content = (string) $content;

 // Replace the content in the template
 return preg_replace_callback($pattern, function ($matches) use ($content, $escape) {
 return preg_replace_callback($pattern, function ($matches) use ($content, $escape): string {
 // Check for {! !} syntax to not escape this one.
 if (
 str_starts_with($matches[0], $this->leftDelimiter . '!')
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/Utilities/NamespacesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ protected function tearDown(): void
 */
 protected function getBuffer()
 {
 return preg_replace_callback('/(\|\s*[^|]+\s*\|\s*)(.*?)(\s*\|\s*[^|]+\s*\|)/', static function (array $matches) {
 return preg_replace_callback('/(\|\s*[^|]+\s*\|\s*)(.*?)(\s*\|\s*[^|]+\s*\|)/', static function (array $matches): string {
 $matches[2] = str_replace(DIRECTORY_SEPARATOR, '/', $matches[2]);

 return $matches[1] . $matches[2] . $matches[3];
Expand Down

4 changes: 2 additions & 2 deletions
tests/system/DataConverter/DataConverterTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -570,7 +570,7 @@ public function testReconstructObjectWithClosure(): void
 'created_at' => 'datetime',
 'updated_at' => 'datetime',
 ];
 $reconstructor = static function ($array) {
 $reconstructor = static function ($array): User {
 $user = new User();
 $user->fill($array);

Expand DownExpand Up@@ -667,7 +667,7 @@ public function testExtractWithClosure(): void
 'created_at' => 'datetime',
 'updated_at' => 'datetime',
 ];
 $extractor = static function ($obj) {
 $extractor = static function ($obj): array {
 $array['id'] = $obj->id;
 $array['name'] = $obj->name;
 $array['created_at'] = $obj->created_at;
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Debug/TimerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,7 @@ public function testRecordFunctionNoReturn(): void
 public function testRecordFunctionWithReturn(): void
 {
 $timer = new Timer();
 $returnValue = $timer->record('longjohn', static function () {
 $returnValue = $timer->record('longjohn', static function (): string {
 usleep(100000);

 return 'test';
Expand Down

6 changes: 3 additions & 3 deletions
tests/system/Events/EventsTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -121,7 +121,7 @@ public function testCancelEvent(): void

 // This should cancel the flow of events, and leave
 // $result = 1.
 Events::on('foo', static function ($arg) use (&$result) {
 Events::on('foo', static function ($arg) use (&$result): bool {
 $result = 1;

 return false;
Expand All@@ -138,14 +138,14 @@ public function testPriority(): void
 {
 $result = 0;

 Events::on('foo', static function () use (&$result) {
 Events::on('foo', static function () use (&$result): bool {
 $result = 1;

 return false;
 }, EVENT_PRIORITY_NORMAL);
 // Since this has a higher priority, it will
 // run first.
 Events::on('foo', static function () use (&$result) {
 Events::on('foo', static function () use (&$result): bool {
 $result = 2;

 return false;
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -152,7 +152,7 @@ public function testCallValidationTwice(): void
 [
 'POST',
 'section/create',
 static function () {
 static function (): string {
 $validation = Services::validation();
 $validation->setRule('title', 'title', 'required|min_length[3]');

Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Validation/ValidationTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -311,7 +311,7 @@ public function testClosureRuleWithParamError(): void
 $this->validation->setRules([
 'foo' => [
 'required',
 static function ($value, $data, &$error, $field) {
 static function ($value, $data, &$error, $field): bool {
 if ($value !== 'abc') {
 $error = 'The ' . $field . ' value is not "abc"';

Expand Down

6 changes: 3 additions & 3 deletions
tests/system/View/ParserTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -806,7 +806,7 @@ public function testParserPluginClosure(): void

 public function testParserPluginParams(): void
 {
 $this->parser->addPlugin('growth', static function ($str, array $params) {
 $this->parser->addPlugin('growth', static function ($str, array $params): string {
 $step = $params['step'] ?? 1;
 $count = $params['count'] ?? 2;

Expand DownExpand Up@@ -853,7 +853,7 @@ public function testParserSingleTagWithSingleParams(): void

 public function testParserSingleTagWithQuotedParams(): void
 {
 $this->parser->addPlugin('count', static function (array $params = []) {
 $this->parser->addPlugin('count', static function (array $params = []): string {
 $out = '';

 foreach ($params as $index => $param) {
Expand All@@ -870,7 +870,7 @@ public function testParserSingleTagWithQuotedParams(): void

 public function testParserSingleTagWithNamedParams(): void
 {
 $this->parser->addPlugin('read_params', static function (array $params = []) {
 $this->parser->addPlugin('read_params', static function (array $params = []): string {
 $out = '';

 foreach ($params as $index => $param) {
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: enable ClosureReturnTypeRector#9187

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

samsonasik
merged 2 commits into

from

Sep 10, 2024
 Merged


refactor: enable ClosureReturnTypeRector
#9187
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
3f29f28

refactor: enable ClosureReturnTypeRector


samsonasik Sep 10, 2024
8ecbf0d

Fix cs


samsonasik Sep 10, 2024

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


2 changes: 2 additions & 0 deletions
rector.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@
use Rector\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector;
use Rector\TypeDeclaration\Rector\ClassMethod\ReturnNeverTypeRector;
use Rector\TypeDeclaration\Rector\Closure\AddClosureVoidReturnTypeWhereNoReturnRector;
use Rector\TypeDeclaration\Rector\Closure\ClosureReturnTypeRector;
use Rector\TypeDeclaration\Rector\Empty_\EmptyOnNullableObjectToInstanceOfRector;
use Rector\TypeDeclaration\Rector\Function_\AddFunctionVoidReturnTypeWhereNoReturnRector;
use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromAssignsRector;
Expand DownExpand Up@@ -217,6 +218,7 @@
 AddFunctionVoidReturnTypeWhereNoReturnRector::class,
 AddMethodCallBasedStrictParamTypeRector::class,
 TypedPropertyFromAssignsRector::class,
 ClosureReturnTypeRector::class,
 ])
 ->withConfiguredRule(StringClassNameToClassConstantRector::class, [
 // keep '\\' prefix string on string '\Foo\Bar'
Expand Down

6 changes: 3 additions & 3 deletions
system/Database/OCI8/Builder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,12 +109,12 @@ protected function _replace(string $table, array $keys, array $values): string
 {
 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);

 $uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames) {
 $uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

 return ($index->type === 'PRIMARY') && $hasAllFields;
 });
 $replaceableFields = array_filter($keys, static function ($columnName) use ($uniqueIndexes) {
 $replaceableFields = array_filter($keys, static function ($columnName) use ($uniqueIndexes): bool {
 foreach ($uniqueIndexes as $index) {
 if (in_array(trim($columnName, '"'), $index->fields, true)) {
 return false;
Expand DownExpand Up@@ -344,7 +344,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 if (empty($constraints)) {
 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);

 $uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames) {
 $uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

 return ($index->type === 'PRIMARY' || $index->type === 'UNIQUE') && $hasAllFields;
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -113,7 +113,7 @@ public function parameterize(string $sql): string
 // Track our current value
 $count = 0;

 return preg_replace_callback('/\?/', static function ($matches) use (&$count) {
 return preg_replace_callback('/\?/', static function ($matches) use (&$count): string {
 return ':' . ($count++);
 }, $sql);
 }
Expand Down

6 changes: 3 additions & 3 deletions
system/Database/Postgre/Builder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -368,7 +368,7 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $sql .= 'WHERE ' . implode(
 ' AND ',
 array_map(
 static function ($key, $value) use ($table, $alias, $that) {
 static function ($key, $value) use ($table, $alias, $that): string|RawSql {
 if ($value instanceof RawSql && is_string($key)) {
 return $table . '.' . $key . ' = ' . $value;
 }
Expand DownExpand Up@@ -463,7 +463,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $constraints = $this->QBOptions['constraints'] ?? [];

 if (empty($constraints)) {
 $allIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames) {
 $allIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

 return ($index->type === 'UNIQUE' || $index->type === 'PRIMARY') && $hasAllFields;
Expand DownExpand Up@@ -575,7 +575,7 @@ protected function _deleteBatch(string $table, array $keys, array $values): stri
 $sql .= 'WHERE ' . implode(
 ' AND ',
 array_map(
 static function ($key, $value) use ($table, $alias, $that) {
 static function ($key, $value) use ($table, $alias, $that): RawSql|string {
 if ($value instanceof RawSql) {
 return $value;
 }
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,7 +119,7 @@ public function parameterize(string $sql): string
 // Track our current value
 $count = 0;

 return preg_replace_callback('/\?/', static function () use (&$count) {
 return preg_replace_callback('/\?/', static function () use (&$count): string {
 $count++;

 return "\${$count}";
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -699,15 +699,15 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 if (empty($constraints)) {
 $tableIndexes = $this->db->getIndexData($table);

 $uniqueIndexes = array_filter($tableIndexes, static function ($index) use ($fieldNames) {
 $uniqueIndexes = array_filter($tableIndexes, static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

 return $index->type === 'PRIMARY' && $hasAllFields;
 });

 // if no primary found then look for unique - since indexes have no order
 if ($uniqueIndexes === []) {
 $uniqueIndexes = array_filter($tableIndexes, static function ($index) use ($fieldNames) {
 $uniqueIndexes = array_filter($tableIndexes, static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

 return $index->type === 'UNIQUE' && $hasAllFields;
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 if (empty($constraints)) {
 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '`'), $keys);

 $allIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames) {
 $allIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);

 return ($index->type === 'PRIMARY' || $index->type === 'UNIQUE') && $hasAllFields;
Expand Down

2 changes: 1 addition & 1 deletion
system/Debug/Toolbar/Collectors/Database.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,7 @@ protected function formatTimelineData(): array
 public function display(): array
 {
 $data = [];
 $data['queries'] = array_map(static function (array $query) {
 $data['queries'] = array_map(static function (array $query): array {
 $isDuplicate = $query['duplicate'] === true;

 $firstNonSystemLine = '';
Expand Down

2 changes: 1 addition & 1 deletion
system/Events/Events.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,7 +84,7 @@ public static function initialize()
 $files = service('locator')->search('Config/Events.php');
 }

 $files = array_filter(array_map(static function (string $file) {
 $files = array_filter(array_map(static function (string $file): false|string {
 if (is_file($file)) {
 return realpath($file) ?: $file;
 }
Expand Down

2 changes: 1 addition & 1 deletion
system/HTTP/ContentSecurityPolicy.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -713,7 +713,7 @@ protected function generateNonces(ResponseInterface $response)
 $pattern = '/(' . preg_quote($this->styleNonceTag, '/')
 . '|' . preg_quote($this->scriptNonceTag, '/') . ')/';

 $body = preg_replace_callback($pattern, function ($match) {
 $body = preg_replace_callback($pattern, function ($match): string {
 $nonce = $match[0] === $this->styleNonceTag ? $this->getStyleNonce() : $this->getScriptNonce();

 return "nonce=\"{$nonce}\"";
Expand Down

2 changes: 1 addition & 1 deletion
system/HTTP/Negotiate.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -233,7 +233,7 @@ public function parseHeader(string $header): array
 }

 // Sort to get the highest results first
 usort($results, static function ($a, $b) {
 usort($results, static function ($a, $b): int {
 if ($a['q'] === $b['q']) {
 $aAst = substr_count($a['value'], '*');
 $bAst = substr_count($b['value'], '*');
Expand Down

2 changes: 1 addition & 1 deletion
system/Helpers/Array/ArrayHelper.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -307,7 +307,7 @@ public static function recursiveCount(array $array, int $counter = 0): int
 */
 public static function sortValuesByNatural(array &$array, $sortByIndex = null): bool
 {
 return usort($array, static function ($currentValue, $nextValue) use ($sortByIndex) {
 return usort($array, static function ($currentValue, $nextValue) use ($sortByIndex): int {
 if ($sortByIndex !== null) {
 return strnatcmp((string) $currentValue[$sortByIndex], (string) $nextValue[$sortByIndex]);
 }
Expand Down

2 changes: 1 addition & 1 deletion
system/Router/Router.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -433,7 +433,7 @@ protected function checkRoutes(string $uri): bool
 // Is this route supposed to redirect to another?
 if ($this->collection->isRedirect($routeKey)) {
 // replacing matched route groups with references: post/([0-9]+) -> post/$1
 $redirectTo = preg_replace_callback('/(\([^\(]+\))/', static function () {
 $redirectTo = preg_replace_callback('/(\([^\(]+\))/', static function (): string {
 static $i = 1;

 return '$' . $i++;
Expand Down

2 changes: 1 addition & 1 deletion
system/View/Parser.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -534,7 +534,7 @@ protected function replaceSingle($pattern, $content, $template, bool $escape = f
 $content = (string) $content;

 // Replace the content in the template
 return preg_replace_callback($pattern, function ($matches) use ($content, $escape) {
 return preg_replace_callback($pattern, function ($matches) use ($content, $escape): string {
 // Check for {! !} syntax to not escape this one.
 if (
 str_starts_with($matches[0], $this->leftDelimiter . '!')
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Commands/Utilities/NamespacesTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ protected function tearDown(): void
 */
 protected function getBuffer()
 {
 return preg_replace_callback('/(\|\s*[^|]+\s*\|\s*)(.*?)(\s*\|\s*[^|]+\s*\|)/', static function (array $matches) {
 return preg_replace_callback('/(\|\s*[^|]+\s*\|\s*)(.*?)(\s*\|\s*[^|]+\s*\|)/', static function (array $matches): string {
 $matches[2] = str_replace(DIRECTORY_SEPARATOR, '/', $matches[2]);

 return $matches[1] . $matches[2] . $matches[3];
Expand Down

4 changes: 2 additions & 2 deletions
tests/system/DataConverter/DataConverterTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -570,7 +570,7 @@ public function testReconstructObjectWithClosure(): void
 'created_at' => 'datetime',
 'updated_at' => 'datetime',
 ];
 $reconstructor = static function ($array) {
 $reconstructor = static function ($array): User {
 $user = new User();
 $user->fill($array);

Expand DownExpand Up@@ -667,7 +667,7 @@ public function testExtractWithClosure(): void
 'created_at' => 'datetime',
 'updated_at' => 'datetime',
 ];
 $extractor = static function ($obj) {
 $extractor = static function ($obj): array {
 $array['id'] = $obj->id;
 $array['name'] = $obj->name;
 $array['created_at'] = $obj->created_at;
Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Debug/TimerTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,7 @@ public function testRecordFunctionNoReturn(): void
 public function testRecordFunctionWithReturn(): void
 {
 $timer = new Timer();
 $returnValue = $timer->record('longjohn', static function () {
 $returnValue = $timer->record('longjohn', static function (): string {
 usleep(100000);

 return 'test';
Expand Down

6 changes: 3 additions & 3 deletions
tests/system/Events/EventsTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -121,7 +121,7 @@ public function testCancelEvent(): void

 // This should cancel the flow of events, and leave
 // $result = 1.
 Events::on('foo', static function ($arg) use (&$result) {
 Events::on('foo', static function ($arg) use (&$result): bool {
 $result = 1;

 return false;
Expand All@@ -138,14 +138,14 @@ public function testPriority(): void
 {
 $result = 0;

 Events::on('foo', static function () use (&$result) {
 Events::on('foo', static function () use (&$result): bool {
 $result = 1;

 return false;
 }, EVENT_PRIORITY_NORMAL);
 // Since this has a higher priority, it will
 // run first.
 Events::on('foo', static function () use (&$result) {
 Events::on('foo', static function () use (&$result): bool {
 $result = 2;

 return false;
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -152,7 +152,7 @@ public function testCallValidationTwice(): void
 [
 'POST',
 'section/create',
 static function () {
 static function (): string {
 $validation = Services::validation();
 $validation->setRule('title', 'title', 'required|min_length[3]');

Expand Down

2 changes: 1 addition & 1 deletion
tests/system/Validation/ValidationTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -311,7 +311,7 @@ public function testClosureRuleWithParamError(): void
 $this->validation->setRules([
 'foo' => [
 'required',
 static function ($value, $data, &$error, $field) {
 static function ($value, $data, &$error, $field): bool {
 if ($value !== 'abc') {
 $error = 'The ' . $field . ' value is not "abc"';

Expand Down

6 changes: 3 additions & 3 deletions
tests/system/View/ParserTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -806,7 +806,7 @@ public function testParserPluginClosure(): void

 public function testParserPluginParams(): void
 {
 $this->parser->addPlugin('growth', static function ($str, array $params) {
 $this->parser->addPlugin('growth', static function ($str, array $params): string {
 $step = $params['step'] ?? 1;
 $count = $params['count'] ?? 2;

Expand DownExpand Up@@ -853,7 +853,7 @@ public function testParserSingleTagWithSingleParams(): void

 public function testParserSingleTagWithQuotedParams(): void
 {
 $this->parser->addPlugin('count', static function (array $params = []) {
 $this->parser->addPlugin('count', static function (array $params = []): string {
 $out = '';

 foreach ($params as $index => $param) {
Expand All@@ -870,7 +870,7 @@ public function testParserSingleTagWithQuotedParams(): void

 public function testParserSingleTagWithNamedParams(): void
 {
 $this->parser->addPlugin('read_params', static function (array $params = []) {
 $this->parser->addPlugin('read_params', static function (array $params = []): string {
 $out = '';

 foreach ($params as $index => $param) {
Expand Down