Updated Rector to commit 5595f80ed176f93485f50ff6dabad79cedbb72dc

5595f80ed1 Update github actions/checkout from v3 to v4 (#4909)
This commit is contained in:
Tomas Votruba 2023-09-04 14:00:44 +00:00
parent c5dca33b93
commit 491915e31b
19 changed files with 47 additions and 45 deletions

View File

@ -31,7 +31,7 @@ jobs:
name: "PHP ${{ matrix.php_version }}" name: "PHP ${{ matrix.php_version }}"
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- uses: shivammathur/setup-php@v2 - uses: shivammathur/setup-php@v2
with: with:

View File

@ -16,7 +16,7 @@ jobs:
php_version: ['7.2', '7.3', '7.4', '8.0', '8.1'] php_version: ['7.2', '7.3', '7.4', '8.0', '8.1']
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- -
uses: shivammathur/setup-php@v2 uses: shivammathur/setup-php@v2

View File

@ -25,7 +25,7 @@ jobs:
name: End to end test - ${{ matrix.directory }} name: End to end test - ${{ matrix.directory }}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- uses: shivammathur/setup-php@v2 - uses: shivammathur/setup-php@v2
with: with:

View File

@ -22,7 +22,7 @@ jobs:
name: End to end test with diff - ${{ matrix.directory }} name: End to end test with diff - ${{ matrix.directory }}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- uses: shivammathur/setup-php@v2 - uses: shivammathur/setup-php@v2
with: with:

View File

@ -19,7 +19,7 @@ jobs:
name: End to end test - ${{ matrix.directory }} name: End to end test - ${{ matrix.directory }}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- uses: shivammathur/setup-php@v2 - uses: shivammathur/setup-php@v2
with: with:

View File

@ -13,7 +13,7 @@ jobs:
name: End to end test - PHP 7.2 with load ReflectionUnionType stub name: End to end test - PHP 7.2 with load ReflectionUnionType stub
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- uses: shivammathur/setup-php@v2 - uses: shivammathur/setup-php@v2
with: with:

View File

@ -16,7 +16,7 @@ jobs:
name: End to end test - PHP 7.4 and Match class name name: End to end test - PHP 7.4 and Match class name
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- uses: shivammathur/setup-php@v2 - uses: shivammathur/setup-php@v2
with: with:

View File

@ -19,7 +19,7 @@ jobs:
name: End to end test - ${{ matrix.directory }} name: End to end test - ${{ matrix.directory }}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- uses: shivammathur/setup-php@v2 - uses: shivammathur/setup-php@v2
with: with:

View File

@ -138,7 +138,7 @@ CODE_SAMPLE
private function refactorEqualsMethodCall(MethodCall $methodCall) : ?Identical private function refactorEqualsMethodCall(MethodCall $methodCall) : ?Identical
{ {
$expr = $this->getNonEnumReturnTypeExpr($methodCall->var); $expr = $this->getNonEnumReturnTypeExpr($methodCall->var);
if ($expr === null) { if (!$expr instanceof Expr) {
$expr = $this->getValidEnumExpr($methodCall->var); $expr = $this->getValidEnumExpr($methodCall->var);
if (!$expr instanceof Expr) { if (!$expr instanceof Expr) {
return null; return null;
@ -149,7 +149,7 @@ CODE_SAMPLE
return null; return null;
} }
$right = $this->getNonEnumReturnTypeExpr($arg->value); $right = $this->getNonEnumReturnTypeExpr($arg->value);
if ($right === null) { if (!$right instanceof Expr) {
$right = $this->getValidEnumExpr($arg->value); $right = $this->getValidEnumExpr($arg->value);
if (!$right instanceof Expr) { if (!$right instanceof Expr) {
return null; return null;

View File

@ -3,6 +3,8 @@
declare (strict_types=1); declare (strict_types=1);
namespace Rector\TypeDeclaration\Rector\ClassMethod; namespace Rector\TypeDeclaration\Rector\ClassMethod;
use PhpParser\Node\Stmt\Expression;
use PhpParser\Node\Expr\MethodCall;
use PhpParser\Node; use PhpParser\Node;
use PhpParser\Node\Expr\ArrayDimFetch; use PhpParser\Node\Expr\ArrayDimFetch;
use PhpParser\Node\Expr\AssignOp\Coalesce as AssignOpCoalesce; use PhpParser\Node\Expr\AssignOp\Coalesce as AssignOpCoalesce;
@ -133,7 +135,7 @@ CODE_SAMPLE
$firstArg = $node->getArgs()[0]; $firstArg = $node->getArgs()[0];
$nodeToCheck = $firstArg->value; $nodeToCheck = $firstArg->value;
} }
if ($node instanceof Node\Stmt\Expression) { if ($node instanceof Expression) {
$nodeToCheck = $node->expr; $nodeToCheck = $node->expr;
} }
if ($node instanceof Coalesce) { if ($node instanceof Coalesce) {
@ -142,7 +144,7 @@ CODE_SAMPLE
if ($node instanceof AssignOpCoalesce) { if ($node instanceof AssignOpCoalesce) {
$nodeToCheck = $node->var; $nodeToCheck = $node->var;
} }
if ($nodeToCheck instanceof Node\Expr\MethodCall) { if ($nodeToCheck instanceof MethodCall) {
return $nodeToCheck->var instanceof Variable && $this->isName($nodeToCheck->var, $paramName); return $nodeToCheck->var instanceof Variable && $this->isName($nodeToCheck->var, $paramName);
} }
if ($nodeToCheck instanceof ArrayDimFetch) { if ($nodeToCheck instanceof ArrayDimFetch) {

View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api * @api
* @var string * @var string
*/ */
public const PACKAGE_VERSION = '5919201e137b5ed041eebdf891ff2bada22fddb1'; public const PACKAGE_VERSION = '5595f80ed176f93485f50ff6dabad79cedbb72dc';
/** /**
* @api * @api
* @var string * @var string
*/ */
public const RELEASE_DATE = '2023-09-04 17:30:16'; public const RELEASE_DATE = '2023-09-04 20:57:25';
/** /**
* @var int * @var int
*/ */

View File

@ -11,7 +11,7 @@ jobs:
steps: steps:
- -
if: github.event.pull_request.head.repo.full_name == github.repository if: github.event.pull_request.head.repo.full_name == github.repository
uses: actions/checkout@v3 uses: actions/checkout@v4
with: with:
# Must be used to trigger workflow after push # Must be used to trigger workflow after push
token: ${{ secrets.ACCESS_TOKEN }} token: ${{ secrets.ACCESS_TOKEN }}

2
vendor/autoload.php vendored
View File

@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
require_once __DIR__ . '/composer/autoload_real.php'; require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInitb65aa1603d7e675653c9c0f0cb1c3897::getLoader(); return ComposerAutoloaderInita4822cf75470888d0b97f29c7b22e1fb::getLoader();

View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer // autoload_real.php @generated by Composer
class ComposerAutoloaderInitb65aa1603d7e675653c9c0f0cb1c3897 class ComposerAutoloaderInita4822cf75470888d0b97f29c7b22e1fb
{ {
private static $loader; private static $loader;
@ -22,17 +22,17 @@ class ComposerAutoloaderInitb65aa1603d7e675653c9c0f0cb1c3897
return self::$loader; return self::$loader;
} }
spl_autoload_register(array('ComposerAutoloaderInitb65aa1603d7e675653c9c0f0cb1c3897', 'loadClassLoader'), true, true); spl_autoload_register(array('ComposerAutoloaderInita4822cf75470888d0b97f29c7b22e1fb', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInitb65aa1603d7e675653c9c0f0cb1c3897', 'loadClassLoader')); spl_autoload_unregister(array('ComposerAutoloaderInita4822cf75470888d0b97f29c7b22e1fb', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php'; require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInitb65aa1603d7e675653c9c0f0cb1c3897::getInitializer($loader)); call_user_func(\Composer\Autoload\ComposerStaticInita4822cf75470888d0b97f29c7b22e1fb::getInitializer($loader));
$loader->setClassMapAuthoritative(true); $loader->setClassMapAuthoritative(true);
$loader->register(true); $loader->register(true);
$filesToLoad = \Composer\Autoload\ComposerStaticInitb65aa1603d7e675653c9c0f0cb1c3897::$files; $filesToLoad = \Composer\Autoload\ComposerStaticInita4822cf75470888d0b97f29c7b22e1fb::$files;
$requireFile = \Closure::bind(static function ($fileIdentifier, $file) { $requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true; $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

View File

@ -4,7 +4,7 @@
namespace Composer\Autoload; namespace Composer\Autoload;
class ComposerStaticInitb65aa1603d7e675653c9c0f0cb1c3897 class ComposerStaticInita4822cf75470888d0b97f29c7b22e1fb
{ {
public static $files = array ( public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php', 'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@ -2611,9 +2611,9 @@ class ComposerStaticInitb65aa1603d7e675653c9c0f0cb1c3897
public static function getInitializer(ClassLoader $loader) public static function getInitializer(ClassLoader $loader)
{ {
return \Closure::bind(function () use ($loader) { return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInitb65aa1603d7e675653c9c0f0cb1c3897::$prefixLengthsPsr4; $loader->prefixLengthsPsr4 = ComposerStaticInita4822cf75470888d0b97f29c7b22e1fb::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitb65aa1603d7e675653c9c0f0cb1c3897::$prefixDirsPsr4; $loader->prefixDirsPsr4 = ComposerStaticInita4822cf75470888d0b97f29c7b22e1fb::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitb65aa1603d7e675653c9c0f0cb1c3897::$classMap; $loader->classMap = ComposerStaticInita4822cf75470888d0b97f29c7b22e1fb::$classMap;
}, null, ClassLoader::class); }, null, ClassLoader::class);
} }

View File

@ -908,17 +908,17 @@
}, },
{ {
"name": "phpstan\/phpstan", "name": "phpstan\/phpstan",
"version": "1.10.32", "version": "1.10.33",
"version_normalized": "1.10.32.0", "version_normalized": "1.10.33.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https:\/\/github.com\/phpstan\/phpstan.git", "url": "https:\/\/github.com\/phpstan\/phpstan.git",
"reference": "c47e47d3ab03137c0e121e77c4d2cb58672f6d44" "reference": "03b1cf9f814ba0863c4e9affea49a4d1ed9a2ed1"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https:\/\/api.github.com\/repos\/phpstan\/phpstan\/zipball\/c47e47d3ab03137c0e121e77c4d2cb58672f6d44", "url": "https:\/\/api.github.com\/repos\/phpstan\/phpstan\/zipball\/03b1cf9f814ba0863c4e9affea49a4d1ed9a2ed1",
"reference": "c47e47d3ab03137c0e121e77c4d2cb58672f6d44", "reference": "03b1cf9f814ba0863c4e9affea49a4d1ed9a2ed1",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -927,7 +927,7 @@
"conflict": { "conflict": {
"phpstan\/phpstan-shim": "*" "phpstan\/phpstan-shim": "*"
}, },
"time": "2023-08-24T21:54:50+00:00", "time": "2023-09-04T12:20:53+00:00",
"bin": [ "bin": [
"phpstan", "phpstan",
"phpstan.phar" "phpstan.phar"

File diff suppressed because one or more lines are too long

Binary file not shown.

View File

@ -1,16 +1,16 @@
-----BEGIN PGP SIGNATURE----- -----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmTn0ZAACgkQUcZzBf/C iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmT1y40ACgkQUcZzBf/C
5cCXIA/9Gmo24JCtSO2yzad3Gi+Jlv0kJtbTMiFgnteWGOq+eXDVC4o9A8I671ei 5cDm6Q//VupQizxW3TICxhwzMDz05+nI8d72mn5vd94Niat90L1wPVHSZ9eBQSs3
wkVuv2Gesez0hCcEvFT+QIUwS/xek3tvlGEqj7y9QPtPjhWb1x8hLyy8mlxwhFQh xMGVKJufB/3tQp6rviYk0aFnTFsKYkgwQYSDk1P9D7VrcJdpB461P3FT4MGsRk8E
w17ecQncsyRH0yLkNJB8LkMNNi6t+EjZfrxtyezeKGfVT8HM439Wy/VjccybcJEc SSo55EuMGpiVvgoKbiPXeYV76yEpSMpelbKDNTm7iglLFVQKAnTv17aQv/UdBoYk
+8Ld5odxf9WINDUq2D+ysiQ9uW0EJsaxe227SZ4Vm9MgPQw0PFFMXxWn96Bb/Eyv t/dOS0ovoWmjkj9837EA5o2FAkhA5njlpvRs1l5Jt/tZsZtJTcDjPYfP5kIGbOwp
ryB8nKL/Hp3nVzcQdcjaZ4L9K6aH0FO4VtSSdSYaHA3jVxTBugr19FTHiWEEJalS V6xKYW7JYht+O0si3GxGmWGOE4VbOHLpUDpLMmVu53njjeGAIkPgX53TqBRbAbVL
zv0j97fDkH4xlnzuW74j/35rOqZlMd6NBzS0/eHvpuJ6kfz0KPHXnhW3EQWu6cTY FjpDSZYC08lE4WblqXZEP6aKqVqthQ4LcGfyZDvuWDgPGHf86cTvfHQvtqRY45kU
MTrXo5CfSAfpsMSp6w1evnDRS4z9pqNQ5hmdA2hl+3qTwixyYjP19EKxKfTWC7Qr GhFDz6IfVlwBrfpc4hKfbhF6Q3Txm8ZSSfiVHim8JFjCqO+jn4qmaXGaOqbNUfv9
o7SwJruaCl6MfQ3dTtvZrRYtvDyJxIUKXGlAaUMA2NP4rh7vUWGwgSJmSwaSs9wP fLgg7Bbnu1tZdMv6JJP5Kmk0x5wp4m2vFxDd6NGfm7uz9182/LtXOjqQ0MuGfL+j
Fv5cTJ+NO3XRDF5RaWF/MNWH1JjupCwQxlsQthW8Dyy1W2pMtv84AY8jk508boo1 Dw53dl+WdUpr4Xk1m1GkYwDF9zLIwBB7dEghz6c4nbiGvh31MUk6N+4N2eGkjtWW
9nEIa/nrKbmjz2fSuIWWVVKrUD6qR5JpF4Odd4p+NR0h8WT/2JAF9rW38WZXWrmh B1PPORcpxxXSlhtftCwsJVxRFodQu9cmI0qmw4EUEipFrkFuT7a1rNF48NFyfRMh
MsSLy056l96wOB3CnNWtCx7M2FXXGlcOK61Kv7+ybu4A6oFybGg= PcB/UcUHMCL7owhfQEEuPvqIPJS4saesCdFeJAM0MKuXB1nNGTQ=
=4S4l =HpaR
-----END PGP SIGNATURE----- -----END PGP SIGNATURE-----