From 56b837666433e2250163c13c2799c46658198113 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Sun, 30 May 2021 07:55:27 +0000 Subject: [PATCH] Updated Rector to commit 223ad8fca8280a298b02dce0226b91269e3b3535 https://github.com/rectorphp/rector-src/commit/223ad8fca8280a298b02dce0226b91269e3b3535 fix ClassTypeResolverTest on windows (#118) --- .../Annotation/AnnotationExtractor.php | 5 ++--- 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 +++++----- 6 files changed, 21 insertions(+), 22 deletions(-) diff --git a/packages/ChangesReporting/Annotation/AnnotationExtractor.php b/packages/ChangesReporting/Annotation/AnnotationExtractor.php index c37e675f1bb..6e6484f0089 100644 --- a/packages/ChangesReporting/Annotation/AnnotationExtractor.php +++ b/packages/ChangesReporting/Annotation/AnnotationExtractor.php @@ -21,9 +21,8 @@ final class AnnotationExtractor if (!\is_string($docComment)) { return null; } - // @see https://3v4l.org/ouYfB - // uses 'r?\n' instead of '$' because windows compat - $pattern = '#' . \preg_quote($annotation, '#') . '\\s+(?.*?)\\r?\\n#m'; + // @see https://regex101.com/r/oYGaWU/1 + $pattern = '#' . \preg_quote($annotation, '#') . '\\s+(?.*?)$#m'; $matches = \RectorPrefix20210530\Nette\Utils\Strings::match($docComment, $pattern); return $matches['content'] ?? null; } diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index 11f54af42ff..5247a12f73e 100644 --- a/src/Application/VersionResolver.php +++ b/src/Application/VersionResolver.php @@ -16,11 +16,11 @@ final class VersionResolver /** * @var string */ - public const PACKAGE_VERSION = 'b42fc3dcbd04bdf5b1512e2f4f7d29645261bae8'; + public const PACKAGE_VERSION = '223ad8fca8280a298b02dce0226b91269e3b3535'; /** * @var string */ - public const RELEASE_DATE = '2021-05-30 09:43:12'; + public const RELEASE_DATE = '2021-05-30 09:42:32'; public static function resolvePackageVersion() : string { $process = new \RectorPrefix20210530\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__); diff --git a/vendor/autoload.php b/vendor/autoload.php index 480db905693..a9ffe034950 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit772a103bfffd8af1598b647ccbc91643::getLoader(); +return ComposerAutoloaderInitb3c3f0bc3b39123d94667d6b15846367::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index fc2e1fdb7fe..d1e18d86e63 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit772a103bfffd8af1598b647ccbc91643 +class ComposerAutoloaderInitb3c3f0bc3b39123d94667d6b15846367 { private static $loader; @@ -22,15 +22,15 @@ class ComposerAutoloaderInit772a103bfffd8af1598b647ccbc91643 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit772a103bfffd8af1598b647ccbc91643', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitb3c3f0bc3b39123d94667d6b15846367', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__))); - spl_autoload_unregister(array('ComposerAutoloaderInit772a103bfffd8af1598b647ccbc91643', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitb3c3f0bc3b39123d94667d6b15846367', '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\ComposerStaticInit772a103bfffd8af1598b647ccbc91643::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInitb3c3f0bc3b39123d94667d6b15846367::getInitializer($loader)); } else { $classMap = require __DIR__ . '/autoload_classmap.php'; if ($classMap) { @@ -42,19 +42,19 @@ class ComposerAutoloaderInit772a103bfffd8af1598b647ccbc91643 $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInit772a103bfffd8af1598b647ccbc91643::$files; + $includeFiles = Composer\Autoload\ComposerStaticInitb3c3f0bc3b39123d94667d6b15846367::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire772a103bfffd8af1598b647ccbc91643($fileIdentifier, $file); + composerRequireb3c3f0bc3b39123d94667d6b15846367($fileIdentifier, $file); } return $loader; } } -function composerRequire772a103bfffd8af1598b647ccbc91643($fileIdentifier, $file) +function composerRequireb3c3f0bc3b39123d94667d6b15846367($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 f2729d3233f..3ca69572d96 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit772a103bfffd8af1598b647ccbc91643 +class ComposerStaticInitb3c3f0bc3b39123d94667d6b15846367 { public static $files = array ( 'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php', @@ -3824,9 +3824,9 @@ class ComposerStaticInit772a103bfffd8af1598b647ccbc91643 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit772a103bfffd8af1598b647ccbc91643::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit772a103bfffd8af1598b647ccbc91643::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit772a103bfffd8af1598b647ccbc91643::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInitb3c3f0bc3b39123d94667d6b15846367::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitb3c3f0bc3b39123d94667d6b15846367::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInitb3c3f0bc3b39123d94667d6b15846367::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/scoper-autoload.php b/vendor/scoper-autoload.php index 267016e0570..8673d139c0a 100644 --- a/vendor/scoper-autoload.php +++ b/vendor/scoper-autoload.php @@ -21,8 +21,8 @@ if (!class_exists('SomeTestCase', false) && !interface_exists('SomeTestCase', fa if (!class_exists('CheckoutEntityFactory', false) && !interface_exists('CheckoutEntityFactory', false) && !trait_exists('CheckoutEntityFactory', false)) { spl_autoload_call('RectorPrefix20210530\CheckoutEntityFactory'); } -if (!class_exists('ComposerAutoloaderInit772a103bfffd8af1598b647ccbc91643', false) && !interface_exists('ComposerAutoloaderInit772a103bfffd8af1598b647ccbc91643', false) && !trait_exists('ComposerAutoloaderInit772a103bfffd8af1598b647ccbc91643', false)) { - spl_autoload_call('RectorPrefix20210530\ComposerAutoloaderInit772a103bfffd8af1598b647ccbc91643'); +if (!class_exists('ComposerAutoloaderInitb3c3f0bc3b39123d94667d6b15846367', false) && !interface_exists('ComposerAutoloaderInitb3c3f0bc3b39123d94667d6b15846367', false) && !trait_exists('ComposerAutoloaderInitb3c3f0bc3b39123d94667d6b15846367', false)) { + spl_autoload_call('RectorPrefix20210530\ComposerAutoloaderInitb3c3f0bc3b39123d94667d6b15846367'); } if (!class_exists('Doctrine\Inflector\Inflector', false) && !interface_exists('Doctrine\Inflector\Inflector', false) && !trait_exists('Doctrine\Inflector\Inflector', false)) { spl_autoload_call('RectorPrefix20210530\Doctrine\Inflector\Inflector'); @@ -3320,9 +3320,9 @@ if (!function_exists('print_node')) { return \RectorPrefix20210530\print_node(...func_get_args()); } } -if (!function_exists('composerRequire772a103bfffd8af1598b647ccbc91643')) { - function composerRequire772a103bfffd8af1598b647ccbc91643() { - return \RectorPrefix20210530\composerRequire772a103bfffd8af1598b647ccbc91643(...func_get_args()); +if (!function_exists('composerRequireb3c3f0bc3b39123d94667d6b15846367')) { + function composerRequireb3c3f0bc3b39123d94667d6b15846367() { + return \RectorPrefix20210530\composerRequireb3c3f0bc3b39123d94667d6b15846367(...func_get_args()); } } if (!function_exists('parseArgs')) {