Skip to content

chore: update rector.php#560

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
kenjis merged 11 commits into from
Dec 17, 2022
Merged

chore: update rector.php #560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d7a621c
chore: add declare(strict_types=1) in rector.php
kenjis Dec 14, 2022
e646b54
chore: remove deprecated TypedPropertyRector
kenjis Dec 14, 2022
61a6e6b
chore: add rector.php to php-cs-fixer
kenjis Dec 15, 2022
a0fe79d
chore: update rector version
kenjis Dec 15, 2022
7813e68
chore: add rector rules
kenjis Dec 15, 2022
e48867b
test: remove unused property
kenjis Dec 15, 2022
6668d6c
test: run rector
kenjis Dec 15, 2022
0561a63
chore: add rector rules
kenjis Dec 15, 2022
6dfb295
chore: skip AnnotationWithValueToAttributeRector
kenjis Dec 15, 2022
a319eb0
test: run rector
kenjis Dec 15, 2022
23c2527
chore: remove TypedPropertyFromAssignsRector config
kenjis Dec 16, 2022
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: 1 addition & 1 deletion .github/workflows/rector.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,5 +63,5 @@ jobs:

- name: Analyze for refactoring
run: |
composer global require --dev rector/rector:^0.13.3
composer global require --dev rector/rector:^0.15.1
rector process --dry-run --no-progress-bar
5 changes: 4 additions & 1 deletion .php-cs-fixer.dist.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,10 @@
__DIR__ . '/tests/',
])
->exclude('build')
->append([__FILE__]);
->append([
__FILE__,
__DIR__ . '/rector.php',
]);

