From 6a9f454c1554407e674dbff8faee2a2ab83a7d51 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Sun, 7 Nov 2021 06:24:52 +0000 Subject: [PATCH] Updated Rector to commit fed8756bacf4220a777936c2456e326379ccfa77 https://github.com/rectorphp/rector-src/commit/fed8756bacf4220a777936c2456e326379ccfa77 [PHPStan] Remove phpstan <=0.12.99 from conflict config (#1175) --- .github/workflows/along_other_packages.yaml | 2 +- composer.json | 3 +-- src/Application/VersionResolver.php | 4 ++-- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 14 +++++++------- vendor/composer/autoload_static.php | 8 ++++---- vendor/scoper-autoload.php | 10 +++++----- 7 files changed, 21 insertions(+), 22 deletions(-) diff --git a/.github/workflows/along_other_packages.yaml b/.github/workflows/along_other_packages.yaml index 8d30f3cfd31..441c9d737a6 100644 --- a/.github/workflows/along_other_packages.yaml +++ b/.github/workflows/along_other_packages.yaml @@ -26,7 +26,7 @@ jobs: - name: 'Along PHPStan' - install: composer require phpstan/phpstan:^1.0 --dev --ansi + install: composer require phpstan/phpstan:^1.1.1 --dev --ansi name: "PHP ${{ matrix.php_version }}" diff --git a/composer.json b/composer.json index 9c3b9ccfa6a..fdb485b07ba 100644 --- a/composer.json +++ b/composer.json @@ -7,7 +7,7 @@ ], "require": { "php": "^7.1|^8.0", - "phpstan/phpstan": "^1.0" + "phpstan/phpstan": "^1.1.1" }, "autoload": { "files": [ @@ -21,7 +21,6 @@ }, "conflict": { "phpstan/phpdoc-parser": "<=0.5.3", - "phpstan/phpstan": "<=0.12.99", "rector/rector-prefixed": "*", "rector/rector-phpunit": "*", "rector/rector-symfony": "*", diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index 583c677940d..78509ac1c25 100644 --- a/src/Application/VersionResolver.php +++ b/src/Application/VersionResolver.php @@ -16,11 +16,11 @@ final class VersionResolver /** * @var string */ - public const PACKAGE_VERSION = '66800f00f1ec158f96416b8e0b84c93f54abb1d5'; + public const PACKAGE_VERSION = 'fed8756bacf4220a777936c2456e326379ccfa77'; /** * @var string */ - public const RELEASE_DATE = '2021-11-07 03:57:30'; + public const RELEASE_DATE = '2021-11-07 06:09:20'; public static function resolvePackageVersion() : string { $process = new \RectorPrefix20211107\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__); diff --git a/vendor/autoload.php b/vendor/autoload.php index d630b9ef535..ad9151062e9 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInitec9d30e58e989f37c3512067062b236d::getLoader(); +return ComposerAutoloaderInitb28ae3d6296762c681212c158268b8d6::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 7d09bce6bdb..0c2ceddcc80 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInitec9d30e58e989f37c3512067062b236d +class ComposerAutoloaderInitb28ae3d6296762c681212c158268b8d6 { private static $loader; @@ -22,15 +22,15 @@ class ComposerAutoloaderInitec9d30e58e989f37c3512067062b236d return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInitec9d30e58e989f37c3512067062b236d', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitb28ae3d6296762c681212c158268b8d6', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__))); - spl_autoload_unregister(array('ComposerAutoloaderInitec9d30e58e989f37c3512067062b236d', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitb28ae3d6296762c681212c158268b8d6', 'loadClassLoader')); $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded()); if ($useStaticLoader) { require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInitec9d30e58e989f37c3512067062b236d::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInitb28ae3d6296762c681212c158268b8d6::getInitializer($loader)); } else { $classMap = require __DIR__ . '/autoload_classmap.php'; if ($classMap) { @@ -42,19 +42,19 @@ class ComposerAutoloaderInitec9d30e58e989f37c3512067062b236d $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInitec9d30e58e989f37c3512067062b236d::$files; + $includeFiles = Composer\Autoload\ComposerStaticInitb28ae3d6296762c681212c158268b8d6::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequireec9d30e58e989f37c3512067062b236d($fileIdentifier, $file); + composerRequireb28ae3d6296762c681212c158268b8d6($fileIdentifier, $file); } return $loader; } } -function composerRequireec9d30e58e989f37c3512067062b236d($fileIdentifier, $file) +function composerRequireb28ae3d6296762c681212c158268b8d6($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { require $file; diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index e1eedb065c6..377621a645e 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInitec9d30e58e989f37c3512067062b236d +class ComposerStaticInitb28ae3d6296762c681212c158268b8d6 { public static $files = array ( 'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php', @@ -3522,9 +3522,9 @@ class ComposerStaticInitec9d30e58e989f37c3512067062b236d public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInitec9d30e58e989f37c3512067062b236d::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInitec9d30e58e989f37c3512067062b236d::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInitec9d30e58e989f37c3512067062b236d::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInitb28ae3d6296762c681212c158268b8d6::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitb28ae3d6296762c681212c158268b8d6::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInitb28ae3d6296762c681212c158268b8d6::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/scoper-autoload.php b/vendor/scoper-autoload.php index f5c9b6f72c0..c81936d5799 100644 --- a/vendor/scoper-autoload.php +++ b/vendor/scoper-autoload.php @@ -9,8 +9,8 @@ $loader = require_once __DIR__.'/autoload.php'; if (!class_exists('AutoloadIncluder', false) && !interface_exists('AutoloadIncluder', false) && !trait_exists('AutoloadIncluder', false)) { spl_autoload_call('RectorPrefix20211107\AutoloadIncluder'); } -if (!class_exists('ComposerAutoloaderInitec9d30e58e989f37c3512067062b236d', false) && !interface_exists('ComposerAutoloaderInitec9d30e58e989f37c3512067062b236d', false) && !trait_exists('ComposerAutoloaderInitec9d30e58e989f37c3512067062b236d', false)) { - spl_autoload_call('RectorPrefix20211107\ComposerAutoloaderInitec9d30e58e989f37c3512067062b236d'); +if (!class_exists('ComposerAutoloaderInitb28ae3d6296762c681212c158268b8d6', false) && !interface_exists('ComposerAutoloaderInitb28ae3d6296762c681212c158268b8d6', false) && !trait_exists('ComposerAutoloaderInitb28ae3d6296762c681212c158268b8d6', false)) { + spl_autoload_call('RectorPrefix20211107\ComposerAutoloaderInitb28ae3d6296762c681212c158268b8d6'); } if (!class_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false) && !interface_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false) && !trait_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false)) { spl_autoload_call('RectorPrefix20211107\Helmich\TypoScriptParser\Parser\AST\Statement'); @@ -3306,9 +3306,9 @@ if (!function_exists('print_node')) { return \RectorPrefix20211107\print_node(...func_get_args()); } } -if (!function_exists('composerRequireec9d30e58e989f37c3512067062b236d')) { - function composerRequireec9d30e58e989f37c3512067062b236d() { - return \RectorPrefix20211107\composerRequireec9d30e58e989f37c3512067062b236d(...func_get_args()); +if (!function_exists('composerRequireb28ae3d6296762c681212c158268b8d6')) { + function composerRequireb28ae3d6296762c681212c158268b8d6() { + return \RectorPrefix20211107\composerRequireb28ae3d6296762c681212c158268b8d6(...func_get_args()); } } if (!function_exists('parseArgs')) {