Skip to content

Commit

Permalink
Updated Rector to commit 5595f80ed176f93485f50ff6dabad79cedbb72dc
Browse files Browse the repository at this point in the history
rectorphp/rector-src@5595f80 Update github actions/checkout from v3 to v4 (#4909)
  • Loading branch information
TomasVotruba committed Sep 4, 2023
1 parent c5dca33 commit 491915e
Show file tree
Hide file tree
Showing 19 changed files with 47 additions and 45 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/along_other_packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
name: "PHP ${{ matrix.php_version }}"

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: shivammathur/setup-php@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bare_run.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
php_version: ['7.2', '7.3', '7.4', '8.0', '8.1']

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

-
uses: shivammathur/setup-php@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
name: End to end test - ${{ matrix.directory }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: shivammathur/setup-php@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e_diff.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
name: End to end test with diff - ${{ matrix.directory }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: shivammathur/setup-php@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e_global.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
name: End to end test - ${{ matrix.directory }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: shivammathur/setup-php@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e_php72.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
name: End to end test - PHP 7.2 with load ReflectionUnionType stub

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: shivammathur/setup-php@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e_php74.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
name: End to end test - PHP 7.4 and Match class name

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: shivammathur/setup-php@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/standalone_rule_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
name: End to end test - ${{ matrix.directory }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: shivammathur/setup-php@v2
with:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ private function refactorGetValueMethodCall(MethodCall $methodCall) : ?PropertyF
private function refactorEqualsMethodCall(MethodCall $methodCall) : ?Identical
{
$expr = $this->getNonEnumReturnTypeExpr($methodCall->var);
if ($expr === null) {
if (!$expr instanceof Expr) {
$expr = $this->getValidEnumExpr($methodCall->var);
if (!$expr instanceof Expr) {
return null;
Expand All @@ -149,7 +149,7 @@ private function refactorEqualsMethodCall(MethodCall $methodCall) : ?Identical
return null;
}
$right = $this->getNonEnumReturnTypeExpr($arg->value);
if ($right === null) {
if (!$right instanceof Expr) {
$right = $this->getValidEnumExpr($arg->value);
if (!$right instanceof Expr) {
return null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
declare (strict_types=1);
namespace Rector\TypeDeclaration\Rector\ClassMethod;

use PhpParser\Node\Stmt\Expression;
use PhpParser\Node\Expr\MethodCall;
use PhpParser\Node;
use PhpParser\Node\Expr\ArrayDimFetch;
use PhpParser\Node\Expr\AssignOp\Coalesce as AssignOpCoalesce;
Expand Down Expand Up @@ -133,7 +135,7 @@ private function shouldStop(Node $node, string $paramName) : bool
$firstArg = $node->getArgs()[0];
$nodeToCheck = $firstArg->value;
}
if ($node instanceof Node\Stmt\Expression) {
if ($node instanceof Expression) {
$nodeToCheck = $node->expr;
}
if ($node instanceof Coalesce) {
Expand All @@ -142,7 +144,7 @@ private function shouldStop(Node $node, string $paramName) : bool
if ($node instanceof AssignOpCoalesce) {
$nodeToCheck = $node->var;
}
if ($nodeToCheck instanceof Node\Expr\MethodCall) {
if ($nodeToCheck instanceof MethodCall) {
return $nodeToCheck->var instanceof Variable && $this->isName($nodeToCheck->var, $paramName);
}
if ($nodeToCheck instanceof ArrayDimFetch) {
Expand Down
4 changes: 2 additions & 2 deletions src/Application/VersionResolver.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '5919201e137b5ed041eebdf891ff2bada22fddb1';
public const PACKAGE_VERSION = '5595f80ed176f93485f50ff6dabad79cedbb72dc';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-09-04 17:30:16';
public const RELEASE_DATE = '2023-09-04 20:57:25';
/**
* @var int
*/
Expand Down
2 changes: 1 addition & 1 deletion templates/rector-github-action-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
steps:
-
if: github.event.pull_request.head.repo.full_name == github.repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
# Must be used to trigger workflow after push
token: ${{ secrets.ACCESS_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion vendor/autoload.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@

require_once __DIR__ . '/composer/autoload_real.php';

return ComposerAutoloaderInitb65aa1603d7e675653c9c0f0cb1c3897::getLoader();
return ComposerAutoloaderInita4822cf75470888d0b97f29c7b22e1fb::getLoader();
10 changes: 5 additions & 5 deletions vendor/composer/autoload_real.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

// autoload_real.php @generated by Composer

class ComposerAutoloaderInitb65aa1603d7e675653c9c0f0cb1c3897
class ComposerAutoloaderInita4822cf75470888d0b97f29c7b22e1fb
{
private static $loader;

Expand All @@ -22,17 +22,17 @@ public static function getLoader()
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__));
spl_autoload_unregister(array('ComposerAutoloaderInitb65aa1603d7e675653c9c0f0cb1c3897', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInita4822cf75470888d0b97f29c7b22e1fb', 'loadClassLoader'));

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->register(true);

$filesToLoad = \Composer\Autoload\ComposerStaticInitb65aa1603d7e675653c9c0f0cb1c3897::$files;
$filesToLoad = \Composer\Autoload\ComposerStaticInita4822cf75470888d0b97f29c7b22e1fb::$files;
$requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
Expand Down
8 changes: 4 additions & 4 deletions vendor/composer/autoload_static.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace Composer\Autoload;

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

}, null, ClassLoader::class);
}
Expand Down
12 changes: 6 additions & 6 deletions vendor/composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -908,17 +908,17 @@
},
{
"name": "phpstan\/phpstan",
"version": "1.10.32",
"version_normalized": "1.10.32.0",
"version": "1.10.33",
"version_normalized": "1.10.33.0",
"source": {
"type": "git",
"url": "https:\/\/github.com\/phpstan\/phpstan.git",
"reference": "c47e47d3ab03137c0e121e77c4d2cb58672f6d44"
"reference": "03b1cf9f814ba0863c4e9affea49a4d1ed9a2ed1"
},
"dist": {
"type": "zip",
"url": "https:\/\/api.github.com\/repos\/phpstan\/phpstan\/zipball\/c47e47d3ab03137c0e121e77c4d2cb58672f6d44",
"reference": "c47e47d3ab03137c0e121e77c4d2cb58672f6d44",
"url": "https:\/\/api.github.com\/repos\/phpstan\/phpstan\/zipball\/03b1cf9f814ba0863c4e9affea49a4d1ed9a2ed1",
"reference": "03b1cf9f814ba0863c4e9affea49a4d1ed9a2ed1",
"shasum": ""
},
"require": {
Expand All @@ -927,7 +927,7 @@
"conflict": {
"phpstan\/phpstan-shim": "*"
},
"time": "2023-08-24T21:54:50+00:00",
"time": "2023-09-04T12:20:53+00:00",
"bin": [
"phpstan",
"phpstan.phar"
Expand Down
Loading

0 comments on commit 491915e

Please sign in to comment.