$overrides = [
'declare_strict_types' => true,
Expand Down
26 changes: 20 additions & 6 deletions rector.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
<?php

declare(strict_types=1);

use Rector\CodeQuality\Rector\BooleanAnd\SimplifyEmptyArrayCheckRector;
use Rector\CodeQuality\Rector\Class_\CompleteDynamicPropertiesRector;
use Rector\CodeQuality\Rector\Expression\InlineIfToExplicitIfRector;
use Rector\CodeQuality\Rector\For_\ForToForeachRector;
use Rector\CodeQuality\Rector\Foreach_\UnusedForeachValueToArrayKeysRector;
Expand DownExpand Up@@ -30,15 +33,23 @@
use Rector\Php56\Rector\FunctionLike\AddDefaultValueForUndefinedVariableRector;
use Rector\Php73\Rector\FuncCall\JsonThrowOnErrorRector;
use Rector\Php73\Rector\FuncCall\StringifyStrNeedlesRector;
use Rector\Php74\Rector\Property\TypedPropertyRector;
use Rector\PHPUnit\Rector\Class_\AnnotationWithValueToAttributeRector;
use Rector\PHPUnit\Set\PHPUnitSetList;
use Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector;
use Rector\PSR4\Rector\FileWithoutNamespace\NormalizeNamespaceByPSR4ComposerAutoloadRector;
use Rector\Set\ValueObject\LevelSetList;
use Rector\Set\ValueObject\SetList;

return static function (RectorConfig $rectorConfig): void {
$rectorConfig->sets([SetList::DEAD_CODE, LevelSetList::UP_TO_PHP_74, PHPUnitSetList::PHPUNIT_SPECIFIC_METHOD, PHPUnitSetList::PHPUNIT_80]);
$rectorConfig->sets([
SetList::DEAD_CODE,
LevelSetList::UP_TO_PHP_74,
PHPUnitSetList::PHPUNIT_SPECIFIC_METHOD,
PHPUnitSetList::PHPUNIT_100,
]);

$rectorConfig->parallel();

// The paths to refactor (can also be supplied with CLI arguments)
$rectorConfig->paths([
__DIR__ . '/src/',
Expand DownExpand Up@@ -74,6 +85,7 @@

// Note: requires php 8
RemoveUnusedPromotedPropertyRector::class,
AnnotationWithValueToAttributeRector::class,

// Ignore tests that might make calls without a result
RemoveEmptyMethodCallRector::class => [
Expand All@@ -97,6 +109,9 @@
__DIR__ . '/src/Models/UserModel.php',
],
]);
// auto import fully qualified class names
$rectorConfig->importNames();

$rectorConfig->rule(SimplifyUselessVariableRector::class);
$rectorConfig->rule(RemoveAlwaysElseRector::class);
$rectorConfig->rule(CountArrayToEmptyArrayComparisonRector::class);
Expand All@@ -119,8 +134,7 @@
$rectorConfig->rule(MakeInheritedMethodVisibilitySameAsParentRector::class);
$rectorConfig->rule(SimplifyEmptyArrayCheckRector::class);
$rectorConfig->rule(NormalizeNamespaceByPSR4ComposerAutoloadRector::class);
$rectorConfig
->ruleWithConfiguration(TypedPropertyRector::class, [
TypedPropertyRector::INLINE_PUBLIC => false,
]);
$rectorConfig->rule(StringClassNameToClassConstantRector::class);
$rectorConfig->rule(PrivatizeFinalClassPropertyRector::class);
$rectorConfig->rule(CompleteDynamicPropertiesRector::class);
};
2 changes: 1 addition & 1 deletion tests/Authentication/AuthenticationTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
*/
final class AuthenticationTest extends DatabaseTestCase
{
protected Authentication $auth;
private Authentication $auth;

protected function setUp(): void
{
Expand Down
2 changes: 1 addition & 1 deletion tests/Authentication/Authenticators/AccessTokenAuthenticatorTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@
*/
final class AccessTokenAuthenticatorTest extends DatabaseTestCase
{
protected AccessTokens $auth;
private AccessTokens $auth;

protected function setUp(): void
{
Expand Down
4 changes: 2 additions & 2 deletions tests/Authentication/Authenticators/SessionAuthenticatorTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,9 +27,9 @@ final class SessionAuthenticatorTest extends TestCase
use DatabaseTestTrait;
use FakeUser;

protected Session $auth;
private Session $auth;
protected $namespace;
protected $events;
private MockEvents $events;

protected function setUp(): void
{
Expand Down
1 change: 1 addition & 0 deletions tests/Authentication/Filters/AbstractFilterTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ abstract class AbstractFilterTest extends TestCase
use FeatureTestTrait;
use AuthenticationTesting;

protected string $routeFilter;
protected $namespace;
protected string $alias;
protected string $classname;
Expand Down
2 changes: 1 addition & 1 deletion tests/Authentication/HasAccessTokensTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@
*/
final class HasAccessTokensTest extends DatabaseTestCase
{
protected User $user;
private User $user;

protected function setUp(): void
{
Expand Down
3 changes: 0 additions & 3 deletions tests/Authorization/AuthorizableTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,14 +23,11 @@ final class AuthorizableTest extends TestCase

protected $refresh = true;
protected $namespace;
protected UserModel $model;

protected function setUp(): void
{
parent::setUp();

$this->model = new UserModel();

// Refresh should take care of this....
db_connect()->table('auth_groups_users')->truncate();
db_connect()->table('auth_permissions_users')->truncate();
Expand Down
4 changes: 2 additions & 2 deletions tests/Language/AbstractTranslationTestCase.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -305,12 +305,12 @@ final public function testAllConfiguredLanguageKeysAreInOrder(string $locale): v
/**
* @return string[][]
*/
final public function localesProvider(): iterable
final public static function localesProvider(): iterable
Comment thread
MGatner marked this conversation as resolved.
{
$locale = self::$locales[static::class] ?? null;

if (null === $locale) {
$this->fail('The locale code should be defined in the $locales property.');
static::fail('The locale code should be defined in the $locales property.');
}

return [$locale => [$locale]];
Expand Down
4 changes: 2 additions & 2 deletions tests/Unit/CompositionValidatorTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,8 +14,8 @@
*/
final class CompositionValidatorTest extends TestCase
{
protected CompositionValidator $validator;
protected Auth $config;
private CompositionValidator $validator;
private Auth $config;

protected function setUp(): void
{
Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/DictionaryValidatorTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
*/
final class DictionaryValidatorTest extends CIUnitTestCase
{
protected DictionaryValidator $validator;
private DictionaryValidator $validator;

protected function setUp(): void
{
Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/FilterInCliTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ public function testWhenInCliDoNothing(FilterInterface $filter): void
$filter->before($clirequest);
}

public function filterProvider(): Generator
public static function filterProvider(): Generator
{
yield from [
[new AuthRates()],
Expand Down
8 changes: 4 additions & 4 deletions tests/Unit/NothingPersonalValidatorTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@
*/
final class NothingPersonalValidatorTest extends CIUnitTestCase
{
protected NothingPersonalValidator $validator;
private NothingPersonalValidator $validator;

protected function setUp(): void
{
Expand DownExpand Up@@ -180,7 +180,7 @@ public function testIsNotPersonalFalsePositivesCaughtByIsNotSimilar($password):
$this->assertNotSame($isNotPersonal, $isNotSimilar);
}

public function passwordProvider(): array
public static function passwordProvider(): array
{
return [
['JoeTheCaptain'],
Expand DownExpand Up@@ -225,7 +225,7 @@ public function testConfigPersonalFieldsValues($firstName, $lastName, $expected)
$this->assertSame($expected, $result->isOK());
}

public function firstLastNameProvider()
public static function firstLastNameProvider()
{
return [
[
Expand DownExpand Up@@ -275,7 +275,7 @@ public function testMaxSimilarityZeroTurnsOffSimilarityCalculation($maxSimilarit
$this->assertSame($expected, $result->isOK());
}

public function maxSimilarityProvider()
public static function maxSimilarityProvider()
{
return [
[
Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/PwnedValidatorTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@
*/
final class PwnedValidatorTest extends CIUnitTestCase
{
protected PwnedValidator $validator;
private PwnedValidator $validator;

protected function setUp(): void
{
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
chore: update rector.php by kenjis · Pull Request #560 · codeigniter4/shield · GitHub
Skip to content
chore: update rector.php#560

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

kenjis
merged 11 commits into

from

Dec 17, 2022
 Merged


chore: update rector.php
#560
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
d7a621c

chore: add declare(strict_types=1) in rector.php


kenjis Dec 14, 2022
e646b54

chore: remove deprecated TypedPropertyRector


kenjis Dec 14, 2022
61a6e6b

chore: add rector.php to php-cs-fixer


kenjis Dec 15, 2022
a0fe79d

chore: update rector version


kenjis Dec 15, 2022
7813e68

chore: add rector rules


kenjis Dec 15, 2022
e48867b

test: remove unused property


kenjis Dec 15, 2022
6668d6c

test: run rector


kenjis Dec 15, 2022
0561a63

chore: add rector rules


kenjis Dec 15, 2022
6dfb295

chore: skip AnnotationWithValueToAttributeRector


kenjis Dec 15, 2022
a319eb0

test: run rector


kenjis Dec 15, 2022
23c2527

chore: remove TypedPropertyFromAssignsRector config


kenjis Dec 16, 2022

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: 1 addition & 1 deletion
.github/workflows/rector.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,5 +63,5 @@ jobs:

 - name: Analyze for refactoring
 run: |
 composer global require --dev rector/rector:^0.13.3
 composer global require --dev rector/rector:^0.15.1
 rector process --dry-run --no-progress-bar

5 changes: 4 additions & 1 deletion
.php-cs-fixer.dist.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,10 @@
 __DIR__ . '/tests/',
 ])
 ->exclude('build')
 ->append([__FILE__]);
 ->append([
 __FILE__,
 __DIR__ . '/rector.php',
 ]);

$overrides = [
 'declare_strict_types' => true,
Expand Down

26 changes: 20 additions & 6 deletions
rector.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
<?php

declare(strict_types=1);

use Rector\CodeQuality\Rector\BooleanAnd\SimplifyEmptyArrayCheckRector;
use Rector\CodeQuality\Rector\Class_\CompleteDynamicPropertiesRector;
use Rector\CodeQuality\Rector\Expression\InlineIfToExplicitIfRector;
use Rector\CodeQuality\Rector\For_\ForToForeachRector;
use Rector\CodeQuality\Rector\Foreach_\UnusedForeachValueToArrayKeysRector;
Expand DownExpand Up@@ -30,15 +33,23 @@
use Rector\Php56\Rector\FunctionLike\AddDefaultValueForUndefinedVariableRector;
use Rector\Php73\Rector\FuncCall\JsonThrowOnErrorRector;
use Rector\Php73\Rector\FuncCall\StringifyStrNeedlesRector;
use Rector\Php74\Rector\Property\TypedPropertyRector;
use Rector\PHPUnit\Rector\Class_\AnnotationWithValueToAttributeRector;
use Rector\PHPUnit\Set\PHPUnitSetList;
use Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector;
use Rector\PSR4\Rector\FileWithoutNamespace\NormalizeNamespaceByPSR4ComposerAutoloadRector;
use Rector\Set\ValueObject\LevelSetList;
use Rector\Set\ValueObject\SetList;

return static function (RectorConfig $rectorConfig): void {
 $rectorConfig->sets([SetList::DEAD_CODE, LevelSetList::UP_TO_PHP_74, PHPUnitSetList::PHPUNIT_SPECIFIC_METHOD, PHPUnitSetList::PHPUNIT_80]);
 $rectorConfig->sets([
 SetList::DEAD_CODE,
 LevelSetList::UP_TO_PHP_74,
 PHPUnitSetList::PHPUNIT_SPECIFIC_METHOD,
 PHPUnitSetList::PHPUNIT_100,
 ]);

 $rectorConfig->parallel();

 // The paths to refactor (can also be supplied with CLI arguments)
 $rectorConfig->paths([
 __DIR__ . '/src/',
Expand DownExpand Up@@ -74,6 +85,7 @@

 // Note: requires php 8
 RemoveUnusedPromotedPropertyRector::class,
 AnnotationWithValueToAttributeRector::class,

 // Ignore tests that might make calls without a result
 RemoveEmptyMethodCallRector::class => [
Expand All@@ -97,6 +109,9 @@
 __DIR__ . '/src/Models/UserModel.php',
 ],
 ]);
 // auto import fully qualified class names
 $rectorConfig->importNames();

 $rectorConfig->rule(SimplifyUselessVariableRector::class);
 $rectorConfig->rule(RemoveAlwaysElseRector::class);
 $rectorConfig->rule(CountArrayToEmptyArrayComparisonRector::class);
Expand All@@ -119,8 +134,7 @@
 $rectorConfig->rule(MakeInheritedMethodVisibilitySameAsParentRector::class);
 $rectorConfig->rule(SimplifyEmptyArrayCheckRector::class);
 $rectorConfig->rule(NormalizeNamespaceByPSR4ComposerAutoloadRector::class);
 $rectorConfig
 ->ruleWithConfiguration(TypedPropertyRector::class, [
 TypedPropertyRector::INLINE_PUBLIC => false,
 ]);
 $rectorConfig->rule(StringClassNameToClassConstantRector::class);
 $rectorConfig->rule(PrivatizeFinalClassPropertyRector::class);
 $rectorConfig->rule(CompleteDynamicPropertiesRector::class);
};

2 changes: 1 addition & 1 deletion
tests/Authentication/AuthenticationTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
 */
final class AuthenticationTest extends DatabaseTestCase
{
protected Authentication $auth;
private Authentication $auth;

 protected function setUp(): void
 {
Expand Down

2 changes: 1 addition & 1 deletion
tests/Authentication/Authenticators/AccessTokenAuthenticatorTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@
 */
final class AccessTokenAuthenticatorTest extends DatabaseTestCase
{
protected AccessTokens $auth;
private AccessTokens $auth;

 protected function setUp(): void
 {
Expand Down

4 changes: 2 additions & 2 deletions
tests/Authentication/Authenticators/SessionAuthenticatorTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,9 +27,9 @@ final class SessionAuthenticatorTest extends TestCase
 use DatabaseTestTrait;
 use FakeUser;

protected Session $auth;
private Session $auth;
 protected $namespace;
protected $events;
private MockEvents $events;

 protected function setUp(): void
 {
Expand Down

1 change: 1 addition & 0 deletions
tests/Authentication/Filters/AbstractFilterTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ abstract class AbstractFilterTest extends TestCase
 use FeatureTestTrait;
 use AuthenticationTesting;

 protected string $routeFilter;
 protected $namespace;
 protected string $alias;
 protected string $classname;
Expand Down

2 changes: 1 addition & 1 deletion
tests/Authentication/HasAccessTokensTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@
 */
final class HasAccessTokensTest extends DatabaseTestCase
{
protected User $user;
private User $user;

 protected function setUp(): void
 {
Expand Down

3 changes: 0 additions & 3 deletions
tests/Authorization/AuthorizableTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,14 +23,11 @@ final class AuthorizableTest extends TestCase

 protected $refresh = true;
 protected $namespace;
 protected UserModel $model;

 protected function setUp(): void
 {
 parent::setUp();

 $this->model = new UserModel();

 // Refresh should take care of this....
 db_connect()->table('auth_groups_users')->truncate();
 db_connect()->table('auth_permissions_users')->truncate();
Expand Down

4 changes: 2 additions & 2 deletions
tests/Language/AbstractTranslationTestCase.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -305,12 +305,12 @@ final public function testAllConfiguredLanguageKeysAreInOrder(string $locale): v
 /**
 * @return string[][]
 */
 final public function localesProvider(): iterable
 final public static function localesProvider(): iterable
Comment thread
MGatner marked this conversation as resolved.

 {
 $locale = self::$locales[static::class] ?? null;

 if (null === $locale) {
$this->fail('The locale code should be defined in the $locales property.');
static::fail('The locale code should be defined in the $locales property.');
 }

 return [$locale => [$locale]];
Expand Down

4 changes: 2 additions & 2 deletions
tests/Unit/CompositionValidatorTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,8 +14,8 @@
 */
final class CompositionValidatorTest extends TestCase
{
protected CompositionValidator $validator;
protected Auth $config;
private CompositionValidator $validator;
private Auth $config;

 protected function setUp(): void
 {
Expand Down

2 changes: 1 addition & 1 deletion
tests/Unit/DictionaryValidatorTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
 */
final class DictionaryValidatorTest extends CIUnitTestCase
{
protected DictionaryValidator $validator;
private DictionaryValidator $validator;

 protected function setUp(): void
 {
Expand Down

2 changes: 1 addition & 1 deletion
tests/Unit/FilterInCliTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ public function testWhenInCliDoNothing(FilterInterface $filter): void
 $filter->before($clirequest);
 }

 public function filterProvider(): Generator
 public static function filterProvider(): Generator
 {
 yield from [
 [new AuthRates()],
Expand Down

8 changes: 4 additions & 4 deletions
tests/Unit/NothingPersonalValidatorTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@
 */
final class NothingPersonalValidatorTest extends CIUnitTestCase
{
protected NothingPersonalValidator $validator;
private NothingPersonalValidator $validator;

 protected function setUp(): void
 {
Expand DownExpand Up@@ -180,7 +180,7 @@ public function testIsNotPersonalFalsePositivesCaughtByIsNotSimilar($password):
 $this->assertNotSame($isNotPersonal, $isNotSimilar);
 }

 public function passwordProvider(): array
 public static function passwordProvider(): array
 {
 return [
 ['JoeTheCaptain'],
Expand DownExpand Up@@ -225,7 +225,7 @@ public function testConfigPersonalFieldsValues($firstName, $lastName, $expected)
 $this->assertSame($expected, $result->isOK());
 }

 public function firstLastNameProvider()
 public static function firstLastNameProvider()
 {
 return [
 [
Expand DownExpand Up@@ -275,7 +275,7 @@ public function testMaxSimilarityZeroTurnsOffSimilarityCalculation($maxSimilarit
 $this->assertSame($expected, $result->isOK());
 }

 public function maxSimilarityProvider()
 public static function maxSimilarityProvider()
 {
 return [
 [
Expand Down

2 changes: 1 addition & 1 deletion
tests/Unit/PwnedValidatorTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@
 */
final class PwnedValidatorTest extends CIUnitTestCase
{
protected PwnedValidator $validator;
private PwnedValidator $validator;

 protected function setUp(): void
 {
Expand Down

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

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

kenjis
merged 11 commits into

from

Dec 17, 2022
 Merged


chore: update rector.php
#560
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
d7a621c

chore: add declare(strict_types=1) in rector.php


kenjis Dec 14, 2022
e646b54

chore: remove deprecated TypedPropertyRector


kenjis Dec 14, 2022
61a6e6b

chore: add rector.php to php-cs-fixer


kenjis Dec 15, 2022
a0fe79d

chore: update rector version


kenjis Dec 15, 2022
7813e68

chore: add rector rules


kenjis Dec 15, 2022
e48867b

test: remove unused property


kenjis Dec 15, 2022
6668d6c

test: run rector


kenjis Dec 15, 2022
0561a63

chore: add rector rules


kenjis Dec 15, 2022
6dfb295

chore: skip AnnotationWithValueToAttributeRector


kenjis Dec 15, 2022
a319eb0

test: run rector


kenjis Dec 15, 2022
23c2527

chore: remove TypedPropertyFromAssignsRector config


kenjis Dec 16, 2022

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: 1 addition & 1 deletion
.github/workflows/rector.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,5 +63,5 @@ jobs:

 - name: Analyze for refactoring
 run: |
 composer global require --dev rector/rector:^0.13.3
 composer global require --dev rector/rector:^0.15.1
 rector process --dry-run --no-progress-bar

5 changes: 4 additions & 1 deletion
.php-cs-fixer.dist.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,10 @@
 __DIR__ . '/tests/',
 ])
 ->exclude('build')
 ->append([__FILE__]);
 ->append([
 __FILE__,
 __DIR__ . '/rector.php',
 ]);

$overrides = [
 'declare_strict_types' => true,
Expand Down

26 changes: 20 additions & 6 deletions
rector.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
<?php

declare(strict_types=1);

use Rector\CodeQuality\Rector\BooleanAnd\SimplifyEmptyArrayCheckRector;
use Rector\CodeQuality\Rector\Class_\CompleteDynamicPropertiesRector;
use Rector\CodeQuality\Rector\Expression\InlineIfToExplicitIfRector;
use Rector\CodeQuality\Rector\For_\ForToForeachRector;
use Rector\CodeQuality\Rector\Foreach_\UnusedForeachValueToArrayKeysRector;
Expand DownExpand Up@@ -30,15 +33,23 @@
use Rector\Php56\Rector\FunctionLike\AddDefaultValueForUndefinedVariableRector;
use Rector\Php73\Rector\FuncCall\JsonThrowOnErrorRector;
use Rector\Php73\Rector\FuncCall\StringifyStrNeedlesRector;
use Rector\Php74\Rector\Property\TypedPropertyRector;
use Rector\PHPUnit\Rector\Class_\AnnotationWithValueToAttributeRector;
use Rector\PHPUnit\Set\PHPUnitSetList;
use Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector;
use Rector\PSR4\Rector\FileWithoutNamespace\NormalizeNamespaceByPSR4ComposerAutoloadRector;
use Rector\Set\ValueObject\LevelSetList;
use Rector\Set\ValueObject\SetList;

return static function (RectorConfig $rectorConfig): void {
 $rectorConfig->sets([SetList::DEAD_CODE, LevelSetList::UP_TO_PHP_74, PHPUnitSetList::PHPUNIT_SPECIFIC_METHOD, PHPUnitSetList::PHPUNIT_80]);
 $rectorConfig->sets([
 SetList::DEAD_CODE,
 LevelSetList::UP_TO_PHP_74,
 PHPUnitSetList::PHPUNIT_SPECIFIC_METHOD,
 PHPUnitSetList::PHPUNIT_100,
 ]);

 $rectorConfig->parallel();

 // The paths to refactor (can also be supplied with CLI arguments)
 $rectorConfig->paths([
 __DIR__ . '/src/',
Expand DownExpand Up@@ -74,6 +85,7 @@

 // Note: requires php 8
 RemoveUnusedPromotedPropertyRector::class,
 AnnotationWithValueToAttributeRector::class,

 // Ignore tests that might make calls without a result
 RemoveEmptyMethodCallRector::class => [
Expand All@@ -97,6 +109,9 @@
 __DIR__ . '/src/Models/UserModel.php',
 ],
 ]);
 // auto import fully qualified class names
 $rectorConfig->importNames();

 $rectorConfig->rule(SimplifyUselessVariableRector::class);
 $rectorConfig->rule(RemoveAlwaysElseRector::class);
 $rectorConfig->rule(CountArrayToEmptyArrayComparisonRector::class);
Expand All@@ -119,8 +134,7 @@
 $rectorConfig->rule(MakeInheritedMethodVisibilitySameAsParentRector::class);
 $rectorConfig->rule(SimplifyEmptyArrayCheckRector::class);
 $rectorConfig->rule(NormalizeNamespaceByPSR4ComposerAutoloadRector::class);
 $rectorConfig
 ->ruleWithConfiguration(TypedPropertyRector::class, [
 TypedPropertyRector::INLINE_PUBLIC => false,
 ]);
 $rectorConfig->rule(StringClassNameToClassConstantRector::class);
 $rectorConfig->rule(PrivatizeFinalClassPropertyRector::class);
 $rectorConfig->rule(CompleteDynamicPropertiesRector::class);
};

2 changes: 1 addition & 1 deletion
tests/Authentication/AuthenticationTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
 */
final class AuthenticationTest extends DatabaseTestCase
{
protected Authentication $auth;
private Authentication $auth;

 protected function setUp(): void
 {
Expand Down

2 changes: 1 addition & 1 deletion
tests/Authentication/Authenticators/AccessTokenAuthenticatorTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@
 */
final class AccessTokenAuthenticatorTest extends DatabaseTestCase
{
protected AccessTokens $auth;
private AccessTokens $auth;

 protected function setUp(): void
 {
Expand Down

4 changes: 2 additions & 2 deletions
tests/Authentication/Authenticators/SessionAuthenticatorTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,9 +27,9 @@ final class SessionAuthenticatorTest extends TestCase
 use DatabaseTestTrait;
 use FakeUser;

protected Session $auth;
private Session $auth;
 protected $namespace;
protected $events;
private MockEvents $events;

 protected function setUp(): void
 {
Expand Down

1 change: 1 addition & 0 deletions
tests/Authentication/Filters/AbstractFilterTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ abstract class AbstractFilterTest extends TestCase
 use FeatureTestTrait;
 use AuthenticationTesting;

 protected string $routeFilter;
 protected $namespace;
 protected string $alias;
 protected string $classname;
Expand Down

2 changes: 1 addition & 1 deletion
tests/Authentication/HasAccessTokensTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@
 */
final class HasAccessTokensTest extends DatabaseTestCase
{
protected User $user;
private User $user;

 protected function setUp(): void
 {
Expand Down

3 changes: 0 additions & 3 deletions
tests/Authorization/AuthorizableTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,14 +23,11 @@ final class AuthorizableTest extends TestCase

 protected $refresh = true;
 protected $namespace;
 protected UserModel $model;

 protected function setUp(): void
 {
 parent::setUp();

 $this->model = new UserModel();

 // Refresh should take care of this....
 db_connect()->table('auth_groups_users')->truncate();
 db_connect()->table('auth_permissions_users')->truncate();
Expand Down

4 changes: 2 additions & 2 deletions
tests/Language/AbstractTranslationTestCase.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -305,12 +305,12 @@ final public function testAllConfiguredLanguageKeysAreInOrder(string $locale): v
 /**
 * @return string[][]
 */
 final public function localesProvider(): iterable
 final public static function localesProvider(): iterable
Comment thread
MGatner marked this conversation as resolved.

 {
 $locale = self::$locales[static::class] ?? null;

 if (null === $locale) {
$this->fail('The locale code should be defined in the $locales property.');
static::fail('The locale code should be defined in the $locales property.');
 }

 return [$locale => [$locale]];
Expand Down

4 changes: 2 additions & 2 deletions
tests/Unit/CompositionValidatorTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,8 +14,8 @@
 */
final class CompositionValidatorTest extends TestCase
{
protected CompositionValidator $validator;
protected Auth $config;
private CompositionValidator $validator;
private Auth $config;

 protected function setUp(): void
 {
Expand Down

2 changes: 1 addition & 1 deletion
tests/Unit/DictionaryValidatorTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
 */
final class DictionaryValidatorTest extends CIUnitTestCase
{
protected DictionaryValidator $validator;
private DictionaryValidator $validator;

 protected function setUp(): void
 {
Expand Down

2 changes: 1 addition & 1 deletion
tests/Unit/FilterInCliTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ public function testWhenInCliDoNothing(FilterInterface $filter): void
 $filter->before($clirequest);
 }

 public function filterProvider(): Generator
 public static function filterProvider(): Generator
 {
 yield from [
 [new AuthRates()],
Expand Down

8 changes: 4 additions & 4 deletions
tests/Unit/NothingPersonalValidatorTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@
 */
final class NothingPersonalValidatorTest extends CIUnitTestCase
{
protected NothingPersonalValidator $validator;
private NothingPersonalValidator $validator;

 protected function setUp(): void
 {
Expand DownExpand Up@@ -180,7 +180,7 @@ public function testIsNotPersonalFalsePositivesCaughtByIsNotSimilar($password):
 $this->assertNotSame($isNotPersonal, $isNotSimilar);
 }

 public function passwordProvider(): array
 public static function passwordProvider(): array
 {
 return [
 ['JoeTheCaptain'],
Expand DownExpand Up@@ -225,7 +225,7 @@ public function testConfigPersonalFieldsValues($firstName, $lastName, $expected)
 $this->assertSame($expected, $result->isOK());
 }

 public function firstLastNameProvider()
 public static function firstLastNameProvider()
 {
 return [
 [
Expand DownExpand Up@@ -275,7 +275,7 @@ public function testMaxSimilarityZeroTurnsOffSimilarityCalculation($maxSimilarit
 $this->assertSame($expected, $result->isOK());
 }

 public function maxSimilarityProvider()
 public static function maxSimilarityProvider()
 {
 return [
 [
Expand Down

2 changes: 1 addition & 1 deletion
tests/Unit/PwnedValidatorTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@
 */
final class PwnedValidatorTest extends CIUnitTestCase
{
protected PwnedValidator $validator;
private PwnedValidator $validator;

 protected function setUp(): void
 {
Expand Down

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

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

kenjis
merged 11 commits into

from

Dec 17, 2022
 Merged


chore: update rector.php
#560
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
d7a621c

chore: add declare(strict_types=1) in rector.php


kenjis Dec 14, 2022
e646b54

chore: remove deprecated TypedPropertyRector


kenjis Dec 14, 2022
61a6e6b

chore: add rector.php to php-cs-fixer


kenjis Dec 15, 2022
a0fe79d

chore: update rector version


kenjis Dec 15, 2022
7813e68

chore: add rector rules


kenjis Dec 15, 2022
e48867b

test: remove unused property


kenjis Dec 15, 2022
6668d6c

test: run rector


kenjis Dec 15, 2022
0561a63

chore: add rector rules


kenjis Dec 15, 2022
6dfb295

chore: skip AnnotationWithValueToAttributeRector


kenjis Dec 15, 2022
a319eb0

test: run rector


kenjis Dec 15, 2022
23c2527

chore: remove TypedPropertyFromAssignsRector config


kenjis Dec 16, 2022

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: 1 addition & 1 deletion
.github/workflows/rector.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,5 +63,5 @@ jobs:

 - name: Analyze for refactoring
 run: |
 composer global require --dev rector/rector:^0.13.3
 composer global require --dev rector/rector:^0.15.1
 rector process --dry-run --no-progress-bar

5 changes: 4 additions & 1 deletion
.php-cs-fixer.dist.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,10 @@
 __DIR__ . '/tests/',
 ])
 ->exclude('build')
 ->append([__FILE__]);
 ->append([
 __FILE__,
 __DIR__ . '/rector.php',
 ]);

$overrides = [
 'declare_strict_types' => true,
Expand Down

26 changes: 20 additions & 6 deletions
rector.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
<?php

declare(strict_types=1);

use Rector\CodeQuality\Rector\BooleanAnd\SimplifyEmptyArrayCheckRector;
use Rector\CodeQuality\Rector\Class_\CompleteDynamicPropertiesRector;
use Rector\CodeQuality\Rector\Expression\InlineIfToExplicitIfRector;
use Rector\CodeQuality\Rector\For_\ForToForeachRector;
use Rector\CodeQuality\Rector\Foreach_\UnusedForeachValueToArrayKeysRector;
Expand DownExpand Up@@ -30,15 +33,23 @@
use Rector\Php56\Rector\FunctionLike\AddDefaultValueForUndefinedVariableRector;
use Rector\Php73\Rector\FuncCall\JsonThrowOnErrorRector;
use Rector\Php73\Rector\FuncCall\StringifyStrNeedlesRector;
use Rector\Php74\Rector\Property\TypedPropertyRector;
use Rector\PHPUnit\Rector\Class_\AnnotationWithValueToAttributeRector;
use Rector\PHPUnit\Set\PHPUnitSetList;
use Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector;
use Rector\PSR4\Rector\FileWithoutNamespace\NormalizeNamespaceByPSR4ComposerAutoloadRector;
use Rector\Set\ValueObject\LevelSetList;
use Rector\Set\ValueObject\SetList;

return static function (RectorConfig $rectorConfig): void {
 $rectorConfig->sets([SetList::DEAD_CODE, LevelSetList::UP_TO_PHP_74, PHPUnitSetList::PHPUNIT_SPECIFIC_METHOD, PHPUnitSetList::PHPUNIT_80]);
 $rectorConfig->sets([
 SetList::DEAD_CODE,
 LevelSetList::UP_TO_PHP_74,
 PHPUnitSetList::PHPUNIT_SPECIFIC_METHOD,
 PHPUnitSetList::PHPUNIT_100,
 ]);

 $rectorConfig->parallel();

 // The paths to refactor (can also be supplied with CLI arguments)
 $rectorConfig->paths([
 __DIR__ . '/src/',
Expand DownExpand Up@@ -74,6 +85,7 @@

 // Note: requires php 8
 RemoveUnusedPromotedPropertyRector::class,
 AnnotationWithValueToAttributeRector::class,

 // Ignore tests that might make calls without a result
 RemoveEmptyMethodCallRector::class => [
Expand All@@ -97,6 +109,9 @@
 __DIR__ . '/src/Models/UserModel.php',
 ],
 ]);
 // auto import fully qualified class names
 $rectorConfig->importNames();

 $rectorConfig->rule(SimplifyUselessVariableRector::class);
 $rectorConfig->rule(RemoveAlwaysElseRector::class);
 $rectorConfig->rule(CountArrayToEmptyArrayComparisonRector::class);
Expand All@@ -119,8 +134,7 @@
 $rectorConfig->rule(MakeInheritedMethodVisibilitySameAsParentRector::class);
 $rectorConfig->rule(SimplifyEmptyArrayCheckRector::class);
 $rectorConfig->rule(NormalizeNamespaceByPSR4ComposerAutoloadRector::class);
 $rectorConfig
 ->ruleWithConfiguration(TypedPropertyRector::class, [
 TypedPropertyRector::INLINE_PUBLIC => false,
 ]);
 $rectorConfig->rule(StringClassNameToClassConstantRector::class);
 $rectorConfig->rule(PrivatizeFinalClassPropertyRector::class);
 $rectorConfig->rule(CompleteDynamicPropertiesRector::class);
};

2 changes: 1 addition & 1 deletion
tests/Authentication/AuthenticationTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
 */
final class AuthenticationTest extends DatabaseTestCase
{
protected Authentication $auth;
private Authentication $auth;

 protected function setUp(): void
 {
Expand Down

2 changes: 1 addition & 1 deletion
tests/Authentication/Authenticators/AccessTokenAuthenticatorTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@
 */
final class AccessTokenAuthenticatorTest extends DatabaseTestCase
{
protected AccessTokens $auth;
private AccessTokens $auth;

 protected function setUp(): void
 {
Expand Down

4 changes: 2 additions & 2 deletions
tests/Authentication/Authenticators/SessionAuthenticatorTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,9 +27,9 @@ final class SessionAuthenticatorTest extends TestCase
 use DatabaseTestTrait;
 use FakeUser;

protected Session $auth;
private Session $auth;
 protected $namespace;
protected $events;
private MockEvents $events;

 protected function setUp(): void
 {
Expand Down

1 change: 1 addition & 0 deletions
tests/Authentication/Filters/AbstractFilterTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ abstract class AbstractFilterTest extends TestCase
 use FeatureTestTrait;
 use AuthenticationTesting;

 protected string $routeFilter;
 protected $namespace;
 protected string $alias;
 protected string $classname;
Expand Down

2 changes: 1 addition & 1 deletion
tests/Authentication/HasAccessTokensTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@
 */
final class HasAccessTokensTest extends DatabaseTestCase
{
protected User $user;
private User $user;

 protected function setUp(): void
 {
Expand Down

3 changes: 0 additions & 3 deletions
tests/Authorization/AuthorizableTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,14 +23,11 @@ final class AuthorizableTest extends TestCase

 protected $refresh = true;
 protected $namespace;
 protected UserModel $model;

 protected function setUp(): void
 {
 parent::setUp();

 $this->model = new UserModel();

 // Refresh should take care of this....
 db_connect()->table('auth_groups_users')->truncate();
 db_connect()->table('auth_permissions_users')->truncate();
Expand Down

4 changes: 2 additions & 2 deletions
tests/Language/AbstractTranslationTestCase.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -305,12 +305,12 @@ final public function testAllConfiguredLanguageKeysAreInOrder(string $locale): v
 /**
 * @return string[][]
 */
 final public function localesProvider(): iterable
 final public static function localesProvider(): iterable
Comment thread
MGatner marked this conversation as resolved.

 {
 $locale = self::$locales[static::class] ?? null;

 if (null === $locale) {
$this->fail('The locale code should be defined in the $locales property.');
static::fail('The locale code should be defined in the $locales property.');
 }

 return [$locale => [$locale]];
Expand Down

4 changes: 2 additions & 2 deletions
tests/Unit/CompositionValidatorTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,8 +14,8 @@
 */
final class CompositionValidatorTest extends TestCase
{
protected CompositionValidator $validator;
protected Auth $config;
private CompositionValidator $validator;
private Auth $config;

 protected function setUp(): void
 {
Expand Down

2 changes: 1 addition & 1 deletion
tests/Unit/DictionaryValidatorTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
 */
final class DictionaryValidatorTest extends CIUnitTestCase
{
protected DictionaryValidator $validator;
private DictionaryValidator $validator;

 protected function setUp(): void
 {
Expand Down

2 changes: 1 addition & 1 deletion
tests/Unit/FilterInCliTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ public function testWhenInCliDoNothing(FilterInterface $filter): void
 $filter->before($clirequest);
 }

 public function filterProvider(): Generator
 public static function filterProvider(): Generator
 {
 yield from [
 [new AuthRates()],
Expand Down

8 changes: 4 additions & 4 deletions
tests/Unit/NothingPersonalValidatorTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@
 */
final class NothingPersonalValidatorTest extends CIUnitTestCase
{
protected NothingPersonalValidator $validator;
private NothingPersonalValidator $validator;

 protected function setUp(): void
 {
Expand DownExpand Up@@ -180,7 +180,7 @@ public function testIsNotPersonalFalsePositivesCaughtByIsNotSimilar($password):
 $this->assertNotSame($isNotPersonal, $isNotSimilar);
 }

 public function passwordProvider(): array
 public static function passwordProvider(): array
 {
 return [
 ['JoeTheCaptain'],
Expand DownExpand Up@@ -225,7 +225,7 @@ public function testConfigPersonalFieldsValues($firstName, $lastName, $expected)
 $this->assertSame($expected, $result->isOK());
 }

 public function firstLastNameProvider()
 public static function firstLastNameProvider()
 {
 return [
 [
Expand DownExpand Up@@ -275,7 +275,7 @@ public function testMaxSimilarityZeroTurnsOffSimilarityCalculation($maxSimilarit
 $this->assertSame($expected, $result->isOK());
 }

 public function maxSimilarityProvider()
 public static function maxSimilarityProvider()
 {
 return [
 [
Expand Down

2 changes: 1 addition & 1 deletion
tests/Unit/PwnedValidatorTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@
 */
final class PwnedValidatorTest extends CIUnitTestCase
{
protected PwnedValidator $validator;
private PwnedValidator $validator;

 protected function setUp(): void
 {
Expand Down

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

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

kenjis
merged 11 commits into

from

Dec 17, 2022
 Merged


chore: update rector.php
#560
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
d7a621c

chore: add declare(strict_types=1) in rector.php


kenjis Dec 14, 2022
e646b54

chore: remove deprecated TypedPropertyRector


kenjis Dec 14, 2022
61a6e6b

chore: add rector.php to php-cs-fixer


kenjis Dec 15, 2022
a0fe79d

chore: update rector version


kenjis Dec 15, 2022
7813e68

chore: add rector rules


kenjis Dec 15, 2022
e48867b

test: remove unused property


kenjis Dec 15, 2022
6668d6c

test: run rector


kenjis Dec 15, 2022
0561a63

chore: add rector rules


kenjis Dec 15, 2022
6dfb295

chore: skip AnnotationWithValueToAttributeRector


kenjis Dec 15, 2022
a319eb0

test: run rector


kenjis Dec 15, 2022
23c2527

chore: remove TypedPropertyFromAssignsRector config


kenjis Dec 16, 2022

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: 1 addition & 1 deletion
.github/workflows/rector.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,5 +63,5 @@ jobs:

 - name: Analyze for refactoring
 run: |
 composer global require --dev rector/rector:^0.13.3
 composer global require --dev rector/rector:^0.15.1
 rector process --dry-run --no-progress-bar

5 changes: 4 additions & 1 deletion
.php-cs-fixer.dist.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,10 @@
 __DIR__ . '/tests/',
 ])
 ->exclude('build')
 ->append([__FILE__]);
 ->append([
 __FILE__,
 __DIR__ . '/rector.php',
 ]);

$overrides = [
 'declare_strict_types' => true,
Expand Down

26 changes: 20 additions & 6 deletions
rector.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
<?php

declare(strict_types=1);

use Rector\CodeQuality\Rector\BooleanAnd\SimplifyEmptyArrayCheckRector;
use Rector\CodeQuality\Rector\Class_\CompleteDynamicPropertiesRector;
use Rector\CodeQuality\Rector\Expression\InlineIfToExplicitIfRector;
use Rector\CodeQuality\Rector\For_\ForToForeachRector;
use Rector\CodeQuality\Rector\Foreach_\UnusedForeachValueToArrayKeysRector;
Expand DownExpand Up@@ -30,15 +33,23 @@
use Rector\Php56\Rector\FunctionLike\AddDefaultValueForUndefinedVariableRector;
use Rector\Php73\Rector\FuncCall\JsonThrowOnErrorRector;
use Rector\Php73\Rector\FuncCall\StringifyStrNeedlesRector;
use Rector\Php74\Rector\Property\TypedPropertyRector;
use Rector\PHPUnit\Rector\Class_\AnnotationWithValueToAttributeRector;
use Rector\PHPUnit\Set\PHPUnitSetList;
use Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector;
use Rector\PSR4\Rector\FileWithoutNamespace\NormalizeNamespaceByPSR4ComposerAutoloadRector;
use Rector\Set\ValueObject\LevelSetList;
use Rector\Set\ValueObject\SetList;

return static function (RectorConfig $rectorConfig): void {
 $rectorConfig->sets([SetList::DEAD_CODE, LevelSetList::UP_TO_PHP_74, PHPUnitSetList::PHPUNIT_SPECIFIC_METHOD, PHPUnitSetList::PHPUNIT_80]);
 $rectorConfig->sets([
 SetList::DEAD_CODE,
 LevelSetList::UP_TO_PHP_74,
 PHPUnitSetList::PHPUNIT_SPECIFIC_METHOD,
 PHPUnitSetList::PHPUNIT_100,
 ]);

 $rectorConfig->parallel();

 // The paths to refactor (can also be supplied with CLI arguments)
 $rectorConfig->paths([
 __DIR__ . '/src/',
Expand DownExpand Up@@ -74,6 +85,7 @@

 // Note: requires php 8
 RemoveUnusedPromotedPropertyRector::class,
 AnnotationWithValueToAttributeRector::class,

 // Ignore tests that might make calls without a result
 RemoveEmptyMethodCallRector::class => [
Expand All@@ -97,6 +109,9 @@
 __DIR__ . '/src/Models/UserModel.php',
 ],
 ]);
 // auto import fully qualified class names
 $rectorConfig->importNames();

 $rectorConfig->rule(SimplifyUselessVariableRector::class);
 $rectorConfig->rule(RemoveAlwaysElseRector::class);
 $rectorConfig->rule(CountArrayToEmptyArrayComparisonRector::class);
Expand All@@ -119,8 +134,7 @@
 $rectorConfig->rule(MakeInheritedMethodVisibilitySameAsParentRector::class);
 $rectorConfig->rule(SimplifyEmptyArrayCheckRector::class);
 $rectorConfig->rule(NormalizeNamespaceByPSR4ComposerAutoloadRector::class);
 $rectorConfig
 ->ruleWithConfiguration(TypedPropertyRector::class, [
 TypedPropertyRector::INLINE_PUBLIC => false,
 ]);
 $rectorConfig->rule(StringClassNameToClassConstantRector::class);
 $rectorConfig->rule(PrivatizeFinalClassPropertyRector::class);
 $rectorConfig->rule(CompleteDynamicPropertiesRector::class);
};

2 changes: 1 addition & 1 deletion
tests/Authentication/AuthenticationTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
 */
final class AuthenticationTest extends DatabaseTestCase
{
protected Authentication $auth;
private Authentication $auth;

 protected function setUp(): void
 {
Expand Down

2 changes: 1 addition & 1 deletion
tests/Authentication/Authenticators/AccessTokenAuthenticatorTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@
 */
final class AccessTokenAuthenticatorTest extends DatabaseTestCase
{
protected AccessTokens $auth;
private AccessTokens $auth;

 protected function setUp(): void
 {
Expand Down

4 changes: 2 additions & 2 deletions
tests/Authentication/Authenticators/SessionAuthenticatorTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,9 +27,9 @@ final class SessionAuthenticatorTest extends TestCase
 use DatabaseTestTrait;
 use FakeUser;

protected Session $auth;
private Session $auth;
 protected $namespace;
protected $events;
private MockEvents $events;

 protected function setUp(): void
 {
Expand Down

1 change: 1 addition & 0 deletions
tests/Authentication/Filters/AbstractFilterTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ abstract class AbstractFilterTest extends TestCase
 use FeatureTestTrait;
 use AuthenticationTesting;

 protected string $routeFilter;
 protected $namespace;
 protected string $alias;
 protected string $classname;
Expand Down

2 changes: 1 addition & 1 deletion
tests/Authentication/HasAccessTokensTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@
 */
final class HasAccessTokensTest extends DatabaseTestCase
{
protected User $user;
private User $user;

 protected function setUp(): void
 {
Expand Down

3 changes: 0 additions & 3 deletions
tests/Authorization/AuthorizableTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,14 +23,11 @@ final class AuthorizableTest extends TestCase

 protected $refresh = true;
 protected $namespace;
 protected UserModel $model;

 protected function setUp(): void
 {
 parent::setUp();

 $this->model = new UserModel();

 // Refresh should take care of this....
 db_connect()->table('auth_groups_users')->truncate();
 db_connect()->table('auth_permissions_users')->truncate();
Expand Down

4 changes: 2 additions & 2 deletions
tests/Language/AbstractTranslationTestCase.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -305,12 +305,12 @@ final public function testAllConfiguredLanguageKeysAreInOrder(string $locale): v
 /**
 * @return string[][]
 */
 final public function localesProvider(): iterable
 final public static function localesProvider(): iterable
Comment thread
MGatner marked this conversation as resolved.

 {
 $locale = self::$locales[static::class] ?? null;

 if (null === $locale) {
$this->fail('The locale code should be defined in the $locales property.');
static::fail('The locale code should be defined in the $locales property.');
 }

 return [$locale => [$locale]];
Expand Down

4 changes: 2 additions & 2 deletions
tests/Unit/CompositionValidatorTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,8 +14,8 @@
 */
final class CompositionValidatorTest extends TestCase
{
protected CompositionValidator $validator;
protected Auth $config;
private CompositionValidator $validator;
private Auth $config;

 protected function setUp(): void
 {
Expand Down

2 changes: 1 addition & 1 deletion
tests/Unit/DictionaryValidatorTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
 */
final class DictionaryValidatorTest extends CIUnitTestCase
{
protected DictionaryValidator $validator;
private DictionaryValidator $validator;

 protected function setUp(): void
 {
Expand Down

2 changes: 1 addition & 1 deletion
tests/Unit/FilterInCliTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ public function testWhenInCliDoNothing(FilterInterface $filter): void
 $filter->before($clirequest);
 }

 public function filterProvider(): Generator
 public static function filterProvider(): Generator
 {
 yield from [
 [new AuthRates()],
Expand Down

8 changes: 4 additions & 4 deletions
tests/Unit/NothingPersonalValidatorTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@
 */
final class NothingPersonalValidatorTest extends CIUnitTestCase
{
protected NothingPersonalValidator $validator;
private NothingPersonalValidator $validator;

 protected function setUp(): void
 {
Expand DownExpand Up@@ -180,7 +180,7 @@ public function testIsNotPersonalFalsePositivesCaughtByIsNotSimilar($password):
 $this->assertNotSame($isNotPersonal, $isNotSimilar);
 }

 public function passwordProvider(): array
 public static function passwordProvider(): array
 {
 return [
 ['JoeTheCaptain'],
Expand DownExpand Up@@ -225,7 +225,7 @@ public function testConfigPersonalFieldsValues($firstName, $lastName, $expected)
 $this->assertSame($expected, $result->isOK());
 }

 public function firstLastNameProvider()
 public static function firstLastNameProvider()
 {
 return [
 [
Expand DownExpand Up@@ -275,7 +275,7 @@ public function testMaxSimilarityZeroTurnsOffSimilarityCalculation($maxSimilarit
 $this->assertSame($expected, $result->isOK());
 }

 public function maxSimilarityProvider()
 public static function maxSimilarityProvider()
 {
 return [
 [
Expand Down

2 changes: 1 addition & 1 deletion
tests/Unit/PwnedValidatorTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@
 */
final class PwnedValidatorTest extends CIUnitTestCase
{
protected PwnedValidator $validator;
private PwnedValidator $validator;

 protected function setUp(): void
 {
Expand Down

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

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

kenjis
merged 11 commits into

from

Dec 17, 2022
 Merged


chore: update rector.php
#560
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
d7a621c

chore: add declare(strict_types=1) in rector.php


kenjis Dec 14, 2022
e646b54

chore: remove deprecated TypedPropertyRector


kenjis Dec 14, 2022
61a6e6b

chore: add rector.php to php-cs-fixer


kenjis Dec 15, 2022
a0fe79d

chore: update rector version


kenjis Dec 15, 2022
7813e68

chore: add rector rules


kenjis Dec 15, 2022
e48867b

test: remove unused property


kenjis Dec 15, 2022
6668d6c

test: run rector


kenjis Dec 15, 2022
0561a63

chore: add rector rules


kenjis Dec 15, 2022
6dfb295

chore: skip AnnotationWithValueToAttributeRector


kenjis Dec 15, 2022
a319eb0

test: run rector


kenjis Dec 15, 2022
23c2527

chore: remove TypedPropertyFromAssignsRector config


kenjis Dec 16, 2022

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: 1 addition & 1 deletion
.github/workflows/rector.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,5 +63,5 @@ jobs:

 - name: Analyze for refactoring
 run: |
 composer global require --dev rector/rector:^0.13.3
 composer global require --dev rector/rector:^0.15.1
 rector process --dry-run --no-progress-bar

5 changes: 4 additions & 1 deletion
.php-cs-fixer.dist.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,10 @@
 __DIR__ . '/tests/',
 ])
 ->exclude('build')
 ->append([__FILE__]);
 ->append([
 __FILE__,
 __DIR__ . '/rector.php',
 ]);

$overrides = [
 'declare_strict_types' => true,
Expand Down

26 changes: 20 additions & 6 deletions
rector.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
<?php

declare(strict_types=1);

use Rector\CodeQuality\Rector\BooleanAnd\SimplifyEmptyArrayCheckRector;
use Rector\CodeQuality\Rector\Class_\CompleteDynamicPropertiesRector;
use Rector\CodeQuality\Rector\Expression\InlineIfToExplicitIfRector;
use Rector\CodeQuality\Rector\For_\ForToForeachRector;
use Rector\CodeQuality\Rector\Foreach_\UnusedForeachValueToArrayKeysRector;
Expand DownExpand Up@@ -30,15 +33,23 @@
use Rector\Php56\Rector\FunctionLike\AddDefaultValueForUndefinedVariableRector;
use Rector\Php73\Rector\FuncCall\JsonThrowOnErrorRector;
use Rector\Php73\Rector\FuncCall\StringifyStrNeedlesRector;
use Rector\Php74\Rector\Property\TypedPropertyRector;
use Rector\PHPUnit\Rector\Class_\AnnotationWithValueToAttributeRector;
use Rector\PHPUnit\Set\PHPUnitSetList;
use Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector;
use Rector\PSR4\Rector\FileWithoutNamespace\NormalizeNamespaceByPSR4ComposerAutoloadRector;
use Rector\Set\ValueObject\LevelSetList;
use Rector\Set\ValueObject\SetList;

return static function (RectorConfig $rectorConfig): void {
 $rectorConfig->sets([SetList::DEAD_CODE, LevelSetList::UP_TO_PHP_74, PHPUnitSetList::PHPUNIT_SPECIFIC_METHOD, PHPUnitSetList::PHPUNIT_80]);
 $rectorConfig->sets([
 SetList::DEAD_CODE,
 LevelSetList::UP_TO_PHP_74,
 PHPUnitSetList::PHPUNIT_SPECIFIC_METHOD,
 PHPUnitSetList::PHPUNIT_100,
 ]);

 $rectorConfig->parallel();

 // The paths to refactor (can also be supplied with CLI arguments)
 $rectorConfig->paths([
 __DIR__ . '/src/',
Expand DownExpand Up@@ -74,6 +85,7 @@

 // Note: requires php 8
 RemoveUnusedPromotedPropertyRector::class,
 AnnotationWithValueToAttributeRector::class,

 // Ignore tests that might make calls without a result
 RemoveEmptyMethodCallRector::class => [
Expand All@@ -97,6 +109,9 @@
 __DIR__ . '/src/Models/UserModel.php',
 ],
 ]);
 // auto import fully qualified class names
 $rectorConfig->importNames();

 $rectorConfig->rule(SimplifyUselessVariableRector::class);
 $rectorConfig->rule(RemoveAlwaysElseRector::class);
 $rectorConfig->rule(CountArrayToEmptyArrayComparisonRector::class);
Expand All@@ -119,8 +134,7 @@
 $rectorConfig->rule(MakeInheritedMethodVisibilitySameAsParentRector::class);
 $rectorConfig->rule(SimplifyEmptyArrayCheckRector::class);
 $rectorConfig->rule(NormalizeNamespaceByPSR4ComposerAutoloadRector::class);
 $rectorConfig
 ->ruleWithConfiguration(TypedPropertyRector::class, [
 TypedPropertyRector::INLINE_PUBLIC => false,
 ]);
 $rectorConfig->rule(StringClassNameToClassConstantRector::class);
 $rectorConfig->rule(PrivatizeFinalClassPropertyRector::class);
 $rectorConfig->rule(CompleteDynamicPropertiesRector::class);
};

2 changes: 1 addition & 1 deletion
tests/Authentication/AuthenticationTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
 */
final class AuthenticationTest extends DatabaseTestCase
{
protected Authentication $auth;
private Authentication $auth;

 protected function setUp(): void
 {
Expand Down

2 changes: 1 addition & 1 deletion
tests/Authentication/Authenticators/AccessTokenAuthenticatorTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@
 */
final class AccessTokenAuthenticatorTest extends DatabaseTestCase
{
protected AccessTokens $auth;
private AccessTokens $auth;

 protected function setUp(): void
 {
Expand Down

4 changes: 2 additions & 2 deletions
tests/Authentication/Authenticators/SessionAuthenticatorTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,9 +27,9 @@ final class SessionAuthenticatorTest extends TestCase
 use DatabaseTestTrait;
 use FakeUser;

protected Session $auth;
private Session $auth;
 protected $namespace;
protected $events;
private MockEvents $events;

 protected function setUp(): void
 {
Expand Down

1 change: 1 addition & 0 deletions
tests/Authentication/Filters/AbstractFilterTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ abstract class AbstractFilterTest extends TestCase
 use FeatureTestTrait;
 use AuthenticationTesting;

 protected string $routeFilter;
 protected $namespace;
 protected string $alias;
 protected string $classname;
Expand Down

2 changes: 1 addition & 1 deletion
tests/Authentication/HasAccessTokensTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@
 */
final class HasAccessTokensTest extends DatabaseTestCase
{
protected User $user;
private User $user;

 protected function setUp(): void
 {
Expand Down

3 changes: 0 additions & 3 deletions
tests/Authorization/AuthorizableTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,14 +23,11 @@ final class AuthorizableTest extends TestCase

 protected $refresh = true;
 protected $namespace;
 protected UserModel $model;

 protected function setUp(): void
 {
 parent::setUp();

 $this->model = new UserModel();

 // Refresh should take care of this....
 db_connect()->table('auth_groups_users')->truncate();
 db_connect()->table('auth_permissions_users')->truncate();
Expand Down

4 changes: 2 additions & 2 deletions
tests/Language/AbstractTranslationTestCase.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -305,12 +305,12 @@ final public function testAllConfiguredLanguageKeysAreInOrder(string $locale): v
 /**
 * @return string[][]
 */
 final public function localesProvider(): iterable
 final public static function localesProvider(): iterable
Comment thread
MGatner marked this conversation as resolved.

 {
 $locale = self::$locales[static::class] ?? null;

 if (null === $locale) {
$this->fail('The locale code should be defined in the $locales property.');
static::fail('The locale code should be defined in the $locales property.');
 }

 return [$locale => [$locale]];
Expand Down

4 changes: 2 additions & 2 deletions
tests/Unit/CompositionValidatorTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,8 +14,8 @@
 */
final class CompositionValidatorTest extends TestCase
{
protected CompositionValidator $validator;
protected Auth $config;
private CompositionValidator $validator;
private Auth $config;

 protected function setUp(): void
 {
Expand Down

2 changes: 1 addition & 1 deletion
tests/Unit/DictionaryValidatorTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
 */
final class DictionaryValidatorTest extends CIUnitTestCase
{
protected DictionaryValidator $validator;
private DictionaryValidator $validator;

 protected function setUp(): void
 {
Expand Down

2 changes: 1 addition & 1 deletion
tests/Unit/FilterInCliTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ public function testWhenInCliDoNothing(FilterInterface $filter): void
 $filter->before($clirequest);
 }

 public function filterProvider(): Generator
 public static function filterProvider(): Generator
 {
 yield from [
 [new AuthRates()],
Expand Down

8 changes: 4 additions & 4 deletions
tests/Unit/NothingPersonalValidatorTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@
 */
final class NothingPersonalValidatorTest extends CIUnitTestCase
{
protected NothingPersonalValidator $validator;
private NothingPersonalValidator $validator;

 protected function setUp(): void
 {
Expand DownExpand Up@@ -180,7 +180,7 @@ public function testIsNotPersonalFalsePositivesCaughtByIsNotSimilar($password):
 $this->assertNotSame($isNotPersonal, $isNotSimilar);
 }

 public function passwordProvider(): array
 public static function passwordProvider(): array
 {
 return [
 ['JoeTheCaptain'],
Expand DownExpand Up@@ -225,7 +225,7 @@ public function testConfigPersonalFieldsValues($firstName, $lastName, $expected)
 $this->assertSame($expected, $result->isOK());
 }

 public function firstLastNameProvider()
 public static function firstLastNameProvider()
 {
 return [
 [
Expand DownExpand Up@@ -275,7 +275,7 @@ public function testMaxSimilarityZeroTurnsOffSimilarityCalculation($maxSimilarit
 $this->assertSame($expected, $result->isOK());
 }

 public function maxSimilarityProvider()
 public static function maxSimilarityProvider()
 {
 return [
 [
Expand Down

2 changes: 1 addition & 1 deletion
tests/Unit/PwnedValidatorTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@
 */
final class PwnedValidatorTest extends CIUnitTestCase
{
protected PwnedValidator $validator;
private PwnedValidator $validator;

 protected function setUp(): void
 {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
})();
chore: update rector.php by kenjis · Pull Request #560 · codeigniter4/shield · GitHub
Skip to content
chore: update rector.php#560

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

kenjis
merged 11 commits into

from

Dec 17, 2022
 Merged


chore: update rector.php
#560
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
d7a621c

chore: add declare(strict_types=1) in rector.php


kenjis Dec 14, 2022
e646b54

chore: remove deprecated TypedPropertyRector


kenjis Dec 14, 2022
61a6e6b

chore: add rector.php to php-cs-fixer


kenjis Dec 15, 2022
a0fe79d

chore: update rector version


kenjis Dec 15, 2022
7813e68

chore: add rector rules


kenjis Dec 15, 2022
e48867b

test: remove unused property


kenjis Dec 15, 2022
6668d6c

test: run rector


kenjis Dec 15, 2022
0561a63

chore: add rector rules


kenjis Dec 15, 2022
6dfb295

chore: skip AnnotationWithValueToAttributeRector


kenjis Dec 15, 2022
a319eb0

test: run rector


kenjis Dec 15, 2022
23c2527

chore: remove TypedPropertyFromAssignsRector config


kenjis Dec 16, 2022

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: 1 addition & 1 deletion
.github/workflows/rector.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,5 +63,5 @@ jobs:

 - name: Analyze for refactoring
 run: |
 composer global require --dev rector/rector:^0.13.3
 composer global require --dev rector/rector:^0.15.1
 rector process --dry-run --no-progress-bar

5 changes: 4 additions & 1 deletion
.php-cs-fixer.dist.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,10 @@
 __DIR__ . '/tests/',
 ])
 ->exclude('build')
 ->append([__FILE__]);
 ->append([
 __FILE__,
 __DIR__ . '/rector.php',
 ]);

$overrides = [
 'declare_strict_types' => true,
Expand Down

26 changes: 20 additions & 6 deletions
rector.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
<?php

declare(strict_types=1);

use Rector\CodeQuality\Rector\BooleanAnd\SimplifyEmptyArrayCheckRector;
use Rector\CodeQuality\Rector\Class_\CompleteDynamicPropertiesRector;
use Rector\CodeQuality\Rector\Expression\InlineIfToExplicitIfRector;
use Rector\CodeQuality\Rector\For_\ForToForeachRector;
use Rector\CodeQuality\Rector\Foreach_\UnusedForeachValueToArrayKeysRector;
Expand DownExpand Up@@ -30,15 +33,23 @@
use Rector\Php56\Rector\FunctionLike\AddDefaultValueForUndefinedVariableRector;
use Rector\Php73\Rector\FuncCall\JsonThrowOnErrorRector;
use Rector\Php73\Rector\FuncCall\StringifyStrNeedlesRector;
use Rector\Php74\Rector\Property\TypedPropertyRector;
use Rector\PHPUnit\Rector\Class_\AnnotationWithValueToAttributeRector;
use Rector\PHPUnit\Set\PHPUnitSetList;
use Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector;
use Rector\PSR4\Rector\FileWithoutNamespace\NormalizeNamespaceByPSR4ComposerAutoloadRector;
use Rector\Set\ValueObject\LevelSetList;
use Rector\Set\ValueObject\SetList;

return static function (RectorConfig $rectorConfig): void {
 $rectorConfig->sets([SetList::DEAD_CODE, LevelSetList::UP_TO_PHP_74, PHPUnitSetList::PHPUNIT_SPECIFIC_METHOD, PHPUnitSetList::PHPUNIT_80]);
 $rectorConfig->sets([
 SetList::DEAD_CODE,
 LevelSetList::UP_TO_PHP_74,
 PHPUnitSetList::PHPUNIT_SPECIFIC_METHOD,
 PHPUnitSetList::PHPUNIT_100,
 ]);

 $rectorConfig->parallel();

 // The paths to refactor (can also be supplied with CLI arguments)
 $rectorConfig->paths([
 __DIR__ . '/src/',
Expand DownExpand Up@@ -74,6 +85,7 @@

 // Note: requires php 8
 RemoveUnusedPromotedPropertyRector::class,
 AnnotationWithValueToAttributeRector::class,

 // Ignore tests that might make calls without a result
 RemoveEmptyMethodCallRector::class => [
Expand All@@ -97,6 +109,9 @@
 __DIR__ . '/src/Models/UserModel.php',
 ],
 ]);
 // auto import fully qualified class names
 $rectorConfig->importNames();

 $rectorConfig->rule(SimplifyUselessVariableRector::class);
 $rectorConfig->rule(RemoveAlwaysElseRector::class);
 $rectorConfig->rule(CountArrayToEmptyArrayComparisonRector::class);
Expand All@@ -119,8 +134,7 @@
 $rectorConfig->rule(MakeInheritedMethodVisibilitySameAsParentRector::class);
 $rectorConfig->rule(SimplifyEmptyArrayCheckRector::class);
 $rectorConfig->rule(NormalizeNamespaceByPSR4ComposerAutoloadRector::class);
 $rectorConfig
 ->ruleWithConfiguration(TypedPropertyRector::class, [
 TypedPropertyRector::INLINE_PUBLIC => false,
 ]);
 $rectorConfig->rule(StringClassNameToClassConstantRector::class);
 $rectorConfig->rule(PrivatizeFinalClassPropertyRector::class);
 $rectorConfig->rule(CompleteDynamicPropertiesRector::class);
};

2 changes: 1 addition & 1 deletion
tests/Authentication/AuthenticationTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
 */
final class AuthenticationTest extends DatabaseTestCase
{
protected Authentication $auth;
private Authentication $auth;

 protected function setUp(): void
 {
Expand Down

2 changes: 1 addition & 1 deletion
tests/Authentication/Authenticators/AccessTokenAuthenticatorTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@
 */
final class AccessTokenAuthenticatorTest extends DatabaseTestCase
{
protected AccessTokens $auth;
private AccessTokens $auth;

 protected function setUp(): void
 {
Expand Down

4 changes: 2 additions & 2 deletions
tests/Authentication/Authenticators/SessionAuthenticatorTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,9 +27,9 @@ final class SessionAuthenticatorTest extends TestCase
 use DatabaseTestTrait;
 use FakeUser;

protected Session $auth;
private Session $auth;
 protected $namespace;
protected $events;
private MockEvents $events;

 protected function setUp(): void
 {
Expand Down

1 change: 1 addition & 0 deletions
tests/Authentication/Filters/AbstractFilterTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ abstract class AbstractFilterTest extends TestCase
 use FeatureTestTrait;
 use AuthenticationTesting;

 protected string $routeFilter;
 protected $namespace;
 protected string $alias;
 protected string $classname;
Expand Down

2 changes: 1 addition & 1 deletion
tests/Authentication/HasAccessTokensTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@
 */
final class HasAccessTokensTest extends DatabaseTestCase
{
protected User $user;
private User $user;

 protected function setUp(): void
 {
Expand Down

3 changes: 0 additions & 3 deletions
tests/Authorization/AuthorizableTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,14 +23,11 @@ final class AuthorizableTest extends TestCase

 protected $refresh = true;
 protected $namespace;
 protected UserModel $model;

 protected function setUp(): void
 {
 parent::setUp();

 $this->model = new UserModel();

 // Refresh should take care of this....
 db_connect()->table('auth_groups_users')->truncate();
 db_connect()->table('auth_permissions_users')->truncate();
Expand Down

4 changes: 2 additions & 2 deletions
tests/Language/AbstractTranslationTestCase.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -305,12 +305,12 @@ final public function testAllConfiguredLanguageKeysAreInOrder(string $locale): v
 /**
 * @return string[][]
 */
 final public function localesProvider(): iterable
 final public static function localesProvider(): iterable
Comment thread
MGatner marked this conversation as resolved.

 {
 $locale = self::$locales[static::class] ?? null;

 if (null === $locale) {
$this->fail('The locale code should be defined in the $locales property.');
static::fail('The locale code should be defined in the $locales property.');
 }

 return [$locale => [$locale]];
Expand Down

4 changes: 2 additions & 2 deletions
tests/Unit/CompositionValidatorTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,8 +14,8 @@
 */
final class CompositionValidatorTest extends TestCase
{
protected CompositionValidator $validator;
protected Auth $config;
private CompositionValidator $validator;
private Auth $config;

 protected function setUp(): void
 {
Expand Down

2 changes: 1 addition & 1 deletion
tests/Unit/DictionaryValidatorTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
 */
final class DictionaryValidatorTest extends CIUnitTestCase
{
protected DictionaryValidator $validator;
private DictionaryValidator $validator;

 protected function setUp(): void
 {
Expand Down

2 changes: 1 addition & 1 deletion
tests/Unit/FilterInCliTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ public function testWhenInCliDoNothing(FilterInterface $filter): void
 $filter->before($clirequest);
 }

 public function filterProvider(): Generator
 public static function filterProvider(): Generator
 {
 yield from [
 [new AuthRates()],
Expand Down

8 changes: 4 additions & 4 deletions
tests/Unit/NothingPersonalValidatorTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@
 */
final class NothingPersonalValidatorTest extends CIUnitTestCase
{
protected NothingPersonalValidator $validator;
private NothingPersonalValidator $validator;

 protected function setUp(): void
 {
Expand DownExpand Up@@ -180,7 +180,7 @@ public function testIsNotPersonalFalsePositivesCaughtByIsNotSimilar($password):
 $this->assertNotSame($isNotPersonal, $isNotSimilar);
 }

 public function passwordProvider(): array
 public static function passwordProvider(): array
 {
 return [
 ['JoeTheCaptain'],
Expand DownExpand Up@@ -225,7 +225,7 @@ public function testConfigPersonalFieldsValues($firstName, $lastName, $expected)
 $this->assertSame($expected, $result->isOK());
 }

 public function firstLastNameProvider()
 public static function firstLastNameProvider()
 {
 return [
 [
Expand DownExpand Up@@ -275,7 +275,7 @@ public function testMaxSimilarityZeroTurnsOffSimilarityCalculation($maxSimilarit
 $this->assertSame($expected, $result->isOK());
 }

 public function maxSimilarityProvider()
 public static function maxSimilarityProvider()
 {
 return [
 [
Expand Down

2 changes: 1 addition & 1 deletion
tests/Unit/PwnedValidatorTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@
 */
final class PwnedValidatorTest extends CIUnitTestCase
{
protected PwnedValidator $validator;
private PwnedValidator $validator;

 protected function setUp(): void
 {
Expand Down