Updated ECS to commit fa59fd61d7e9a706fb1d8081b4bd5ae3b1f86338

actions-user · actions-user · commit e9ca9cb0c973 · 2021-06-28T14:46:17.000Z
deprecated-packages/symplify@fa59fd6 [ESC] Rebuild cache just once per release (#3359)
diff --git a/.gitattributes b/.gitattributes
@@ -1,5 +1 @@
 /tests export-ignore
-.gitattributes export-ignore
-.gitignore export-ignore
-*.md export-ignore
-docs/ export-ignore
diff --git a/.github/workflows/bare_run.yaml b/.github/workflows/bare_run.yaml
@@ -21,3 +21,5 @@ jobs:
                     coverage: none
 
             -   run: php bin/ecs list --ansi --debug
+
+            -   run: php bin/ecs init --ansi --debug
diff --git a/.github/workflows/check_command_run.yaml b/.github/workflows/check_command_run.yaml
@@ -0,0 +1,23 @@
+name: Check Command Run
+
+on: [pull_request, push]
+
+jobs:
+    check_command_run:
+        runs-on: ubuntu-latest
+
+        strategy:
+            fail-fast: false
+            matrix:
+                php_version: ['7.1', '7.2', '7.3', '7.4', '8.0']
+
+        steps:
+            -   uses: actions/checkout@v2
+
+            -
+                uses: shivammathur/setup-php@v2
+                with:
+                    php-version: ${{ matrix.php_version }}
+                    coverage: none
+
+            -   run: php bin/ecs check tests/Fixture --config tests/config/some_ecs.php --ansi
diff --git a/config/config.php b/config/config.php
@@ -4,15 +4,19 @@
 namespace ECSPrefix20210628;
 
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
-use Symplify\EasyCodingStandard\HttpKernel\EasyCodingStandardKernel;
+use Symplify\EasyCodingStandard\Application\Version\VersionResolver;
 use Symplify\EasyCodingStandard\ValueObject\Option;
 return static function (\Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator $containerConfigurator) {
     $containerConfigurator->import(__DIR__ . '/services.php');
     $containerConfigurator->import(__DIR__ . '/packages.php');
     $parameters = $containerConfigurator->parameters();
     $parameters->set(\Symplify\EasyCodingStandard\ValueObject\Option::INDENTATION, \Symplify\EasyCodingStandard\ValueObject\Option::INDENTATION_SPACES);
     $parameters->set(\Symplify\EasyCodingStandard\ValueObject\Option::LINE_ENDING, \PHP_EOL);
-    $parameters->set(\Symplify\EasyCodingStandard\ValueObject\Option::CACHE_DIRECTORY, \sys_get_temp_dir() . '/changed_files_detector%env(TEST_SUFFIX)%' . \Symplify\EasyCodingStandard\HttpKernel\EasyCodingStandardKernel::CONTAINER_VERSION);
+    $cacheDirectory = \sys_get_temp_dir() . '/changed_files_detector%env(TEST_SUFFIX)%';
+    if (\Symplify\EasyCodingStandard\Application\Version\VersionResolver::PACKAGE_VERSION !== '@package_version@') {
+        $cacheDirectory .= '_' . \Symplify\EasyCodingStandard\Application\Version\VersionResolver::PACKAGE_VERSION;
+    }
+    $parameters->set(\Symplify\EasyCodingStandard\ValueObject\Option::CACHE_DIRECTORY, $cacheDirectory);
     $cacheNamespace = \str_replace(\DIRECTORY_SEPARATOR, '_', \getcwd());
     $parameters->set(\Symplify\EasyCodingStandard\ValueObject\Option::CACHE_NAMESPACE, $cacheNamespace);
     // parallel
diff --git a/src/DependencyInjection/EasyCodingStandardContainerFactory.php b/src/DependencyInjection/EasyCodingStandardContainerFactory.php
@@ -5,6 +5,7 @@
 
 use ECSPrefix20210628\Symfony\Component\Console\Input\InputInterface;
 use ECSPrefix20210628\Symfony\Component\DependencyInjection\ContainerInterface;
+use Symplify\EasyCodingStandard\Application\Version\VersionResolver;
 use Symplify\EasyCodingStandard\Caching\ChangedFilesDetector;
 use Symplify\EasyCodingStandard\HttpKernel\EasyCodingStandardKernel;
 use ECSPrefix20210628\Symplify\PackageBuilder\Console\Input\StaticInputDetector;
@@ -13,7 +14,7 @@ final class EasyCodingStandardContainerFactory
 {
     public function createFromFromInput(\ECSPrefix20210628\Symfony\Component\Console\Input\InputInterface $input) : \ECSPrefix20210628\Symfony\Component\DependencyInjection\ContainerInterface
     {
-        $environment = 'easy_coding_standard_version_' . \Symplify\EasyCodingStandard\HttpKernel\EasyCodingStandardKernel::CONTAINER_VERSION;
+        $environment = $this->resolveEnvironment();
         $easyCodingStandardKernel = new \Symplify\EasyCodingStandard\HttpKernel\EasyCodingStandardKernel($environment, \ECSPrefix20210628\Symplify\PackageBuilder\Console\Input\StaticInputDetector::isDebug());
         $inputConfigFileInfos = [];
         $rootECSConfig = \getcwd() . \DIRECTORY_SEPARATOR . '/ecs.php';
@@ -38,4 +39,11 @@ public function createFromFromInput(\ECSPrefix20210628\Symfony\Component\Console
         }
         return $container;
     }
+    private function resolveEnvironment() : string
+    {
+        if (\Symplify\EasyCodingStandard\Application\Version\VersionResolver::PACKAGE_VERSION === '@package_version@') {
+            return 'dev';
+        }
+        return 'prod_' . \Symplify\EasyCodingStandard\Application\Version\VersionResolver::PACKAGE_VERSION;
+    }
 }
diff --git a/src/HttpKernel/EasyCodingStandardKernel.php b/src/HttpKernel/EasyCodingStandardKernel.php
@@ -9,26 +9,38 @@
 use ECSPrefix20210628\Symfony\Component\HttpKernel\Bundle\BundleInterface;
 use Symplify\CodingStandard\Bundle\SymplifyCodingStandardBundle;
 use ECSPrefix20210628\Symplify\ConsoleColorDiff\Bundle\ConsoleColorDiffBundle;
+use Symplify\EasyCodingStandard\Application\Version\VersionResolver;
 use Symplify\EasyCodingStandard\Bundle\EasyCodingStandardBundle;
 use Symplify\EasyCodingStandard\DependencyInjection\DelegatingLoaderFactory;
 use ECSPrefix20210628\Symplify\Skipper\Bundle\SkipperBundle;
 use ECSPrefix20210628\Symplify\SymplifyKernel\Bundle\SymplifyKernelBundle;
 use ECSPrefix20210628\Symplify\SymplifyKernel\HttpKernel\AbstractSymplifyKernel;
 final class EasyCodingStandardKernel extends \ECSPrefix20210628\Symplify\SymplifyKernel\HttpKernel\AbstractSymplifyKernel
 {
-    /**
-     * To enable Kernel cache that is changed only when new services are needed.
-     *
-     * @var string
-     */
-    const CONTAINER_VERSION = 'v1';
     /**
      * @return mixed[]
      */
     public function registerBundles()
     {
         return [new \Symplify\EasyCodingStandard\Bundle\EasyCodingStandardBundle(), new \Symplify\CodingStandard\Bundle\SymplifyCodingStandardBundle(), new \ECSPrefix20210628\Symplify\ConsoleColorDiff\Bundle\ConsoleColorDiffBundle(), new \ECSPrefix20210628\Symplify\SymplifyKernel\Bundle\SymplifyKernelBundle(), new \ECSPrefix20210628\Symplify\Skipper\Bundle\SkipperBundle()];
     }
+    public function getCacheDir() : string
+    {
+        // the PACKAGE_VERSION constant helps to rebuild cache on new release, but just once
+        $cacheDirectory = \sys_get_temp_dir() . '/ecs_' . \get_current_user();
+        if (\Symplify\EasyCodingStandard\Application\Version\VersionResolver::PACKAGE_VERSION !== '@package_version@') {
+            $cacheDirectory .= '_' . \Symplify\EasyCodingStandard\Application\Version\VersionResolver::PACKAGE_VERSION;
+        }
+        return $cacheDirectory;
+    }
+    public function getLogDir() : string
+    {
+        $logDirectory = \sys_get_temp_dir() . '/ecs_log_' . \get_current_user();
+        if (\Symplify\EasyCodingStandard\Application\Version\VersionResolver::PACKAGE_VERSION !== '@package_version@') {
+            $logDirectory .= '_' . \Symplify\EasyCodingStandard\Application\Version\VersionResolver::PACKAGE_VERSION;
+        }
+        return $logDirectory;
+    }
     /**
      * @return void
      */
diff --git a/tests/Fixture/SomeClass.php b/tests/Fixture/SomeClass.php
@@ -0,0 +1,6 @@
+<?php
+
+
+namespace App;
+
+class SomeClass {}
diff --git a/tests/config/some_ecs.php b/tests/config/some_ecs.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use Symplify\EasyCodingStandard\ValueObject\Set\SetList;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $containerConfigurator->import(SetList::PSR_12);
+};
diff --git a/vendor/autoload.php b/vendor/autoload.php
@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit18695cc0dfce4bcda568d48cddb6e6d1::getLoader();
+return ComposerAutoloaderInit42923fe255792072bb55ad9fa9212317::getLoader();
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit18695cc0dfce4bcda568d48cddb6e6d1
+class ComposerAutoloaderInit42923fe255792072bb55ad9fa9212317
 {
     private static $loader;
 
@@ -22,15 +22,15 @@ public static function getLoader()
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit18695cc0dfce4bcda568d48cddb6e6d1', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit42923fe255792072bb55ad9fa9212317', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
-        spl_autoload_unregister(array('ComposerAutoloaderInit18695cc0dfce4bcda568d48cddb6e6d1', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit42923fe255792072bb55ad9fa9212317', '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\ComposerStaticInit18695cc0dfce4bcda568d48cddb6e6d1::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInit42923fe255792072bb55ad9fa9212317::getInitializer($loader));
         } else {
             $classMap = require __DIR__ . '/autoload_classmap.php';
             if ($classMap) {
@@ -42,19 +42,19 @@ public static function getLoader()
         $loader->register(true);
 
         if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInit18695cc0dfce4bcda568d48cddb6e6d1::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInit42923fe255792072bb55ad9fa9212317::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire18695cc0dfce4bcda568d48cddb6e6d1($fileIdentifier, $file);
+            composerRequire42923fe255792072bb55ad9fa9212317($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-function composerRequire18695cc0dfce4bcda568d48cddb6e6d1($fileIdentifier, $file)
+function composerRequire42923fe255792072bb55ad9fa9212317($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
@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit18695cc0dfce4bcda568d48cddb6e6d1
+class ComposerStaticInit42923fe255792072bb55ad9fa9212317
 {
     public static $files = array (
         'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@@ -1943,9 +1943,9 @@ class ComposerStaticInit18695cc0dfce4bcda568d48cddb6e6d1
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit18695cc0dfce4bcda568d48cddb6e6d1::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit18695cc0dfce4bcda568d48cddb6e6d1::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInit18695cc0dfce4bcda568d48cddb6e6d1::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit42923fe255792072bb55ad9fa9212317::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit42923fe255792072bb55ad9fa9212317::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInit42923fe255792072bb55ad9fa9212317::$classMap;
 
         }, null, ClassLoader::class);
     }
diff --git a/vendor/scoper-autoload.php b/vendor/scoper-autoload.php
@@ -9,8 +9,8 @@
 if (!class_exists('AutoloadIncluder', false) && !interface_exists('AutoloadIncluder', false) && !trait_exists('AutoloadIncluder', false)) {
     spl_autoload_call('ECSPrefix20210628\AutoloadIncluder');
 }
-if (!class_exists('ComposerAutoloaderInit18695cc0dfce4bcda568d48cddb6e6d1', false) && !interface_exists('ComposerAutoloaderInit18695cc0dfce4bcda568d48cddb6e6d1', false) && !trait_exists('ComposerAutoloaderInit18695cc0dfce4bcda568d48cddb6e6d1', false)) {
-    spl_autoload_call('ECSPrefix20210628\ComposerAutoloaderInit18695cc0dfce4bcda568d48cddb6e6d1');
+if (!class_exists('ComposerAutoloaderInit42923fe255792072bb55ad9fa9212317', false) && !interface_exists('ComposerAutoloaderInit42923fe255792072bb55ad9fa9212317', false) && !trait_exists('ComposerAutoloaderInit42923fe255792072bb55ad9fa9212317', false)) {
+    spl_autoload_call('ECSPrefix20210628\ComposerAutoloaderInit42923fe255792072bb55ad9fa9212317');
 }
 if (!class_exists('Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator', false) && !interface_exists('Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator', false) && !trait_exists('Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator', false)) {
     spl_autoload_call('ECSPrefix20210628\Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator');
@@ -39,9 +39,9 @@
 
 // Functions whitelisting. For more information see:
 // https://github.com/humbug/php-scoper/blob/master/README.md#functions-whitelisting
-if (!function_exists('composerRequire18695cc0dfce4bcda568d48cddb6e6d1')) {
-    function composerRequire18695cc0dfce4bcda568d48cddb6e6d1() {
-        return \ECSPrefix20210628\composerRequire18695cc0dfce4bcda568d48cddb6e6d1(...func_get_args());
+if (!function_exists('composerRequire42923fe255792072bb55ad9fa9212317')) {
+    function composerRequire42923fe255792072bb55ad9fa9212317() {
+        return \ECSPrefix20210628\composerRequire42923fe255792072bb55ad9fa9212317(...func_get_args());
     }
 }
 if (!function_exists('sample')) {

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`
`6`	`6`	`use ECSPrefix20210628\Symfony\Component\Console\Input\InputInterface;`
`7`	`7`	`use ECSPrefix20210628\Symfony\Component\DependencyInjection\ContainerInterface;`
	`8`	`+use Symplify\EasyCodingStandard\Application\Version\VersionResolver;`
`8`	`9`	`use Symplify\EasyCodingStandard\Caching\ChangedFilesDetector;`
`9`	`10`	`use Symplify\EasyCodingStandard\HttpKernel\EasyCodingStandardKernel;`
`10`	`11`	`use ECSPrefix20210628\Symplify\PackageBuilder\Console\Input\StaticInputDetector;`
`@@ -13,7 +14,7 @@ final class EasyCodingStandardContainerFactory`
`13`	`14`	`{`
`14`	`15`	`public function createFromFromInput(\ECSPrefix20210628\Symfony\Component\Console\Input\InputInterface $input) : \ECSPrefix20210628\Symfony\Component\DependencyInjection\ContainerInterface`
`15`	`16`	`{`
`16`		`- $environment = 'easy_coding_standard_version_' . \Symplify\EasyCodingStandard\HttpKernel\EasyCodingStandardKernel::CONTAINER_VERSION;`
	`17`	`+ $environment = $this->resolveEnvironment();`
`17`	`18`	`$easyCodingStandardKernel = new \Symplify\EasyCodingStandard\HttpKernel\EasyCodingStandardKernel($environment, \ECSPrefix20210628\Symplify\PackageBuilder\Console\Input\StaticInputDetector::isDebug());`
`18`	`19`	`$inputConfigFileInfos = [];`
`19`	`20`	`$rootECSConfig = \getcwd() . \DIRECTORY_SEPARATOR . '/ecs.php';`
`@@ -38,4 +39,11 @@ public function createFromFromInput(\ECSPrefix20210628\Symfony\Component\Console`
`38`	`39`	`}`
`39`	`40`	`return $container;`
`40`	`41`	`}`
	`42`	`+ private function resolveEnvironment() : string`
	`43`	`+ {`
	`44`	`+ if (\Symplify\EasyCodingStandard\Application\Version\VersionResolver::PACKAGE_VERSION === '@package_version@') {`
	`45`	`+ return 'dev';`
	`46`	`+ }`
	`47`	`+ return 'prod_' . \Symplify\EasyCodingStandard\Application\Version\VersionResolver::PACKAGE_VERSION;`
	`48`	`+ }`
`41`	`49`	`}`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +<?php
++
++
 +namespace App;
++
 +class SomeClass {}
Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,4 @@`
`4`	`4`
`5`	`5`	`require_once __DIR__ . '/composer/autoload_real.php';`
`6`	`6`
`7`		`-return ComposerAutoloaderInit18695cc0dfce4bcda568d48cddb6e6d1::getLoader();`
	`7`	`+return ComposerAutoloaderInit42923fe255792072bb55ad9fa9212317::getLoader();`