mirror of https://github.com/rectorphp/rector.git
Updated Rector to commit 853fdee039
853fdee039
Allowing future versions of phpstan (#810)
This commit is contained in:
parent
8a6c24cf3d
commit
09fd3dac67
|
@ -26,7 +26,7 @@ jobs:
|
|||
|
||||
-
|
||||
name: 'Along PHPStan'
|
||||
install: composer require phpstan/phpstan:^0.12.96 --dev --ansi
|
||||
install: composer require phpstan/phpstan:^0.12.97 --dev --ansi
|
||||
|
||||
name: "PHP ${{ matrix.php_version }}"
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
],
|
||||
"require": {
|
||||
"php": "^7.1|^8.0",
|
||||
"phpstan/phpstan": "0.12.96"
|
||||
"phpstan/phpstan": "0.12.97"
|
||||
},
|
||||
"autoload": {
|
||||
"files": [
|
||||
|
|
|
@ -16,11 +16,11 @@ final class VersionResolver
|
|||
/**
|
||||
* @var string
|
||||
*/
|
||||
public const PACKAGE_VERSION = 'b1d573e8b56a92a0f3dcd0f11a49a41d2c2f72f6';
|
||||
public const PACKAGE_VERSION = '853fdee039e3ce5339d54947f0ca4cbaa9008978';
|
||||
/**
|
||||
* @var string
|
||||
*/
|
||||
public const RELEASE_DATE = '2021-09-01 09:17:01';
|
||||
public const RELEASE_DATE = '2021-09-01 22:10:20';
|
||||
public static function resolvePackageVersion() : string
|
||||
{
|
||||
$process = new \RectorPrefix20210901\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__);
|
||||
|
|
|
@ -4,4 +4,4 @@
|
|||
|
||||
require_once __DIR__ . '/composer/autoload_real.php';
|
||||
|
||||
return ComposerAutoloaderInit929a42a2ebe3cdb227e99e7bf5c53033::getLoader();
|
||||
return ComposerAutoloaderInit1245a53e53118f0b1dd5d966413630c8::getLoader();
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
// autoload_real.php @generated by Composer
|
||||
|
||||
class ComposerAutoloaderInit929a42a2ebe3cdb227e99e7bf5c53033
|
||||
class ComposerAutoloaderInit1245a53e53118f0b1dd5d966413630c8
|
||||
{
|
||||
private static $loader;
|
||||
|
||||
|
@ -22,15 +22,15 @@ class ComposerAutoloaderInit929a42a2ebe3cdb227e99e7bf5c53033
|
|||
return self::$loader;
|
||||
}
|
||||
|
||||
spl_autoload_register(array('ComposerAutoloaderInit929a42a2ebe3cdb227e99e7bf5c53033', 'loadClassLoader'), true, true);
|
||||
spl_autoload_register(array('ComposerAutoloaderInit1245a53e53118f0b1dd5d966413630c8', 'loadClassLoader'), true, true);
|
||||
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
|
||||
spl_autoload_unregister(array('ComposerAutoloaderInit929a42a2ebe3cdb227e99e7bf5c53033', 'loadClassLoader'));
|
||||
spl_autoload_unregister(array('ComposerAutoloaderInit1245a53e53118f0b1dd5d966413630c8', '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\ComposerStaticInit929a42a2ebe3cdb227e99e7bf5c53033::getInitializer($loader));
|
||||
call_user_func(\Composer\Autoload\ComposerStaticInit1245a53e53118f0b1dd5d966413630c8::getInitializer($loader));
|
||||
} else {
|
||||
$classMap = require __DIR__ . '/autoload_classmap.php';
|
||||
if ($classMap) {
|
||||
|
@ -42,19 +42,19 @@ class ComposerAutoloaderInit929a42a2ebe3cdb227e99e7bf5c53033
|
|||
$loader->register(true);
|
||||
|
||||
if ($useStaticLoader) {
|
||||
$includeFiles = Composer\Autoload\ComposerStaticInit929a42a2ebe3cdb227e99e7bf5c53033::$files;
|
||||
$includeFiles = Composer\Autoload\ComposerStaticInit1245a53e53118f0b1dd5d966413630c8::$files;
|
||||
} else {
|
||||
$includeFiles = require __DIR__ . '/autoload_files.php';
|
||||
}
|
||||
foreach ($includeFiles as $fileIdentifier => $file) {
|
||||
composerRequire929a42a2ebe3cdb227e99e7bf5c53033($fileIdentifier, $file);
|
||||
composerRequire1245a53e53118f0b1dd5d966413630c8($fileIdentifier, $file);
|
||||
}
|
||||
|
||||
return $loader;
|
||||
}
|
||||
}
|
||||
|
||||
function composerRequire929a42a2ebe3cdb227e99e7bf5c53033($fileIdentifier, $file)
|
||||
function composerRequire1245a53e53118f0b1dd5d966413630c8($fileIdentifier, $file)
|
||||
{
|
||||
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
|
||||
require $file;
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
namespace Composer\Autoload;
|
||||
|
||||
class ComposerStaticInit929a42a2ebe3cdb227e99e7bf5c53033
|
||||
class ComposerStaticInit1245a53e53118f0b1dd5d966413630c8
|
||||
{
|
||||
public static $files = array (
|
||||
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
|
||||
|
@ -3855,9 +3855,9 @@ class ComposerStaticInit929a42a2ebe3cdb227e99e7bf5c53033
|
|||
public static function getInitializer(ClassLoader $loader)
|
||||
{
|
||||
return \Closure::bind(function () use ($loader) {
|
||||
$loader->prefixLengthsPsr4 = ComposerStaticInit929a42a2ebe3cdb227e99e7bf5c53033::$prefixLengthsPsr4;
|
||||
$loader->prefixDirsPsr4 = ComposerStaticInit929a42a2ebe3cdb227e99e7bf5c53033::$prefixDirsPsr4;
|
||||
$loader->classMap = ComposerStaticInit929a42a2ebe3cdb227e99e7bf5c53033::$classMap;
|
||||
$loader->prefixLengthsPsr4 = ComposerStaticInit1245a53e53118f0b1dd5d966413630c8::$prefixLengthsPsr4;
|
||||
$loader->prefixDirsPsr4 = ComposerStaticInit1245a53e53118f0b1dd5d966413630c8::$prefixDirsPsr4;
|
||||
$loader->classMap = ComposerStaticInit1245a53e53118f0b1dd5d966413630c8::$classMap;
|
||||
|
||||
}, null, ClassLoader::class);
|
||||
}
|
||||
|
|
|
@ -832,17 +832,17 @@
|
|||
},
|
||||
{
|
||||
"name": "phpstan\/phpstan",
|
||||
"version": "0.12.96",
|
||||
"version_normalized": "0.12.96.0",
|
||||
"version": "0.12.97",
|
||||
"version_normalized": "0.12.97.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https:\/\/github.com\/phpstan\/phpstan.git",
|
||||
"reference": "a98bdc51318f20fcae8c953d266f81a70254917f"
|
||||
"reference": "a8867e63a00e606589faf8d3613164f20722c4ee"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https:\/\/api.github.com\/repos\/phpstan\/phpstan\/zipball\/a98bdc51318f20fcae8c953d266f81a70254917f",
|
||||
"reference": "a98bdc51318f20fcae8c953d266f81a70254917f",
|
||||
"url": "https:\/\/api.github.com\/repos\/phpstan\/phpstan\/zipball\/a8867e63a00e606589faf8d3613164f20722c4ee",
|
||||
"reference": "a8867e63a00e606589faf8d3613164f20722c4ee",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
@ -851,7 +851,7 @@
|
|||
"conflict": {
|
||||
"phpstan\/phpstan-shim": "*"
|
||||
},
|
||||
"time": "2021-08-21T11:55:13+00:00",
|
||||
"time": "2021-09-01T10:51:52+00:00",
|
||||
"bin": [
|
||||
"phpstan",
|
||||
"phpstan.phar"
|
||||
|
@ -875,7 +875,7 @@
|
|||
"description": "PHPStan - PHP Static Analysis Tool",
|
||||
"support": {
|
||||
"issues": "https:\/\/github.com\/phpstan\/phpstan\/issues",
|
||||
"source": "https:\/\/github.com\/phpstan\/phpstan\/tree\/0.12.96"
|
||||
"source": "https:\/\/github.com\/phpstan\/phpstan\/tree\/0.12.97"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
|
@ -1938,12 +1938,12 @@
|
|||
"source": {
|
||||
"type": "git",
|
||||
"url": "https:\/\/github.com\/symfony\/dependency-injection.git",
|
||||
"reference": "a665946279f566d94ed5eb98999cfa65c6fa5a78"
|
||||
"reference": "999cfcf6400502bbc145b2bf36935770770ba6ca"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https:\/\/api.github.com\/repos\/symfony\/dependency-injection\/zipball\/a665946279f566d94ed5eb98999cfa65c6fa5a78",
|
||||
"reference": "a665946279f566d94ed5eb98999cfa65c6fa5a78",
|
||||
"url": "https:\/\/api.github.com\/repos\/symfony\/dependency-injection\/zipball\/999cfcf6400502bbc145b2bf36935770770ba6ca",
|
||||
"reference": "999cfcf6400502bbc145b2bf36935770770ba6ca",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
@ -1976,7 +1976,7 @@
|
|||
"symfony\/proxy-manager-bridge": "Generate service proxies to lazy load them",
|
||||
"symfony\/yaml": ""
|
||||
},
|
||||
"time": "2021-08-02T16:16:27+00:00",
|
||||
"time": "2021-08-31T18:22:06+00:00",
|
||||
"default-branch": true,
|
||||
"type": "library",
|
||||
"installation-source": "dist",
|
||||
|
@ -2005,7 +2005,7 @@
|
|||
"description": "Allows you to standardize and centralize the way objects are constructed in your application",
|
||||
"homepage": "https:\/\/symfony.com",
|
||||
"support": {
|
||||
"source": "https:\/\/github.com\/symfony\/dependency-injection\/tree\/v5.3.7"
|
||||
"source": "https:\/\/github.com\/symfony\/dependency-injection\/tree\/5.3"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
|
|
File diff suppressed because one or more lines are too long
Binary file not shown.
|
@ -1,16 +1,16 @@
|
|||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEE0yaA1ZV9xxFr4pwUzxoQjQ565yAFAmEg6aAACgkQzxoQjQ56
|
||||
5yDk8A/+OimMkPF13Rb6QQLsZi1RnR3ejdX8e8NKya4egO1HvK6oGHOpNFlLOrn5
|
||||
VJsqgzKX7EFKbrBjtzn+igCiL626LrpNp9Npcd7sTvopcfWkXkU4CrMwLqxkaAY5
|
||||
50Qw95LIS9xfyifgN8d2At/lzWayvBcXWAFQXnNyCIKGhZf9Et5ZfiKagn3Z2v7P
|
||||
b93YznNUGomEaaTB5iDqG8sUfIUzfKfWuAWyyz2gIy1ouz45ezy8JsGOSnP5KoZn
|
||||
sXiKhFsC5eaiqtzOiQjIiqvdjXcGQplIG5vwzmnbE+VhKAQB7oaIIi++kc8RlW+E
|
||||
Uk4M0Cf5+c4lijJDM+FS0Xy7UUt5qa03vaHP9Ds0JRyL9JGrZHy+G3dEZKWUswAS
|
||||
yOjW1P4OIWjo056oYiXWSlDMbo1y69990efwulpJ7tG93ivdK6DOk02AEXj5VVKS
|
||||
W9To4p99Tl3/sSgm98yEMXQjKNiD2YR6atKY75pz4wabEqRPt60Je4qt9+VLYF63
|
||||
xe1b79uq+AeG09/JtTh2Vpe24mgN1me6MATeXw9hVLmVdS3YO0p/dGhsXxPa06d9
|
||||
lfddEOi22PDKe8s4/OP0Uo8BBLu4dujrb9MZC/eYQR5WFycLkUxQptrelGPuViN9
|
||||
q67vx53A3bs7wLN8rr5PcfRss7POn0+sDWDMlHQFBoinztLGF8E=
|
||||
=BSQQ
|
||||
iQIzBAABCgAdFiEE0yaA1ZV9xxFr4pwUzxoQjQ565yAFAmEvW0cACgkQzxoQjQ56
|
||||
5yCeJg//RSSNf+HccgUO+RNb6LXBCIUja4uCQydlukqCnVzfbKu1wxwEkxdXTJ9C
|
||||
cfOVJz9cceyYywLZEsrUGQzg2d+TfaAiP4Mn/o/YsSxg/qujmmZ59XrwkT5d4Y2W
|
||||
4WmCdoh+ROM/1WpOVTFPS28iosnZCgp+UhMj1sX8yT5hgk/hFbuF7KrLbxRPMXam
|
||||
KkJl9M3MVgxjRogEuGjlW6rRoJ5efZwdPUzfsa74jUdAXfXaofx05J5vmqsfgFok
|
||||
H0i0N0tl2MhEgTH2v/zhkg+JUgbBEQKM1tp0rMNEalAfQ2zMZNYYYVkKck/tQeqR
|
||||
/9sqSllWomLk3H1GqKdNBlLx17M5sVOEXQWrFyQfB07jDt7w0UIwmZlBV2Is2P1A
|
||||
Efdwm1aQpS4HGEdEMTwpdCzdcrt6QWjShpEE0wi73IltVpr9DUSrp5Abhjt1aUgk
|
||||
i+iFQYXknHN3N8LRtvF7amUt+3k8R3cdjqg0ARN/BWHfV2qQpB3nbcIR/0RkKDnl
|
||||
J+POC1jzUSOQz17fYrGbfjoxb8/2J5rrFCOrzzcxlhz1BY2PppP37TywXewdSRTH
|
||||
VvCvXgTs07uUeP61FcGgjh6uxMbk7ccOacQqlxyDyxme1I/9QXW3Eiz7aTR3Xk8E
|
||||
qZGZvvsbhelOGGJ/kme2hpNCvcyMZbWGeukVMwhGwPyLA4tDh30=
|
||||
=pvEJ
|
||||
-----END PGP SIGNATURE-----
|
||||
|
|
|
@ -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('RectorPrefix20210901\AutoloadIncluder');
|
||||
}
|
||||
if (!class_exists('ComposerAutoloaderInit929a42a2ebe3cdb227e99e7bf5c53033', false) && !interface_exists('ComposerAutoloaderInit929a42a2ebe3cdb227e99e7bf5c53033', false) && !trait_exists('ComposerAutoloaderInit929a42a2ebe3cdb227e99e7bf5c53033', false)) {
|
||||
spl_autoload_call('RectorPrefix20210901\ComposerAutoloaderInit929a42a2ebe3cdb227e99e7bf5c53033');
|
||||
if (!class_exists('ComposerAutoloaderInit1245a53e53118f0b1dd5d966413630c8', false) && !interface_exists('ComposerAutoloaderInit1245a53e53118f0b1dd5d966413630c8', false) && !trait_exists('ComposerAutoloaderInit1245a53e53118f0b1dd5d966413630c8', false)) {
|
||||
spl_autoload_call('RectorPrefix20210901\ComposerAutoloaderInit1245a53e53118f0b1dd5d966413630c8');
|
||||
}
|
||||
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('RectorPrefix20210901\Helmich\TypoScriptParser\Parser\AST\Statement');
|
||||
|
@ -3311,9 +3311,9 @@ if (!function_exists('print_node')) {
|
|||
return \RectorPrefix20210901\print_node(...func_get_args());
|
||||
}
|
||||
}
|
||||
if (!function_exists('composerRequire929a42a2ebe3cdb227e99e7bf5c53033')) {
|
||||
function composerRequire929a42a2ebe3cdb227e99e7bf5c53033() {
|
||||
return \RectorPrefix20210901\composerRequire929a42a2ebe3cdb227e99e7bf5c53033(...func_get_args());
|
||||
if (!function_exists('composerRequire1245a53e53118f0b1dd5d966413630c8')) {
|
||||
function composerRequire1245a53e53118f0b1dd5d966413630c8() {
|
||||
return \RectorPrefix20210901\composerRequire1245a53e53118f0b1dd5d966413630c8(...func_get_args());
|
||||
}
|
||||
}
|
||||
if (!function_exists('parseArgs')) {
|
||||
|
|
|
@ -132,8 +132,10 @@ class AutowirePass extends \RectorPrefix20210901\Symfony\Component\DependencyInj
|
|||
$this->decoratedId = null;
|
||||
$this->decoratedClass = null;
|
||||
$this->getPreviousValue = null;
|
||||
if ($isRoot && ($definition = $this->container->getDefinition($this->currentId)) && null !== ($this->decoratedId = $definition->innerServiceId) && $this->container->has($this->decoratedId)) {
|
||||
$this->decoratedClass = $this->container->findDefinition($this->decoratedId)->getClass();
|
||||
if ($isRoot && ($definition = $this->container->getDefinition($this->currentId)) && ($decoratedDefinition = $definition->getDecoratedService()) && null !== ($innerId = $decoratedDefinition[0]) && $this->container->has($innerId)) {
|
||||
// If the class references to itself and is decorated, provide the inner service id and class to not get a circular reference
|
||||
$this->decoratedClass = $this->container->findDefinition($innerId)->getClass();
|
||||
$this->decoratedId = $decoratedDefinition[1] ?? $this->currentId . '.inner';
|
||||
}
|
||||
foreach ($this->methodCalls as $i => $call) {
|
||||
$this->decoratedMethodIndex = $i;
|
||||
|
|
Loading…
Reference in New Issue