Skip to content

Commit 1059340

Browse files
committed
Updated ECS to commit 8f72e3c42a736c80617e00b9dec3a822a1566106
1 parent c83965e commit 1059340

9 files changed

Lines changed: 20 additions & 31 deletions

File tree

bin/ecs.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
use Symplify\EasyCodingStandard\Console\EasyCodingStandardConsoleApplication;
1111
use Symplify\EasyCodingStandard\Console\Style\SymfonyStyleFactory;
1212
use Symplify\EasyCodingStandard\DependencyInjection\EasyCodingStandardContainerFactory;
13-
use Symplify\EasyCodingStandard\DependencyInjection\LazyContainerFactory;
13+
use Symplify\EasyCodingStandard\DependencyInjection\ServiceContainerFactory;
1414
// performance boost
1515
\gc_disable();
1616
\define('__ECS_RUNNING__', \true);
@@ -55,7 +55,7 @@ public function includeCwdVendorAutoloadIfExists(): void
5555
public function includeDependencyOrRepositoryVendorAutoloadIfExists(): void
5656
{
5757
// ECS' vendor is already loaded
58-
if (\class_exists(LazyContainerFactory::class)) {
58+
if (\class_exists(ServiceContainerFactory::class)) {
5959
return;
6060
}
6161
$devVendorAutoload = __DIR__ . '/../vendor/autoload.php';

src/Application/Version/StaticVersionResolver.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ final class StaticVersionResolver
1515
* @api
1616
* @var string
1717
*/
18-
public const PACKAGE_VERSION = '9a00ea6cc6ed3b6db115f7e864a45bfa7ef2eb1f';
18+
public const PACKAGE_VERSION = '8f72e3c42a736c80617e00b9dec3a822a1566106';
1919
/**
2020
* @api
2121
* @var string
2222
*/
23-
public const RELEASE_DATE = '2026-06-10 15:17:29';
23+
public const RELEASE_DATE = '2026-06-10 21:35:34';
2424
/**
2525
* @var int
2626
*/

src/DependencyInjection/EasyCodingStandardContainerFactory.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ final class EasyCodingStandardContainerFactory
1414
public function createFromFromInput(ArgvInput $argvInput): ECSConfig
1515
{
1616
// $easyCodingStandardKernel = new EasyCodingStandardKernel();
17-
$lazyContainerFactory = new \Symplify\EasyCodingStandard\DependencyInjection\LazyContainerFactory();
17+
$serviceContainerFactory = new \Symplify\EasyCodingStandard\DependencyInjection\ServiceContainerFactory();
1818
$inputConfigFiles = [];
1919
$rootECSConfig = getcwd() . \DIRECTORY_SEPARATOR . 'ecs.php';
2020
if ($argvInput->hasParameterOption(['--config', '-c'])) {
@@ -26,7 +26,7 @@ public function createFromFromInput(ArgvInput $argvInput): ECSConfig
2626
} elseif (file_exists($rootECSConfig)) {
2727
$inputConfigFiles[] = $rootECSConfig;
2828
}
29-
$ecsConfig = $lazyContainerFactory->create($inputConfigFiles);
29+
$ecsConfig = $serviceContainerFactory->create($inputConfigFiles);
3030
$ecsConfig->boot();
3131
if ($inputConfigFiles !== []) {
3232
// for cache invalidation on config change

src/DependencyInjection/LazyContainerFactory.php renamed to src/DependencyInjection/ServiceContainerFactory.php

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,14 @@
1212
use Symplify\EasyCodingStandard\Caching\Cache;
1313
use Symplify\EasyCodingStandard\Caching\CacheFactory;
1414
use Symplify\EasyCodingStandard\Config\ECSConfig;
15-
use Symplify\EasyCodingStandard\Console\Output\CheckstyleOutputFormatter;
16-
use Symplify\EasyCodingStandard\Console\Output\ConsoleOutputFormatter;
17-
use Symplify\EasyCodingStandard\Console\Output\GitlabOutputFormatter;
18-
use Symplify\EasyCodingStandard\Console\Output\JsonOutputFormatter;
19-
use Symplify\EasyCodingStandard\Console\Output\JUnitOutputFormatter;
2015
use Symplify\EasyCodingStandard\Console\Style\EasyCodingStandardStyle;
2116
use Symplify\EasyCodingStandard\Console\Style\EasyCodingStandardStyleFactory;
2217
use Symplify\EasyCodingStandard\Console\Style\SymfonyStyleFactory;
18+
use Symplify\EasyCodingStandard\Contract\Console\Output\OutputFormatterInterface;
2319
use Symplify\EasyCodingStandard\FixerRunner\WhitespacesFixerConfigFactory;
2420
use ECSPrefix202606\Webmozart\Assert\Assert;
25-
final class LazyContainerFactory
21+
final class ServiceContainerFactory
2622
{
27-
/**
28-
* Output formatters are registered explicitly, so they can be collected by contract.
29-
*
30-
* @var array<class-string>
31-
*/
32-
private const OUTPUT_FORMATTER_CLASSES = [GitlabOutputFormatter::class, CheckstyleOutputFormatter::class, ConsoleOutputFormatter::class, JsonOutputFormatter::class, JUnitOutputFormatter::class];
3323
/**
3424
* @param string[] $configFiles
3525
*/
@@ -61,10 +51,9 @@ public function create(array $configFiles = []): ECSConfig
6151
$ecsConfig->service(DifferInterface::class, static function (): DifferInterface {
6252
return new UnifiedDiffer();
6353
});
64-
// output formatters - autowired eagerly so OutputFormatterCollector can find them by contract
65-
foreach (self::OUTPUT_FORMATTER_CLASSES as $outputFormatterClass) {
66-
$ecsConfig->make($outputFormatterClass);
67-
}
54+
// output formatters - autodiscovered, then collected by contract for OutputFormatterCollector
55+
$ecsConfig->autodiscover(__DIR__ . '/..');
56+
$ecsConfig->findByContract(OutputFormatterInterface::class);
6857
// load default config first
6958
$configFiles = array_merge([__DIR__ . '/../../config/config.php'], $configFiles);
7059
foreach ($configFiles as $configFile) {

src/Testing/PHPUnit/AbstractTestCase.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
use PHPUnit\Framework\TestCase;
77
use Symplify\EasyCodingStandard\Config\ECSConfig;
8-
use Symplify\EasyCodingStandard\DependencyInjection\LazyContainerFactory;
8+
use Symplify\EasyCodingStandard\DependencyInjection\ServiceContainerFactory;
99
use ECSPrefix202606\Webmozart\Assert\Assert;
1010
abstract class AbstractTestCase extends TestCase
1111
{
@@ -15,8 +15,8 @@ abstract class AbstractTestCase extends TestCase
1515
private $ecsConfig;
1616
protected function setUp(): void
1717
{
18-
$lazyContainerFactory = new LazyContainerFactory();
19-
$this->ecsConfig = $lazyContainerFactory->create();
18+
$serviceContainerFactory = new ServiceContainerFactory();
19+
$this->ecsConfig = $serviceContainerFactory->create();
2020
$this->ecsConfig->boot();
2121
}
2222
/**
@@ -26,8 +26,8 @@ protected function createContainerWithConfigs(array $configs): void
2626
{
2727
Assert::allString($configs);
2828
Assert::allFile($configs);
29-
$lazyContainerFactory = new LazyContainerFactory();
30-
$this->ecsConfig = $lazyContainerFactory->create($configs);
29+
$serviceContainerFactory = new ServiceContainerFactory();
30+
$this->ecsConfig = $serviceContainerFactory->create($configs);
3131
$this->ecsConfig->boot();
3232
}
3333
/**

vendor/composer/autoload_classmap.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1474,7 +1474,7 @@
14741474
'Symplify\\EasyCodingStandard\\DependencyInjection\\CompilerPass\\RemoveExcludedCheckersCompilerPass' => $baseDir . '/src/DependencyInjection/CompilerPass/RemoveExcludedCheckersCompilerPass.php',
14751475
'Symplify\\EasyCodingStandard\\DependencyInjection\\CompilerPass\\RemoveMutualCheckersCompilerPass' => $baseDir . '/src/DependencyInjection/CompilerPass/RemoveMutualCheckersCompilerPass.php',
14761476
'Symplify\\EasyCodingStandard\\DependencyInjection\\EasyCodingStandardContainerFactory' => $baseDir . '/src/DependencyInjection/EasyCodingStandardContainerFactory.php',
1477-
'Symplify\\EasyCodingStandard\\DependencyInjection\\LazyContainerFactory' => $baseDir . '/src/DependencyInjection/LazyContainerFactory.php',
1477+
'Symplify\\EasyCodingStandard\\DependencyInjection\\ServiceContainerFactory' => $baseDir . '/src/DependencyInjection/ServiceContainerFactory.php',
14781478
'Symplify\\EasyCodingStandard\\DependencyInjection\\SimpleParameterProvider' => $baseDir . '/src/DependencyInjection/SimpleParameterProvider.php',
14791479
'Symplify\\EasyCodingStandard\\Error\\FileDiffFactory' => $baseDir . '/src/Error/FileDiffFactory.php',
14801480
'Symplify\\EasyCodingStandard\\Exception\\Configuration\\ConflictingCheckersLoadedException' => $baseDir . '/src/Exception/Configuration/ConflictingCheckersLoadedException.php',

vendor/composer/autoload_static.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1675,7 +1675,7 @@ class ComposerStaticInitb98b460274d30539ab1220e9d09778c6
16751675
'Symplify\\EasyCodingStandard\\DependencyInjection\\CompilerPass\\RemoveExcludedCheckersCompilerPass' => __DIR__ . '/../..' . '/src/DependencyInjection/CompilerPass/RemoveExcludedCheckersCompilerPass.php',
16761676
'Symplify\\EasyCodingStandard\\DependencyInjection\\CompilerPass\\RemoveMutualCheckersCompilerPass' => __DIR__ . '/../..' . '/src/DependencyInjection/CompilerPass/RemoveMutualCheckersCompilerPass.php',
16771677
'Symplify\\EasyCodingStandard\\DependencyInjection\\EasyCodingStandardContainerFactory' => __DIR__ . '/../..' . '/src/DependencyInjection/EasyCodingStandardContainerFactory.php',
1678-
'Symplify\\EasyCodingStandard\\DependencyInjection\\LazyContainerFactory' => __DIR__ . '/../..' . '/src/DependencyInjection/LazyContainerFactory.php',
1678+
'Symplify\\EasyCodingStandard\\DependencyInjection\\ServiceContainerFactory' => __DIR__ . '/../..' . '/src/DependencyInjection/ServiceContainerFactory.php',
16791679
'Symplify\\EasyCodingStandard\\DependencyInjection\\SimpleParameterProvider' => __DIR__ . '/../..' . '/src/DependencyInjection/SimpleParameterProvider.php',
16801680
'Symplify\\EasyCodingStandard\\Error\\FileDiffFactory' => __DIR__ . '/../..' . '/src/Error/FileDiffFactory.php',
16811681
'Symplify\\EasyCodingStandard\\Exception\\Configuration\\ConflictingCheckersLoadedException' => __DIR__ . '/../..' . '/src/Exception/Configuration/ConflictingCheckersLoadedException.php',

vendor/composer/installed.php

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

vendor/scoper-autoload.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
// Restore the backup and ensure the excluded files are properly marked as loaded
1515
$GLOBALS['__composer_autoload_files'] = \array_merge(
1616
$existingComposerAutoloadFiles,
17-
\array_fill_keys(['80dfc307f8b4b13bcd033cef5c977d19', '8825ede83f2f289127722d4e842cf7e8', 'acbe0d033c55cd0a032b415e08d14f4c', 'a4a119a56e50fbb293281d9a48007e0e', '23c18046f52bef3eea034657bafda50f', '9d2b9fc6db0f153a0a149fefb182415e', 'c18d2008c6f2fa913c7bba17deb24ff5', '7bfbed8d216c917b4d3e46b319a08b5c', '7bdb062931f6e7102434c3ad28423eb6', '18e965175c6bcd96deba6bc791a44373', 'f49032536fdd06afd9df7191c3f21453', '7edcabe1b67fbb38f4972a722bbbb429', '51421aa3e5e8003b70a289762d146a2a', 'd1fb64fd99fc22e28e29a95cc0ea533a', '7b0b5d7b98f96ad751222ae5cc98cfcb', '5a966bedfea587acd3f5a140d050c889', 'ed74e3668930207f1a4ac3f94099e2e6', '0e1fff5a03ce8edfa2fa9b52d709372a', '88eb642bc60ad56d36dcb0cbcddc74f4', 'f9fd4d0bdd191df87ed0092ea696bcbc', '3e593131d33cca33b86e55317d2bc0b3', '79ae8b3fe21b90a128627e3871279d1b', '72e758a5054532edb6cb9ed0d015e600', '87005e5d70a864da11374798fc217696'], true)
17+
\array_fill_keys(['acbe0d033c55cd0a032b415e08d14f4c', '8825ede83f2f289127722d4e842cf7e8', '80dfc307f8b4b13bcd033cef5c977d19', 'a4a119a56e50fbb293281d9a48007e0e', '23c18046f52bef3eea034657bafda50f', '7bfbed8d216c917b4d3e46b319a08b5c', '9d2b9fc6db0f153a0a149fefb182415e', 'c18d2008c6f2fa913c7bba17deb24ff5', 'f49032536fdd06afd9df7191c3f21453', '7edcabe1b67fbb38f4972a722bbbb429', '7bdb062931f6e7102434c3ad28423eb6', '18e965175c6bcd96deba6bc791a44373', '51421aa3e5e8003b70a289762d146a2a', 'd1fb64fd99fc22e28e29a95cc0ea533a', '7b0b5d7b98f96ad751222ae5cc98cfcb', '79ae8b3fe21b90a128627e3871279d1b', '72e758a5054532edb6cb9ed0d015e600', '87005e5d70a864da11374798fc217696', '0e1fff5a03ce8edfa2fa9b52d709372a', 'ed74e3668930207f1a4ac3f94099e2e6', '3e593131d33cca33b86e55317d2bc0b3', '88eb642bc60ad56d36dcb0cbcddc74f4', 'f9fd4d0bdd191df87ed0092ea696bcbc', '5a966bedfea587acd3f5a140d050c889'], true)
1818
);
1919

2020
return $loader;

0 commit comments

Comments
 (0)