From 71c00f366f9b16da322fd1b08acc2cba2b0d9b79 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Sun, 8 Aug 2021 16:52:18 +0000 Subject: [PATCH] Updated Rector to commit e3f20c1fb6665e7f0f6f84ced015f9eff86b6834 https://github.com/rectorphp/rector-src/commit/e3f20c1fb6665e7f0f6f84ced015f9eff86b6834 [docker] remove docker building from release repository (#614) --- .gitattributes | 3 - .github/workflows/publish_docker_images.yaml | 64 -------------------- 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, 19 insertions(+), 86 deletions(-) delete mode 100644 .github/workflows/publish_docker_images.yaml diff --git a/.gitattributes b/.gitattributes index 599d83b710d..e5542d52d2f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -17,12 +17,9 @@ CODE_OF_CONDUCT.md export-ignore # exclude only root dirs, otherwise nette/utils is removed - see https://github.com/TomasVotruba/tomasvotruba.com/pull/1197/checks?check_run_id=2577329283 /stubs export-ignore -Dockerfile export-ignore docs/images export-ignore -.docker export-ignore .github export-ignore /e2e export-ignore -.dockerignore export-ignore # testing Windows spaces - https://help.github.com/en/github/using-git/configuring-git-to-handle-line-endings packages/better-php-doc-parser/tests/PhpDocInfo/PhpDocInfoPrinter/FixtureBasic/with_spac.txt text eol=crlf diff --git a/.github/workflows/publish_docker_images.yaml b/.github/workflows/publish_docker_images.yaml deleted file mode 100644 index d40be47eb91..00000000000 --- a/.github/workflows/publish_docker_images.yaml +++ /dev/null @@ -1,64 +0,0 @@ -name: Build docker images -on: - push: - # Publish `main` as Docker `latest` image. - branches: - - main - - # Publish `v1.2.3` tags as releases. - tags: - - '*' - -env: - # see https://github.com/composer/composer/issues/9368#issuecomment-718112361 - COMPOSER_ROOT_VERSION: "dev-main" - -jobs: - publish_images: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - - name: Login to DockerHub - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - name: Build images - run: | - DOCKER_TAGS="" - - # Pull tag and branch from github.ref, which is either refs/heads/... or refs/tags/... - TAG=$(echo "${{ github.ref }}" | sed -e '/refs\/tags\//!d; s,refs/.*/v\?\(.*\),\1,') - BRANCH=$(echo "${{ github.ref }}" | sed -e '/refs\/heads\//!d; s,refs/.*/\(.*\),\1,') - - if [ "main" == "$BRANCH" ]; then - DOCKER_TAGS="$DOCKER_TAGS latest" - fi - - if [ ! -z "$TAG" ]; then - DOCKER_TAGS="$DOCKER_TAGS $TAG" - fi - - echo "Image will be tagged with: $DOCKER_TAGS" - - DOCKER_TAG_ARG="" - for ARG in $DOCKER_TAGS; do - DOCKER_TAG_ARG="$DOCKER_TAG_ARG --tag rector/rector:$ARG" - done - - docker buildx create --name builder-php8 --use - docker buildx build \ - --progress plain \ - --cache-from=rector/rector:build-cache-php8 \ - --cache-to=type=registry,ref=rector/rector:build-cache-php8,mode=max,push=true \ - --target rector \ - --push \ - $DOCKER_TAG_ARG \ - --platform linux/amd64,linux/arm64 \ - --build-arg PHP_VERSION=8 . diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index 93169dc06b5..3739043d705 100644 --- a/src/Application/VersionResolver.php +++ b/src/Application/VersionResolver.php @@ -16,11 +16,11 @@ final class VersionResolver /** * @var string */ - public const PACKAGE_VERSION = 'a8b01f217b9702f7dd6e485f84fe46a6dabe0d86'; + public const PACKAGE_VERSION = 'e3f20c1fb6665e7f0f6f84ced015f9eff86b6834'; /** * @var string */ - public const RELEASE_DATE = '2021-08-08 00:14:44'; + public const RELEASE_DATE = '2021-08-08 18:42:15'; public static function resolvePackageVersion() : string { $process = new \RectorPrefix20210808\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__); diff --git a/vendor/autoload.php b/vendor/autoload.php index 6705e8a4d5c..bf03fff2aff 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInita0e1dbf7efc32e02c49e682e647d5f3e::getLoader(); +return ComposerAutoloaderInitd68240002bad7ce1a50ee6dd5c914b1b::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index db441e4859d..1428adbb88d 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInita0e1dbf7efc32e02c49e682e647d5f3e +class ComposerAutoloaderInitd68240002bad7ce1a50ee6dd5c914b1b { private static $loader; @@ -22,15 +22,15 @@ class ComposerAutoloaderInita0e1dbf7efc32e02c49e682e647d5f3e return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInita0e1dbf7efc32e02c49e682e647d5f3e', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitd68240002bad7ce1a50ee6dd5c914b1b', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__))); - spl_autoload_unregister(array('ComposerAutoloaderInita0e1dbf7efc32e02c49e682e647d5f3e', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitd68240002bad7ce1a50ee6dd5c914b1b', '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\ComposerStaticInita0e1dbf7efc32e02c49e682e647d5f3e::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInitd68240002bad7ce1a50ee6dd5c914b1b::getInitializer($loader)); } else { $classMap = require __DIR__ . '/autoload_classmap.php'; if ($classMap) { @@ -42,19 +42,19 @@ class ComposerAutoloaderInita0e1dbf7efc32e02c49e682e647d5f3e $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInita0e1dbf7efc32e02c49e682e647d5f3e::$files; + $includeFiles = Composer\Autoload\ComposerStaticInitd68240002bad7ce1a50ee6dd5c914b1b::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequirea0e1dbf7efc32e02c49e682e647d5f3e($fileIdentifier, $file); + composerRequired68240002bad7ce1a50ee6dd5c914b1b($fileIdentifier, $file); } return $loader; } } -function composerRequirea0e1dbf7efc32e02c49e682e647d5f3e($fileIdentifier, $file) +function composerRequired68240002bad7ce1a50ee6dd5c914b1b($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 0444d753aa0..5f5e9d0d955 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInita0e1dbf7efc32e02c49e682e647d5f3e +class ComposerStaticInitd68240002bad7ce1a50ee6dd5c914b1b { public static $files = array ( 'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php', @@ -3846,9 +3846,9 @@ class ComposerStaticInita0e1dbf7efc32e02c49e682e647d5f3e public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInita0e1dbf7efc32e02c49e682e647d5f3e::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInita0e1dbf7efc32e02c49e682e647d5f3e::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInita0e1dbf7efc32e02c49e682e647d5f3e::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInitd68240002bad7ce1a50ee6dd5c914b1b::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitd68240002bad7ce1a50ee6dd5c914b1b::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInitd68240002bad7ce1a50ee6dd5c914b1b::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/scoper-autoload.php b/vendor/scoper-autoload.php index 9aa0fa5ab5d..2f588abc9af 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('RectorPrefix20210808\AutoloadIncluder'); } -if (!class_exists('ComposerAutoloaderInita0e1dbf7efc32e02c49e682e647d5f3e', false) && !interface_exists('ComposerAutoloaderInita0e1dbf7efc32e02c49e682e647d5f3e', false) && !trait_exists('ComposerAutoloaderInita0e1dbf7efc32e02c49e682e647d5f3e', false)) { - spl_autoload_call('RectorPrefix20210808\ComposerAutoloaderInita0e1dbf7efc32e02c49e682e647d5f3e'); +if (!class_exists('ComposerAutoloaderInitd68240002bad7ce1a50ee6dd5c914b1b', false) && !interface_exists('ComposerAutoloaderInitd68240002bad7ce1a50ee6dd5c914b1b', false) && !trait_exists('ComposerAutoloaderInitd68240002bad7ce1a50ee6dd5c914b1b', false)) { + spl_autoload_call('RectorPrefix20210808\ComposerAutoloaderInitd68240002bad7ce1a50ee6dd5c914b1b'); } if (!class_exists('AjaxLogin', false) && !interface_exists('AjaxLogin', false) && !trait_exists('AjaxLogin', false)) { spl_autoload_call('RectorPrefix20210808\AjaxLogin'); @@ -3305,9 +3305,9 @@ if (!function_exists('print_node')) { return \RectorPrefix20210808\print_node(...func_get_args()); } } -if (!function_exists('composerRequirea0e1dbf7efc32e02c49e682e647d5f3e')) { - function composerRequirea0e1dbf7efc32e02c49e682e647d5f3e() { - return \RectorPrefix20210808\composerRequirea0e1dbf7efc32e02c49e682e647d5f3e(...func_get_args()); +if (!function_exists('composerRequired68240002bad7ce1a50ee6dd5c914b1b')) { + function composerRequired68240002bad7ce1a50ee6dd5c914b1b() { + return \RectorPrefix20210808\composerRequired68240002bad7ce1a50ee6dd5c914b1b(...func_get_args()); } } if (!function_exists('parseArgs')) {