Skip to content

Commit e019c76

Browse files
TomasVotrubaTomasVotruba
committed
Updated ECS to commit dede7b9d903f36c95ee50f179199123978ddda71
1 parent 20e7af5 commit e019c76

15 files changed

Lines changed: 101 additions & 55 deletions

File tree

‎packages/coding-standard/src/Fixer/LineLength/LineLengthFixer.php‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,18 @@
2424
/**
2525
* @see \Symplify\CodingStandard\Tests\Fixer\LineLength\LineLengthFixer\LineLengthFixerTest
2626
* @see \Symplify\CodingStandard\Tests\Fixer\LineLength\LineLengthFixer\ConfiguredLineLengthFixerTest
27+
*
28+
* @implements ConfigurableFixerInterface<
29+
* array{
30+
* self::LINE_LENGTH?: int,
31+
* self::BREAK_LONG_LINES?: bool,
32+
* self::INLINE_SHORT_LINES?: bool
33+
* }, array{
34+
* self::LINE_LENGTH: int,
35+
* self::BREAK_LONG_LINES: bool,
36+
* self::INLINE_SHORT_LINES: bool
37+
* }
38+
* >
2739
*/
2840
final class LineLengthFixer extends AbstractSymplifyFixer implements ConfigurableFixerInterface
2941
{

‎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 = '3adffe1eb1e216144735783da33566c5adb34658';
18+
public const PACKAGE_VERSION = 'dede7b9d903f36c95ee50f179199123978ddda71';
1919
/**
2020
* @api
2121
* @var string
2222
*/
23-
public const RELEASE_DATE = '2026-06-20 11:09:15';
23+
public const RELEASE_DATE = '2026-06-20 10:14:16';
2424
/**
2525
* @var int
2626
*/

‎src/Console/Output/JsonOutputFormatter.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public function createJsonContent(ErrorAndDiffResult $errorAndDiffResult, bool $
6969
return Json::encode($errorsArrayJson, Json::PRETTY);
7070
}
7171
/**
72-
* @return array{totals: array{errors: int, diffs: int}, files: string[]}
72+
* @return array{totals: array{errors: int, diffs: int}, files: array<string, array<string, list<array<string, mixed>>>>}
7373
*/
7474
private function createBaseErrorsJson(ErrorAndDiffResult $errorAndDiffResult): array
7575
{

‎src/Parallel/Application/ParallelFileProcessor.php‎

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,6 @@ final class ParallelFileProcessor
4343
* @var int
4444
*/
4545
private const SYSTEM_ERROR_LIMIT = 50;
46-
/**
47-
* @var \Symplify\EasyCodingStandard\Parallel\ValueObject\ProcessPool|null
48-
*/
49-
private $processPool = null;
5046
public function __construct(WorkerCommandLineFactory $workerCommandLineFactory)
5147
{
5248
$this->workerCommandLineFactory = $workerCommandLineFactory;
@@ -68,20 +64,20 @@ public function check(Schedule $schedule, string $mainScript, callable $postFile
6864
$fileDiffs = [];
6965
$systemErrors = [];
7066
$tcpServer = new TcpServer('127.0.0.1:0', $streamSelectLoop);
71-
$this->processPool = new ProcessPool($tcpServer);
72-
$tcpServer->on(ReactEvent::CONNECTION, function (ConnectionInterface $connection) use (&$jobs): void {
67+
$processPool = new ProcessPool($tcpServer);
68+
$tcpServer->on(ReactEvent::CONNECTION, function (ConnectionInterface $connection) use (&$jobs, $processPool): void {
7369
$inDecoder = new Decoder($connection, \true, 512, 0, 4 * 1024 * 1024);
7470
$outEncoder = new Encoder($connection);
75-
$inDecoder->on(ReactEvent::DATA, function (array $data) use (&$jobs, $inDecoder, $outEncoder): void {
71+
$inDecoder->on(ReactEvent::DATA, function (array $data) use (&$jobs, $inDecoder, $outEncoder, $processPool): void {
7672
$action = $data[ReactCommand::ACTION];
7773
if ($action !== Action::HELLO) {
7874
return;
7975
}
8076
$processIdentifier = $data[Option::PARALLEL_IDENTIFIER];
81-
$parallelProcess = $this->processPool->getProcess($processIdentifier);
77+
$parallelProcess = $processPool->getProcess($processIdentifier);
8278
$parallelProcess->bindConnection($inDecoder, $outEncoder);
8379
if ($jobs === []) {
84-
$this->processPool->quitProcess($processIdentifier);
80+
$processPool->quitProcess($processIdentifier);
8581
return;
8682
}
8783
$job = array_pop($jobs);
@@ -94,11 +90,11 @@ public function check(Schedule $schedule, string $mainScript, callable $postFile
9490
$serverPort = parse_url($serverAddress, \PHP_URL_PORT);
9591
$systemErrorsCount = 0;
9692
$reachedSystemErrorsCountLimit = \false;
97-
$handleErrorCallable = function (Throwable $throwable) use (&$systemErrors, &$systemErrorsCount, &$reachedSystemErrorsCountLimit): void {
93+
$handleErrorCallable = function (Throwable $throwable) use (&$systemErrors, &$systemErrorsCount, &$reachedSystemErrorsCountLimit, $processPool): void {
9894
$systemErrors[] = new SystemError($throwable->getLine(), $throwable->getMessage(), $throwable->getFile());
9995
++$systemErrorsCount;
10096
$reachedSystemErrorsCountLimit = \true;
101-
$this->processPool->quitAll();
97+
$processPool->quitAll();
10298
};
10399
$timeoutInSeconds = SimpleParameterProvider::getIntParameter(Option::PARALLEL_TIMEOUT_IN_SECONDS);
104100
// options mirrored to each worker sub-process
@@ -113,7 +109,7 @@ public function check(Schedule $schedule, string $mainScript, callable $postFile
113109
$parallelProcess = new ParallelProcess($workerCommandLine, $streamSelectLoop, $timeoutInSeconds);
114110
$parallelProcess->start(
115111
// 1. callable on data
116-
function (array $json) use ($parallelProcess, &$systemErrors, &$fileDiffs, &$codingStandardErrors, &$jobs, $postFileCallback, &$systemErrorsCount, &$reachedInternalErrorsCountLimit, $processIdentifier): void {
112+
function (array $json) use ($parallelProcess, &$systemErrors, &$fileDiffs, &$codingStandardErrors, &$jobs, $postFileCallback, &$systemErrorsCount, &$reachedInternalErrorsCountLimit, $processIdentifier, $processPool): void {
117113
// decode arrays to objects
118114
foreach ($json[Bridge::SYSTEM_ERRORS] as $jsonError) {
119115
if (is_string($jsonError)) {
@@ -132,10 +128,10 @@ function (array $json) use ($parallelProcess, &$systemErrors, &$fileDiffs, &$cod
132128
$systemErrorsCount += $json[Bridge::SYSTEM_ERRORS_COUNT];
133129
if ($systemErrorsCount >= self::SYSTEM_ERROR_LIMIT) {
134130
$reachedInternalErrorsCountLimit = \true;
135-
$this->processPool->quitAll();
131+
$processPool->quitAll();
136132
}
137133
if ($jobs === []) {
138-
$this->processPool->quitProcess($processIdentifier);
134+
$processPool->quitProcess($processIdentifier);
139135
return;
140136
}
141137
$job = array_pop($jobs);
@@ -144,8 +140,8 @@ function (array $json) use ($parallelProcess, &$systemErrors, &$fileDiffs, &$cod
144140
// 2. callable on error
145141
$handleErrorCallable,
146142
// 3. callable on exit
147-
function ($exitCode, string $stdErr) use (&$systemErrors, $processIdentifier): void {
148-
$this->processPool->tryQuitProcess($processIdentifier);
143+
function ($exitCode, string $stdErr) use (&$systemErrors, $processIdentifier, $processPool): void {
144+
$processPool->tryQuitProcess($processIdentifier);
149145
if ($exitCode === ExitCode::SUCCESS) {
150146
return;
151147
}
@@ -155,7 +151,7 @@ function ($exitCode, string $stdErr) use (&$systemErrors, $processIdentifier): v
155151
$systemErrors[] = 'Child process error: ' . $stdErr;
156152
}
157153
);
158-
$this->processPool->attachProcess($processIdentifier, $parallelProcess);
154+
$processPool->attachProcess($processIdentifier, $parallelProcess);
159155
}
160156
$streamSelectLoop->run();
161157
if ($reachedSystemErrorsCountLimit) {

‎src/Skipper/FileSystem/FnMatchPathNormalizer.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ public function normalizeForFnmatch(string $path): string
1414
return '*' . trim($path, '*') . '*';
1515
}
1616
if (strpos($path, '..') !== \false) {
17-
/** @var string|false $realPath */
1817
$realPath = realpath($path);
1918
if ($realPath === \false) {
2019
return '';

‎src/Skipper/RealpathMatcher.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@ final class RealpathMatcher
77
{
88
public function match(string $matchingPath, string $filePath): bool
99
{
10-
/** @var string|false $realPathMatchingPath */
10+
/** @var non-empty-string|false $realPathMatchingPath */
1111
$realPathMatchingPath = realpath($matchingPath);
1212
if ($realPathMatchingPath === \false) {
1313
return \false;
1414
}
15-
/** @var string|false $realpathFilePath */
1615
$realpathFilePath = realpath($filePath);
1716
if ($realpathFilePath === \false) {
1817
return \false;

‎vendor/autoload.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@
1919

2020
require_once __DIR__ . '/composer/autoload_real.php';
2121

22-
return ComposerAutoloaderInit7bfa69059fa0337cfc75373899fdd69d::getLoader();
22+
return ComposerAutoloaderInitc23700a8507cf45c476c8104d331b180::getLoader();

‎vendor/composer/autoload_real.php‎

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

33
// autoload_real.php @generated by Composer
44

5-
class ComposerAutoloaderInit7bfa69059fa0337cfc75373899fdd69d
5+
class ComposerAutoloaderInitc23700a8507cf45c476c8104d331b180
66
{
77
private static $loader;
88

@@ -22,17 +22,17 @@ public static function getLoader()
2222
return self::$loader;
2323
}
2424

25-
spl_autoload_register(array('ComposerAutoloaderInit7bfa69059fa0337cfc75373899fdd69d', 'loadClassLoader'), true, true);
25+
spl_autoload_register(array('ComposerAutoloaderInitc23700a8507cf45c476c8104d331b180', 'loadClassLoader'), true, true);
2626
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
27-
spl_autoload_unregister(array('ComposerAutoloaderInit7bfa69059fa0337cfc75373899fdd69d', 'loadClassLoader'));
27+
spl_autoload_unregister(array('ComposerAutoloaderInitc23700a8507cf45c476c8104d331b180', 'loadClassLoader'));
2828

2929
require __DIR__ . '/autoload_static.php';
30-
call_user_func(\Composer\Autoload\ComposerStaticInit7bfa69059fa0337cfc75373899fdd69d::getInitializer($loader));
30+
call_user_func(\Composer\Autoload\ComposerStaticInitc23700a8507cf45c476c8104d331b180::getInitializer($loader));
3131

3232
$loader->setClassMapAuthoritative(true);
3333
$loader->register(true);
3434

35-
$filesToLoad = \Composer\Autoload\ComposerStaticInit7bfa69059fa0337cfc75373899fdd69d::$files;
35+
$filesToLoad = \Composer\Autoload\ComposerStaticInitc23700a8507cf45c476c8104d331b180::$files;
3636
$requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
3737
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
3838
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

‎vendor/composer/autoload_static.php‎

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

55
namespace Composer\Autoload;
66

7-
class ComposerStaticInit7bfa69059fa0337cfc75373899fdd69d
7+
class ComposerStaticInitc23700a8507cf45c476c8104d331b180
88
{
99
public static $files = array (
1010
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@@ -1560,9 +1560,9 @@ class ComposerStaticInit7bfa69059fa0337cfc75373899fdd69d
15601560
public static function getInitializer(ClassLoader $loader)
15611561
{
15621562
return \Closure::bind(function () use ($loader) {
1563-
$loader->prefixLengthsPsr4 = ComposerStaticInit7bfa69059fa0337cfc75373899fdd69d::$prefixLengthsPsr4;
1564-
$loader->prefixDirsPsr4 = ComposerStaticInit7bfa69059fa0337cfc75373899fdd69d::$prefixDirsPsr4;
1565-
$loader->classMap = ComposerStaticInit7bfa69059fa0337cfc75373899fdd69d::$classMap;
1563+
$loader->prefixLengthsPsr4 = ComposerStaticInitc23700a8507cf45c476c8104d331b180::$prefixLengthsPsr4;
1564+
$loader->prefixDirsPsr4 = ComposerStaticInitc23700a8507cf45c476c8104d331b180::$prefixDirsPsr4;
1565+
$loader->classMap = ComposerStaticInitc23700a8507cf45c476c8104d331b180::$classMap;
15661566

15671567
}, null, ClassLoader::class);
15681568
}

‎vendor/composer/installed.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -297,17 +297,17 @@
297297
},
298298
{
299299
"name": "entropy\/entropy",
300-
"version": "0.4.2",
301-
"version_normalized": "0.4.2.0",
300+
"version": "0.4.6",
301+
"version_normalized": "0.4.6.0",
302302
"source": {
303303
"type": "git",
304304
"url": "https:\/\/github.com\/TomasVotruba\/entropy.git",
305-
"reference": "f0d35f20c9b361a63d0804906d36439a103953fd"
305+
"reference": "415f69258150409db7c36aa747923e28aa53e9f6"
306306
},
307307
"dist": {
308308
"type": "zip",
309-
"url": "https:\/\/api.github.com\/repos\/TomasVotruba\/entropy\/zipball\/f0d35f20c9b361a63d0804906d36439a103953fd",
310-
"reference": "f0d35f20c9b361a63d0804906d36439a103953fd",
309+
"url": "https:\/\/api.github.com\/repos\/TomasVotruba\/entropy\/zipball\/415f69258150409db7c36aa747923e28aa53e9f6",
310+
"reference": "415f69258150409db7c36aa747923e28aa53e9f6",
311311
"shasum": ""
312312
},
313313
"require": {
@@ -329,7 +329,7 @@
329329
"tomasvotruba\/unused-public": "^2.2",
330330
"tracy\/tracy": "^2.12"
331331
},
332-
"time": "2026-06-15T13:31:41+00:00",
332+
"time": "2026-06-20T10:04:38+00:00",
333333
"type": "library",
334334
"installation-source": "dist",
335335
"autoload": {
@@ -344,7 +344,7 @@
344344
"description": "Entropy framework",
345345
"support": {
346346
"issues": "https:\/\/github.com\/TomasVotruba\/entropy\/issues",
347-
"source": "https:\/\/github.com\/TomasVotruba\/entropy\/tree\/0.4.2"
347+
"source": "https:\/\/github.com\/TomasVotruba\/entropy\/tree\/0.4.6"
348348
},
349349
"install-path": "..\/entropy\/entropy"
350350
},

0 commit comments

Comments
 (0)