Skip to content

Commit 85a9220

Browse files
Merge remote-tracking branch 'upstream/main'
2 parents 38d1caf + 92ddbf0 commit 85a9220

65 files changed

Lines changed: 1120 additions & 19 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/rector_laravel_rector_dev.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,3 @@ jobs:
2828
- run: git clone https://github.com/driftingly/rector-laravel.git
2929
- run: composer require rector/rector:dev-main --working-dir rector-laravel
3030
- run: cd rector-laravel && vendor/bin/phpunit
31-

.github/workflows/tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
php-versions: ['8.3', '8.4', '8.5']
2222

2323
runs-on: ${{ matrix.os }}
24-
timeout-minutes: 3
24+
timeout-minutes: 4
2525

2626
name: PHP ${{ matrix.php-versions }} tests (${{ matrix.os }})
2727
steps:

build/target-repository/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@ Among there projects belong:
103103
* [contao/contao-rector](https://github.com/contao/contao-rector)
104104
* [php-static-analysis/rector-rule](https://github.com/php-static-analysis/rector-rule)
105105
* [ibexa/rector](https://github.com/ibexa/rector)
106-
106+
* [guanguans/rector-rules](https://github.com/guanguans/rector-rules)
107+
107108
<br>
108109

109110
## Hire us to get Job Done :muscle:

build/target-repository/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
],
1010
"require": {
1111
"php": "^7.4|^8.0",
12-
"phpstan/phpstan": "^2.1.34"
12+
"phpstan/phpstan": "^2.1.37"
1313
},
1414
"autoload": {
1515
"files": [
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
if (! defined('APPPATH')) {
46
define('APPPATH', realpath(rtrim($paths->appDirectory, '\\/ ')) . DIRECTORY_SEPARATOR);
57
}

composer.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"nikic/php-parser": "^5.7",
2424
"ondram/ci-detector": "^4.2",
2525
"phpstan/phpdoc-parser": "^2.3",
26-
"phpstan/phpstan": "^2.1.34",
26+
"phpstan/phpstan": "^2.1.37",
2727
"react/event-loop": "^1.6",
2828
"react/promise": "^3.3",
2929
"react/socket": "^1.17",
@@ -34,7 +34,7 @@
3434
"rector/rector-symfony": "dev-main",
3535
"sebastian/diff": "^6.0|^7.0",
3636
"symfony/console": "^6.4.24",
37-
"symfony/filesystem": "^6.4|7.0.*",
37+
"symfony/filesystem": "^7.0",
3838
"symfony/finder": "^6.4",
3939
"symfony/process": "^6.4|7.0.*",
4040
"symplify/easy-parallel": "^11.2.2",
@@ -49,8 +49,8 @@
4949
"phpstan/phpstan-deprecation-rules": "^2.0",
5050
"phpstan/phpstan-phpunit": "^2.0",
5151
"phpstan/phpstan-webmozart-assert": "^2.0",
52-
"phpunit/phpunit": "^11.5|^12.0",
53-
"rector/jack": "^0.4",
52+
"phpunit/phpunit": "^12.5.6",
53+
"rector/jack": "^0.5",
5454
"rector/release-notes-generator": "^0.5.1",
5555
"rector/swiss-knife": "^2.3",
5656
"rector/type-perfect": "^2.1.2",
@@ -99,6 +99,7 @@
9999
"tests/debug_functions.php",
100100
"rules-tests/Transform/Rector/FuncCall/FuncCallToMethodCallRector/Source/some_view_function.php",
101101
"rules-tests/TypeDeclaration/Rector/ClassMethod/ParamTypeByMethodCallTypeRector/Source/FunctionTyped.php",
102+
"rules-tests/TypeDeclaration/Rector/StmtsAwareInterface/SafeDeclareStrictTypesRector/Source/functions.php",
102103
"rules-tests/Php70/Rector/ClassMethod/Php4ConstructorRector/Source/ParentClass.php",
103104
"rules-tests/CodingStyle/Rector/Closure/StaticClosureRector/Source/functions.php"
104105
]
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
class Test
46
{
57
}

phpstan.neon

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@ parameters:
6868
# phpstan class constant value
6969
- identifier: phpstanApi.classConstant
7070

71+
# phpstan class construction
72+
- identifier: phpstanApi.constructor
73+
7174
# phpstan instanceof
7275
- identifier: phpstanApi.instanceofAssumption
7376

rules-tests/CodeQuality/Rector/Class_/CompleteDynamicPropertiesRector/Fixture/constructor_private.php.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ class ConstructorPrivate
66
{
77
public function __construct()
88
{
9-
$this->value = 'classStringCaseInSensitive';
9+
$this->value = 'constructorPrivate';
1010
}
1111
}
1212

@@ -21,7 +21,7 @@ class ConstructorPrivate
2121
private string $value;
2222
public function __construct()
2323
{
24-
$this->value = 'classStringCaseInSensitive';
24+
$this->value = 'constructorPrivate';
2525
}
2626
}
2727

rules-tests/Php81/Rector/Property/ReadOnlyPropertyRector/Fixture/skip_doctrine_odm_mongodb_document.php.inc renamed to rules-tests/Php81/Rector/Property/ReadOnlyPropertyRector/Fixture/skip_doctrine_odm_mongodb_annotations_document.php.inc

File renamed without changes.

0 commit comments

Comments
 (0)