From 7fb879196f2313cc49d85d3c7660148ac3713987 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Tue, 8 Feb 2022 23:25:14 +0000 Subject: [PATCH] Updated Rector to commit f03e2a1ee33c0d5e5fdf7adda058f4179d7cf824 https://github.com/rectorphp/rector-src/commit/f03e2a1ee33c0d5e5fdf7adda058f4179d7cf824 [e2e] Try add back global e2e tests for scoped (#1786) --- .github/workflows/e2e_global.yaml | 40 +++++++++++++++++++ e2e/global-install/.gitignore | 1 + e2e/global-install/App/ExceptionInterface.php | 7 ++++ e2e/global-install/composer.json | 8 ++++ e2e/global-install/rector.php | 15 +++++++ e2e/global-install/src/MyException.php | 13 ++++++ 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 ++--- 11 files changed, 103 insertions(+), 19 deletions(-) create mode 100644 .github/workflows/e2e_global.yaml create mode 100644 e2e/global-install/.gitignore create mode 100644 e2e/global-install/App/ExceptionInterface.php create mode 100644 e2e/global-install/composer.json create mode 100644 e2e/global-install/rector.php create mode 100644 e2e/global-install/src/MyException.php diff --git a/.github/workflows/e2e_global.yaml b/.github/workflows/e2e_global.yaml new file mode 100644 index 00000000000..48fbbd291a4 --- /dev/null +++ b/.github/workflows/e2e_global.yaml @@ -0,0 +1,40 @@ +name: End to End global tests + +on: + pull_request: null + push: + branches: + - main + +jobs: + end_to_end: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + php_version: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1'] + directory: + - 'e2e/global-install' + + name: End to end test - ${{ matrix.directory }} + + steps: + - uses: actions/checkout@v2 + + - uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php_version }} + coverage: none + + # wait for deploy to packagist + - run: sleep 70 + + - + run: | + composer global require --dev rector/rector:dev-main + composer install --ansi + working-directory: ${{ matrix.directory }} + + - + run: /home/runner/.composer/vendor/bin/rector process --ansi --clear-cache + working-directory: ${{ matrix.directory }} diff --git a/e2e/global-install/.gitignore b/e2e/global-install/.gitignore new file mode 100644 index 00000000000..49ce3c193f8 --- /dev/null +++ b/e2e/global-install/.gitignore @@ -0,0 +1 @@ +/vendor \ No newline at end of file diff --git a/e2e/global-install/App/ExceptionInterface.php b/e2e/global-install/App/ExceptionInterface.php new file mode 100644 index 00000000000..37d9c23e583 --- /dev/null +++ b/e2e/global-install/App/ExceptionInterface.php @@ -0,0 +1,7 @@ +parameters(); + $parameters->set(Option::PATHS, [__DIR__ . '/src/']); + + $services = $containerConfigurator->services(); + $services->set(MakeInheritedMethodVisibilitySameAsParentRector::class); +}; diff --git a/e2e/global-install/src/MyException.php b/e2e/global-install/src/MyException.php new file mode 100644 index 00000000000..411a6153ca9 --- /dev/null +++ b/e2e/global-install/src/MyException.php @@ -0,0 +1,13 @@ += 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\ComposerStaticInit20d3ed2e5604c2085a552190c9fb5624::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit8f91f945a7ae87f344e91aaa54f540f0::getInitializer($loader)); } else { $classMap = require __DIR__ . '/autoload_classmap.php'; if ($classMap) { @@ -42,12 +42,12 @@ class ComposerAutoloaderInit20d3ed2e5604c2085a552190c9fb5624 $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInit20d3ed2e5604c2085a552190c9fb5624::$files; + $includeFiles = Composer\Autoload\ComposerStaticInit8f91f945a7ae87f344e91aaa54f540f0::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire20d3ed2e5604c2085a552190c9fb5624($fileIdentifier, $file); + composerRequire8f91f945a7ae87f344e91aaa54f540f0($fileIdentifier, $file); } return $loader; @@ -59,7 +59,7 @@ class ComposerAutoloaderInit20d3ed2e5604c2085a552190c9fb5624 * @param string $file * @return void */ -function composerRequire20d3ed2e5604c2085a552190c9fb5624($fileIdentifier, $file) +function composerRequire8f91f945a7ae87f344e91aaa54f540f0($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true; diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 90fbed2928c..15c6cd66af7 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit20d3ed2e5604c2085a552190c9fb5624 +class ComposerStaticInit8f91f945a7ae87f344e91aaa54f540f0 { public static $files = array ( '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php', @@ -3865,9 +3865,9 @@ class ComposerStaticInit20d3ed2e5604c2085a552190c9fb5624 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit20d3ed2e5604c2085a552190c9fb5624::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit20d3ed2e5604c2085a552190c9fb5624::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit20d3ed2e5604c2085a552190c9fb5624::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit8f91f945a7ae87f344e91aaa54f540f0::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit8f91f945a7ae87f344e91aaa54f540f0::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit8f91f945a7ae87f344e91aaa54f540f0::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/scoper-autoload.php b/vendor/scoper-autoload.php index 8f44780b629..0d1019bed9d 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('RectorPrefix20220208\AutoloadIncluder'); } -if (!class_exists('ComposerAutoloaderInit20d3ed2e5604c2085a552190c9fb5624', false) && !interface_exists('ComposerAutoloaderInit20d3ed2e5604c2085a552190c9fb5624', false) && !trait_exists('ComposerAutoloaderInit20d3ed2e5604c2085a552190c9fb5624', false)) { - spl_autoload_call('RectorPrefix20220208\ComposerAutoloaderInit20d3ed2e5604c2085a552190c9fb5624'); +if (!class_exists('ComposerAutoloaderInit8f91f945a7ae87f344e91aaa54f540f0', false) && !interface_exists('ComposerAutoloaderInit8f91f945a7ae87f344e91aaa54f540f0', false) && !trait_exists('ComposerAutoloaderInit8f91f945a7ae87f344e91aaa54f540f0', false)) { + spl_autoload_call('RectorPrefix20220208\ComposerAutoloaderInit8f91f945a7ae87f344e91aaa54f540f0'); } 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('RectorPrefix20220208\Helmich\TypoScriptParser\Parser\AST\Statement'); @@ -71,9 +71,9 @@ if (!function_exists('print_node')) { return \RectorPrefix20220208\print_node(...func_get_args()); } } -if (!function_exists('composerRequire20d3ed2e5604c2085a552190c9fb5624')) { - function composerRequire20d3ed2e5604c2085a552190c9fb5624() { - return \RectorPrefix20220208\composerRequire20d3ed2e5604c2085a552190c9fb5624(...func_get_args()); +if (!function_exists('composerRequire8f91f945a7ae87f344e91aaa54f540f0')) { + function composerRequire8f91f945a7ae87f344e91aaa54f540f0() { + return \RectorPrefix20220208\composerRequire8f91f945a7ae87f344e91aaa54f540f0(...func_get_args()); } } if (!function_exists('scanPath')) {