diff --git a/composer.json b/composer.json index 8a08cd3b9..49d2ef566 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,7 @@ "react/event-loop": "^1.1", "symfony/cache": "^6.3", "symfony/config": "^6.3", - "symfony/console": "6.3.2", + "symfony/console": "^6.3", "symfony/dependency-injection": "^6.3", "symfony/dotenv": "^6.3", "symfony/event-dispatcher": "^6.3", diff --git a/composer.lock b/composer.lock index 7283ef564..7207ee0fe 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "cf656c7a733183495270ef1b8d92ade8", + "content-hash": "dcba072d839491a8b2215bdb45fa1523", "packages": [ { "name": "acquia/drupal-environment-detector", @@ -3921,16 +3921,16 @@ }, { "name": "symfony/console", - "version": "v6.3.2", + "version": "v6.4.9", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "aa5d64ad3f63f2e48964fc81ee45cb318a723898" + "reference": "6edb5363ec0c78ad4d48c5128ebf4d083d89d3a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/aa5d64ad3f63f2e48964fc81ee45cb318a723898", - "reference": "aa5d64ad3f63f2e48964fc81ee45cb318a723898", + "url": "https://api.github.com/repos/symfony/console/zipball/6edb5363ec0c78ad4d48c5128ebf4d083d89d3a9", + "reference": "6edb5363ec0c78ad4d48c5128ebf4d083d89d3a9", "shasum": "" }, "require": { @@ -3938,7 +3938,7 @@ "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-mbstring": "~1.0", "symfony/service-contracts": "^2.5|^3", - "symfony/string": "^5.4|^6.0" + "symfony/string": "^5.4|^6.0|^7.0" }, "conflict": { "symfony/dependency-injection": "<5.4", @@ -3952,12 +3952,16 @@ }, "require-dev": { "psr/log": "^1|^2|^3", - "symfony/config": "^5.4|^6.0", - "symfony/dependency-injection": "^5.4|^6.0", - "symfony/event-dispatcher": "^5.4|^6.0", - "symfony/lock": "^5.4|^6.0", - "symfony/process": "^5.4|^6.0", - "symfony/var-dumper": "^5.4|^6.0" + "symfony/config": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/event-dispatcher": "^5.4|^6.0|^7.0", + "symfony/http-foundation": "^6.4|^7.0", + "symfony/http-kernel": "^6.4|^7.0", + "symfony/lock": "^5.4|^6.0|^7.0", + "symfony/messenger": "^5.4|^6.0|^7.0", + "symfony/process": "^5.4|^6.0|^7.0", + "symfony/stopwatch": "^5.4|^6.0|^7.0", + "symfony/var-dumper": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -3991,7 +3995,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.3.2" + "source": "https://github.com/symfony/console/tree/v6.4.9" }, "funding": [ { @@ -4007,7 +4011,7 @@ "type": "tidelift" } ], - "time": "2023-07-19T20:17:28+00:00" + "time": "2024-06-28T09:49:33+00:00" }, { "name": "symfony/dependency-injection", @@ -7419,16 +7423,16 @@ }, { "name": "brianium/paratest", - "version": "v6.10.1", + "version": "v6.11.1", "source": { "type": "git", "url": "https://github.com/paratestphp/paratest.git", - "reference": "d6f32a91302b74458e8ef5d132bb2215a5edb34b" + "reference": "78e297a969049ca7cc370e80ff5e102921ef39a3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paratestphp/paratest/zipball/d6f32a91302b74458e8ef5d132bb2215a5edb34b", - "reference": "d6f32a91302b74458e8ef5d132bb2215a5edb34b", + "url": "https://api.github.com/repos/paratestphp/paratest/zipball/78e297a969049ca7cc370e80ff5e102921ef39a3", + "reference": "78e297a969049ca7cc370e80ff5e102921ef39a3", "shasum": "" }, "require": { @@ -7436,7 +7440,7 @@ "ext-pcre": "*", "ext-reflection": "*", "ext-simplexml": "*", - "fidry/cpu-core-counter": "^0.4.1 || ^0.5.1", + "fidry/cpu-core-counter": "^0.4.1 || ^0.5.1 || ^1.0.0", "jean85/pretty-package-versions": "^2.0.5", "php": "^7.3 || ^8.0", "phpunit/php-code-coverage": "^9.2.25", @@ -7444,16 +7448,16 @@ "phpunit/php-timer": "^5.0.3", "phpunit/phpunit": "^9.6.4", "sebastian/environment": "^5.1.5", - "symfony/console": "^5.4.21 || ^6.2.7", - "symfony/process": "^5.4.21 || ^6.2.7" + "symfony/console": "^5.4.28 || ^6.3.4 || ^7.0.0", + "symfony/process": "^5.4.28 || ^6.3.4 || ^7.0.0" }, "require-dev": { - "doctrine/coding-standard": "^10.0.0", + "doctrine/coding-standard": "^12.0.0", "ext-pcov": "*", "ext-posix": "*", - "infection/infection": "^0.26.19", + "infection/infection": "^0.27.6", "squizlabs/php_codesniffer": "^3.7.2", - "symfony/filesystem": "^5.4.21 || ^6.2.7", + "symfony/filesystem": "^5.4.25 || ^6.3.1 || ^7.0.0", "vimeo/psalm": "^5.7.7" }, "bin": [ @@ -7495,7 +7499,7 @@ ], "support": { "issues": "https://github.com/paratestphp/paratest/issues", - "source": "https://github.com/paratestphp/paratest/tree/v6.10.1" + "source": "https://github.com/paratestphp/paratest/tree/v6.11.1" }, "funding": [ { @@ -7507,7 +7511,7 @@ "type": "paypal" } ], - "time": "2023-10-04T13:33:07+00:00" + "time": "2024-03-13T06:54:29+00:00" }, { "name": "colinodell/json5", @@ -8516,16 +8520,16 @@ }, { "name": "fidry/cpu-core-counter", - "version": "0.5.1", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/theofidry/cpu-core-counter.git", - "reference": "b58e5a3933e541dc286cc91fc4f3898bbc6f1623" + "reference": "f92996c4d5c1a696a6a970e20f7c4216200fcc42" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/b58e5a3933e541dc286cc91fc4f3898bbc6f1623", - "reference": "b58e5a3933e541dc286cc91fc4f3898bbc6f1623", + "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/f92996c4d5c1a696a6a970e20f7c4216200fcc42", + "reference": "f92996c4d5c1a696a6a970e20f7c4216200fcc42", "shasum": "" }, "require": { @@ -8533,13 +8537,13 @@ }, "require-dev": { "fidry/makefile": "^0.2.0", + "fidry/php-cs-fixer-config": "^1.1.2", "phpstan/extension-installer": "^1.2.0", "phpstan/phpstan": "^1.9.2", "phpstan/phpstan-deprecation-rules": "^1.0.0", "phpstan/phpstan-phpunit": "^1.2.2", "phpstan/phpstan-strict-rules": "^1.4.4", - "phpunit/phpunit": "^9.5.26 || ^8.5.31", - "theofidry/php-cs-fixer-config": "^1.0", + "phpunit/phpunit": "^8.5.31 || ^9.5.26", "webmozarts/strict-phpunit": "^7.5" }, "type": "library", @@ -8565,7 +8569,7 @@ ], "support": { "issues": "https://github.com/theofidry/cpu-core-counter/issues", - "source": "https://github.com/theofidry/cpu-core-counter/tree/0.5.1" + "source": "https://github.com/theofidry/cpu-core-counter/tree/1.1.0" }, "funding": [ { @@ -8573,7 +8577,7 @@ "type": "github" } ], - "time": "2022-12-24T12:35:10+00:00" + "time": "2024-02-07T09:43:46+00:00" }, { "name": "gitonomy/gitlib", @@ -9844,34 +9848,35 @@ }, { "name": "overtrue/phplint", - "version": "9.0.8", + "version": "9.4.1", "source": { "type": "git", "url": "https://github.com/overtrue/phplint.git", - "reference": "9b0cabaf0af41b06d0b0bc51e9045e5321e9b11a" + "reference": "cec4a0dbb9d00077dafa2f0cd89f4ca532814276" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/overtrue/phplint/zipball/9b0cabaf0af41b06d0b0bc51e9045e5321e9b11a", - "reference": "9b0cabaf0af41b06d0b0bc51e9045e5321e9b11a", + "url": "https://api.github.com/repos/overtrue/phplint/zipball/cec4a0dbb9d00077dafa2f0cd89f4ca532814276", + "reference": "cec4a0dbb9d00077dafa2f0cd89f4ca532814276", "shasum": "" }, "require": { + "ext-dom": "*", "ext-json": "*", "ext-mbstring": "*", - "php": "^8.0", - "symfony/cache": "^5.4 || ^6.0 || ^7.0", - "symfony/console": "^5.4 || ^6.0 || ^7.0", - "symfony/event-dispatcher": "^5.4 || ^6.0 || ^7.0", - "symfony/finder": "^5.4 || ^6.0 || ^7.0", - "symfony/options-resolver": "^5.4 || ^6.0 || ^7.0", - "symfony/process": "^5.4 || ^6.0 || ^7.0", - "symfony/yaml": "^5.4 || ^6.0 || ^7.0" + "php": "^8.1", + "symfony/cache": "^6.4 || ^7.0", + "symfony/console": "^6.4 || ^7.0", + "symfony/event-dispatcher": "^6.4 || ^7.0", + "symfony/finder": "^6.4 || ^7.0", + "symfony/options-resolver": "^6.4 || ^7.0", + "symfony/process": "^6.4 || ^7.0", + "symfony/yaml": "^6.4 || ^7.0" }, "require-dev": { "bamarni/composer-bin-plugin": "^1.4", - "brainmaestro/composer-git-hooks": "^2.8.5 || 3.0.0-alpha.1", - "jetbrains/phpstorm-stubs": "^2021.3 || ^2022.3 || ^2023.0", + "brainmaestro/composer-git-hooks": "^3.0.0", + "jetbrains/phpstorm-stubs": "^2024.1", "php-parallel-lint/php-console-highlighter": "^1.0" }, "bin": [ @@ -9879,13 +9884,22 @@ ], "type": "library", "extra": { + "bamarni-bin": { + "bin-links": true, + "target-directory": "vendor-bin", + "forward-command": true + }, "hooks": { "pre-commit": [ - "composer fix-style" + "composer style:fix", + "composer code:check" + ], + "pre-push": [ + "composer qa:check" ] }, "branch-alias": { - "dev-main": "9.0.x-dev" + "dev-main": "9.4.x-dev" } }, "autoload": { @@ -9917,7 +9931,7 @@ ], "support": { "issues": "https://github.com/overtrue/phplint/issues", - "source": "https://github.com/overtrue/phplint/tree/9.0.8" + "source": "https://github.com/overtrue/phplint/tree/9.4.1" }, "funding": [ { @@ -9925,7 +9939,7 @@ "type": "github" } ], - "time": "2024-02-05T09:37:32+00:00" + "time": "2024-07-05T14:16:33+00:00" }, { "name": "phar-io/manifest", diff --git a/src/Output/Checklist.php b/src/Output/Checklist.php index aba78ca8b..62146e12b 100644 --- a/src/Output/Checklist.php +++ b/src/Output/Checklist.php @@ -44,7 +44,7 @@ public function completePreviousItem(): void $item = $this->getLastItem(); /** @var \Acquia\Cli\Output\Spinner\Spinner $spinner */ $spinner = $item['spinner']; - $spinner->setMessage('', 'detail'); + $spinner->setMessage(' ', 'detail'); $spinner->setMessage($item['message']); $spinner->advance(); $spinner->finish(); diff --git a/src/Output/Spinner/Spinner.php b/src/Output/Spinner/Spinner.php index 6e6ef4ff5..16b0598ea 100644 --- a/src/Output/Spinner/Spinner.php +++ b/src/Output/Spinner/Spinner.php @@ -105,7 +105,7 @@ public function __construct(private OutputInterface $output, private int $indent $this->progressBar->setEmptyBarCharacter('⌛'); $this->progressBar->setFormat($indentString . "%bar% %message%\n%detail%"); $this->progressBar->setBarWidth(1); - $this->progressBar->setMessage('', 'detail'); + $this->progressBar->setMessage(' ', 'detail'); $this->progressBar->setOverwrite($output->getVerbosity() < OutputInterface::VERBOSITY_VERBOSE); } diff --git a/tests/phpunit/src/Commands/ChecklistTest.php b/tests/phpunit/src/Misc/ChecklistTest.php similarity index 87% rename from tests/phpunit/src/Commands/ChecklistTest.php rename to tests/phpunit/src/Misc/ChecklistTest.php index 50cc65701..be0cb7479 100644 --- a/tests/phpunit/src/Commands/ChecklistTest.php +++ b/tests/phpunit/src/Misc/ChecklistTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Acquia\Cli\Tests\Commands; +namespace Acquia\Cli\Tests\Misc; use Acquia\Cli\Output\Checklist; use Acquia\Cli\Tests\TestBase; @@ -28,6 +28,9 @@ public function testSpinner(): void putenv('PHPUNIT_RUNNING=1'); $checklist = new Checklist($this->output); $checklist->addItem('Testing!'); + $items = $checklist->getItems(); + $progressBar = $items[0]['spinner']->getProgressBar(); + $this->assertEquals(' ', $progressBar->getMessage('detail')); // Make the spinner spin with some output. $outputCallback = static function (string $type, string $buffer) use ($checklist): void { @@ -48,7 +51,7 @@ public function testSpinner(): void $this->assertEquals('⢸', $progressBar->getProgressCharacter()); $this->assertEquals('⌛', $progressBar->getEmptyBarCharacter()); $this->assertEquals(1, $progressBar->getBarWidth()); - $this->assertEquals('', $progressBar->getMessage('detail')); + $this->assertEquals(' ', $progressBar->getMessage('detail')); putenv('PHPUNIT_RUNNING'); }