From 71d37c0387b42b7b3f07e14f06686fbd90845a3c Mon Sep 17 00:00:00 2001 From: sayan goswami Date: Wed, 19 Jul 2023 20:48:37 +0530 Subject: [PATCH 01/81] Back to dev --- config/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/VERSION b/config/VERSION index 7422eeba2..eb75f81c0 100644 --- a/config/VERSION +++ b/config/VERSION @@ -1 +1 @@ -v4.5.0 \ No newline at end of file +v4.6.0-dev \ No newline at end of file From 4e56b62d7f3ada781042c4d7f96c98e291f72b4c Mon Sep 17 00:00:00 2001 From: Sayan Goswami Date: Tue, 25 Jul 2023 19:42:09 +0530 Subject: [PATCH 02/81] Fix next minor dev calculations (#416) * fix next minor * testing * testing again * Both jobs are running * save * saving on friday * Fix all issues * Pairing WIP. * Fix tests * Add other tests --------- Co-authored-by: Travis Carden --- ...atedTestOnNextMajorLatestMinorDevCiJob.php | 3 +- .../Version/DrupalCoreVersionResolver.php | 45 ++++++++- ...TestOnNextMajorLatestMinorDevCiJobTest.php | 50 ++++++++++ .../Version/DrupalCoreVersionResolverTest.php | 92 ++++++++++++++++--- 4 files changed, 173 insertions(+), 17 deletions(-) diff --git a/src/Domain/Ci/Job/IntegratedTestOnNextMajorLatestMinorDevCiJob.php b/src/Domain/Ci/Job/IntegratedTestOnNextMajorLatestMinorDevCiJob.php index 17ca52477..ed1d5a480 100644 --- a/src/Domain/Ci/Job/IntegratedTestOnNextMajorLatestMinorDevCiJob.php +++ b/src/Domain/Ci/Job/IntegratedTestOnNextMajorLatestMinorDevCiJob.php @@ -72,7 +72,8 @@ protected function jobName(): CiJobEnum { * {@inheritdoc} */ public function exitEarly(): bool { - return !$this->matchingCoreVersionExists($this->drupalCoreVersionResolver, $this->output); + $next_minor_dev = $this->drupalCoreVersionResolver->getNextMinorDevCandidate(); + return !$this->drupalCoreVersionResolver->existsArbitrary($next_minor_dev) || !$this->matchingCoreVersionExists($this->drupalCoreVersionResolver, $this->output); } /** diff --git a/src/Domain/Composer/Version/DrupalCoreVersionResolver.php b/src/Domain/Composer/Version/DrupalCoreVersionResolver.php index c2cd8ea71..d276c78a0 100644 --- a/src/Domain/Composer/Version/DrupalCoreVersionResolver.php +++ b/src/Domain/Composer/Version/DrupalCoreVersionResolver.php @@ -156,6 +156,30 @@ public function resolvePredefined(DrupalCoreVersionEnum $version): string { } } + /** + * Determines if a given arbitrary version resolves to a version that exists. + * + * @param string $version + * The core version constraint. + * @param string $preferred_stability + * The stability, both minimum and preferred. Available options (in order of + * stability) are dev, alpha, beta, RC, and stable. + * @param bool $dev + * TRUE to allow dev stability results or FALSE not to. + * + * @return bool + * TRUE if the version exists or FALSE if not. + */ + public function existsArbitrary(string $version, string $preferred_stability = 'stable', bool $dev = TRUE): bool { + try { + $this->resolveArbitrary($version, $preferred_stability, $dev); + } + catch (OrcaVersionNotFoundException $e) { + return FALSE; + } + return TRUE; + } + /** * Finds the Drupal core version matching the given arbitrary criteria. * @@ -332,6 +356,17 @@ private function findNextMinorUnresolved(): string { return "{$current_minor}.0"; } + /** + * Gets a possible next minor dev value. + * + * @return string + * The next minor dev candidate string. + */ + public function getNextMinorDevCandidate(): string { + $next_minor = $this->findNextMinorUnresolved(); + return $this->convertToDev($next_minor); + } + /** * Finds the next minor dev version of Drupal core. * @@ -345,8 +380,14 @@ private function findNextMinorDev(): string { return $this->nextMinorDev; } - $next_minor = $this->findNextMinorUnresolved(); - $this->nextMinorDev = $this->convertToDev($next_minor); + $next_minor_dev = $this->getNextMinorDevCandidate(); + + if ($this->existsArbitrary($next_minor_dev)) { + $this->nextMinorDev = $this->resolveArbitrary($next_minor_dev); + } + else { + $this->nextMinorDev = $this->findNextMajorLatestMinorDev(); + } return $this->nextMinorDev; } diff --git a/tests/Domain/Ci/Job/IntegratedTestOnNextMajorLatestMinorDevCiJobTest.php b/tests/Domain/Ci/Job/IntegratedTestOnNextMajorLatestMinorDevCiJobTest.php index 4c9c32fb7..4a35d0065 100644 --- a/tests/Domain/Ci/Job/IntegratedTestOnNextMajorLatestMinorDevCiJobTest.php +++ b/tests/Domain/Ci/Job/IntegratedTestOnNextMajorLatestMinorDevCiJobTest.php @@ -10,6 +10,7 @@ use Acquia\Orca\Helper\EnvFacade; use Acquia\Orca\Helper\Process\ProcessRunner; use Acquia\Orca\Tests\Domain\Ci\Job\_Helper\CiJobTestBase; +use Prophecy\Argument; use Symfony\Component\Console\Output\OutputInterface; /** @@ -53,12 +54,29 @@ public function testInstall(): void { '--dev', ]) ->shouldBeCalledOnce(); + $this->drupalCoreVersionResolver + ->getNextMinorDevCandidate() + ->shouldBeCalledOnce() + ->willReturn(Argument::type('string')); + $this->drupalCoreVersionResolver + ->existsArbitrary(Argument::any()) + ->shouldBeCalledOnce() + ->willReturn(TRUE); + $job = $this->createJob(); $this->runInstallPhase($job); } public function testNoDrupalCoreVersionFound(): void { + $this->drupalCoreVersionResolver + ->getNextMinorDevCandidate() + ->shouldBeCalled() + ->willReturn(Argument::type('string')); + $this->drupalCoreVersionResolver + ->existsArbitrary(Argument::any()) + ->shouldBeCalled() + ->willReturn(TRUE); $this->assertExitsEarlyIfNoDrupalCoreVersionFound(); } @@ -77,6 +95,14 @@ public function testInstallOverrideProfile(): void { "--profile={$profile}", ]) ->shouldBeCalledOnce(); + $this->drupalCoreVersionResolver + ->getNextMinorDevCandidate() + ->shouldBeCalled() + ->willReturn(Argument::type('string')); + $this->drupalCoreVersionResolver + ->existsArbitrary(Argument::any()) + ->shouldBeCalled() + ->willReturn(TRUE); $job = $this->createJob(); $this->runInstallPhase($job); @@ -97,6 +123,14 @@ public function testInstallOverrideProjectTemplate(): void { "--project-template={$project_template}", ]) ->shouldBeCalledOnce(); + $this->drupalCoreVersionResolver + ->getNextMinorDevCandidate() + ->shouldBeCalled() + ->willReturn(Argument::type('string')); + $this->drupalCoreVersionResolver + ->existsArbitrary(Argument::any()) + ->shouldBeCalled() + ->willReturn(TRUE); $job = $this->createJob(); $this->runInstallPhase($job); @@ -112,6 +146,14 @@ public function testScript(): void { "--sut={$this->validSutName()}", ]) ->shouldBeCalledOnce(); + $this->drupalCoreVersionResolver + ->getNextMinorDevCandidate() + ->shouldBeCalled() + ->willReturn(Argument::type('string')); + $this->drupalCoreVersionResolver + ->existsArbitrary(Argument::any()) + ->shouldBeCalled() + ->willReturn(TRUE); $job = $this->createJob(); $this->runScriptPhase($job); @@ -128,6 +170,14 @@ public function testScriptOverrideProfile(): void { '--sut-only', ]) ->shouldBeCalledOnce(); + $this->drupalCoreVersionResolver + ->getNextMinorDevCandidate() + ->shouldBeCalled() + ->willReturn(Argument::type('string')); + $this->drupalCoreVersionResolver + ->existsArbitrary(Argument::any()) + ->shouldBeCalled() + ->willReturn(TRUE); $job = $this->createJob(); $this->runScriptPhase($job); diff --git a/tests/Domain/Composer/Version/DrupalCoreVersionResolverTest.php b/tests/Domain/Composer/Version/DrupalCoreVersionResolverTest.php index 8b76c4ef6..1ca786b06 100644 --- a/tests/Domain/Composer/Version/DrupalCoreVersionResolverTest.php +++ b/tests/Domain/Composer/Version/DrupalCoreVersionResolverTest.php @@ -15,10 +15,14 @@ use Prophecy\Prophecy\ObjectProphecy; /** - * @property \Acquia\Orca\Domain\Composer\Version\DrupalDotOrgApiClient|\Prophecy\Prophecy\ObjectProphecy $drupalDotOrgApiClient - * @property \Acquia\Orca\Domain\Composer\Version\VersionSelectorFactory|\Prophecy\Prophecy\ObjectProphecy $selectorFactory - * @property \Composer\Package\PackageInterface|\Prophecy\Prophecy\ObjectProphecy $package - * @property \Composer\Package\Version\VersionSelector|\Prophecy\Prophecy\ObjectProphecy $selector + * @property \Acquia\Orca\Domain\Composer\Version\DrupalDotOrgApiClient|\Prophecy\Prophecy\ObjectProphecy + * $drupalDotOrgApiClient + * @property \Acquia\Orca\Domain\Composer\Version\VersionSelectorFactory|\Prophecy\Prophecy\ObjectProphecy + * $selectorFactory + * @property \Composer\Package\PackageInterface|\Prophecy\Prophecy\ObjectProphecy + * $package + * @property \Composer\Package\Version\VersionSelector|\Prophecy\Prophecy\ObjectProphecy + * $selector */ class DrupalCoreVersionResolverTest extends TestCase { @@ -30,6 +34,8 @@ class DrupalCoreVersionResolverTest extends TestCase { protected PackageInterface|ObjectProphecy $package; + protected PackageInterface|ObjectProphecy $package2; + protected VersionSelector|ObjectProphecy $selector; private const CURRENT = '9.1.0'; @@ -44,6 +50,7 @@ protected function setUp(): void { ->getPrettyVersion() ->willReturn(self::CURRENT); $package = $this->package->reveal(); + $this->selector = $this->prophesize(VersionSelector::class); $this->selector ->findBestCandidate('drupal/core', Argument::any(), Argument::any()) @@ -289,20 +296,77 @@ public function testResolvePredefinedNextMinor(): void { self::assertSame('9.2.0-alpha1', $actual); } - public function testResolvePredefinedNextMinorDev(): void { - $this->expectGetCurrentToBeCalledOnce(); - $this->package + public function testResolvePredefinedNextMinorDevNotExists(): void { + $current_stable = '10.1.1'; + $current_dev = '10.2.x-dev'; + $next_major = '^11'; + $next_minor_dev = '11.x-dev'; + + $current_stable_package = $this->prophesize(PackageInterface::class); + $current_stable_package ->getPrettyVersion() - ->willReturn('9.1.x-dev'); - $this->selector->findBestCandidate('drupal/core', '*', 'stable') - ->willReturn($this->package->reveal()); - $resolver = $this->createDrupalCoreVersionResolver(); + ->willReturn($current_stable) + ->shouldBeCalled(); + $this->selector + ->findBestCandidate('drupal/core', '*', 'stable') + ->willReturn($current_stable_package->reveal()) + ->shouldBeCalled(); + + $this->selector + ->findBestCandidate('drupal/core', $current_dev, 'stable') + ->shouldBeCalled() + ->willReturn(FALSE); + + $next_minor_dev_package = $this->prophesize(PackageInterface::class); + $next_minor_dev_package + ->getPrettyVersion() + ->shouldBeCalled() + ->willReturn($next_minor_dev); + $this->selector + ->findBestCandidate('drupal/core', $next_major, 'dev') + ->shouldBeCalled() + ->willReturn($next_minor_dev_package->reveal()); + + $sut = $this->createDrupalCoreVersionResolver(); + + $actual = $sut->resolvePredefined(DrupalCoreVersionEnum::NEXT_MINOR_DEV()); + // Call again to test value caching. + $sut->resolvePredefined(DrupalCoreVersionEnum::NEXT_MINOR_DEV()); + + self::assertSame($next_minor_dev, $actual); + } + + public function testResolvePredefinedNextMinorDevExists(): void { + $current_stable = '10.1.1'; + $current_dev = '10.2.x-dev'; + + $current_stable_package = $this->prophesize(PackageInterface::class); + $current_stable_package + ->getPrettyVersion() + ->willReturn($current_stable) + ->shouldBeCalled(); + $this->selector + ->findBestCandidate('drupal/core', '*', 'stable') + ->willReturn($current_stable_package->reveal()) + ->shouldBeCalled(); + + $current_dev_package = $this->prophesize(PackageInterface::class); + $current_dev_package + ->getPrettyVersion() + ->shouldBeCalled() + ->willReturn($current_dev); + $this->selector + ->findBestCandidate('drupal/core', $current_dev, 'stable') + ->shouldBeCalled() + ->willReturn($current_dev_package->reveal()); + + $sut = $this->createDrupalCoreVersionResolver(); - $actual = $resolver->resolvePredefined(DrupalCoreVersionEnum::NEXT_MINOR_DEV()); + $actual = $sut->resolvePredefined(DrupalCoreVersionEnum::NEXT_MINOR_DEV()); // Call again to test value caching. - $resolver->resolvePredefined(DrupalCoreVersionEnum::NEXT_MINOR_DEV()); + $sut->resolvePredefined(DrupalCoreVersionEnum::NEXT_MINOR_DEV()); - self::assertSame('9.2.x-dev', $actual); + self::assertSame($current_dev, $actual); } public function testResolvePredefinedNextMajorLatestMinorBetaOrLater(): void { From 60675353f9bdb686150c840695d0b88cfa609d13 Mon Sep 17 00:00:00 2001 From: Sayan Goswami Date: Thu, 24 Aug 2023 09:47:46 +0530 Subject: [PATCH 03/81] Downgrade chrome version in github actions (#421) * Specify chrome version * add new * stable + 1 * stable + 2 * Update .github/workflows/orca.yml Co-authored-by: Travis Carden * Update .github/workflows/orca.yml Co-authored-by: Travis Carden * Small fixes --------- Co-authored-by: Travis Carden --- .github/workflows/orca.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/.github/workflows/orca.yml b/.github/workflows/orca.yml index 26192da03..27369a562 100644 --- a/.github/workflows/orca.yml +++ b/.github/workflows/orca.yml @@ -92,6 +92,31 @@ jobs: php-version: ${{ matrix.php-version }} coverage: xdebug + - name: Install google-chrome-stable + run: | + # Remove existing google chrome and install required version. + sudo dpkg -r google-chrome-stable + CHROME_VERSION_STRING="114.0.5735.198-1" + wget --no-verbose -O /tmp/chrome.deb "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${CHROME_VERSION_STRING}_amd64.deb" \ + && sudo apt install -y /tmp/chrome.deb \ + && sudo rm /tmp/chrome.deb + sudo echo "CHROME_BIN=/usr/bin/google-chrome" | sudo tee -a /etc/environment + + # Download and unpack chromedriver. + CHROME_DRIVER_VERSION_STRING="114.0.5735.90" + CHROMEDRIVER_ARCHIVE="chromedriver_linux64.zip" + CHROMEDRIVER_URL="https://chromedriver.storage.googleapis.com/${CHROME_DRIVER_VERSION_STRING}/${CHROMEDRIVER_ARCHIVE}" + CHROMEDRIVER_DIR="/usr/local/share/chromedriver-linux64" + CHROMEDRIVER_BIN="$CHROMEDRIVER_DIR/chromedriver" + sudo rm -rf $CHROMEDRIVER_DIR + sudo mkdir $CHROMEDRIVER_DIR + echo "Installing chromedriver version" + wget --no-verbose -O /tmp/$CHROMEDRIVER_ARCHIVE $CHROMEDRIVER_URL + sudo unzip -qq /tmp/$CHROMEDRIVER_ARCHIVE -d $CHROMEDRIVER_DIR + sudo chmod +x $CHROMEDRIVER_BIN + sudo ln -sf "$CHROMEDRIVER_BIN" /usr/bin/ + sudo echo "CHROMEWEBDRIVER=$CHROMEDRIVER_DIR" | sudo tee -a /etc/environment + - name: Before install run: | ../orca/bin/ci/self-test/before_install.sh From d3b053f920b00d10cb028399e3eaa2a19a80e7b1 Mon Sep 17 00:00:00 2001 From: Sayan Goswami Date: Thu, 24 Aug 2023 10:14:41 +0530 Subject: [PATCH 04/81] Add back content hub (#422) * Add back content hub and acms * Dont change ACMS --- config/packages.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/config/packages.yml b/config/packages.yml index a6e027fc9..368b6254b 100644 --- a/config/packages.yml +++ b/config/packages.yml @@ -64,13 +64,8 @@ drupal/acquia_connector: version_dev: 4.x-dev drupal/acquia_contenthub: - core_matrix: - 10.1.x: - version: ~ - version_dev: ~ - '*': - version: 3.0.x - version_dev: 3.0.x-dev + version: 3.2.x + version_dev: 3.2.x-dev drupal/acquia_perz: version: 4.x From a2f49f42f540fc01b9cd03c35ead8825e1a7c16a Mon Sep 17 00:00:00 2001 From: Sayan Goswami Date: Mon, 28 Aug 2023 13:36:52 +0530 Subject: [PATCH 05/81] Add Domo env variables to example module --- example/.github/workflows/orca.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/example/.github/workflows/orca.yml b/example/.github/workflows/orca.yml index de025662e..3fdff3518 100644 --- a/example/.github/workflows/orca.yml +++ b/example/.github/workflows/orca.yml @@ -94,6 +94,10 @@ jobs: # Do not modify the following lines. They are critical for managing the build matrix. ORCA_JOB: ${{ matrix.orca-job }} ORCA_ENABLE_NIGHTWATCH: ${{ matrix.orca-enable-nightwatch }} + # Google env variables required for Domo Integration. + ORCA_GOOGLE_API_CLIENT_ID: ${{ secrets.ORCA_GOOGLE_API_CLIENT_ID }} + ORCA_GOOGLE_API_CLIENT_SECRET: ${{ secrets.ORCA_GOOGLE_API_CLIENT_SECRET }} + ORCA_GOOGLE_API_REFRESH_TOKEN: ${{ secrets.ORCA_GOOGLE_API_REFRESH_TOKEN }} # Execution time is drastically reduced by splitting the build into multiple # concurrent jobs. From 9057450fbcd10e6fe4b947ce5914b0d629dcd8ab Mon Sep 17 00:00:00 2001 From: Sayan Goswami Date: Tue, 5 Sep 2023 12:54:28 +0530 Subject: [PATCH 06/81] add acms (#427) --- config/packages.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/config/packages.yml b/config/packages.yml index 368b6254b..0ef235c81 100644 --- a/config/packages.yml +++ b/config/packages.yml @@ -51,13 +51,8 @@ # example. acquia/acquia_cms: - core_matrix: - 10.1.x: - version: ~ - version_dev: ~ - '*': - version: 2.x - version_dev: 2.x-dev + version: 2.x + version_dev: 2.x-dev drupal/acquia_connector: version: 4.x From a01e13d39b257ef881d9e3fc147b2ff3d896dc79 Mon Sep 17 00:00:00 2001 From: Dane Powell Date: Tue, 3 Oct 2023 10:26:58 -0700 Subject: [PATCH 07/81] Remove JIRA_BASE_URL (#423) --- .github/workflows/jira.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/jira.yml b/.github/workflows/jira.yml index a9321c03c..9cec94bf6 100644 --- a/.github/workflows/jira.yml +++ b/.github/workflows/jira.yml @@ -17,7 +17,6 @@ jobs: # Set the JIRA* secrets in your repository settings. You will need to create an API # token from your Jira user profile. secrets: - jira-base-url: ${{ secrets.JIRA_BASE_URL }} jira-api-token: ${{ secrets.JIRA_API_TOKEN }} github-token: ${{ secrets.GITHUB_TOKEN }} with: From 7431fd2893ad090f12c9f9b21706f6c00b47c0fa Mon Sep 17 00:00:00 2001 From: Sayan Goswami Date: Wed, 11 Oct 2023 18:19:32 +0530 Subject: [PATCH 08/81] add JIRA user email (#433) --- .github/workflows/jira.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/jira.yml b/.github/workflows/jira.yml index 9cec94bf6..b83911a2e 100644 --- a/.github/workflows/jira.yml +++ b/.github/workflows/jira.yml @@ -18,6 +18,7 @@ jobs: # token from your Jira user profile. secrets: jira-api-token: ${{ secrets.JIRA_API_TOKEN }} + jira-user-email: ${{ secrets.JIRA_USER_EMAIL }} github-token: ${{ secrets.GITHUB_TOKEN }} with: issue_label: grooming From 2ace8826f36cdc78df0610e4b4195844298eb2ed Mon Sep 17 00:00:00 2001 From: Dane Powell Date: Tue, 7 Nov 2023 00:48:17 -0800 Subject: [PATCH 09/81] Ignore push builds for dependabot (#424) --- example/.github/workflows/orca.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/example/.github/workflows/orca.yml b/example/.github/workflows/orca.yml index 3fdff3518..5ba82caeb 100644 --- a/example/.github/workflows/orca.yml +++ b/example/.github/workflows/orca.yml @@ -24,7 +24,10 @@ --- name: ORCA CI on: - push: ~ + push: + # Prevent duplicate jobs on Dependabot PRs that interfere with automerge. + branches-ignore: + - 'dependabot/**' pull_request: ~ schedule: # Daily at 00:00:00 UTC. From 34d79dd93cd12445286977fa42340a70f5ad2206 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Nov 2023 11:01:24 +0000 Subject: [PATCH 10/81] Bump symfony/http-client from 6.3.0 to 6.3.7 (#436) Bumps [symfony/http-client](https://github.com/symfony/http-client) from 6.3.0 to 6.3.7. - [Release notes](https://github.com/symfony/http-client/releases) - [Changelog](https://github.com/symfony/http-client/blob/6.3/CHANGELOG.md) - [Commits](https://github.com/symfony/http-client/compare/v6.3.0...v6.3.7) --- updated-dependencies: - dependency-name: symfony/http-client dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.lock b/composer.lock index 2b837b5ae..3119bdc40 100644 --- a/composer.lock +++ b/composer.lock @@ -4103,16 +4103,16 @@ }, { "name": "symfony/http-client", - "version": "v6.3.0", + "version": "v6.3.7", "source": { "type": "git", "url": "https://github.com/symfony/http-client.git", - "reference": "b2f892c91e4e02a939edddeb7ef452522d10a424" + "reference": "cd67fcaf4524ec6ae5d9b2d9497682d7ad3ce57d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/b2f892c91e4e02a939edddeb7ef452522d10a424", - "reference": "b2f892c91e4e02a939edddeb7ef452522d10a424", + "url": "https://api.github.com/repos/symfony/http-client/zipball/cd67fcaf4524ec6ae5d9b2d9497682d7ad3ce57d", + "reference": "cd67fcaf4524ec6ae5d9b2d9497682d7ad3ce57d", "shasum": "" }, "require": { @@ -4175,7 +4175,7 @@ "http" ], "support": { - "source": "https://github.com/symfony/http-client/tree/v6.3.0" + "source": "https://github.com/symfony/http-client/tree/v6.3.7" }, "funding": [ { @@ -4191,7 +4191,7 @@ "type": "tidelift" } ], - "time": "2023-05-12T08:49:48+00:00" + "time": "2023-10-29T12:41:36+00:00" }, { "name": "symfony/http-client-contracts", @@ -7503,5 +7503,5 @@ "ext-sqlite3": "*" }, "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } From fd2d142198825b3289c30e613c66f7620352bf45 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Nov 2023 14:50:13 +0000 Subject: [PATCH 11/81] Bump symfony/finder from 6.2.7 to 6.3.5 (#437) Bumps [symfony/finder](https://github.com/symfony/finder) from 6.2.7 to 6.3.5. - [Release notes](https://github.com/symfony/finder/releases) - [Changelog](https://github.com/symfony/finder/blob/6.3/CHANGELOG.md) - [Commits](https://github.com/symfony/finder/compare/v6.2.7...v6.3.5) --- updated-dependencies: - dependency-name: symfony/finder dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 3119bdc40..bfd11a8a8 100644 --- a/composer.lock +++ b/composer.lock @@ -4039,16 +4039,16 @@ }, { "name": "symfony/finder", - "version": "v6.2.7", + "version": "v6.3.5", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "20808dc6631aecafbe67c186af5dcb370be3a0eb" + "reference": "a1b31d88c0e998168ca7792f222cbecee47428c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/20808dc6631aecafbe67c186af5dcb370be3a0eb", - "reference": "20808dc6631aecafbe67c186af5dcb370be3a0eb", + "url": "https://api.github.com/repos/symfony/finder/zipball/a1b31d88c0e998168ca7792f222cbecee47428c4", + "reference": "a1b31d88c0e998168ca7792f222cbecee47428c4", "shasum": "" }, "require": { @@ -4083,7 +4083,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v6.2.7" + "source": "https://github.com/symfony/finder/tree/v6.3.5" }, "funding": [ { @@ -4099,7 +4099,7 @@ "type": "tidelift" } ], - "time": "2023-02-16T09:57:23+00:00" + "time": "2023-09-26T12:56:25+00:00" }, { "name": "symfony/http-client", From e81428070d8a82dd87e1cfdf52adfcf6c7502971 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Nov 2023 14:52:49 +0000 Subject: [PATCH 12/81] Bump symfony/dependency-injection from 6.2.11 to 6.3.5 (#439) Bumps [symfony/dependency-injection](https://github.com/symfony/dependency-injection) from 6.2.11 to 6.3.5. - [Release notes](https://github.com/symfony/dependency-injection/releases) - [Changelog](https://github.com/symfony/dependency-injection/blob/6.3/CHANGELOG.md) - [Commits](https://github.com/symfony/dependency-injection/compare/v6.2.11...v6.3.5) --- updated-dependencies: - dependency-name: symfony/dependency-injection dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 38 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/composer.lock b/composer.lock index bfd11a8a8..da29ced15 100644 --- a/composer.lock +++ b/composer.lock @@ -3602,30 +3602,30 @@ }, { "name": "symfony/dependency-injection", - "version": "v6.2.11", + "version": "v6.3.5", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "2dff40fdc5ff1647c5561eb8e4fe574bc58c849d" + "reference": "2ed62b3bf98346e1f45529a7b6be2196739bb993" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/2dff40fdc5ff1647c5561eb8e4fe574bc58c849d", - "reference": "2dff40fdc5ff1647c5561eb8e4fe574bc58c849d", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/2ed62b3bf98346e1f45529a7b6be2196739bb993", + "reference": "2ed62b3bf98346e1f45529a7b6be2196739bb993", "shasum": "" }, "require": { "php": ">=8.1", "psr/container": "^1.1|^2.0", - "symfony/deprecation-contracts": "^2.1|^3", - "symfony/service-contracts": "^1.1.6|^2.0|^3.0", - "symfony/var-exporter": "^6.2.7" + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/service-contracts": "^2.5|^3.0", + "symfony/var-exporter": "^6.2.10" }, "conflict": { "ext-psr": "<1.1|>=2", "symfony/config": "<6.1", "symfony/finder": "<5.4", - "symfony/proxy-manager-bridge": "<6.2", + "symfony/proxy-manager-bridge": "<6.3", "symfony/yaml": "<5.4" }, "provide": { @@ -3637,12 +3637,6 @@ "symfony/expression-language": "^5.4|^6.0", "symfony/yaml": "^5.4|^6.0" }, - "suggest": { - "symfony/config": "", - "symfony/expression-language": "For using expressions in service container configuration", - "symfony/finder": "For using double-star glob patterns or when GLOB_BRACE portability is required", - "symfony/yaml": "" - }, "type": "library", "autoload": { "psr-4": { @@ -3669,7 +3663,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v6.2.11" + "source": "https://github.com/symfony/dependency-injection/tree/v6.3.5" }, "funding": [ { @@ -3685,7 +3679,7 @@ "type": "tidelift" } ], - "time": "2023-05-05T15:52:57+00:00" + "time": "2023-09-25T16:46:40+00:00" }, { "name": "symfony/deprecation-contracts", @@ -5224,16 +5218,16 @@ }, { "name": "symfony/var-exporter", - "version": "v6.2.10", + "version": "v6.3.6", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "9a07920c2058bafee921ce4d90aeef2193837d63" + "reference": "374d289c13cb989027274c86206ddc63b16a2441" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/9a07920c2058bafee921ce4d90aeef2193837d63", - "reference": "9a07920c2058bafee921ce4d90aeef2193837d63", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/374d289c13cb989027274c86206ddc63b16a2441", + "reference": "374d289c13cb989027274c86206ddc63b16a2441", "shasum": "" }, "require": { @@ -5278,7 +5272,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v6.2.10" + "source": "https://github.com/symfony/var-exporter/tree/v6.3.6" }, "funding": [ { @@ -5294,7 +5288,7 @@ "type": "tidelift" } ], - "time": "2023-04-21T08:33:05+00:00" + "time": "2023-10-13T09:16:49+00:00" }, { "name": "symfony/yaml", From a8f335bb3df236302d47bec128121ce3b9697d7f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Nov 2023 15:01:14 +0000 Subject: [PATCH 13/81] Bump ergebnis/composer-normalize from 2.31.0 to 2.39.0 (#440) Bumps [ergebnis/composer-normalize](https://github.com/ergebnis/composer-normalize) from 2.31.0 to 2.39.0. - [Release notes](https://github.com/ergebnis/composer-normalize/releases) - [Changelog](https://github.com/ergebnis/composer-normalize/blob/main/CHANGELOG.md) - [Commits](https://github.com/ergebnis/composer-normalize/compare/2.31.0...2.39.0) --- updated-dependencies: - dependency-name: ergebnis/composer-normalize dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 230 +++++++++++++++++++++++++++----------------------- 1 file changed, 125 insertions(+), 105 deletions(-) diff --git a/composer.lock b/composer.lock index da29ced15..a29730f96 100644 --- a/composer.lock +++ b/composer.lock @@ -873,39 +873,40 @@ }, { "name": "ergebnis/composer-normalize", - "version": "2.31.0", + "version": "2.39.0", "source": { "type": "git", "url": "https://github.com/ergebnis/composer-normalize.git", - "reference": "da1d18bcc2ca02111359c2c76fd938a907ba0a16" + "reference": "a878360bc8cb5cb440b9381f72b0aaa125f937c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ergebnis/composer-normalize/zipball/da1d18bcc2ca02111359c2c76fd938a907ba0a16", - "reference": "da1d18bcc2ca02111359c2c76fd938a907ba0a16", + "url": "https://api.github.com/repos/ergebnis/composer-normalize/zipball/a878360bc8cb5cb440b9381f72b0aaa125f937c7", + "reference": "a878360bc8cb5cb440b9381f72b0aaa125f937c7", "shasum": "" }, "require": { "composer-plugin-api": "^2.0.0", - "ergebnis/json": "^1.0.1", - "ergebnis/json-normalizer": "^4.1.0", - "ergebnis/json-printer": "^3.3.0", + "ergebnis/json": "^1.1.0", + "ergebnis/json-normalizer": "^4.3.0", + "ergebnis/json-printer": "^3.4.0", "ext-json": "*", "justinrainbow/json-schema": "^5.2.12", "localheinz/diff": "^1.1.1", - "php": "~8.0.0 || ~8.1.0 || ~8.2.0" + "php": "~8.1.0 || ~8.2.0 || ~8.3.0" }, "require-dev": { - "composer/composer": "^2.5.5", - "ergebnis/license": "^2.1.0", - "ergebnis/php-cs-fixer-config": "^5.5.2", - "fakerphp/faker": "^1.21.0", - "infection/infection": "~0.26.19", - "phpunit/phpunit": "^9.6.7", + "composer/composer": "^2.6.5", + "ergebnis/license": "^2.2.0", + "ergebnis/php-cs-fixer-config": "~6.7.0", + "ergebnis/phpunit-slow-test-detector": "^2.3.0", + "fakerphp/faker": "^1.23.0", + "infection/infection": "~0.27.4", + "phpunit/phpunit": "^10.4.1", "psalm/plugin-phpunit": "~0.18.4", - "rector/rector": "~0.15.25", + "rector/rector": "~0.18.5", "symfony/filesystem": "^6.0.13", - "vimeo/psalm": "^5.9.0" + "vimeo/psalm": "^5.15.0" }, "type": "composer-plugin", "extra": { @@ -928,7 +929,8 @@ "authors": [ { "name": "Andreas Möller", - "email": "am@localheinz.com" + "email": "am@localheinz.com", + "homepage": "https://localheinz.com" } ], "description": "Provides a composer plugin for normalizing composer.json.", @@ -944,36 +946,37 @@ "security": "https://github.com/ergebnis/composer-normalize/blob/main/.github/SECURITY.md", "source": "https://github.com/ergebnis/composer-normalize" }, - "time": "2023-05-02T14:10:33+00:00" + "time": "2023-10-10T15:43:27+00:00" }, { "name": "ergebnis/json", - "version": "1.0.1", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/ergebnis/json.git", - "reference": "d66ea30060856d0729a4aa319a02752519ca63a0" + "reference": "9f2b9086c43b189d7044a5b6215a931fb6e9125d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ergebnis/json/zipball/d66ea30060856d0729a4aa319a02752519ca63a0", - "reference": "d66ea30060856d0729a4aa319a02752519ca63a0", + "url": "https://api.github.com/repos/ergebnis/json/zipball/9f2b9086c43b189d7044a5b6215a931fb6e9125d", + "reference": "9f2b9086c43b189d7044a5b6215a931fb6e9125d", "shasum": "" }, "require": { - "php": "^8.0" + "php": "~8.1.0 || ~8.2.0 || ~8.3.0" }, "require-dev": { "ergebnis/composer-normalize": "^2.29.0", - "ergebnis/data-provider": "^1.2.0", - "ergebnis/license": "^2.1.0", - "ergebnis/php-cs-fixer-config": "^5.0.0", - "ergebnis/phpstan-rules": "^1.0.0", - "fakerphp/faker": "^1.20.0", - "infection/infection": "~0.26.16", - "phpunit/phpunit": "^9.5.27", + "ergebnis/data-provider": "^3.0.0", + "ergebnis/license": "^2.2.0", + "ergebnis/php-cs-fixer-config": "^6.6.0", + "ergebnis/phpunit-slow-test-detector": "^2.3.0", + "fakerphp/faker": "^1.23.0", + "infection/infection": "~0.27.4", + "phpunit/phpunit": "^10.4.1", "psalm/plugin-phpunit": "~0.18.4", - "vimeo/psalm": "^5.1.0" + "rector/rector": "~0.18.5", + "vimeo/psalm": "^5.15.0" }, "type": "library", "extra": { @@ -994,7 +997,8 @@ "authors": [ { "name": "Andreas Möller", - "email": "am@localheinz.com" + "email": "am@localheinz.com", + "homepage": "https://localheinz.com" } ], "description": "Provides a Json value object for representing a valid JSON string.", @@ -1004,46 +1008,48 @@ ], "support": { "issues": "https://github.com/ergebnis/json/issues", + "security": "https://github.com/ergebnis/json/blob/main/.github/SECURITY.md", "source": "https://github.com/ergebnis/json" }, - "time": "2022-12-10T22:38:50+00:00" + "time": "2023-10-10T07:57:48+00:00" }, { "name": "ergebnis/json-normalizer", - "version": "4.1.0", + "version": "4.3.0", "source": { "type": "git", "url": "https://github.com/ergebnis/json-normalizer.git", - "reference": "e38f8b27f908686b200e3bd68e1b7bdfb5d53061" + "reference": "716fa0a5dcc75fbcb2c1c2e0542b2f56732460bd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ergebnis/json-normalizer/zipball/e38f8b27f908686b200e3bd68e1b7bdfb5d53061", - "reference": "e38f8b27f908686b200e3bd68e1b7bdfb5d53061", + "url": "https://api.github.com/repos/ergebnis/json-normalizer/zipball/716fa0a5dcc75fbcb2c1c2e0542b2f56732460bd", + "reference": "716fa0a5dcc75fbcb2c1c2e0542b2f56732460bd", "shasum": "" }, "require": { - "ergebnis/json": "^1.0.1", + "ergebnis/json": "^1.1.0", "ergebnis/json-pointer": "^3.2.0", - "ergebnis/json-printer": "^3.3.0", - "ergebnis/json-schema-validator": "^4.0.0", + "ergebnis/json-printer": "^3.4.0", + "ergebnis/json-schema-validator": "^4.1.0", "ext-json": "*", "justinrainbow/json-schema": "^5.2.12", - "php": "~8.0.0 || ~8.1.0 || ~8.2.0" + "php": "~8.1.0 || ~8.2.0 || ~8.3.0" }, "require-dev": { - "composer/semver": "^3.2.1", - "ergebnis/data-provider": "^1.3.0", - "ergebnis/license": "^2.1.0", - "ergebnis/php-cs-fixer-config": "^5.5.2", - "fakerphp/faker": "^1.21.0", - "infection/infection": "~0.26.19", - "phpunit/phpunit": "^9.6.7", + "composer/semver": "^3.4.0", + "ergebnis/data-provider": "^3.0.0", + "ergebnis/license": "^2.2.0", + "ergebnis/php-cs-fixer-config": "~6.7.0", + "ergebnis/phpunit-slow-test-detector": "^2.3.0", + "fakerphp/faker": "^1.23.0", + "infection/infection": "~0.27.4", + "phpunit/phpunit": "^10.4.1", "psalm/plugin-phpunit": "~0.18.4", - "rector/rector": "~0.15.25", - "symfony/filesystem": "^6.0.19", - "symfony/finder": "^6.0.19", - "vimeo/psalm": "^5.9.0" + "rector/rector": "~0.18.5", + "symfony/filesystem": "^6.3.1", + "symfony/finder": "^6.3.5", + "vimeo/psalm": "^5.15.0" }, "suggest": { "composer/semver": "If you want to use ComposerJsonNormalizer or VersionConstraintNormalizer" @@ -1061,7 +1067,8 @@ "authors": [ { "name": "Andreas Möller", - "email": "am@localheinz.com" + "email": "am@localheinz.com", + "homepage": "https://localheinz.com" } ], "description": "Provides generic and vendor-specific normalizers for normalizing JSON documents.", @@ -1072,37 +1079,40 @@ ], "support": { "issues": "https://github.com/ergebnis/json-normalizer/issues", + "security": "https://github.com/ergebnis/json-normalizer/blob/main/.github/SECURITY.md", "source": "https://github.com/ergebnis/json-normalizer" }, - "time": "2023-05-02T11:08:03+00:00" + "time": "2023-10-10T15:15:03+00:00" }, { "name": "ergebnis/json-pointer", - "version": "3.2.0", + "version": "3.3.0", "source": { "type": "git", "url": "https://github.com/ergebnis/json-pointer.git", - "reference": "861516ff5afa1aa8905fdf3361315909523a1bf8" + "reference": "8e517faefc06b7c761eaa041febef51a9375819a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ergebnis/json-pointer/zipball/861516ff5afa1aa8905fdf3361315909523a1bf8", - "reference": "861516ff5afa1aa8905fdf3361315909523a1bf8", + "url": "https://api.github.com/repos/ergebnis/json-pointer/zipball/8e517faefc06b7c761eaa041febef51a9375819a", + "reference": "8e517faefc06b7c761eaa041febef51a9375819a", "shasum": "" }, "require": { - "php": "^8.0" + "php": "~8.1.0 || ~8.2.0 || ~8.3.0" }, "require-dev": { - "ergebnis/composer-normalize": "^2.28.3", - "ergebnis/data-provider": "^1.2.0", - "ergebnis/license": "^2.1.0", - "ergebnis/php-cs-fixer-config": "^5.0.0", - "fakerphp/faker": "^1.20.0", - "infection/infection": "~0.26.16", - "phpunit/phpunit": "^9.5.26", - "psalm/plugin-phpunit": "~0.18.3", - "vimeo/psalm": "^4.30" + "ergebnis/composer-normalize": "^2.29.0", + "ergebnis/data-provider": "^3.0.0", + "ergebnis/license": "^2.2.0", + "ergebnis/php-cs-fixer-config": "~6.7.0", + "ergebnis/phpunit-slow-test-detector": "^2.3.0", + "fakerphp/faker": "^1.23.0", + "infection/infection": "~0.27.4", + "phpunit/phpunit": "^10.4.1", + "psalm/plugin-phpunit": "~0.18.4", + "rector/rector": "~0.18.5", + "vimeo/psalm": "^5.15.0" }, "type": "library", "extra": { @@ -1123,7 +1133,8 @@ "authors": [ { "name": "Andreas Möller", - "email": "am@localheinz.com" + "email": "am@localheinz.com", + "homepage": "https://localheinz.com" } ], "description": "Provides JSON pointer as a value object.", @@ -1135,37 +1146,40 @@ ], "support": { "issues": "https://github.com/ergebnis/json-pointer/issues", + "security": "https://github.com/ergebnis/json-pointer/blob/main/.github/SECURITY.md", "source": "https://github.com/ergebnis/json-pointer" }, - "time": "2022-11-28T17:03:31+00:00" + "time": "2023-10-10T14:41:06+00:00" }, { "name": "ergebnis/json-printer", - "version": "3.3.0", + "version": "3.4.0", "source": { "type": "git", "url": "https://github.com/ergebnis/json-printer.git", - "reference": "18920367473b099633f644f0ca6dc8794345148f" + "reference": "05841593d72499de4f7ce4034a237c77e470558f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ergebnis/json-printer/zipball/18920367473b099633f644f0ca6dc8794345148f", - "reference": "18920367473b099633f644f0ca6dc8794345148f", + "url": "https://api.github.com/repos/ergebnis/json-printer/zipball/05841593d72499de4f7ce4034a237c77e470558f", + "reference": "05841593d72499de4f7ce4034a237c77e470558f", "shasum": "" }, "require": { "ext-json": "*", "ext-mbstring": "*", - "php": "^8.0" + "php": "~8.1.0 || ~8.2.0 || ~8.3.0" }, "require-dev": { - "ergebnis/license": "^2.0.0", - "ergebnis/php-cs-fixer-config": "^4.11.0", - "fakerphp/faker": "^1.20.0", - "infection/infection": "~0.26.6", - "phpunit/phpunit": "^9.5.26", - "psalm/plugin-phpunit": "~0.18.3", - "vimeo/psalm": "^4.30.0" + "ergebnis/license": "^2.2.0", + "ergebnis/php-cs-fixer-config": "^6.6.0", + "ergebnis/phpunit-slow-test-detector": "^2.3.0", + "fakerphp/faker": "^1.23.0", + "infection/infection": "~0.27.3", + "phpunit/phpunit": "^10.4.1", + "psalm/plugin-phpunit": "~0.18.4", + "rector/rector": "~0.18.5", + "vimeo/psalm": "^5.15.0" }, "type": "library", "autoload": { @@ -1180,7 +1194,8 @@ "authors": [ { "name": "Andreas Möller", - "email": "am@localheinz.com" + "email": "am@localheinz.com", + "homepage": "https://localheinz.com" } ], "description": "Provides a JSON printer, allowing for flexible indentation.", @@ -1192,41 +1207,44 @@ ], "support": { "issues": "https://github.com/ergebnis/json-printer/issues", + "security": "https://github.com/ergebnis/json-printer/blob/main/.github/SECURITY.md", "source": "https://github.com/ergebnis/json-printer" }, - "time": "2022-11-28T10:27:43+00:00" + "time": "2023-10-10T07:42:48+00:00" }, { "name": "ergebnis/json-schema-validator", - "version": "4.0.0", + "version": "4.1.0", "source": { "type": "git", "url": "https://github.com/ergebnis/json-schema-validator.git", - "reference": "a6166272ac5691a9bc791f185841e5f92a6d4723" + "reference": "d568ed85d1cdc2e49d650c2fc234dc2516f3f25b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ergebnis/json-schema-validator/zipball/a6166272ac5691a9bc791f185841e5f92a6d4723", - "reference": "a6166272ac5691a9bc791f185841e5f92a6d4723", + "url": "https://api.github.com/repos/ergebnis/json-schema-validator/zipball/d568ed85d1cdc2e49d650c2fc234dc2516f3f25b", + "reference": "d568ed85d1cdc2e49d650c2fc234dc2516f3f25b", "shasum": "" }, "require": { - "ergebnis/json": "^1.0.0", + "ergebnis/json": "^1.0.1", "ergebnis/json-pointer": "^3.2.0", "ext-json": "*", "justinrainbow/json-schema": "^5.2.12", - "php": "^8.0" + "php": "~8.1.0 || ~8.2.0 || ~8.3.0" }, "require-dev": { "ergebnis/composer-normalize": "^2.21.0", - "ergebnis/data-provider": "^1.2.0", - "ergebnis/license": "^2.1.0", - "ergebnis/php-cs-fixer-config": "~5.0.0", - "fakerphp/faker": "^1.20.0", - "infection/infection": "~0.26.16", - "phpunit/phpunit": "~9.5.27", + "ergebnis/data-provider": "^3.0.0", + "ergebnis/license": "^2.2.0", + "ergebnis/php-cs-fixer-config": "~6.6.0", + "ergebnis/phpunit-slow-test-detector": "^2.3.0", + "fakerphp/faker": "^1.23.0", + "infection/infection": "~0.27.4", + "phpunit/phpunit": "^10.4.1", "psalm/plugin-phpunit": "~0.18.4", - "vimeo/psalm": "^5.1.0" + "rector/rector": "~0.18.5", + "vimeo/psalm": "^5.15.0" }, "type": "library", "extra": { @@ -1247,7 +1265,8 @@ "authors": [ { "name": "Andreas Möller", - "email": "am@localheinz.com" + "email": "am@localheinz.com", + "homepage": "https://localheinz.com" } ], "description": "Provides a JSON schema validator, building on top of justinrainbow/json-schema.", @@ -1259,9 +1278,10 @@ ], "support": { "issues": "https://github.com/ergebnis/json-schema-validator/issues", + "security": "https://github.com/ergebnis/json-schema-validator/blob/main/.github/SECURITY.md", "source": "https://github.com/ergebnis/json-schema-validator" }, - "time": "2022-12-10T14:50:15+00:00" + "time": "2023-10-10T14:16:57+00:00" }, { "name": "hassankhan/config", @@ -1386,16 +1406,16 @@ }, { "name": "justinrainbow/json-schema", - "version": "5.2.12", + "version": "v5.2.13", "source": { "type": "git", "url": "https://github.com/justinrainbow/json-schema.git", - "reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60" + "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/ad87d5a5ca981228e0e205c2bc7dfb8e24559b60", - "reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60", + "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/fbbe7e5d79f618997bc3332a6f49246036c45793", + "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793", "shasum": "" }, "require": { @@ -1450,9 +1470,9 @@ ], "support": { "issues": "https://github.com/justinrainbow/json-schema/issues", - "source": "https://github.com/justinrainbow/json-schema/tree/5.2.12" + "source": "https://github.com/justinrainbow/json-schema/tree/v5.2.13" }, - "time": "2022-04-13T08:02:27+00:00" + "time": "2023-09-26T02:20:38+00:00" }, { "name": "localheinz/diff", From 432f58c95eb0824efeace586dbf2b043d5760279 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 Nov 2023 14:29:45 +0000 Subject: [PATCH 14/81] Bump weitzman/drupal-test-traits from 2.1.0 to 2.2.0 (#441) Bumps [weitzman/drupal-test-traits](https://gitlab.com/weitzman/drupal-test-traits) from 2.1.0 to 2.2.0. - [Release notes](https://gitlab.com/weitzman/drupal-test-traits/tags) - [Commits](https://gitlab.com/weitzman/drupal-test-traits/compare/2.1.0...2.2.0) --- updated-dependencies: - dependency-name: weitzman/drupal-test-traits dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index a29730f96..18ceac1ac 100644 --- a/composer.lock +++ b/composer.lock @@ -5427,16 +5427,16 @@ }, { "name": "weitzman/drupal-test-traits", - "version": "2.1.0", + "version": "2.2.0", "source": { "type": "git", "url": "git@gitlab.com:weitzman/drupal-test-traits.git", - "reference": "e40ee4e8e41f229d297c5e714fd63c4a00c633a2" + "reference": "9ef44f5cd5eef942c84f2d2ffd21734944d566f8" }, "dist": { "type": "zip", - "url": "https://gitlab.com/api/v4/projects/weitzman%2Fdrupal-test-traits/repository/archive.zip?sha=e40ee4e8e41f229d297c5e714fd63c4a00c633a2", - "reference": "e40ee4e8e41f229d297c5e714fd63c4a00c633a2", + "url": "https://gitlab.com/api/v4/projects/weitzman%2Fdrupal-test-traits/repository/archive.zip?sha=9ef44f5cd5eef942c84f2d2ffd21734944d566f8", + "reference": "9ef44f5cd5eef942c84f2d2ffd21734944d566f8", "shasum": "" }, "require": { @@ -5476,7 +5476,7 @@ } ], "description": "Traits for testing Drupal sites that have user content (versus unpopulated sites).", - "time": "2023-04-23T03:17:53+00:00" + "time": "2023-10-13T22:55:15+00:00" } ], "packages-dev": [ From 7cc67169019124a3f5eaf9bd779b78fc3d7cefe9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Nov 2023 14:20:42 +0000 Subject: [PATCH 15/81] Bump symfony/dependency-injection from 6.3.5 to 6.3.8 (#442) Bumps [symfony/dependency-injection](https://github.com/symfony/dependency-injection) from 6.3.5 to 6.3.8. - [Release notes](https://github.com/symfony/dependency-injection/releases) - [Changelog](https://github.com/symfony/dependency-injection/blob/6.3/CHANGELOG.md) - [Commits](https://github.com/symfony/dependency-injection/compare/v6.3.5...v6.3.8) --- updated-dependencies: - dependency-name: symfony/dependency-injection dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 18ceac1ac..d9236ed82 100644 --- a/composer.lock +++ b/composer.lock @@ -3622,16 +3622,16 @@ }, { "name": "symfony/dependency-injection", - "version": "v6.3.5", + "version": "v6.3.8", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "2ed62b3bf98346e1f45529a7b6be2196739bb993" + "reference": "1f30f545c4151f611148fc19e28d54d39e0a00bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/2ed62b3bf98346e1f45529a7b6be2196739bb993", - "reference": "2ed62b3bf98346e1f45529a7b6be2196739bb993", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/1f30f545c4151f611148fc19e28d54d39e0a00bc", + "reference": "1f30f545c4151f611148fc19e28d54d39e0a00bc", "shasum": "" }, "require": { @@ -3683,7 +3683,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v6.3.5" + "source": "https://github.com/symfony/dependency-injection/tree/v6.3.8" }, "funding": [ { @@ -3699,7 +3699,7 @@ "type": "tidelift" } ], - "time": "2023-09-25T16:46:40+00:00" + "time": "2023-10-31T08:07:48+00:00" }, { "name": "symfony/deprecation-contracts", From 60f231ad45ebeb346e1cfe684f865a434750bc1c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Nov 2023 15:03:36 +0000 Subject: [PATCH 16/81] Bump symfony/expression-language from 5.4.21 to 6.3.0 (#443) Bumps [symfony/expression-language](https://github.com/symfony/expression-language) from 5.4.21 to 6.3.0. - [Release notes](https://github.com/symfony/expression-language/releases) - [Changelog](https://github.com/symfony/expression-language/blob/6.3/CHANGELOG.md) - [Commits](https://github.com/symfony/expression-language/compare/v5.4.21...v6.3.0) --- updated-dependencies: - dependency-name: symfony/expression-language dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.json | 2 +- composer.lock | 88 +++++++++++++++++++++++++-------------------------- 2 files changed, 44 insertions(+), 46 deletions(-) diff --git a/composer.json b/composer.json index 821dd6cf4..c9579e411 100644 --- a/composer.json +++ b/composer.json @@ -46,7 +46,7 @@ "symfony/console": "^5.4.22", "symfony/dependency-injection": "^6.0.20", "symfony/event-dispatcher": "^6.3", - "symfony/expression-language": "^5.4.21", + "symfony/expression-language": "^6.3.0", "symfony/filesystem": "^5.4.21", "symfony/finder": "^6.2.7", "symfony/http-client": "^6.2.10", diff --git a/composer.lock b/composer.lock index d9236ed82..15f534283 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": "2178461fc3adc9e0adf3b4a9a5afd00f", + "content-hash": "90dae33ece098f3a05efcaa967c150db", "packages": [ { "name": "acquia/coding-standards", @@ -3273,25 +3273,25 @@ }, { "name": "symfony/cache", - "version": "v6.2.10", + "version": "v6.3.8", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "1ce7ed8e7ca6948892b6a3a52bb60cf2b04f7c94" + "reference": "ba33517043c22c94c7ab04b056476f6f86816cf8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/1ce7ed8e7ca6948892b6a3a52bb60cf2b04f7c94", - "reference": "1ce7ed8e7ca6948892b6a3a52bb60cf2b04f7c94", + "url": "https://api.github.com/repos/symfony/cache/zipball/ba33517043c22c94c7ab04b056476f6f86816cf8", + "reference": "ba33517043c22c94c7ab04b056476f6f86816cf8", "shasum": "" }, "require": { "php": ">=8.1", "psr/cache": "^2.0|^3.0", "psr/log": "^1.1|^2|^3", - "symfony/cache-contracts": "^1.1.7|^2|^3", - "symfony/service-contracts": "^1.1|^2|^3", - "symfony/var-exporter": "^6.2.10" + "symfony/cache-contracts": "^2.5|^3", + "symfony/service-contracts": "^2.5|^3", + "symfony/var-exporter": "^6.3.6" }, "conflict": { "doctrine/dbal": "<2.13.1", @@ -3306,8 +3306,8 @@ }, "require-dev": { "cache/integration-tests": "dev-master", - "doctrine/dbal": "^2.13.1|^3.0", - "predis/predis": "^1.1", + "doctrine/dbal": "^2.13.1|^3|^4", + "predis/predis": "^1.1|^2.0", "psr/simple-cache": "^1.0|^2.0|^3.0", "symfony/config": "^5.4|^6.0", "symfony/dependency-injection": "^5.4|^6.0", @@ -3349,7 +3349,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v6.2.10" + "source": "https://github.com/symfony/cache/tree/v6.3.8" }, "funding": [ { @@ -3365,33 +3365,30 @@ "type": "tidelift" } ], - "time": "2023-04-21T15:42:15+00:00" + "time": "2023-11-07T10:17:15+00:00" }, { "name": "symfony/cache-contracts", - "version": "v3.2.1", + "version": "v3.3.0", "source": { "type": "git", "url": "https://github.com/symfony/cache-contracts.git", - "reference": "eeb71f04b6f7f34ca6d15633df82e014528b1632" + "reference": "ad945640ccc0ae6e208bcea7d7de4b39b569896b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/eeb71f04b6f7f34ca6d15633df82e014528b1632", - "reference": "eeb71f04b6f7f34ca6d15633df82e014528b1632", + "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/ad945640ccc0ae6e208bcea7d7de4b39b569896b", + "reference": "ad945640ccc0ae6e208bcea7d7de4b39b569896b", "shasum": "" }, "require": { "php": ">=8.1", "psr/cache": "^3.0" }, - "suggest": { - "symfony/cache-implementation": "" - }, "type": "library", "extra": { "branch-alias": { - "dev-main": "3.3-dev" + "dev-main": "3.4-dev" }, "thanks": { "name": "symfony/contracts", @@ -3428,7 +3425,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/cache-contracts/tree/v3.2.1" + "source": "https://github.com/symfony/cache-contracts/tree/v3.3.0" }, "funding": [ { @@ -3444,7 +3441,7 @@ "type": "tidelift" } ], - "time": "2023-03-01T10:32:47+00:00" + "time": "2023-05-23T14:45:45+00:00" }, { "name": "symfony/config", @@ -3926,22 +3923,23 @@ }, { "name": "symfony/expression-language", - "version": "v5.4.21", + "version": "v6.3.0", "source": { "type": "git", "url": "https://github.com/symfony/expression-language.git", - "reference": "501589522b844b8eecf012c133f0404f0eef77ac" + "reference": "6d560c4c80e7e328708efd923f93ad67e6a0c1c0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/expression-language/zipball/501589522b844b8eecf012c133f0404f0eef77ac", - "reference": "501589522b844b8eecf012c133f0404f0eef77ac", + "url": "https://api.github.com/repos/symfony/expression-language/zipball/6d560c4c80e7e328708efd923f93ad67e6a0c1c0", + "reference": "6d560c4c80e7e328708efd923f93ad67e6a0c1c0", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/cache": "^4.4|^5.0|^6.0", - "symfony/service-contracts": "^1.1|^2|^3" + "php": ">=8.1", + "symfony/cache": "^5.4|^6.0", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/service-contracts": "^2.5|^3" }, "type": "library", "autoload": { @@ -3969,7 +3967,7 @@ "description": "Provides an engine that can compile and evaluate expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/expression-language/tree/v5.4.21" + "source": "https://github.com/symfony/expression-language/tree/v6.3.0" }, "funding": [ { @@ -3985,7 +3983,7 @@ "type": "tidelift" } ], - "time": "2023-02-14T08:03:56+00:00" + "time": "2023-04-28T16:05:33+00:00" }, { "name": "symfony/filesystem", @@ -4767,16 +4765,16 @@ }, { "name": "symfony/polyfill-php73", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9" + "reference": "fe2f306d1d9d346a7fee353d0d5012e401e984b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/9e8ecb5f92152187c4799efd3c96b78ccab18ff9", - "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fe2f306d1d9d346a7fee353d0d5012e401e984b5", + "reference": "fe2f306d1d9d346a7fee353d0d5012e401e984b5", "shasum": "" }, "require": { @@ -4785,7 +4783,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4826,7 +4824,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.28.0" }, "funding": [ { @@ -4842,20 +4840,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936" + "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", - "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5", + "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5", "shasum": "" }, "require": { @@ -4864,7 +4862,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4909,7 +4907,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.28.0" }, "funding": [ { @@ -4925,7 +4923,7 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-php81", From cd71e655e66e7b400eca2dbc6bd4b1e1f7201cc4 Mon Sep 17 00:00:00 2001 From: Sayan Goswami Date: Wed, 15 Nov 2023 14:59:02 +0530 Subject: [PATCH 17/81] Add back ACMS (#435) --- config/packages.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/config/packages.yml b/config/packages.yml index d515796f2..8360d25d2 100644 --- a/config/packages.yml +++ b/config/packages.yml @@ -50,10 +50,9 @@ # config/services.yml for the relevant code or bin/self-test for a usage # example. -# ORCA-576: ACMS was temporarily removed on 10/24/2023 due to a patch failure. -#acquia/acquia_cms: -# version: 2.x -# version_dev: 2.x-dev +acquia/acquia_cms: + version: 2.x + version_dev: 2.x-dev drupal/acquia_connector: version: 4.x From 8b8faae060ddc0228733de16f19e6bef5fcf8c2a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Nov 2023 15:06:30 +0000 Subject: [PATCH 18/81] Bump symfony/http-client from 6.3.7 to 6.3.8 (#444) Bumps [symfony/http-client](https://github.com/symfony/http-client) from 6.3.7 to 6.3.8. - [Release notes](https://github.com/symfony/http-client/releases) - [Changelog](https://github.com/symfony/http-client/blob/6.3/CHANGELOG.md) - [Commits](https://github.com/symfony/http-client/compare/v6.3.7...v6.3.8) --- updated-dependencies: - dependency-name: symfony/http-client dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 15f534283..924bd0b05 100644 --- a/composer.lock +++ b/composer.lock @@ -4115,16 +4115,16 @@ }, { "name": "symfony/http-client", - "version": "v6.3.7", + "version": "v6.3.8", "source": { "type": "git", "url": "https://github.com/symfony/http-client.git", - "reference": "cd67fcaf4524ec6ae5d9b2d9497682d7ad3ce57d" + "reference": "0314e2d49939a9831929d6fc81c01c6df137fd0a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/cd67fcaf4524ec6ae5d9b2d9497682d7ad3ce57d", - "reference": "cd67fcaf4524ec6ae5d9b2d9497682d7ad3ce57d", + "url": "https://api.github.com/repos/symfony/http-client/zipball/0314e2d49939a9831929d6fc81c01c6df137fd0a", + "reference": "0314e2d49939a9831929d6fc81c01c6df137fd0a", "shasum": "" }, "require": { @@ -4187,7 +4187,7 @@ "http" ], "support": { - "source": "https://github.com/symfony/http-client/tree/v6.3.7" + "source": "https://github.com/symfony/http-client/tree/v6.3.8" }, "funding": [ { @@ -4203,7 +4203,7 @@ "type": "tidelift" } ], - "time": "2023-10-29T12:41:36+00:00" + "time": "2023-11-06T18:31:59+00:00" }, { "name": "symfony/http-client-contracts", From f6e766bb31479cbbeec7ca697c759fc73a64a2cf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Nov 2023 14:32:57 +0000 Subject: [PATCH 19/81] Bump phpmd/phpmd from 2.13.0 to 2.14.1 (#446) Bumps [phpmd/phpmd](https://github.com/phpmd/phpmd) from 2.13.0 to 2.14.1. - [Release notes](https://github.com/phpmd/phpmd/releases) - [Changelog](https://github.com/phpmd/phpmd/blob/master/CHANGELOG) - [Commits](https://github.com/phpmd/phpmd/compare/2.13.0...2.14.1) --- updated-dependencies: - dependency-name: phpmd/phpmd dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 111 +++++++++++++++++++++++++------------------------- 1 file changed, 56 insertions(+), 55 deletions(-) diff --git a/composer.lock b/composer.lock index 924bd0b05..e1cd61855 100644 --- a/composer.lock +++ b/composer.lock @@ -398,16 +398,16 @@ }, { "name": "composer/pcre", - "version": "3.1.0", + "version": "3.1.1", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2" + "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/4bff79ddd77851fe3cdd11616ed3f92841ba5bd2", - "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2", + "url": "https://api.github.com/repos/composer/pcre/zipball/00104306927c7a0919b4ced2aaa6782c1e61a3c9", + "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9", "shasum": "" }, "require": { @@ -449,7 +449,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/3.1.0" + "source": "https://github.com/composer/pcre/tree/3.1.1" }, "funding": [ { @@ -465,7 +465,7 @@ "type": "tidelift" } ], - "time": "2022-11-17T09:50:14+00:00" + "time": "2023-10-11T07:11:09+00:00" }, { "name": "composer/semver", @@ -1894,16 +1894,16 @@ }, { "name": "pdepend/pdepend", - "version": "2.14.0", + "version": "2.15.1", "source": { "type": "git", "url": "https://github.com/pdepend/pdepend.git", - "reference": "1121d4b04af06e33e9659bac3a6741b91cab1de1" + "reference": "d12f25bcdfb7754bea458a4a5cb159d55e9950d0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pdepend/pdepend/zipball/1121d4b04af06e33e9659bac3a6741b91cab1de1", - "reference": "1121d4b04af06e33e9659bac3a6741b91cab1de1", + "url": "https://api.github.com/repos/pdepend/pdepend/zipball/d12f25bcdfb7754bea458a4a5cb159d55e9950d0", + "reference": "d12f25bcdfb7754bea458a4a5cb159d55e9950d0", "shasum": "" }, "require": { @@ -1945,7 +1945,7 @@ ], "support": { "issues": "https://github.com/pdepend/pdepend/issues", - "source": "https://github.com/pdepend/pdepend/tree/2.14.0" + "source": "https://github.com/pdepend/pdepend/tree/2.15.1" }, "funding": [ { @@ -1953,7 +1953,7 @@ "type": "tidelift" } ], - "time": "2023-05-26T13:15:18+00:00" + "time": "2023-09-28T12:00:56+00:00" }, { "name": "php-parallel-lint/php-console-color", @@ -2239,22 +2239,22 @@ }, { "name": "phpmd/phpmd", - "version": "2.13.0", + "version": "2.14.1", "source": { "type": "git", "url": "https://github.com/phpmd/phpmd.git", - "reference": "dad0228156856b3ad959992f9748514fa943f3e3" + "reference": "442fc2c34edcd5198b442d8647c7f0aec3afabe8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpmd/phpmd/zipball/dad0228156856b3ad959992f9748514fa943f3e3", - "reference": "dad0228156856b3ad959992f9748514fa943f3e3", + "url": "https://api.github.com/repos/phpmd/phpmd/zipball/442fc2c34edcd5198b442d8647c7f0aec3afabe8", + "reference": "442fc2c34edcd5198b442d8647c7f0aec3afabe8", "shasum": "" }, "require": { "composer/xdebug-handler": "^1.0 || ^2.0 || ^3.0", "ext-xml": "*", - "pdepend/pdepend": "^2.12.1", + "pdepend/pdepend": "^2.15.1", "php": ">=5.3.9" }, "require-dev": { @@ -2264,7 +2264,7 @@ "gregwar/rst": "^1.0", "mikey179/vfsstream": "^1.6.8", "phpunit/phpunit": "^4.8.36 || ^5.7.27", - "squizlabs/php_codesniffer": "^2.0" + "squizlabs/php_codesniffer": "^2.9.2 || ^3.7.2" }, "bin": [ "src/bin/phpmd" @@ -2301,6 +2301,7 @@ "description": "PHPMD is a spin-off project of PHP Depend and aims to be a PHP equivalent of the well known Java tool PMD.", "homepage": "https://phpmd.org/", "keywords": [ + "dev", "mess detection", "mess detector", "pdepend", @@ -2310,7 +2311,7 @@ "support": { "irc": "irc://irc.freenode.org/phpmd", "issues": "https://github.com/phpmd/phpmd/issues", - "source": "https://github.com/phpmd/phpmd/tree/2.13.0" + "source": "https://github.com/phpmd/phpmd/tree/2.14.1" }, "funding": [ { @@ -2318,7 +2319,7 @@ "type": "tidelift" } ], - "time": "2022-09-10T08:44:15+00:00" + "time": "2023-09-28T13:07:44+00:00" }, { "name": "phpstan/phpdoc-parser", @@ -3445,16 +3446,16 @@ }, { "name": "symfony/config", - "version": "v6.3.0", + "version": "v6.3.8", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "a5e00dec161b08c946a2c16eed02adbeedf827ae" + "reference": "b7a63887960359e5b59b15826fa9f9be10acbe88" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/a5e00dec161b08c946a2c16eed02adbeedf827ae", - "reference": "a5e00dec161b08c946a2c16eed02adbeedf827ae", + "url": "https://api.github.com/repos/symfony/config/zipball/b7a63887960359e5b59b15826fa9f9be10acbe88", + "reference": "b7a63887960359e5b59b15826fa9f9be10acbe88", "shasum": "" }, "require": { @@ -3500,7 +3501,7 @@ "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/config/tree/v6.3.0" + "source": "https://github.com/symfony/config/tree/v6.3.8" }, "funding": [ { @@ -3516,7 +3517,7 @@ "type": "tidelift" } ], - "time": "2023-04-25T10:46:17+00:00" + "time": "2023-11-09T08:28:21+00:00" }, { "name": "symfony/console", @@ -3700,7 +3701,7 @@ }, { "name": "symfony/deprecation-contracts", - "version": "v3.3.0", + "version": "v3.4.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", @@ -3747,7 +3748,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.3.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.4.0" }, "funding": [ { @@ -4435,16 +4436,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "5bbc823adecdae860bb64756d639ecfec17b050a" + "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a", - "reference": "5bbc823adecdae860bb64756d639ecfec17b050a", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", + "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", "shasum": "" }, "require": { @@ -4459,7 +4460,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4497,7 +4498,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0" }, "funding": [ { @@ -4513,7 +4514,7 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-intl-grapheme", @@ -4682,16 +4683,16 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534" + "reference": "42292d99c55abe617799667f454222c54c60e229" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534", - "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229", + "reference": "42292d99c55abe617799667f454222c54c60e229", "shasum": "" }, "require": { @@ -4706,7 +4707,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4745,7 +4746,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0" }, "funding": [ { @@ -4761,7 +4762,7 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-07-28T09:04:16+00:00" }, { "name": "symfony/polyfill-php73", @@ -4927,16 +4928,16 @@ }, { "name": "symfony/polyfill-php81", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a" + "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/707403074c8ea6e2edaf8794b0157a0bfa52157a", - "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/7581cd600fa9fd681b797d00b02f068e2f13263b", + "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b", "shasum": "" }, "require": { @@ -4945,7 +4946,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4986,7 +4987,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-php81/tree/v1.28.0" }, "funding": [ { @@ -5002,7 +5003,7 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/process", @@ -5068,16 +5069,16 @@ }, { "name": "symfony/service-contracts", - "version": "v3.3.0", + "version": "v3.4.0", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "40da9cc13ec349d9e4966ce18b5fbcd724ab10a4" + "reference": "b3313c2dbffaf71c8de2934e2ea56ed2291a3838" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/40da9cc13ec349d9e4966ce18b5fbcd724ab10a4", - "reference": "40da9cc13ec349d9e4966ce18b5fbcd724ab10a4", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/b3313c2dbffaf71c8de2934e2ea56ed2291a3838", + "reference": "b3313c2dbffaf71c8de2934e2ea56ed2291a3838", "shasum": "" }, "require": { @@ -5130,7 +5131,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v3.3.0" + "source": "https://github.com/symfony/service-contracts/tree/v3.4.0" }, "funding": [ { @@ -5146,7 +5147,7 @@ "type": "tidelift" } ], - "time": "2023-05-23T14:45:45+00:00" + "time": "2023-07-30T20:28:31+00:00" }, { "name": "symfony/string", From 72cb6244353222dd8dca5b435e3ec6b7508c8133 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Nov 2023 15:12:00 +0000 Subject: [PATCH 20/81] Bump phpunit/phpunit from 9.6.9 to 9.6.13 (#447) Bumps [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) from 9.6.9 to 9.6.13. - [Changelog](https://github.com/sebastianbergmann/phpunit/blob/9.6.13/ChangeLog-9.6.md) - [Commits](https://github.com/sebastianbergmann/phpunit/compare/9.6.9...9.6.13) --- updated-dependencies: - dependency-name: phpunit/phpunit dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 51 ++++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/composer.lock b/composer.lock index e1cd61855..d944d81b0 100644 --- a/composer.lock +++ b/composer.lock @@ -5726,16 +5726,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.15.5", + "version": "v4.17.1", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e" + "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/11e2663a5bc9db5d714eedb4277ee300403b4a9e", - "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", + "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", "shasum": "" }, "require": { @@ -5776,9 +5776,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.5" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.17.1" }, - "time": "2023-05-19T20:20:00+00:00" + "time": "2023-08-13T19:53:39+00:00" }, { "name": "phar-io/manifest", @@ -6181,16 +6181,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.26", + "version": "9.2.29", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1" + "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/443bc6912c9bd5b409254a40f4b0f4ced7c80ea1", - "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6a3a87ac2bbe33b25042753df8195ba4aa534c76", + "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76", "shasum": "" }, "require": { @@ -6246,7 +6246,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.26" + "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.29" }, "funding": [ { @@ -6254,7 +6255,7 @@ "type": "github" } ], - "time": "2023-03-06T12:58:08+00:00" + "time": "2023-09-19T04:57:46+00:00" }, { "name": "phpunit/php-invoker", @@ -6439,16 +6440,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.9", + "version": "9.6.13", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "a9aceaf20a682aeacf28d582654a1670d8826778" + "reference": "f3d767f7f9e191eab4189abe41ab37797e30b1be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a9aceaf20a682aeacf28d582654a1670d8826778", - "reference": "a9aceaf20a682aeacf28d582654a1670d8826778", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f3d767f7f9e191eab4189abe41ab37797e30b1be", + "reference": "f3d767f7f9e191eab4189abe41ab37797e30b1be", "shasum": "" }, "require": { @@ -6463,7 +6464,7 @@ "phar-io/manifest": "^2.0.3", "phar-io/version": "^3.0.2", "php": ">=7.3", - "phpunit/php-code-coverage": "^9.2.13", + "phpunit/php-code-coverage": "^9.2.28", "phpunit/php-file-iterator": "^3.0.5", "phpunit/php-invoker": "^3.1.1", "phpunit/php-text-template": "^2.0.3", @@ -6522,7 +6523,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.9" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.13" }, "funding": [ { @@ -6538,7 +6539,7 @@ "type": "tidelift" } ], - "time": "2023-06-11T06:13:56+00:00" + "time": "2023-09-19T05:39:22+00:00" }, { "name": "sebastian/code-unit", @@ -6990,16 +6991,16 @@ }, { "name": "sebastian/global-state", - "version": "5.0.5", + "version": "5.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2" + "reference": "bde739e7565280bda77be70044ac1047bc007e34" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/0ca8db5a5fc9c8646244e629625ac486fa286bf2", - "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bde739e7565280bda77be70044ac1047bc007e34", + "reference": "bde739e7565280bda77be70044ac1047bc007e34", "shasum": "" }, "require": { @@ -7042,7 +7043,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/global-state/issues", - "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.5" + "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.6" }, "funding": [ { @@ -7050,7 +7051,7 @@ "type": "github" } ], - "time": "2022-02-14T08:28:10+00:00" + "time": "2023-08-02T09:26:13+00:00" }, { "name": "sebastian/lines-of-code", From d1f76d37bb4a5584b78f7e53c451d257534f0359 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Nov 2023 14:38:51 +0000 Subject: [PATCH 21/81] Bump symfony/options-resolver from 5.4.21 to 6.3.0 (#448) Bumps [symfony/options-resolver](https://github.com/symfony/options-resolver) from 5.4.21 to 6.3.0. - [Release notes](https://github.com/symfony/options-resolver/releases) - [Changelog](https://github.com/symfony/options-resolver/blob/6.3/CHANGELOG.md) - [Commits](https://github.com/symfony/options-resolver/compare/v5.4.21...v6.3.0) --- updated-dependencies: - dependency-name: symfony/options-resolver dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.json | 2 +- composer.lock | 20 +++++++++----------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/composer.json b/composer.json index c9579e411..4f9fb2ddb 100644 --- a/composer.json +++ b/composer.json @@ -50,7 +50,7 @@ "symfony/filesystem": "^5.4.21", "symfony/finder": "^6.2.7", "symfony/http-client": "^6.2.10", - "symfony/options-resolver": "^5.4.21", + "symfony/options-resolver": "^6.3.0", "symfony/phpunit-bridge": "^6.2.7", "symfony/process": "^5.4.22", "symfony/yaml": "^6.3.0", diff --git a/composer.lock b/composer.lock index d944d81b0..ab8410b02 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": "90dae33ece098f3a05efcaa967c150db", + "content-hash": "f741005e4b59e51a5cb930d8611da7b2", "packages": [ { "name": "acquia/coding-standards", @@ -4286,23 +4286,21 @@ }, { "name": "symfony/options-resolver", - "version": "v5.4.21", + "version": "v6.3.0", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "4fe5cf6ede71096839f0e4b4444d65dd3a7c1eb9" + "reference": "a10f19f5198d589d5c33333cffe98dc9820332dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/4fe5cf6ede71096839f0e4b4444d65dd3a7c1eb9", - "reference": "4fe5cf6ede71096839f0e4b4444d65dd3a7c1eb9", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/a10f19f5198d589d5c33333cffe98dc9820332dd", + "reference": "a10f19f5198d589d5c33333cffe98dc9820332dd", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1|^3", - "symfony/polyfill-php73": "~1.0", - "symfony/polyfill-php80": "^1.16" + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3" }, "type": "library", "autoload": { @@ -4335,7 +4333,7 @@ "options" ], "support": { - "source": "https://github.com/symfony/options-resolver/tree/v5.4.21" + "source": "https://github.com/symfony/options-resolver/tree/v6.3.0" }, "funding": [ { @@ -4351,7 +4349,7 @@ "type": "tidelift" } ], - "time": "2023-02-14T08:03:56+00:00" + "time": "2023-05-12T14:21:09+00:00" }, { "name": "symfony/phpunit-bridge", From 9c2de906d1269c1c85a3d753ccfabb665f14ae89 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Nov 2023 14:31:17 +0000 Subject: [PATCH 22/81] Bump symfony/console from 5.4.24 to 5.4.31 (#449) Bumps [symfony/console](https://github.com/symfony/console) from 5.4.24 to 5.4.31. - [Release notes](https://github.com/symfony/console/releases) - [Changelog](https://github.com/symfony/console/blob/6.3/CHANGELOG.md) - [Commits](https://github.com/symfony/console/compare/v5.4.24...v5.4.31) --- updated-dependencies: - dependency-name: symfony/console dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 56 +++++++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/composer.lock b/composer.lock index ab8410b02..317ee638e 100644 --- a/composer.lock +++ b/composer.lock @@ -3521,16 +3521,16 @@ }, { "name": "symfony/console", - "version": "v5.4.24", + "version": "v5.4.31", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "560fc3ed7a43e6d30ea94a07d77f9a60b8ed0fb8" + "reference": "11ac5f154e0e5c4c77af83ad11ead9165280b92a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/560fc3ed7a43e6d30ea94a07d77f9a60b8ed0fb8", - "reference": "560fc3ed7a43e6d30ea94a07d77f9a60b8ed0fb8", + "url": "https://api.github.com/repos/symfony/console/zipball/11ac5f154e0e5c4c77af83ad11ead9165280b92a", + "reference": "11ac5f154e0e5c4c77af83ad11ead9165280b92a", "shasum": "" }, "require": { @@ -3600,7 +3600,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.24" + "source": "https://github.com/symfony/console/tree/v5.4.31" }, "funding": [ { @@ -3616,7 +3616,7 @@ "type": "tidelift" } ], - "time": "2023-05-26T05:13:16+00:00" + "time": "2023-10-31T07:58:33+00:00" }, { "name": "symfony/dependency-injection", @@ -4516,16 +4516,16 @@ }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "511a08c03c1960e08a883f4cffcacd219b758354" + "reference": "875e90aeea2777b6f135677f618529449334a612" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/511a08c03c1960e08a883f4cffcacd219b758354", - "reference": "511a08c03c1960e08a883f4cffcacd219b758354", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/875e90aeea2777b6f135677f618529449334a612", + "reference": "875e90aeea2777b6f135677f618529449334a612", "shasum": "" }, "require": { @@ -4537,7 +4537,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4577,7 +4577,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.28.0" }, "funding": [ { @@ -4593,20 +4593,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6" + "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6", - "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", + "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", "shasum": "" }, "require": { @@ -4618,7 +4618,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4661,7 +4661,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.28.0" }, "funding": [ { @@ -4677,7 +4677,7 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-mbstring", @@ -5149,16 +5149,16 @@ }, { "name": "symfony/string", - "version": "v6.2.8", + "version": "v6.3.8", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "193e83bbd6617d6b2151c37fff10fa7168ebddef" + "reference": "13880a87790c76ef994c91e87efb96134522577a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/193e83bbd6617d6b2151c37fff10fa7168ebddef", - "reference": "193e83bbd6617d6b2151c37fff10fa7168ebddef", + "url": "https://api.github.com/repos/symfony/string/zipball/13880a87790c76ef994c91e87efb96134522577a", + "reference": "13880a87790c76ef994c91e87efb96134522577a", "shasum": "" }, "require": { @@ -5169,13 +5169,13 @@ "symfony/polyfill-mbstring": "~1.0" }, "conflict": { - "symfony/translation-contracts": "<2.0" + "symfony/translation-contracts": "<2.5" }, "require-dev": { "symfony/error-handler": "^5.4|^6.0", "symfony/http-client": "^5.4|^6.0", "symfony/intl": "^6.2", - "symfony/translation-contracts": "^2.0|^3.0", + "symfony/translation-contracts": "^2.5|^3.0", "symfony/var-exporter": "^5.4|^6.0" }, "type": "library", @@ -5215,7 +5215,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.2.8" + "source": "https://github.com/symfony/string/tree/v6.3.8" }, "funding": [ { @@ -5231,7 +5231,7 @@ "type": "tidelift" } ], - "time": "2023-03-20T16:06:02+00:00" + "time": "2023-11-09T08:28:21+00:00" }, { "name": "symfony/var-exporter", From 2be3e8671d1d6b20dc39f22fd746484ed3a2b3f4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Nov 2023 15:01:07 +0000 Subject: [PATCH 23/81] Bump symfony/phpunit-bridge from 6.3.1 to 6.3.8 (#450) Bumps [symfony/phpunit-bridge](https://github.com/symfony/phpunit-bridge) from 6.3.1 to 6.3.8. - [Release notes](https://github.com/symfony/phpunit-bridge/releases) - [Changelog](https://github.com/symfony/phpunit-bridge/blob/6.3/CHANGELOG.md) - [Commits](https://github.com/symfony/phpunit-bridge/compare/v6.3.1...v6.3.8) --- updated-dependencies: - dependency-name: symfony/phpunit-bridge dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 317ee638e..a68c56d01 100644 --- a/composer.lock +++ b/composer.lock @@ -4353,16 +4353,16 @@ }, { "name": "symfony/phpunit-bridge", - "version": "v6.3.1", + "version": "v6.3.8", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "0b0bf59b0d9bd1422145a123a67fb12af546ef0d" + "reference": "45610900872a35b77db7698651f36129906041ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/0b0bf59b0d9bd1422145a123a67fb12af546ef0d", - "reference": "0b0bf59b0d9bd1422145a123a67fb12af546ef0d", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/45610900872a35b77db7698651f36129906041ea", + "reference": "45610900872a35b77db7698651f36129906041ea", "shasum": "" }, "require": { @@ -4414,7 +4414,7 @@ "description": "Provides utilities for PHPUnit, especially user deprecation notices management", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/phpunit-bridge/tree/v6.3.1" + "source": "https://github.com/symfony/phpunit-bridge/tree/v6.3.8" }, "funding": [ { @@ -4430,7 +4430,7 @@ "type": "tidelift" } ], - "time": "2023-06-23T13:25:16+00:00" + "time": "2023-10-31T08:07:48+00:00" }, { "name": "symfony/polyfill-ctype", From af2058051e2be1d6e36dc58482d8b22bb9fc2380 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 Nov 2023 14:50:19 +0000 Subject: [PATCH 24/81] Bump symfony/yaml from 6.3.0 to 6.3.8 (#451) Bumps [symfony/yaml](https://github.com/symfony/yaml) from 6.3.0 to 6.3.8. - [Release notes](https://github.com/symfony/yaml/releases) - [Changelog](https://github.com/symfony/yaml/blob/6.3/CHANGELOG.md) - [Commits](https://github.com/symfony/yaml/compare/v6.3.0...v6.3.8) --- updated-dependencies: - dependency-name: symfony/yaml dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index a68c56d01..fedb73310 100644 --- a/composer.lock +++ b/composer.lock @@ -5309,20 +5309,21 @@ }, { "name": "symfony/yaml", - "version": "v6.3.0", + "version": "v6.3.8", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "a9a8337aa641ef2aa39c3e028f9107ec391e5927" + "reference": "3493af8a8dad7fa91c77fa473ba23ecd95334a92" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/a9a8337aa641ef2aa39c3e028f9107ec391e5927", - "reference": "a9a8337aa641ef2aa39c3e028f9107ec391e5927", + "url": "https://api.github.com/repos/symfony/yaml/zipball/3493af8a8dad7fa91c77fa473ba23ecd95334a92", + "reference": "3493af8a8dad7fa91c77fa473ba23ecd95334a92", "shasum": "" }, "require": { "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-ctype": "^1.8" }, "conflict": { @@ -5360,7 +5361,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v6.3.0" + "source": "https://github.com/symfony/yaml/tree/v6.3.8" }, "funding": [ { @@ -5376,7 +5377,7 @@ "type": "tidelift" } ], - "time": "2023-04-28T13:28:14+00:00" + "time": "2023-11-06T10:58:05+00:00" }, { "name": "webflo/drupal-finder", From c095ff0b943e7c1d19a85aaad2f639944ba9534a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Nov 2023 14:53:32 +0000 Subject: [PATCH 25/81] Bump composer/composer from 2.5.7 to 2.6.5 (#452) Bumps [composer/composer](https://github.com/composer/composer) from 2.5.7 to 2.6.5. - [Release notes](https://github.com/composer/composer/releases) - [Changelog](https://github.com/composer/composer/blob/main/CHANGELOG.md) - [Commits](https://github.com/composer/composer/compare/2.5.7...2.6.5) --- updated-dependencies: - dependency-name: composer/composer dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 128 +++++++++++++++++++++++++------------------------- 1 file changed, 65 insertions(+), 63 deletions(-) diff --git a/composer.lock b/composer.lock index fedb73310..c687cd011 100644 --- a/composer.lock +++ b/composer.lock @@ -67,16 +67,16 @@ }, { "name": "composer/ca-bundle", - "version": "1.3.5", + "version": "1.3.7", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "74780ccf8c19d6acb8d65c5f39cd72110e132bbd" + "reference": "76e46335014860eec1aa5a724799a00a2e47cc85" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/74780ccf8c19d6acb8d65c5f39cd72110e132bbd", - "reference": "74780ccf8c19d6acb8d65c5f39cd72110e132bbd", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/76e46335014860eec1aa5a724799a00a2e47cc85", + "reference": "76e46335014860eec1aa5a724799a00a2e47cc85", "shasum": "" }, "require": { @@ -123,7 +123,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/ca-bundle/issues", - "source": "https://github.com/composer/ca-bundle/tree/1.3.5" + "source": "https://github.com/composer/ca-bundle/tree/1.3.7" }, "funding": [ { @@ -139,26 +139,26 @@ "type": "tidelift" } ], - "time": "2023-01-11T08:27:00+00:00" + "time": "2023-08-30T09:31:38+00:00" }, { "name": "composer/class-map-generator", - "version": "1.0.0", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/composer/class-map-generator.git", - "reference": "1e1cb2b791facb2dfe32932a7718cf2571187513" + "reference": "953cc4ea32e0c31f2185549c7d216d7921f03da9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/class-map-generator/zipball/1e1cb2b791facb2dfe32932a7718cf2571187513", - "reference": "1e1cb2b791facb2dfe32932a7718cf2571187513", + "url": "https://api.github.com/repos/composer/class-map-generator/zipball/953cc4ea32e0c31f2185549c7d216d7921f03da9", + "reference": "953cc4ea32e0c31f2185549c7d216d7921f03da9", "shasum": "" }, "require": { - "composer/pcre": "^2 || ^3", + "composer/pcre": "^2.1 || ^3.1", "php": "^7.2 || ^8.0", - "symfony/finder": "^4.4 || ^5.3 || ^6" + "symfony/finder": "^4.4 || ^5.3 || ^6 || ^7" }, "require-dev": { "phpstan/phpstan": "^1.6", @@ -196,7 +196,7 @@ ], "support": { "issues": "https://github.com/composer/class-map-generator/issues", - "source": "https://github.com/composer/class-map-generator/tree/1.0.0" + "source": "https://github.com/composer/class-map-generator/tree/1.1.0" }, "funding": [ { @@ -212,20 +212,20 @@ "type": "tidelift" } ], - "time": "2022-06-19T11:31:27+00:00" + "time": "2023-06-30T13:58:57+00:00" }, { "name": "composer/composer", - "version": "2.5.7", + "version": "2.6.5", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "d477018d3f2ebd76dede3d3988a0b1a7add4d81e" + "reference": "4b0fe89db9e65b1e64df633a992e70a7a215ab33" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/d477018d3f2ebd76dede3d3988a0b1a7add4d81e", - "reference": "d477018d3f2ebd76dede3d3988a0b1a7add4d81e", + "url": "https://api.github.com/repos/composer/composer/zipball/4b0fe89db9e65b1e64df633a992e70a7a215ab33", + "reference": "4b0fe89db9e65b1e64df633a992e70a7a215ab33", "shasum": "" }, "require": { @@ -233,23 +233,23 @@ "composer/class-map-generator": "^1.0", "composer/metadata-minifier": "^1.0", "composer/pcre": "^2.1 || ^3.1", - "composer/semver": "^3.0", + "composer/semver": "^3.2.5", "composer/spdx-licenses": "^1.5.7", "composer/xdebug-handler": "^2.0.2 || ^3.0.3", "justinrainbow/json-schema": "^5.2.11", "php": "^7.2.5 || ^8.0", "psr/log": "^1.0 || ^2.0 || ^3.0", - "react/promise": "^2.8", + "react/promise": "^2.8 || ^3", "seld/jsonlint": "^1.4", "seld/phar-utils": "^1.2", "seld/signal-handler": "^2.0", - "symfony/console": "^5.4.11 || ^6.0.11", - "symfony/filesystem": "^5.4 || ^6.0", - "symfony/finder": "^5.4 || ^6.0", + "symfony/console": "^5.4.11 || ^6.0.11 || ^7", + "symfony/filesystem": "^5.4 || ^6.0 || ^7", + "symfony/finder": "^5.4 || ^6.0 || ^7", "symfony/polyfill-php73": "^1.24", "symfony/polyfill-php80": "^1.24", "symfony/polyfill-php81": "^1.24", - "symfony/process": "^5.4 || ^6.0" + "symfony/process": "^5.4 || ^6.0 || ^7" }, "require-dev": { "phpstan/phpstan": "^1.9.3", @@ -257,7 +257,7 @@ "phpstan/phpstan-phpunit": "^1.0", "phpstan/phpstan-strict-rules": "^1", "phpstan/phpstan-symfony": "^1.2.10", - "symfony/phpunit-bridge": "^6.0" + "symfony/phpunit-bridge": "^6.0 || ^7" }, "suggest": { "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", @@ -270,7 +270,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.5-dev" + "dev-main": "2.6-dev" }, "phpstan": { "includes": [ @@ -280,7 +280,7 @@ }, "autoload": { "psr-4": { - "Composer\\": "src/Composer" + "Composer\\": "src/Composer/" } }, "notification-url": "https://packagist.org/downloads/", @@ -309,7 +309,8 @@ "support": { "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/composer/issues", - "source": "https://github.com/composer/composer/tree/2.5.7" + "security": "https://github.com/composer/composer/security/policy", + "source": "https://github.com/composer/composer/tree/2.6.5" }, "funding": [ { @@ -325,7 +326,7 @@ "type": "tidelift" } ], - "time": "2023-05-24T13:00:40+00:00" + "time": "2023-10-06T08:11:52+00:00" }, { "name": "composer/metadata-minifier", @@ -469,16 +470,16 @@ }, { "name": "composer/semver", - "version": "3.3.2", + "version": "3.4.0", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9" + "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/3953f23262f2bff1919fc82183ad9acb13ff62c9", - "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9", + "url": "https://api.github.com/repos/composer/semver/zipball/35e8d0af4486141bc745f23a29cc2091eb624a32", + "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32", "shasum": "" }, "require": { @@ -528,9 +529,9 @@ "versioning" ], "support": { - "irc": "irc://irc.freenode.org/composer", + "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.3.2" + "source": "https://github.com/composer/semver/tree/3.4.0" }, "funding": [ { @@ -546,20 +547,20 @@ "type": "tidelift" } ], - "time": "2022-04-01T19:23:25+00:00" + "time": "2023-08-31T09:50:34+00:00" }, { "name": "composer/spdx-licenses", - "version": "1.5.7", + "version": "1.5.8", "source": { "type": "git", "url": "https://github.com/composer/spdx-licenses.git", - "reference": "c848241796da2abf65837d51dce1fae55a960149" + "reference": "560bdcf8deb88ae5d611c80a2de8ea9d0358cc0a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/c848241796da2abf65837d51dce1fae55a960149", - "reference": "c848241796da2abf65837d51dce1fae55a960149", + "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/560bdcf8deb88ae5d611c80a2de8ea9d0358cc0a", + "reference": "560bdcf8deb88ae5d611c80a2de8ea9d0358cc0a", "shasum": "" }, "require": { @@ -608,9 +609,9 @@ "validator" ], "support": { - "irc": "irc://irc.freenode.org/composer", + "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/spdx-licenses/issues", - "source": "https://github.com/composer/spdx-licenses/tree/1.5.7" + "source": "https://github.com/composer/spdx-licenses/tree/1.5.8" }, "funding": [ { @@ -626,7 +627,7 @@ "type": "tidelift" } ], - "time": "2022-05-23T07:37:50+00:00" + "time": "2023-11-20T07:44:33+00:00" }, { "name": "composer/xdebug-handler", @@ -2740,23 +2741,24 @@ }, { "name": "react/promise", - "version": "v2.10.0", + "version": "v3.1.0", "source": { "type": "git", "url": "https://github.com/reactphp/promise.git", - "reference": "f913fb8cceba1e6644b7b90c4bfb678ed8a3ef38" + "reference": "e563d55d1641de1dea9f5e84f3cccc66d2bfe02c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reactphp/promise/zipball/f913fb8cceba1e6644b7b90c4bfb678ed8a3ef38", - "reference": "f913fb8cceba1e6644b7b90c4bfb678ed8a3ef38", + "url": "https://api.github.com/repos/reactphp/promise/zipball/e563d55d1641de1dea9f5e84f3cccc66d2bfe02c", + "reference": "e563d55d1641de1dea9f5e84f3cccc66d2bfe02c", "shasum": "" }, "require": { - "php": ">=5.4.0" + "php": ">=7.1.0" }, "require-dev": { - "phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.36" + "phpstan/phpstan": "1.10.39 || 1.4.10", + "phpunit/phpunit": "^9.6 || ^7.5" }, "type": "library", "autoload": { @@ -2800,7 +2802,7 @@ ], "support": { "issues": "https://github.com/reactphp/promise/issues", - "source": "https://github.com/reactphp/promise/tree/v2.10.0" + "source": "https://github.com/reactphp/promise/tree/v3.1.0" }, "funding": [ { @@ -2808,7 +2810,7 @@ "type": "open_collective" } ], - "time": "2023-05-02T15:15:43+00:00" + "time": "2023-11-16T16:21:57+00:00" }, { "name": "sebastian/cli-parser", @@ -3033,16 +3035,16 @@ }, { "name": "seld/signal-handler", - "version": "2.0.1", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/Seldaek/signal-handler.git", - "reference": "f69d119511dc0360440cdbdaa71829c149b7be75" + "reference": "04a6112e883ad76c0ada8e4a9f7520bbfdb6bb98" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/signal-handler/zipball/f69d119511dc0360440cdbdaa71829c149b7be75", - "reference": "f69d119511dc0360440cdbdaa71829c149b7be75", + "url": "https://api.github.com/repos/Seldaek/signal-handler/zipball/04a6112e883ad76c0ada8e4a9f7520bbfdb6bb98", + "reference": "04a6112e883ad76c0ada8e4a9f7520bbfdb6bb98", "shasum": "" }, "require": { @@ -3088,9 +3090,9 @@ ], "support": { "issues": "https://github.com/Seldaek/signal-handler/issues", - "source": "https://github.com/Seldaek/signal-handler/tree/2.0.1" + "source": "https://github.com/Seldaek/signal-handler/tree/2.0.2" }, - "time": "2022-07-20T18:31:45+00:00" + "time": "2023-09-03T09:24:00+00:00" }, { "name": "sirbrillig/phpcs-variable-analysis", @@ -5005,16 +5007,16 @@ }, { "name": "symfony/process", - "version": "v5.4.24", + "version": "v5.4.28", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "e3c46cc5689c8782944274bb30702106ecbe3b64" + "reference": "45261e1fccad1b5447a8d7a8e67aa7b4a9798b7b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/e3c46cc5689c8782944274bb30702106ecbe3b64", - "reference": "e3c46cc5689c8782944274bb30702106ecbe3b64", + "url": "https://api.github.com/repos/symfony/process/zipball/45261e1fccad1b5447a8d7a8e67aa7b4a9798b7b", + "reference": "45261e1fccad1b5447a8d7a8e67aa7b4a9798b7b", "shasum": "" }, "require": { @@ -5047,7 +5049,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v5.4.24" + "source": "https://github.com/symfony/process/tree/v5.4.28" }, "funding": [ { @@ -5063,7 +5065,7 @@ "type": "tidelift" } ], - "time": "2023-05-17T11:26:05+00:00" + "time": "2023-08-07T10:36:04+00:00" }, { "name": "symfony/service-contracts", From bca6236025fe5e2a5c1ae505106df855db942bc1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 24 Nov 2023 14:36:47 +0000 Subject: [PATCH 26/81] Bump symfony/event-dispatcher from 6.3.0 to 6.3.2 (#453) Bumps [symfony/event-dispatcher](https://github.com/symfony/event-dispatcher) from 6.3.0 to 6.3.2. - [Release notes](https://github.com/symfony/event-dispatcher/releases) - [Changelog](https://github.com/symfony/event-dispatcher/blob/6.3/CHANGELOG.md) - [Commits](https://github.com/symfony/event-dispatcher/compare/v6.3.0...v6.3.2) --- updated-dependencies: - dependency-name: symfony/event-dispatcher dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.lock b/composer.lock index c687cd011..9b5bb7792 100644 --- a/composer.lock +++ b/composer.lock @@ -3770,16 +3770,16 @@ }, { "name": "symfony/event-dispatcher", - "version": "v6.3.0", + "version": "v6.3.2", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "3af8ac1a3f98f6dbc55e10ae59c9e44bfc38dfaa" + "reference": "adb01fe097a4ee930db9258a3cc906b5beb5cf2e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/3af8ac1a3f98f6dbc55e10ae59c9e44bfc38dfaa", - "reference": "3af8ac1a3f98f6dbc55e10ae59c9e44bfc38dfaa", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/adb01fe097a4ee930db9258a3cc906b5beb5cf2e", + "reference": "adb01fe097a4ee930db9258a3cc906b5beb5cf2e", "shasum": "" }, "require": { @@ -3830,7 +3830,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v6.3.0" + "source": "https://github.com/symfony/event-dispatcher/tree/v6.3.2" }, "funding": [ { @@ -3846,11 +3846,11 @@ "type": "tidelift" } ], - "time": "2023-04-21T14:41:17+00:00" + "time": "2023-07-06T06:56:43+00:00" }, { "name": "symfony/event-dispatcher-contracts", - "version": "v3.3.0", + "version": "v3.4.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", @@ -3906,7 +3906,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.3.0" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.4.0" }, "funding": [ { From 598ef3c3a680f69695ed4cd4ab6de2a2a328112f Mon Sep 17 00:00:00 2001 From: Sayan Goswami Date: Tue, 28 Nov 2023 13:52:20 +0530 Subject: [PATCH 27/81] Domo Improvements (#438) * Adding allowed failure * add sheet2 * add sheet2 * revert sheet 1 * add branch * Update script.sh * formatting * Update tests/Console/Command/Ci/CiRunCommandTest.php Co-authored-by: Travis Carden * adding a last line * Update src/Console/Command/Ci/CiRunCommand.php Co-authored-by: Travis Carden * move to sheet1 * fix tests * testing * check return values * add debug message * add debug 5 * add trap * missing dollar sign * bash fix * change to SIGINT * new approach * final fix --------- Co-authored-by: Travis Carden --- .idea/orca.iml | 4 +--- .idea/php-test-framework.xml | 1 + bin/ci/_includes.sh | 9 ++++++++- bin/ci/script.sh | 9 +++++---- src/Console/Command/Ci/CiRunCommand.php | 15 ++++++++++++++- src/Helper/Log/GoogleApiClient.php | 2 ++ tests/Console/Command/Ci/CiRunCommandTest.php | 11 ++++++++++- tests/Helper/Log/GoogleApiClientTest.php | 4 ++++ 8 files changed, 45 insertions(+), 10 deletions(-) diff --git a/.idea/orca.iml b/.idea/orca.iml index 59e883872..f8687bc5b 100644 --- a/.idea/orca.iml +++ b/.idea/orca.iml @@ -2,9 +2,7 @@ - - - + diff --git a/.idea/php-test-framework.xml b/.idea/php-test-framework.xml index b870bf5d9..9361f323b 100644 --- a/.idea/php-test-framework.xml +++ b/.idea/php-test-framework.xml @@ -6,6 +6,7 @@ + diff --git a/bin/ci/_includes.sh b/bin/ci/_includes.sh index 693d3b407..245a9751d 100755 --- a/bin/ci/_includes.sh +++ b/bin/ci/_includes.sh @@ -122,10 +122,17 @@ allowed_failures=( "INTEGRATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_BETA_OR_LATER" ) if [[ " ${allowed_failures[*]} " =~ " ${ORCA_JOB} " ]]; then - set +e export ORCA_IS_ALLOWED_FAILURE="TRUE" notice "This job is allowed to fail and will report as passing regardless of outcome." fi +function shutdown() { + if [[ "$ORCA_IS_ALLOWED_FAILURE" == "TRUE" ]]; then + exit 0 + fi +} + +trap shutdown ERR + # Make the shell print all lines in the script before executing them. set -v diff --git a/bin/ci/script.sh b/bin/ci/script.sh index f5233b564..3225e8d20 100755 --- a/bin/ci/script.sh +++ b/bin/ci/script.sh @@ -11,10 +11,6 @@ cd "$(dirname "$0")" || exit; source _includes.sh -if [[ "$ORCA_JOB" ]]; then - eval "orca ci:run $ORCA_JOB script $ORCA_SUT_NAME" -fi - if [[ "$ORCA_ENABLE_NIGHTWATCH" == "TRUE" && "$ORCA_SUT_HAS_NIGHTWATCH_TESTS" && -d "$ORCA_YARN_DIR" ]]; then ( cd "$ORCA_YARN_DIR" || exit @@ -34,3 +30,8 @@ if [[ "$ORCA_ENABLE_NIGHTWATCH" == "TRUE" && "$ORCA_SUT_HAS_NIGHTWATCH_TESTS" && kill -0 $CHROMEDRIVER_PID ) fi + +if [[ "$ORCA_JOB" ]]; then + eval "orca ci:run $ORCA_JOB script $ORCA_SUT_NAME" +fi + diff --git a/src/Console/Command/Ci/CiRunCommand.php b/src/Console/Command/Ci/CiRunCommand.php index 95aab3f07..4bdc46865 100644 --- a/src/Console/Command/Ci/CiRunCommand.php +++ b/src/Console/Command/Ci/CiRunCommand.php @@ -8,6 +8,7 @@ use Acquia\Orca\Enum\StatusCodeEnum; use Acquia\Orca\Event\CiEvent; use Acquia\Orca\Exception\OrcaInvalidArgumentException; +use Acquia\Orca\Helper\EnvFacade; use Acquia\Orca\Options\CiRunOptionsFactory; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputArgument; @@ -46,6 +47,13 @@ class CiRunCommand extends Command { */ private $eventDispatcher; + /** + * The environment facade. + * + * @var \Acquia\Orca\Helper\EnvFacade + */ + private EnvFacade $env; + /** * Constructs an instance. * @@ -55,11 +63,14 @@ class CiRunCommand extends Command { * The CI run options factory. * @param \Symfony\Component\EventDispatcher\EventDispatcher $eventDispatcher * The event dispatcher service. + * @param \Acquia\Orca\Helper\EnvFacade $env + * The environment facade. */ - public function __construct(CiJobFactory $job_factory, CiRunOptionsFactory $ci_run_options_factory, EventDispatcher $eventDispatcher) { + public function __construct(CiJobFactory $job_factory, CiRunOptionsFactory $ci_run_options_factory, EventDispatcher $eventDispatcher, EnvFacade $env) { $this->ciJobFactory = $job_factory; $this->ciRunOptionsFactory = $ci_run_options_factory; $this->eventDispatcher = $eventDispatcher; + $this->env = $env; parent::__construct(self::$defaultName); } @@ -131,6 +142,8 @@ public function execute(InputInterface $input, OutputInterface $output): int { $data['status'] = 'FAIL'; $job = $this->ciJobFactory->create($options->getJob()); $data['version'] = $job->getDrupalCoreVersion(); + $data['allowedToFail'] = $this->env->get("ORCA_IS_ALLOWED_FAILURE", FALSE); + $data['branch'] = $this->env->get("ORCA_SUT_BRANCH", FALSE); $job->run($options); } diff --git a/src/Helper/Log/GoogleApiClient.php b/src/Helper/Log/GoogleApiClient.php index 219e164fa..4c6104538 100644 --- a/src/Helper/Log/GoogleApiClient.php +++ b/src/Helper/Log/GoogleApiClient.php @@ -143,6 +143,8 @@ public function postData(array $data): void { $data['version'], PHP_VERSION, $data['status'], + $data['allowedToFail'], + $data['branch'], ], ], ], diff --git a/tests/Console/Command/Ci/CiRunCommandTest.php b/tests/Console/Command/Ci/CiRunCommandTest.php index d91e98ee9..82137b767 100644 --- a/tests/Console/Command/Ci/CiRunCommandTest.php +++ b/tests/Console/Command/Ci/CiRunCommandTest.php @@ -9,6 +9,7 @@ use Acquia\Orca\Enum\CiJobPhaseEnum; use Acquia\Orca\Enum\StatusCodeEnum; use Acquia\Orca\Exception\OrcaInvalidArgumentException; +use Acquia\Orca\Helper\EnvFacade; use Acquia\Orca\Options\CiRunOptions; use Acquia\Orca\Options\CiRunOptionsFactory; use Acquia\Orca\Tests\Console\Command\CommandTestBase; @@ -24,6 +25,8 @@ * @property \Acquia\Orca\Domain\Ci\Job\AbstractCiJob|\Prophecy\Prophecy\ObjectProphecy $ciJob * @property \Acquia\Orca\Options\CiRunOptionsFactory|\Prophecy\Prophecy\ObjectProphecy $ciRunOptionsFactory * @property \Acquia\Orca\Options\CiRunOptions|\Prophecy\Prophecy\ObjectProphecy $ciRunOptions + * @property \Symfony\Component\EventDispatcher\EventDispatcher|\Prophecy\Prophecy\ObjectProphecy $eventDispatcher + * @property \Acquia\Orca\Helper\EnvFacade|\Prophecy\Prophecy\ObjectProphecy $env * @coversDefaultClass \Acquia\Orca\Console\Command\Ci\CiRunCommand */ class CiRunCommandTest extends CommandTestBase { @@ -35,6 +38,7 @@ class CiRunCommandTest extends CommandTestBase { protected CiRunOptionsFactory|ObjectProphecy $ciRunOptionsFactory; protected CiRunOptions|ObjectProphecy $ciRunOptions; protected EventDispatcher|ObjectProphecy $eventDispatcher; + protected EnvFacade|ObjectProphecy $env; protected function setUp(): void { $this->ciRunOptions = $this->prophesize(CiRunOptions::class); @@ -54,13 +58,18 @@ protected function setUp(): void { $this->eventDispatcher ->dispatch(Argument::cetera()) ->willReturn(new \stdClass()); + $this->env = $this->prophesize(EnvFacade::class); + $this->env + ->get(Argument::any(), FALSE) + ->willReturn(NULL); } protected function createCommand(): Command { $ci_run_options_factory = $this->ciRunOptionsFactory->reveal(); $ci_job_factory = $this->ciJobFactory->reveal(); $event_dispatcher = $this->eventDispatcher->reveal(); - return new CiRunCommand($ci_job_factory, $ci_run_options_factory, $event_dispatcher); + $env = $this->env->reveal(); + return new CiRunCommand($ci_job_factory, $ci_run_options_factory, $event_dispatcher, $env); } private function validSutName(): string { diff --git a/tests/Helper/Log/GoogleApiClientTest.php b/tests/Helper/Log/GoogleApiClientTest.php index e72298bbe..3ec297a87 100644 --- a/tests/Helper/Log/GoogleApiClientTest.php +++ b/tests/Helper/Log/GoogleApiClientTest.php @@ -79,6 +79,8 @@ public function testPostDataWithNullVersion(): void { 'sut' => 'drupal/example', 'status' => 'PASS', 'version' => NULL, + 'allowedToFail' => TRUE, + 'branch' => 'main', ]; $this->version ->resolvePredefined(Argument::any()) @@ -99,6 +101,8 @@ public function testPostDataWithLatestDrupalVersion(): void { 'sut' => 'drupal/example', 'status' => 'PASS', 'version' => DrupalCoreVersionEnum::CURRENT(), + 'allowedToFail' => TRUE, + 'branch' => 'main', ]; $this->version ->existsPredefined(Argument::any()) From 0ed10808adae2040ef572abda2d6a84dab95b2d1 Mon Sep 17 00:00:00 2001 From: Sayan Goswami Date: Tue, 28 Nov 2023 14:10:14 +0530 Subject: [PATCH 28/81] Remove acms (#454) --- config/packages.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/config/packages.yml b/config/packages.yml index 8360d25d2..c2aa9abcc 100644 --- a/config/packages.yml +++ b/config/packages.yml @@ -50,9 +50,10 @@ # config/services.yml for the relevant code or bin/self-test for a usage # example. -acquia/acquia_cms: - version: 2.x - version_dev: 2.x-dev +# ORCA-567 : ACMS was temporarily removed due to an outage. +#acquia/acquia_cms: +# version: 2.x +# version_dev: 2.x-dev drupal/acquia_connector: version: 4.x From dc6b078878fa147957bc5546e292213aa2e649ef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Nov 2023 15:02:16 +0000 Subject: [PATCH 29/81] Bump symfony/dependency-injection from 6.3.8 to 6.4.0 (#455) Bumps [symfony/dependency-injection](https://github.com/symfony/dependency-injection) from 6.3.8 to 6.4.0. - [Release notes](https://github.com/symfony/dependency-injection/releases) - [Changelog](https://github.com/symfony/dependency-injection/blob/7.0/CHANGELOG.md) - [Commits](https://github.com/symfony/dependency-injection/compare/v6.3.8...v6.4.0) --- updated-dependencies: - dependency-name: symfony/dependency-injection dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/composer.lock b/composer.lock index 9b5bb7792..2730d7dfa 100644 --- a/composer.lock +++ b/composer.lock @@ -3622,16 +3622,16 @@ }, { "name": "symfony/dependency-injection", - "version": "v6.3.8", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "1f30f545c4151f611148fc19e28d54d39e0a00bc" + "reference": "5dc8ad5f2bbba7046f5947682bf7d868ce80d4e8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/1f30f545c4151f611148fc19e28d54d39e0a00bc", - "reference": "1f30f545c4151f611148fc19e28d54d39e0a00bc", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/5dc8ad5f2bbba7046f5947682bf7d868ce80d4e8", + "reference": "5dc8ad5f2bbba7046f5947682bf7d868ce80d4e8", "shasum": "" }, "require": { @@ -3639,7 +3639,7 @@ "psr/container": "^1.1|^2.0", "symfony/deprecation-contracts": "^2.5|^3", "symfony/service-contracts": "^2.5|^3.0", - "symfony/var-exporter": "^6.2.10" + "symfony/var-exporter": "^6.2.10|^7.0" }, "conflict": { "ext-psr": "<1.1|>=2", @@ -3653,9 +3653,9 @@ "symfony/service-implementation": "1.1|2.0|3.0" }, "require-dev": { - "symfony/config": "^6.1", - "symfony/expression-language": "^5.4|^6.0", - "symfony/yaml": "^5.4|^6.0" + "symfony/config": "^6.1|^7.0", + "symfony/expression-language": "^5.4|^6.0|^7.0", + "symfony/yaml": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -3683,7 +3683,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v6.3.8" + "source": "https://github.com/symfony/dependency-injection/tree/v6.4.0" }, "funding": [ { @@ -3699,7 +3699,7 @@ "type": "tidelift" } ], - "time": "2023-10-31T08:07:48+00:00" + "time": "2023-10-31T08:40:20+00:00" }, { "name": "symfony/deprecation-contracts", @@ -5237,23 +5237,24 @@ }, { "name": "symfony/var-exporter", - "version": "v6.3.6", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "374d289c13cb989027274c86206ddc63b16a2441" + "reference": "d6081c0316f0f5921f2010d1766925005a82ea3b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/374d289c13cb989027274c86206ddc63b16a2441", - "reference": "374d289c13cb989027274c86206ddc63b16a2441", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/d6081c0316f0f5921f2010d1766925005a82ea3b", + "reference": "d6081c0316f0f5921f2010d1766925005a82ea3b", "shasum": "" }, "require": { - "php": ">=8.1" + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3" }, "require-dev": { - "symfony/var-dumper": "^5.4|^6.0" + "symfony/var-dumper": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -5291,7 +5292,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v6.3.6" + "source": "https://github.com/symfony/var-exporter/tree/v6.4.0" }, "funding": [ { @@ -5307,7 +5308,7 @@ "type": "tidelift" } ], - "time": "2023-10-13T09:16:49+00:00" + "time": "2023-11-28T20:41:49+00:00" }, { "name": "symfony/yaml", From f284c51cf589e6b7fd40567a6b91a33c24d09df2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 Nov 2023 14:22:12 +0000 Subject: [PATCH 30/81] Bump symfony/options-resolver from 6.3.0 to 6.4.0 (#458) Bumps [symfony/options-resolver](https://github.com/symfony/options-resolver) from 6.3.0 to 6.4.0. - [Release notes](https://github.com/symfony/options-resolver/releases) - [Changelog](https://github.com/symfony/options-resolver/blob/7.0/CHANGELOG.md) - [Commits](https://github.com/symfony/options-resolver/compare/v6.3.0...v6.4.0) --- updated-dependencies: - dependency-name: symfony/options-resolver dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 2730d7dfa..36c3730a2 100644 --- a/composer.lock +++ b/composer.lock @@ -4288,16 +4288,16 @@ }, { "name": "symfony/options-resolver", - "version": "v6.3.0", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "a10f19f5198d589d5c33333cffe98dc9820332dd" + "reference": "22301f0e7fdeaacc14318928612dee79be99860e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/a10f19f5198d589d5c33333cffe98dc9820332dd", - "reference": "a10f19f5198d589d5c33333cffe98dc9820332dd", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/22301f0e7fdeaacc14318928612dee79be99860e", + "reference": "22301f0e7fdeaacc14318928612dee79be99860e", "shasum": "" }, "require": { @@ -4335,7 +4335,7 @@ "options" ], "support": { - "source": "https://github.com/symfony/options-resolver/tree/v6.3.0" + "source": "https://github.com/symfony/options-resolver/tree/v6.4.0" }, "funding": [ { @@ -4351,7 +4351,7 @@ "type": "tidelift" } ], - "time": "2023-05-12T14:21:09+00:00" + "time": "2023-08-08T10:16:24+00:00" }, { "name": "symfony/phpunit-bridge", From f66c26eb2e1e8915b339d40a22add17c6ce1d7af Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Dec 2023 14:13:16 +0000 Subject: [PATCH 31/81] Bump symfony/yaml from 6.3.8 to 6.4.0 (#459) Bumps [symfony/yaml](https://github.com/symfony/yaml) from 6.3.8 to 6.4.0. - [Release notes](https://github.com/symfony/yaml/releases) - [Changelog](https://github.com/symfony/yaml/blob/7.0/CHANGELOG.md) - [Commits](https://github.com/symfony/yaml/compare/v6.3.8...v6.4.0) --- updated-dependencies: - dependency-name: symfony/yaml dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.lock b/composer.lock index 36c3730a2..e4c28ba11 100644 --- a/composer.lock +++ b/composer.lock @@ -5312,16 +5312,16 @@ }, { "name": "symfony/yaml", - "version": "v6.3.8", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "3493af8a8dad7fa91c77fa473ba23ecd95334a92" + "reference": "4f9237a1bb42455d609e6687d2613dde5b41a587" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/3493af8a8dad7fa91c77fa473ba23ecd95334a92", - "reference": "3493af8a8dad7fa91c77fa473ba23ecd95334a92", + "url": "https://api.github.com/repos/symfony/yaml/zipball/4f9237a1bb42455d609e6687d2613dde5b41a587", + "reference": "4f9237a1bb42455d609e6687d2613dde5b41a587", "shasum": "" }, "require": { @@ -5333,7 +5333,7 @@ "symfony/console": "<5.4" }, "require-dev": { - "symfony/console": "^5.4|^6.0" + "symfony/console": "^5.4|^6.0|^7.0" }, "bin": [ "Resources/bin/yaml-lint" @@ -5364,7 +5364,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v6.3.8" + "source": "https://github.com/symfony/yaml/tree/v6.4.0" }, "funding": [ { @@ -5380,7 +5380,7 @@ "type": "tidelift" } ], - "time": "2023-11-06T10:58:05+00:00" + "time": "2023-11-06T11:00:25+00:00" }, { "name": "webflo/drupal-finder", From 52ceadfcdb872a7753085c6c0b2102dd2ca6b90a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Dec 2023 14:46:31 +0000 Subject: [PATCH 32/81] Bump phpunit/phpunit from 9.6.13 to 9.6.15 (#460) Bumps [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) from 9.6.13 to 9.6.15. - [Changelog](https://github.com/sebastianbergmann/phpunit/blob/9.6.15/ChangeLog-9.6.md) - [Commits](https://github.com/sebastianbergmann/phpunit/compare/9.6.13...9.6.15) --- updated-dependencies: - dependency-name: phpunit/phpunit dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/composer.lock b/composer.lock index e4c28ba11..7c090ceab 100644 --- a/composer.lock +++ b/composer.lock @@ -6442,16 +6442,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.13", + "version": "9.6.15", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "f3d767f7f9e191eab4189abe41ab37797e30b1be" + "reference": "05017b80304e0eb3f31d90194a563fd53a6021f1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f3d767f7f9e191eab4189abe41ab37797e30b1be", - "reference": "f3d767f7f9e191eab4189abe41ab37797e30b1be", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/05017b80304e0eb3f31d90194a563fd53a6021f1", + "reference": "05017b80304e0eb3f31d90194a563fd53a6021f1", "shasum": "" }, "require": { @@ -6525,7 +6525,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.13" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.15" }, "funding": [ { @@ -6541,7 +6541,7 @@ "type": "tidelift" } ], - "time": "2023-09-19T05:39:22+00:00" + "time": "2023-12-01T16:55:19+00:00" }, { "name": "sebastian/code-unit", @@ -7400,16 +7400,16 @@ }, { "name": "theseer/tokenizer", - "version": "1.2.1", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e" + "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96", + "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96", "shasum": "" }, "require": { @@ -7438,7 +7438,7 @@ "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", "support": { "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/1.2.1" + "source": "https://github.com/theseer/tokenizer/tree/1.2.2" }, "funding": [ { @@ -7446,7 +7446,7 @@ "type": "github" } ], - "time": "2021-07-28T10:34:58+00:00" + "time": "2023-11-20T00:12:19+00:00" }, { "name": "webmozart/assert", From cb6ce1246a3457d704f58cb129cb10dcf6c6ab2b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Dec 2023 14:24:30 +0000 Subject: [PATCH 33/81] Bump symfony/expression-language from 6.3.0 to 6.4.0 (#461) Bumps [symfony/expression-language](https://github.com/symfony/expression-language) from 6.3.0 to 6.4.0. - [Release notes](https://github.com/symfony/expression-language/releases) - [Changelog](https://github.com/symfony/expression-language/blob/7.0/CHANGELOG.md) - [Commits](https://github.com/symfony/expression-language/compare/v6.3.0...v6.4.0) --- updated-dependencies: - dependency-name: symfony/expression-language dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 64 +++++++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/composer.lock b/composer.lock index 7c090ceab..2f9915f32 100644 --- a/composer.lock +++ b/composer.lock @@ -3276,16 +3276,16 @@ }, { "name": "symfony/cache", - "version": "v6.3.8", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "ba33517043c22c94c7ab04b056476f6f86816cf8" + "reference": "ac2d25f97b17eec6e19760b6b9962a4f7c44356a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/ba33517043c22c94c7ab04b056476f6f86816cf8", - "reference": "ba33517043c22c94c7ab04b056476f6f86816cf8", + "url": "https://api.github.com/repos/symfony/cache/zipball/ac2d25f97b17eec6e19760b6b9962a4f7c44356a", + "reference": "ac2d25f97b17eec6e19760b6b9962a4f7c44356a", "shasum": "" }, "require": { @@ -3294,7 +3294,7 @@ "psr/log": "^1.1|^2|^3", "symfony/cache-contracts": "^2.5|^3", "symfony/service-contracts": "^2.5|^3", - "symfony/var-exporter": "^6.3.6" + "symfony/var-exporter": "^6.3.6|^7.0" }, "conflict": { "doctrine/dbal": "<2.13.1", @@ -3312,12 +3312,12 @@ "doctrine/dbal": "^2.13.1|^3|^4", "predis/predis": "^1.1|^2.0", "psr/simple-cache": "^1.0|^2.0|^3.0", - "symfony/config": "^5.4|^6.0", - "symfony/dependency-injection": "^5.4|^6.0", - "symfony/filesystem": "^5.4|^6.0", - "symfony/http-kernel": "^5.4|^6.0", - "symfony/messenger": "^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/filesystem": "^5.4|^6.0|^7.0", + "symfony/http-kernel": "^5.4|^6.0|^7.0", + "symfony/messenger": "^5.4|^6.0|^7.0", + "symfony/var-dumper": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -3352,7 +3352,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v6.3.8" + "source": "https://github.com/symfony/cache/tree/v6.4.0" }, "funding": [ { @@ -3368,20 +3368,20 @@ "type": "tidelift" } ], - "time": "2023-11-07T10:17:15+00:00" + "time": "2023-11-24T19:28:07+00:00" }, { "name": "symfony/cache-contracts", - "version": "v3.3.0", + "version": "v3.4.0", "source": { "type": "git", "url": "https://github.com/symfony/cache-contracts.git", - "reference": "ad945640ccc0ae6e208bcea7d7de4b39b569896b" + "reference": "1d74b127da04ffa87aa940abe15446fa89653778" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/ad945640ccc0ae6e208bcea7d7de4b39b569896b", - "reference": "ad945640ccc0ae6e208bcea7d7de4b39b569896b", + "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/1d74b127da04ffa87aa940abe15446fa89653778", + "reference": "1d74b127da04ffa87aa940abe15446fa89653778", "shasum": "" }, "require": { @@ -3428,7 +3428,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/cache-contracts/tree/v3.3.0" + "source": "https://github.com/symfony/cache-contracts/tree/v3.4.0" }, "funding": [ { @@ -3444,7 +3444,7 @@ "type": "tidelift" } ], - "time": "2023-05-23T14:45:45+00:00" + "time": "2023-09-25T12:52:38+00:00" }, { "name": "symfony/config", @@ -3926,21 +3926,21 @@ }, { "name": "symfony/expression-language", - "version": "v6.3.0", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/symfony/expression-language.git", - "reference": "6d560c4c80e7e328708efd923f93ad67e6a0c1c0" + "reference": "6c8b12f1e5ee5d91b812fb8628fca86e2fe5d152" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/expression-language/zipball/6d560c4c80e7e328708efd923f93ad67e6a0c1c0", - "reference": "6d560c4c80e7e328708efd923f93ad67e6a0c1c0", + "url": "https://api.github.com/repos/symfony/expression-language/zipball/6c8b12f1e5ee5d91b812fb8628fca86e2fe5d152", + "reference": "6c8b12f1e5ee5d91b812fb8628fca86e2fe5d152", "shasum": "" }, "require": { "php": ">=8.1", - "symfony/cache": "^5.4|^6.0", + "symfony/cache": "^5.4|^6.0|^7.0", "symfony/deprecation-contracts": "^2.5|^3", "symfony/service-contracts": "^2.5|^3" }, @@ -3970,7 +3970,7 @@ "description": "Provides an engine that can compile and evaluate expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/expression-language/tree/v6.3.0" + "source": "https://github.com/symfony/expression-language/tree/v6.4.0" }, "funding": [ { @@ -3986,7 +3986,7 @@ "type": "tidelift" } ], - "time": "2023-04-28T16:05:33+00:00" + "time": "2023-07-27T06:52:43+00:00" }, { "name": "symfony/filesystem", @@ -5237,16 +5237,16 @@ }, { "name": "symfony/var-exporter", - "version": "v6.4.0", + "version": "v6.4.1", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "d6081c0316f0f5921f2010d1766925005a82ea3b" + "reference": "2d08ca6b9cc704dce525615d1e6d1788734f36d9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/d6081c0316f0f5921f2010d1766925005a82ea3b", - "reference": "d6081c0316f0f5921f2010d1766925005a82ea3b", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/2d08ca6b9cc704dce525615d1e6d1788734f36d9", + "reference": "2d08ca6b9cc704dce525615d1e6d1788734f36d9", "shasum": "" }, "require": { @@ -5292,7 +5292,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v6.4.0" + "source": "https://github.com/symfony/var-exporter/tree/v6.4.1" }, "funding": [ { @@ -5308,7 +5308,7 @@ "type": "tidelift" } ], - "time": "2023-11-28T20:41:49+00:00" + "time": "2023-11-30T10:32:10+00:00" }, { "name": "symfony/yaml", From e50d9e393ec6df2900b7438fc9a726e4bf584535 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Dec 2023 14:17:44 +0000 Subject: [PATCH 34/81] Bump symfony/dependency-injection from 6.4.0 to 6.4.1 (#464) Bumps [symfony/dependency-injection](https://github.com/symfony/dependency-injection) from 6.4.0 to 6.4.1. - [Release notes](https://github.com/symfony/dependency-injection/releases) - [Changelog](https://github.com/symfony/dependency-injection/blob/7.0/CHANGELOG.md) - [Commits](https://github.com/symfony/dependency-injection/compare/v6.4.0...v6.4.1) --- updated-dependencies: - dependency-name: symfony/dependency-injection dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 2f9915f32..65d223d33 100644 --- a/composer.lock +++ b/composer.lock @@ -3622,16 +3622,16 @@ }, { "name": "symfony/dependency-injection", - "version": "v6.4.0", + "version": "v6.4.1", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "5dc8ad5f2bbba7046f5947682bf7d868ce80d4e8" + "reference": "f88ff6428afbeb17cc648c8003bd608534750baf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/5dc8ad5f2bbba7046f5947682bf7d868ce80d4e8", - "reference": "5dc8ad5f2bbba7046f5947682bf7d868ce80d4e8", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/f88ff6428afbeb17cc648c8003bd608534750baf", + "reference": "f88ff6428afbeb17cc648c8003bd608534750baf", "shasum": "" }, "require": { @@ -3683,7 +3683,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v6.4.0" + "source": "https://github.com/symfony/dependency-injection/tree/v6.4.1" }, "funding": [ { @@ -3699,7 +3699,7 @@ "type": "tidelift" } ], - "time": "2023-10-31T08:40:20+00:00" + "time": "2023-12-01T14:56:37+00:00" }, { "name": "symfony/deprecation-contracts", From d0594c1acbbedd01512d8a808b3eccafeacca253 Mon Sep 17 00:00:00 2001 From: Sayan Goswami Date: Thu, 7 Dec 2023 12:19:07 +0530 Subject: [PATCH 35/81] Alpine compatibility 4.x (#462) * chrome driver fix * test * test 2 * test 3 * test 4 * test 5 * test 6 * test 6 * test 8 * test 8 * test 9 * alpine support --- bin/ci/before_install.sh | 80 +++++++++++++++++++++++----------------- 1 file changed, 46 insertions(+), 34 deletions(-) diff --git a/bin/ci/before_install.sh b/bin/ci/before_install.sh index deb22921d..4d2544be9 100755 --- a/bin/ci/before_install.sh +++ b/bin/ci/before_install.sh @@ -15,7 +15,7 @@ cd "$(dirname "$0")" || exit; source _includes.sh [[ "$CI" ]] || exit 0 # Display the Google Chrome version. -google-chrome-stable --version +#google-chrome-stable --version # Display the Yarn version. yarn --version @@ -35,42 +35,54 @@ if [[ ! "$ORCA_COVERAGE_ENABLE" == TRUE ]]; then fi if [[ "$JENKINS_HOME" ]]; then - # Install ChromeDriver. - # @see https://chromedriver.chromium.org/downloads/version-selection - # @see https://groups.google.com/g/chromedriver-users/c/clpipqvOGjE/m/5NxzS_SRAgAJ - # Get Google Chrome version. - CHROMEDRIVER="$( google-chrome-stable --version)" - echo "$CHROMEDRIVER" - CHROMEDRIVER_VERSION="$(echo "$CHROMEDRIVER" | awk '{print $3}')" - echo "CHROMEDRIVER_VERSION=$CHROMEDRIVER_VERSION" - # Cut off last part from google chrome version. - CHROMEDRIVER_VERSION_FAMILY="$(echo "$CHROMEDRIVER_VERSION" | awk -F'.' '{print $1,$2,$3}' OFS='.' )" - MAJOR="$(echo "$CHROMEDRIVER_VERSION_FAMILY" | awk -F'.' '{print $1}' )" - if (( $MAJOR < 115 )) - then - echo "VERSION_FAMILY=$CHROMEDRIVER_VERSION_FAMILY" - # check latest_release - VERSION=$(curl -f --silent https://chromedriver.storage.googleapis.com/LATEST_RELEASE_${CHROMEDRIVER_VERSION_FAMILY}) - echo "FINAL_VERSION=$VERSION" - # Download driver - wget -N https://chromedriver.storage.googleapis.com/${VERSION}/chromedriver_linux64.zip -P ~/ - unzip ~/chromedriver_linux64.zip -d ~/ - rm ~/chromedriver_linux64.zip - mv -f ~/chromedriver /usr/local/share/ - chmod +x /usr/local/share/chromedriver - ln -s /usr/local/share/chromedriver /usr/local/bin/chromedriver - else - # Download driver - wget -N https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/${CHROMEDRIVER_VERSION}/linux64/chromedriver-linux64.zip -P ~/ - unzip ~/chromedriver-linux64.zip -d ~/ - rm ~/chromedriver-linux64.zip - mv -f ~/chromedriver-linux64/chromedriver /usr/local/share/ - chmod +x /usr/local/share/chromedriver - ln -s /usr/local/share/chromedriver /usr/local/bin/chromedriver - fi + LINUX_VERSION_STRING="$( cat /etc/os-release )" + echo "$LINUX_VERSION_STRING" + if echo "$LINUX_VERSION_STRING" | grep -q "alpine" + then + echo "This is Alpine Linux, ChromeDriver installation not required." + else + echo "Installing chromedriver." + # Install ChromeDriver. + # @see https://chromedriver.chromium.org/downloads/version-selection + # @see https://groups.google.com/g/chromedriver-users/c/clpipqvOGjE/m/5NxzS_SRAgAJ + # Get Google Chrome version. + CHROMEDRIVER="$( google-chrome-stable --version)" + echo "$CHROMEDRIVER" + CHROMEDRIVER_VERSION="$(echo "$CHROMEDRIVER" | awk '{print $3}')" + echo "CHROMEDRIVER_VERSION=$CHROMEDRIVER_VERSION" + # Cut off last part from google chrome version. + CHROMEDRIVER_VERSION_FAMILY="$(echo "$CHROMEDRIVER_VERSION" | awk -F'.' '{print $1,$2,$3}' OFS='.' )" + MAJOR="$(echo "$CHROMEDRIVER_VERSION_FAMILY" | awk -F'.' '{print $1}' )" + if (( $MAJOR < 115 )) + then + echo "VERSION_FAMILY=$CHROMEDRIVER_VERSION_FAMILY" + # check latest_release + VERSION=$(curl -f --silent https://chromedriver.storage.googleapis.com/LATEST_RELEASE_${CHROMEDRIVER_VERSION_FAMILY}) + echo "FINAL_VERSION=$VERSION" + # Download driver + wget -N https://chromedriver.storage.googleapis.com/${VERSION}/chromedriver_linux64.zip -P ~/ + unzip ~/chromedriver_linux64.zip -d ~/ + rm ~/chromedriver_linux64.zip + mv -f ~/chromedriver /usr/local/share/ + chmod +x /usr/local/share/chromedriver + ln -s /usr/local/share/chromedriver /usr/local/bin/chromedriver + else + # Download driver + wget -N https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/${CHROMEDRIVER_VERSION}/linux64/chromedriver-linux64.zip -P ~/ + unzip ~/chromedriver-linux64.zip -d ~/ + rm ~/chromedriver-linux64.zip + mv -f ~/chromedriver-linux64/chromedriver /usr/local/share/ + chmod +x /usr/local/share/chromedriver + ln -s /usr/local/share/chromedriver /usr/local/bin/chromedriver + fi + fi fi + + + + # Display PHP information. which php php -i From 5d7ab3dd2537be885763b54d1e1903565cd1ce15 Mon Sep 17 00:00:00 2001 From: sayan goswami Date: Thu, 7 Dec 2023 13:29:32 +0530 Subject: [PATCH 36/81] updated version --- config/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/VERSION b/config/VERSION index 98bde4e49..0ad170fbe 100644 --- a/config/VERSION +++ b/config/VERSION @@ -1 +1 @@ -v4.6.0-dev +v4.7.0-dev From af720dda00c0dc63a656b7c69140d99a29f061aa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Dec 2023 14:20:15 +0000 Subject: [PATCH 37/81] Bump symfony/event-dispatcher from 6.3.2 to 6.4.0 (#465) Bumps [symfony/event-dispatcher](https://github.com/symfony/event-dispatcher) from 6.3.2 to 6.4.0. - [Release notes](https://github.com/symfony/event-dispatcher/releases) - [Changelog](https://github.com/symfony/event-dispatcher/blob/7.0/CHANGELOG.md) - [Commits](https://github.com/symfony/event-dispatcher/compare/v6.3.2...v6.4.0) --- updated-dependencies: - dependency-name: symfony/event-dispatcher dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/composer.lock b/composer.lock index 65d223d33..f51aa99bf 100644 --- a/composer.lock +++ b/composer.lock @@ -3770,16 +3770,16 @@ }, { "name": "symfony/event-dispatcher", - "version": "v6.3.2", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "adb01fe097a4ee930db9258a3cc906b5beb5cf2e" + "reference": "d76d2632cfc2206eecb5ad2b26cd5934082941b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/adb01fe097a4ee930db9258a3cc906b5beb5cf2e", - "reference": "adb01fe097a4ee930db9258a3cc906b5beb5cf2e", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d76d2632cfc2206eecb5ad2b26cd5934082941b6", + "reference": "d76d2632cfc2206eecb5ad2b26cd5934082941b6", "shasum": "" }, "require": { @@ -3796,13 +3796,13 @@ }, "require-dev": { "psr/log": "^1|^2|^3", - "symfony/config": "^5.4|^6.0", - "symfony/dependency-injection": "^5.4|^6.0", - "symfony/error-handler": "^5.4|^6.0", - "symfony/expression-language": "^5.4|^6.0", - "symfony/http-foundation": "^5.4|^6.0", + "symfony/config": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/error-handler": "^5.4|^6.0|^7.0", + "symfony/expression-language": "^5.4|^6.0|^7.0", + "symfony/http-foundation": "^5.4|^6.0|^7.0", "symfony/service-contracts": "^2.5|^3", - "symfony/stopwatch": "^5.4|^6.0" + "symfony/stopwatch": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -3830,7 +3830,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v6.3.2" + "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.0" }, "funding": [ { @@ -3846,7 +3846,7 @@ "type": "tidelift" } ], - "time": "2023-07-06T06:56:43+00:00" + "time": "2023-07-27T06:52:43+00:00" }, { "name": "symfony/event-dispatcher-contracts", From 15f3e9387d0f35cd31eb37dedbf0f6f90f18ab66 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Dec 2023 15:03:05 +0000 Subject: [PATCH 38/81] Bump symfony/console from 5.4.31 to 5.4.32 (#466) Bumps [symfony/console](https://github.com/symfony/console) from 5.4.31 to 5.4.32. - [Release notes](https://github.com/symfony/console/releases) - [Changelog](https://github.com/symfony/console/blob/7.0/CHANGELOG.md) - [Commits](https://github.com/symfony/console/compare/v5.4.31...v5.4.32) --- updated-dependencies: - dependency-name: symfony/console dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/composer.lock b/composer.lock index f51aa99bf..987ccb16e 100644 --- a/composer.lock +++ b/composer.lock @@ -3523,16 +3523,16 @@ }, { "name": "symfony/console", - "version": "v5.4.31", + "version": "v5.4.32", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "11ac5f154e0e5c4c77af83ad11ead9165280b92a" + "reference": "c70df1ffaf23a8d340bded3cfab1b86752ad6ed7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/11ac5f154e0e5c4c77af83ad11ead9165280b92a", - "reference": "11ac5f154e0e5c4c77af83ad11ead9165280b92a", + "url": "https://api.github.com/repos/symfony/console/zipball/c70df1ffaf23a8d340bded3cfab1b86752ad6ed7", + "reference": "c70df1ffaf23a8d340bded3cfab1b86752ad6ed7", "shasum": "" }, "require": { @@ -3602,7 +3602,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.31" + "source": "https://github.com/symfony/console/tree/v5.4.32" }, "funding": [ { @@ -3618,7 +3618,7 @@ "type": "tidelift" } ], - "time": "2023-10-31T07:58:33+00:00" + "time": "2023-11-18T18:23:04+00:00" }, { "name": "symfony/dependency-injection", @@ -5151,16 +5151,16 @@ }, { "name": "symfony/string", - "version": "v6.3.8", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "13880a87790c76ef994c91e87efb96134522577a" + "reference": "b45fcf399ea9c3af543a92edf7172ba21174d809" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/13880a87790c76ef994c91e87efb96134522577a", - "reference": "13880a87790c76ef994c91e87efb96134522577a", + "url": "https://api.github.com/repos/symfony/string/zipball/b45fcf399ea9c3af543a92edf7172ba21174d809", + "reference": "b45fcf399ea9c3af543a92edf7172ba21174d809", "shasum": "" }, "require": { @@ -5174,11 +5174,11 @@ "symfony/translation-contracts": "<2.5" }, "require-dev": { - "symfony/error-handler": "^5.4|^6.0", - "symfony/http-client": "^5.4|^6.0", - "symfony/intl": "^6.2", + "symfony/error-handler": "^5.4|^6.0|^7.0", + "symfony/http-client": "^5.4|^6.0|^7.0", + "symfony/intl": "^6.2|^7.0", "symfony/translation-contracts": "^2.5|^3.0", - "symfony/var-exporter": "^5.4|^6.0" + "symfony/var-exporter": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -5217,7 +5217,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.3.8" + "source": "https://github.com/symfony/string/tree/v6.4.0" }, "funding": [ { @@ -5233,7 +5233,7 @@ "type": "tidelift" } ], - "time": "2023-11-09T08:28:21+00:00" + "time": "2023-11-28T20:41:49+00:00" }, { "name": "symfony/var-exporter", From d6357b0ed8b43f069f7008923e78baf5a199df27 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 8 Dec 2023 14:36:28 +0000 Subject: [PATCH 39/81] Bump phpspec/prophecy-phpunit from 2.0.2 to 2.1.0 (#467) Bumps [phpspec/prophecy-phpunit](https://github.com/phpspec/prophecy-phpunit) from 2.0.2 to 2.1.0. - [Release notes](https://github.com/phpspec/prophecy-phpunit/releases) - [Changelog](https://github.com/phpspec/prophecy-phpunit/blob/master/CHANGES.md) - [Commits](https://github.com/phpspec/prophecy-phpunit/compare/v2.0.2...v2.1.0) --- updated-dependencies: - dependency-name: phpspec/prophecy-phpunit dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 71 +++++++++++++++++++++++++++------------------------ 1 file changed, 38 insertions(+), 33 deletions(-) diff --git a/composer.lock b/composer.lock index 987ccb16e..dbf0b9f23 100644 --- a/composer.lock +++ b/composer.lock @@ -5556,25 +5556,29 @@ }, { "name": "doctrine/deprecations", - "version": "v1.1.0", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/doctrine/deprecations.git", - "reference": "8cffffb2218e01f3b370bf763e00e81697725259" + "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/deprecations/zipball/8cffffb2218e01f3b370bf763e00e81697725259", - "reference": "8cffffb2218e01f3b370bf763e00e81697725259", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/4f2d4f2836e7ec4e7a8625e75c6aa916004db931", + "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931", "shasum": "" }, "require": { - "php": "^7.1|^8.0" + "php": "^7.1 || ^8.0" }, "require-dev": { "doctrine/coding-standard": "^9", - "phpunit/phpunit": "^7.5|^8.5|^9.5", - "psr/log": "^1|^2|^3" + "phpstan/phpstan": "1.4.10 || 1.10.15", + "phpstan/phpstan-phpunit": "^1.0", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "psalm/plugin-phpunit": "0.18.4", + "psr/log": "^1 || ^2 || ^3", + "vimeo/psalm": "4.30.0 || 5.12.0" }, "suggest": { "psr/log": "Allows logging deprecations via PSR-3 logger implementation" @@ -5593,9 +5597,9 @@ "homepage": "https://www.doctrine-project.org/", "support": { "issues": "https://github.com/doctrine/deprecations/issues", - "source": "https://github.com/doctrine/deprecations/tree/v1.1.0" + "source": "https://github.com/doctrine/deprecations/tree/1.1.2" }, - "time": "2023-05-29T18:55:17+00:00" + "time": "2023-09-27T20:04:15+00:00" }, { "name": "doctrine/instantiator", @@ -6005,16 +6009,16 @@ }, { "name": "phpdocumentor/type-resolver", - "version": "1.7.1", + "version": "1.7.3", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "dfc078e8af9c99210337325ff5aa152872c98714" + "reference": "3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/dfc078e8af9c99210337325ff5aa152872c98714", - "reference": "dfc078e8af9c99210337325ff5aa152872c98714", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419", + "reference": "3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419", "shasum": "" }, "require": { @@ -6057,35 +6061,35 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.7.1" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.7.3" }, - "time": "2023-03-27T19:02:04+00:00" + "time": "2023-08-12T11:01:26+00:00" }, { "name": "phpspec/prophecy", - "version": "v1.17.0", + "version": "v1.18.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "15873c65b207b07765dbc3c95d20fdf4a320cbe2" + "reference": "d4f454f7e1193933f04e6500de3e79191648ed0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/15873c65b207b07765dbc3c95d20fdf4a320cbe2", - "reference": "15873c65b207b07765dbc3c95d20fdf4a320cbe2", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/d4f454f7e1193933f04e6500de3e79191648ed0c", + "reference": "d4f454f7e1193933f04e6500de3e79191648ed0c", "shasum": "" }, "require": { "doctrine/instantiator": "^1.2 || ^2.0", - "php": "^7.2 || 8.0.* || 8.1.* || 8.2.*", + "php": "^7.2 || 8.0.* || 8.1.* || 8.2.* || 8.3.*", "phpdocumentor/reflection-docblock": "^5.2", - "sebastian/comparator": "^3.0 || ^4.0", - "sebastian/recursion-context": "^3.0 || ^4.0" + "sebastian/comparator": "^3.0 || ^4.0 || ^5.0", + "sebastian/recursion-context": "^3.0 || ^4.0 || ^5.0" }, "require-dev": { "phpspec/phpspec": "^6.0 || ^7.0", "phpstan/phpstan": "^1.9", - "phpunit/phpunit": "^8.0 || ^9.0" + "phpunit/phpunit": "^8.0 || ^9.0 || ^10.0" }, "type": "library", "extra": { @@ -6118,6 +6122,7 @@ "keywords": [ "Double", "Dummy", + "dev", "fake", "mock", "spy", @@ -6125,28 +6130,28 @@ ], "support": { "issues": "https://github.com/phpspec/prophecy/issues", - "source": "https://github.com/phpspec/prophecy/tree/v1.17.0" + "source": "https://github.com/phpspec/prophecy/tree/v1.18.0" }, - "time": "2023-02-02T15:41:36+00:00" + "time": "2023-12-07T16:22:33+00:00" }, { "name": "phpspec/prophecy-phpunit", - "version": "v2.0.2", + "version": "v2.1.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy-phpunit.git", - "reference": "9f26c224a2fa335f33e6666cc078fbf388255e87" + "reference": "29f8114c2c319a4308e6b070902211e062efa392" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy-phpunit/zipball/9f26c224a2fa335f33e6666cc078fbf388255e87", - "reference": "9f26c224a2fa335f33e6666cc078fbf388255e87", + "url": "https://api.github.com/repos/phpspec/prophecy-phpunit/zipball/29f8114c2c319a4308e6b070902211e062efa392", + "reference": "29f8114c2c319a4308e6b070902211e062efa392", "shasum": "" }, "require": { "php": "^7.3 || ^8", - "phpspec/prophecy": "^1.3", - "phpunit/phpunit": "^9.1" + "phpspec/prophecy": "^1.18", + "phpunit/phpunit": "^9.1 || ^10.1" }, "type": "library", "extra": { @@ -6177,9 +6182,9 @@ ], "support": { "issues": "https://github.com/phpspec/prophecy-phpunit/issues", - "source": "https://github.com/phpspec/prophecy-phpunit/tree/v2.0.2" + "source": "https://github.com/phpspec/prophecy-phpunit/tree/v2.1.0" }, - "time": "2023-04-18T11:58:05+00:00" + "time": "2023-12-08T12:48:02+00:00" }, { "name": "phpunit/php-code-coverage", From 65d3e0e3c883fc294ea25f08dd6910ed66f532d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Dec 2023 14:19:34 +0000 Subject: [PATCH 40/81] Bump phpmd/phpmd from 2.14.1 to 2.15.0 (#468) Bumps [phpmd/phpmd](https://github.com/phpmd/phpmd) from 2.14.1 to 2.15.0. - [Release notes](https://github.com/phpmd/phpmd/releases) - [Changelog](https://github.com/phpmd/phpmd/blob/master/CHANGELOG) - [Commits](https://github.com/phpmd/phpmd/compare/2.14.1...2.15.0) --- updated-dependencies: - dependency-name: phpmd/phpmd dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 57 +++++++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 29 deletions(-) diff --git a/composer.lock b/composer.lock index dbf0b9f23..94c871504 100644 --- a/composer.lock +++ b/composer.lock @@ -1895,28 +1895,28 @@ }, { "name": "pdepend/pdepend", - "version": "2.15.1", + "version": "2.16.1", "source": { "type": "git", "url": "https://github.com/pdepend/pdepend.git", - "reference": "d12f25bcdfb7754bea458a4a5cb159d55e9950d0" + "reference": "66ceb05eaa8bf358574143c974b04463911bc700" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pdepend/pdepend/zipball/d12f25bcdfb7754bea458a4a5cb159d55e9950d0", - "reference": "d12f25bcdfb7754bea458a4a5cb159d55e9950d0", + "url": "https://api.github.com/repos/pdepend/pdepend/zipball/66ceb05eaa8bf358574143c974b04463911bc700", + "reference": "66ceb05eaa8bf358574143c974b04463911bc700", "shasum": "" }, "require": { "php": ">=5.3.7", - "symfony/config": "^2.3.0|^3|^4|^5|^6.0", - "symfony/dependency-injection": "^2.3.0|^3|^4|^5|^6.0", - "symfony/filesystem": "^2.3.0|^3|^4|^5|^6.0" + "symfony/config": "^2.3.0|^3|^4|^5|^6.0|^7.0", + "symfony/dependency-injection": "^2.3.0|^3|^4|^5|^6.0|^7.0", + "symfony/filesystem": "^2.3.0|^3|^4|^5|^6.0|^7.0", + "symfony/polyfill-mbstring": "^1.19" }, "require-dev": { "easy-doc/easy-doc": "0.0.0|^1.2.3", "gregwar/rst": "^1.0", - "phpunit/phpunit": "^4.8.36|^5.7.27", "squizlabs/php_codesniffer": "^2.0.0" }, "bin": [ @@ -1946,7 +1946,7 @@ ], "support": { "issues": "https://github.com/pdepend/pdepend/issues", - "source": "https://github.com/pdepend/pdepend/tree/2.15.1" + "source": "https://github.com/pdepend/pdepend/tree/2.16.1" }, "funding": [ { @@ -1954,7 +1954,7 @@ "type": "tidelift" } ], - "time": "2023-09-28T12:00:56+00:00" + "time": "2023-12-10T18:38:19+00:00" }, { "name": "php-parallel-lint/php-console-color", @@ -2240,22 +2240,22 @@ }, { "name": "phpmd/phpmd", - "version": "2.14.1", + "version": "2.15.0", "source": { "type": "git", "url": "https://github.com/phpmd/phpmd.git", - "reference": "442fc2c34edcd5198b442d8647c7f0aec3afabe8" + "reference": "74a1f56e33afad4128b886e334093e98e1b5e7c0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpmd/phpmd/zipball/442fc2c34edcd5198b442d8647c7f0aec3afabe8", - "reference": "442fc2c34edcd5198b442d8647c7f0aec3afabe8", + "url": "https://api.github.com/repos/phpmd/phpmd/zipball/74a1f56e33afad4128b886e334093e98e1b5e7c0", + "reference": "74a1f56e33afad4128b886e334093e98e1b5e7c0", "shasum": "" }, "require": { "composer/xdebug-handler": "^1.0 || ^2.0 || ^3.0", "ext-xml": "*", - "pdepend/pdepend": "^2.15.1", + "pdepend/pdepend": "^2.16.1", "php": ">=5.3.9" }, "require-dev": { @@ -2264,7 +2264,6 @@ "ext-simplexml": "*", "gregwar/rst": "^1.0", "mikey179/vfsstream": "^1.6.8", - "phpunit/phpunit": "^4.8.36 || ^5.7.27", "squizlabs/php_codesniffer": "^2.9.2 || ^3.7.2" }, "bin": [ @@ -2312,7 +2311,7 @@ "support": { "irc": "irc://irc.freenode.org/phpmd", "issues": "https://github.com/phpmd/phpmd/issues", - "source": "https://github.com/phpmd/phpmd/tree/2.14.1" + "source": "https://github.com/phpmd/phpmd/tree/2.15.0" }, "funding": [ { @@ -2320,7 +2319,7 @@ "type": "tidelift" } ], - "time": "2023-09-28T13:07:44+00:00" + "time": "2023-12-11T08:22:20+00:00" }, { "name": "phpstan/phpdoc-parser", @@ -3448,22 +3447,22 @@ }, { "name": "symfony/config", - "version": "v6.3.8", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "b7a63887960359e5b59b15826fa9f9be10acbe88" + "reference": "5d33e0fb707d603330e0edfd4691803a1253572e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/b7a63887960359e5b59b15826fa9f9be10acbe88", - "reference": "b7a63887960359e5b59b15826fa9f9be10acbe88", + "url": "https://api.github.com/repos/symfony/config/zipball/5d33e0fb707d603330e0edfd4691803a1253572e", + "reference": "5d33e0fb707d603330e0edfd4691803a1253572e", "shasum": "" }, "require": { "php": ">=8.1", "symfony/deprecation-contracts": "^2.5|^3", - "symfony/filesystem": "^5.4|^6.0", + "symfony/filesystem": "^5.4|^6.0|^7.0", "symfony/polyfill-ctype": "~1.8" }, "conflict": { @@ -3471,11 +3470,11 @@ "symfony/service-contracts": "<2.5" }, "require-dev": { - "symfony/event-dispatcher": "^5.4|^6.0", - "symfony/finder": "^5.4|^6.0", - "symfony/messenger": "^5.4|^6.0", + "symfony/event-dispatcher": "^5.4|^6.0|^7.0", + "symfony/finder": "^5.4|^6.0|^7.0", + "symfony/messenger": "^5.4|^6.0|^7.0", "symfony/service-contracts": "^2.5|^3", - "symfony/yaml": "^5.4|^6.0" + "symfony/yaml": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -3503,7 +3502,7 @@ "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/config/tree/v6.3.8" + "source": "https://github.com/symfony/config/tree/v6.4.0" }, "funding": [ { @@ -3519,7 +3518,7 @@ "type": "tidelift" } ], - "time": "2023-11-09T08:28:21+00:00" + "time": "2023-11-09T08:28:32+00:00" }, { "name": "symfony/console", From 94f2b5b5b7c7d8fa9f4f5cafe85dc9cf02d6ab6b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Dec 2023 14:44:08 +0000 Subject: [PATCH 41/81] Bump composer/composer from 2.6.5 to 2.6.6 (#469) Bumps [composer/composer](https://github.com/composer/composer) from 2.6.5 to 2.6.6. - [Release notes](https://github.com/composer/composer/releases) - [Changelog](https://github.com/composer/composer/blob/main/CHANGELOG.md) - [Commits](https://github.com/composer/composer/compare/2.6.5...2.6.6) --- updated-dependencies: - dependency-name: composer/composer dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/composer.lock b/composer.lock index 94c871504..d64642c5a 100644 --- a/composer.lock +++ b/composer.lock @@ -216,16 +216,16 @@ }, { "name": "composer/composer", - "version": "2.6.5", + "version": "2.6.6", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "4b0fe89db9e65b1e64df633a992e70a7a215ab33" + "reference": "683557bd2466072777309d039534bb1332d0dda5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/4b0fe89db9e65b1e64df633a992e70a7a215ab33", - "reference": "4b0fe89db9e65b1e64df633a992e70a7a215ab33", + "url": "https://api.github.com/repos/composer/composer/zipball/683557bd2466072777309d039534bb1332d0dda5", + "reference": "683557bd2466072777309d039534bb1332d0dda5", "shasum": "" }, "require": { @@ -243,7 +243,7 @@ "seld/jsonlint": "^1.4", "seld/phar-utils": "^1.2", "seld/signal-handler": "^2.0", - "symfony/console": "^5.4.11 || ^6.0.11 || ^7", + "symfony/console": "^5.4.11 || ^6.0.11", "symfony/filesystem": "^5.4 || ^6.0 || ^7", "symfony/finder": "^5.4 || ^6.0 || ^7", "symfony/polyfill-php73": "^1.24", @@ -310,7 +310,7 @@ "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/composer/issues", "security": "https://github.com/composer/composer/security/policy", - "source": "https://github.com/composer/composer/tree/2.6.5" + "source": "https://github.com/composer/composer/tree/2.6.6" }, "funding": [ { @@ -326,7 +326,7 @@ "type": "tidelift" } ], - "time": "2023-10-06T08:11:52+00:00" + "time": "2023-12-08T17:32:26+00:00" }, { "name": "composer/metadata-minifier", @@ -4053,23 +4053,23 @@ }, { "name": "symfony/finder", - "version": "v6.3.5", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "a1b31d88c0e998168ca7792f222cbecee47428c4" + "reference": "11d736e97f116ac375a81f96e662911a34cd50ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/a1b31d88c0e998168ca7792f222cbecee47428c4", - "reference": "a1b31d88c0e998168ca7792f222cbecee47428c4", + "url": "https://api.github.com/repos/symfony/finder/zipball/11d736e97f116ac375a81f96e662911a34cd50ce", + "reference": "11d736e97f116ac375a81f96e662911a34cd50ce", "shasum": "" }, "require": { "php": ">=8.1" }, "require-dev": { - "symfony/filesystem": "^6.0" + "symfony/filesystem": "^6.0|^7.0" }, "type": "library", "autoload": { @@ -4097,7 +4097,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v6.3.5" + "source": "https://github.com/symfony/finder/tree/v6.4.0" }, "funding": [ { @@ -4113,7 +4113,7 @@ "type": "tidelift" } ], - "time": "2023-09-26T12:56:25+00:00" + "time": "2023-10-31T17:30:12+00:00" }, { "name": "symfony/http-client", From b1b9dbfe26470e1f65f9f2996940c5df3e98cbaa Mon Sep 17 00:00:00 2001 From: Sayan Goswami Date: Wed, 13 Dec 2023 00:04:56 +0530 Subject: [PATCH 42/81] Add Contenthub back (#470) --- config/packages.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/config/packages.yml b/config/packages.yml index c36923ef6..290ace9c3 100644 --- a/config/packages.yml +++ b/config/packages.yml @@ -59,15 +59,9 @@ drupal/acquia_connector: version: 4.x version_dev: 4.x-dev -# ORCA-629: Contenthub was temporarily removed on 06/11/2023 due to an outage. -# drupal/acquia_contenthub: -# core_matrix: -# 10.1.x: -# version: ~ -# version_dev: ~ -# '*': -# version: 3.0.x -# version_dev: 3.0.x-dev +drupal/acquia_contenthub: + version: 3.3.x + version_dev: 3.3.x drupal/acquia_perz: version: 4.x From ba96da6c65124752842c717211e10d6dd8fe6c72 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Dec 2023 14:43:39 +0000 Subject: [PATCH 43/81] Bump symfony/http-client from 6.3.8 to 6.4.0 (#471) Bumps [symfony/http-client](https://github.com/symfony/http-client) from 6.3.8 to 6.4.0. - [Release notes](https://github.com/symfony/http-client/releases) - [Changelog](https://github.com/symfony/http-client/blob/7.0/CHANGELOG.md) - [Commits](https://github.com/symfony/http-client/compare/v6.3.8...v6.4.0) --- updated-dependencies: - dependency-name: symfony/http-client dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/composer.lock b/composer.lock index d64642c5a..17f06215a 100644 --- a/composer.lock +++ b/composer.lock @@ -4117,16 +4117,16 @@ }, { "name": "symfony/http-client", - "version": "v6.3.8", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/symfony/http-client.git", - "reference": "0314e2d49939a9831929d6fc81c01c6df137fd0a" + "reference": "5c584530b77aa10ae216989ffc48b4bedc9c0b29" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/0314e2d49939a9831929d6fc81c01c6df137fd0a", - "reference": "0314e2d49939a9831929d6fc81c01c6df137fd0a", + "url": "https://api.github.com/repos/symfony/http-client/zipball/5c584530b77aa10ae216989ffc48b4bedc9c0b29", + "reference": "5c584530b77aa10ae216989ffc48b4bedc9c0b29", "shasum": "" }, "require": { @@ -4155,10 +4155,11 @@ "nyholm/psr7": "^1.0", "php-http/httplug": "^1.0|^2.0", "psr/http-client": "^1.0", - "symfony/dependency-injection": "^5.4|^6.0", - "symfony/http-kernel": "^5.4|^6.0", - "symfony/process": "^5.4|^6.0", - "symfony/stopwatch": "^5.4|^6.0" + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/http-kernel": "^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" }, "type": "library", "autoload": { @@ -4189,7 +4190,7 @@ "http" ], "support": { - "source": "https://github.com/symfony/http-client/tree/v6.3.8" + "source": "https://github.com/symfony/http-client/tree/v6.4.0" }, "funding": [ { @@ -4205,20 +4206,20 @@ "type": "tidelift" } ], - "time": "2023-11-06T18:31:59+00:00" + "time": "2023-11-28T20:55:58+00:00" }, { "name": "symfony/http-client-contracts", - "version": "v3.3.0", + "version": "v3.4.0", "source": { "type": "git", "url": "https://github.com/symfony/http-client-contracts.git", - "reference": "3b66325d0176b4ec826bffab57c9037d759c31fb" + "reference": "1ee70e699b41909c209a0c930f11034b93578654" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/3b66325d0176b4ec826bffab57c9037d759c31fb", - "reference": "3b66325d0176b4ec826bffab57c9037d759c31fb", + "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/1ee70e699b41909c209a0c930f11034b93578654", + "reference": "1ee70e699b41909c209a0c930f11034b93578654", "shasum": "" }, "require": { @@ -4267,7 +4268,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/http-client-contracts/tree/v3.3.0" + "source": "https://github.com/symfony/http-client-contracts/tree/v3.4.0" }, "funding": [ { @@ -4283,7 +4284,7 @@ "type": "tidelift" } ], - "time": "2023-05-23T14:45:45+00:00" + "time": "2023-07-30T20:28:31+00:00" }, { "name": "symfony/options-resolver", From 03e532f20de2fc03ba2b33e622237b08ef2f1f1c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Dec 2023 15:05:56 +0000 Subject: [PATCH 44/81] Bump symfony/phpunit-bridge from 6.3.8 to 7.0.1 (#472) Bumps [symfony/phpunit-bridge](https://github.com/symfony/phpunit-bridge) from 6.3.8 to 7.0.1. - [Release notes](https://github.com/symfony/phpunit-bridge/releases) - [Changelog](https://github.com/symfony/phpunit-bridge/blob/6.3/CHANGELOG.md) - [Commits](https://github.com/symfony/phpunit-bridge/compare/v6.3.8...v7.0.1) --- updated-dependencies: - dependency-name: symfony/phpunit-bridge dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.json | 2 +- composer.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index 4f9fb2ddb..ef1ede774 100644 --- a/composer.json +++ b/composer.json @@ -51,7 +51,7 @@ "symfony/finder": "^6.2.7", "symfony/http-client": "^6.2.10", "symfony/options-resolver": "^6.3.0", - "symfony/phpunit-bridge": "^6.2.7", + "symfony/phpunit-bridge": "^7.0.1", "symfony/process": "^5.4.22", "symfony/yaml": "^6.3.0", "weitzman/drupal-test-traits": "^2.1" diff --git a/composer.lock b/composer.lock index 17f06215a..6546bc962 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": "f741005e4b59e51a5cb930d8611da7b2", + "content-hash": "99558f6013cad17097d609f0f70f8aa9", "packages": [ { "name": "acquia/coding-standards", @@ -4355,27 +4355,27 @@ }, { "name": "symfony/phpunit-bridge", - "version": "v6.3.8", + "version": "v7.0.1", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "45610900872a35b77db7698651f36129906041ea" + "reference": "c2d059b25e31274157dd7727131cd1cf33650207" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/45610900872a35b77db7698651f36129906041ea", - "reference": "45610900872a35b77db7698651f36129906041ea", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/c2d059b25e31274157dd7727131cd1cf33650207", + "reference": "c2d059b25e31274157dd7727131cd1cf33650207", "shasum": "" }, "require": { - "php": ">=7.1.3" + "php": ">=7.2.5" }, "conflict": { "phpunit/phpunit": "<7.5|9.1.2" }, "require-dev": { "symfony/deprecation-contracts": "^2.5|^3.0", - "symfony/error-handler": "^5.4|^6.0", + "symfony/error-handler": "^5.4|^6.4|^7.0", "symfony/polyfill-php81": "^1.27" }, "bin": [ @@ -4416,7 +4416,7 @@ "description": "Provides utilities for PHPUnit, especially user deprecation notices management", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/phpunit-bridge/tree/v6.3.8" + "source": "https://github.com/symfony/phpunit-bridge/tree/v7.0.1" }, "funding": [ { @@ -4432,7 +4432,7 @@ "type": "tidelift" } ], - "time": "2023-10-31T08:07:48+00:00" + "time": "2023-12-01T09:26:31+00:00" }, { "name": "symfony/polyfill-ctype", From 25d31db73f5ee08f486ffe31c28025929c5821c8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 15:05:09 +0000 Subject: [PATCH 45/81] Bump ergebnis/composer-normalize from 2.39.0 to 2.41.1 (#473) Bumps [ergebnis/composer-normalize](https://github.com/ergebnis/composer-normalize) from 2.39.0 to 2.41.1. - [Release notes](https://github.com/ergebnis/composer-normalize/releases) - [Changelog](https://github.com/ergebnis/composer-normalize/blob/main/CHANGELOG.md) - [Commits](https://github.com/ergebnis/composer-normalize/compare/2.39.0...2.41.1) --- updated-dependencies: - dependency-name: ergebnis/composer-normalize dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 62 ++++++++++++++++++++++++++------------------------- 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/composer.lock b/composer.lock index 6546bc962..ac9c7db93 100644 --- a/composer.lock +++ b/composer.lock @@ -874,22 +874,22 @@ }, { "name": "ergebnis/composer-normalize", - "version": "2.39.0", + "version": "2.41.1", "source": { "type": "git", "url": "https://github.com/ergebnis/composer-normalize.git", - "reference": "a878360bc8cb5cb440b9381f72b0aaa125f937c7" + "reference": "01eb2d9b8623828ec2264f54d7782a25558d27b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ergebnis/composer-normalize/zipball/a878360bc8cb5cb440b9381f72b0aaa125f937c7", - "reference": "a878360bc8cb5cb440b9381f72b0aaa125f937c7", + "url": "https://api.github.com/repos/ergebnis/composer-normalize/zipball/01eb2d9b8623828ec2264f54d7782a25558d27b2", + "reference": "01eb2d9b8623828ec2264f54d7782a25558d27b2", "shasum": "" }, "require": { "composer-plugin-api": "^2.0.0", "ergebnis/json": "^1.1.0", - "ergebnis/json-normalizer": "^4.3.0", + "ergebnis/json-normalizer": "^4.4.1", "ergebnis/json-printer": "^3.4.0", "ext-json": "*", "justinrainbow/json-schema": "^5.2.12", @@ -897,17 +897,18 @@ "php": "~8.1.0 || ~8.2.0 || ~8.3.0" }, "require-dev": { - "composer/composer": "^2.6.5", - "ergebnis/license": "^2.2.0", - "ergebnis/php-cs-fixer-config": "~6.7.0", - "ergebnis/phpunit-slow-test-detector": "^2.3.0", + "composer/composer": "^2.6.6", + "ergebnis/license": "^2.4.0", + "ergebnis/php-cs-fixer-config": "~6.14.0", + "ergebnis/phpunit-slow-test-detector": "^2.7.0", "fakerphp/faker": "^1.23.0", - "infection/infection": "~0.27.4", - "phpunit/phpunit": "^10.4.1", + "infection/infection": "~0.27.9", + "phpunit/phpunit": "^10.5.3", "psalm/plugin-phpunit": "~0.18.4", - "rector/rector": "~0.18.5", - "symfony/filesystem": "^6.0.13", - "vimeo/psalm": "^5.15.0" + "rector/rector": "~0.18.12", + "roave/backward-compatibility-check": "^8.4.0", + "symfony/filesystem": "^6.4.0", + "vimeo/psalm": "^5.17.0" }, "type": "composer-plugin", "extra": { @@ -947,7 +948,7 @@ "security": "https://github.com/ergebnis/composer-normalize/blob/main/.github/SECURITY.md", "source": "https://github.com/ergebnis/composer-normalize" }, - "time": "2023-10-10T15:43:27+00:00" + "time": "2023-12-14T09:37:52+00:00" }, { "name": "ergebnis/json", @@ -1016,16 +1017,16 @@ }, { "name": "ergebnis/json-normalizer", - "version": "4.3.0", + "version": "4.4.1", "source": { "type": "git", "url": "https://github.com/ergebnis/json-normalizer.git", - "reference": "716fa0a5dcc75fbcb2c1c2e0542b2f56732460bd" + "reference": "d28f36af9763ee6bc4e2a2390c0348963df7881b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ergebnis/json-normalizer/zipball/716fa0a5dcc75fbcb2c1c2e0542b2f56732460bd", - "reference": "716fa0a5dcc75fbcb2c1c2e0542b2f56732460bd", + "url": "https://api.github.com/repos/ergebnis/json-normalizer/zipball/d28f36af9763ee6bc4e2a2390c0348963df7881b", + "reference": "d28f36af9763ee6bc4e2a2390c0348963df7881b", "shasum": "" }, "require": { @@ -1039,18 +1040,19 @@ }, "require-dev": { "composer/semver": "^3.4.0", - "ergebnis/data-provider": "^3.0.0", - "ergebnis/license": "^2.2.0", - "ergebnis/php-cs-fixer-config": "~6.7.0", - "ergebnis/phpunit-slow-test-detector": "^2.3.0", + "ergebnis/data-provider": "^3.2.0", + "ergebnis/license": "^2.4.0", + "ergebnis/php-cs-fixer-config": "~6.14.0", + "ergebnis/phpunit-slow-test-detector": "^2.7.0", "fakerphp/faker": "^1.23.0", - "infection/infection": "~0.27.4", - "phpunit/phpunit": "^10.4.1", + "infection/infection": "~0.27.9", + "phpunit/phpunit": "^10.5.3", "psalm/plugin-phpunit": "~0.18.4", - "rector/rector": "~0.18.5", - "symfony/filesystem": "^6.3.1", - "symfony/finder": "^6.3.5", - "vimeo/psalm": "^5.15.0" + "rector/rector": "~0.18.12", + "roave/backward-compatibility-check": "^8.4.0", + "symfony/filesystem": "^6.4.0", + "symfony/finder": "^6.4.0", + "vimeo/psalm": "^5.17.0" }, "suggest": { "composer/semver": "If you want to use ComposerJsonNormalizer or VersionConstraintNormalizer" @@ -1083,7 +1085,7 @@ "security": "https://github.com/ergebnis/json-normalizer/blob/main/.github/SECURITY.md", "source": "https://github.com/ergebnis/json-normalizer" }, - "time": "2023-10-10T15:15:03+00:00" + "time": "2023-12-14T09:30:24+00:00" }, { "name": "ergebnis/json-pointer", From 47622321f359936316e206bd9f4995680821318f Mon Sep 17 00:00:00 2001 From: sayan goswami Date: Mon, 18 Dec 2023 10:09:42 +0530 Subject: [PATCH 46/81] Removing acquia_perz --- config/packages.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/config/packages.yml b/config/packages.yml index 290ace9c3..d54c4a41f 100644 --- a/config/packages.yml +++ b/config/packages.yml @@ -63,9 +63,10 @@ drupal/acquia_contenthub: version: 3.3.x version_dev: 3.3.x -drupal/acquia_perz: - version: 4.x - version_dev: 4.x-dev +# ORCA-642: Acquia Perz was temporarily removed due to an outage. +#drupal/acquia_perz: +# version: 4.x +# version_dev: 4.x-dev drupal/acquia_purge: version: 1.x From 99b11475bc27519edfe7f6b2c9c7c8271d55f257 Mon Sep 17 00:00:00 2001 From: Sayan Goswami Date: Fri, 22 Dec 2023 12:56:42 +0530 Subject: [PATCH 47/81] Fix nightwatch (#474) --- bin/ci/_includes.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/ci/_includes.sh b/bin/ci/_includes.sh index 245a9751d..e939bb215 100755 --- a/bin/ci/_includes.sh +++ b/bin/ci/_includes.sh @@ -73,6 +73,7 @@ export DRUPAL_TEST_DB_URL="sqlite://localhost/sites/default/files/db.sqlite" export DRUPAL_TEST_WEBDRIVER_CHROME_ARGS="--disable-gpu --headless --no-sandbox" export DRUPAL_TEST_WEBDRIVER_HOSTNAME="localhost" export DRUPAL_TEST_WEBDRIVER_PORT="4444" +export DRUPAL_NIGHTWATCH_SEARCH_DIRECTORY=../../ if [[ ! "$ORCA_TEMP_DIR" ]]; then # GitHub Actions. From f5213d3af582a2806bc33e7b559832c16d813016 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Jan 2024 14:34:15 +0000 Subject: [PATCH 48/81] Bump symfony/console from 5.4.32 to 5.4.34 (#475) Bumps [symfony/console](https://github.com/symfony/console) from 5.4.32 to 5.4.34. - [Release notes](https://github.com/symfony/console/releases) - [Changelog](https://github.com/symfony/console/blob/7.0/CHANGELOG.md) - [Commits](https://github.com/symfony/console/compare/v5.4.32...v5.4.34) --- updated-dependencies: - dependency-name: symfony/console dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/composer.lock b/composer.lock index ac9c7db93..6401feebd 100644 --- a/composer.lock +++ b/composer.lock @@ -3524,16 +3524,16 @@ }, { "name": "symfony/console", - "version": "v5.4.32", + "version": "v5.4.34", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "c70df1ffaf23a8d340bded3cfab1b86752ad6ed7" + "reference": "4b4d8cd118484aa604ec519062113dd87abde18c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/c70df1ffaf23a8d340bded3cfab1b86752ad6ed7", - "reference": "c70df1ffaf23a8d340bded3cfab1b86752ad6ed7", + "url": "https://api.github.com/repos/symfony/console/zipball/4b4d8cd118484aa604ec519062113dd87abde18c", + "reference": "4b4d8cd118484aa604ec519062113dd87abde18c", "shasum": "" }, "require": { @@ -3603,7 +3603,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.32" + "source": "https://github.com/symfony/console/tree/v5.4.34" }, "funding": [ { @@ -3619,7 +3619,7 @@ "type": "tidelift" } ], - "time": "2023-11-18T18:23:04+00:00" + "time": "2023-12-08T13:33:03+00:00" }, { "name": "symfony/dependency-injection", @@ -5071,21 +5071,21 @@ }, { "name": "symfony/service-contracts", - "version": "v3.4.0", + "version": "v3.4.1", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "b3313c2dbffaf71c8de2934e2ea56ed2291a3838" + "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/b3313c2dbffaf71c8de2934e2ea56ed2291a3838", - "reference": "b3313c2dbffaf71c8de2934e2ea56ed2291a3838", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/fe07cbc8d837f60caf7018068e350cc5163681a0", + "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0", "shasum": "" }, "require": { "php": ">=8.1", - "psr/container": "^2.0" + "psr/container": "^1.1|^2.0" }, "conflict": { "ext-psr": "<1.1|>=2" @@ -5133,7 +5133,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v3.4.0" + "source": "https://github.com/symfony/service-contracts/tree/v3.4.1" }, "funding": [ { @@ -5149,20 +5149,20 @@ "type": "tidelift" } ], - "time": "2023-07-30T20:28:31+00:00" + "time": "2023-12-26T14:02:43+00:00" }, { "name": "symfony/string", - "version": "v6.4.0", + "version": "v6.4.2", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "b45fcf399ea9c3af543a92edf7172ba21174d809" + "reference": "7cb80bc10bfcdf6b5492741c0b9357dac66940bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/b45fcf399ea9c3af543a92edf7172ba21174d809", - "reference": "b45fcf399ea9c3af543a92edf7172ba21174d809", + "url": "https://api.github.com/repos/symfony/string/zipball/7cb80bc10bfcdf6b5492741c0b9357dac66940bc", + "reference": "7cb80bc10bfcdf6b5492741c0b9357dac66940bc", "shasum": "" }, "require": { @@ -5219,7 +5219,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.4.0" + "source": "https://github.com/symfony/string/tree/v6.4.2" }, "funding": [ { @@ -5235,7 +5235,7 @@ "type": "tidelift" } ], - "time": "2023-11-28T20:41:49+00:00" + "time": "2023-12-10T16:15:48+00:00" }, { "name": "symfony/var-exporter", From f32b5b5dc287a372207f559da4e904d422aa7040 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Jan 2024 15:08:26 +0000 Subject: [PATCH 49/81] Bump symfony/event-dispatcher from 6.4.0 to 6.4.2 (#478) Bumps [symfony/event-dispatcher](https://github.com/symfony/event-dispatcher) from 6.4.0 to 6.4.2. - [Release notes](https://github.com/symfony/event-dispatcher/releases) - [Changelog](https://github.com/symfony/event-dispatcher/blob/7.0/CHANGELOG.md) - [Commits](https://github.com/symfony/event-dispatcher/compare/v6.4.0...v6.4.2) --- updated-dependencies: - dependency-name: symfony/event-dispatcher dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 6401feebd..b23117c6a 100644 --- a/composer.lock +++ b/composer.lock @@ -3771,16 +3771,16 @@ }, { "name": "symfony/event-dispatcher", - "version": "v6.4.0", + "version": "v6.4.2", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "d76d2632cfc2206eecb5ad2b26cd5934082941b6" + "reference": "e95216850555cd55e71b857eb9d6c2674124603a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d76d2632cfc2206eecb5ad2b26cd5934082941b6", - "reference": "d76d2632cfc2206eecb5ad2b26cd5934082941b6", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/e95216850555cd55e71b857eb9d6c2674124603a", + "reference": "e95216850555cd55e71b857eb9d6c2674124603a", "shasum": "" }, "require": { @@ -3831,7 +3831,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.0" + "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.2" }, "funding": [ { @@ -3847,7 +3847,7 @@ "type": "tidelift" } ], - "time": "2023-07-27T06:52:43+00:00" + "time": "2023-12-27T22:16:42+00:00" }, { "name": "symfony/event-dispatcher-contracts", From 0511e80e2f6cc2258d1995f4aa1e0b5b125e283b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Jan 2024 14:58:42 +0000 Subject: [PATCH 50/81] Bump symfony/phpunit-bridge from 7.0.1 to 7.0.2 (#479) Bumps [symfony/phpunit-bridge](https://github.com/symfony/phpunit-bridge) from 7.0.1 to 7.0.2. - [Release notes](https://github.com/symfony/phpunit-bridge/releases) - [Changelog](https://github.com/symfony/phpunit-bridge/blob/6.3/CHANGELOG.md) - [Commits](https://github.com/symfony/phpunit-bridge/compare/v7.0.1...v7.0.2) --- updated-dependencies: - dependency-name: symfony/phpunit-bridge dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index b23117c6a..6500545c7 100644 --- a/composer.lock +++ b/composer.lock @@ -4357,16 +4357,16 @@ }, { "name": "symfony/phpunit-bridge", - "version": "v7.0.1", + "version": "v7.0.2", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "c2d059b25e31274157dd7727131cd1cf33650207" + "reference": "92df075808c9437beca9540e25ae0c40eea1c061" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/c2d059b25e31274157dd7727131cd1cf33650207", - "reference": "c2d059b25e31274157dd7727131cd1cf33650207", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/92df075808c9437beca9540e25ae0c40eea1c061", + "reference": "92df075808c9437beca9540e25ae0c40eea1c061", "shasum": "" }, "require": { @@ -4418,7 +4418,7 @@ "description": "Provides utilities for PHPUnit, especially user deprecation notices management", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/phpunit-bridge/tree/v7.0.1" + "source": "https://github.com/symfony/phpunit-bridge/tree/v7.0.2" }, "funding": [ { @@ -4434,7 +4434,7 @@ "type": "tidelift" } ], - "time": "2023-12-01T09:26:31+00:00" + "time": "2023-12-19T11:23:03+00:00" }, { "name": "symfony/polyfill-ctype", From b182159a808880d516588b522a5bd522bb285e4d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 Jan 2024 14:44:04 +0000 Subject: [PATCH 51/81] Bump symfony/http-client from 6.4.0 to 6.4.2 (#480) Bumps [symfony/http-client](https://github.com/symfony/http-client) from 6.4.0 to 6.4.2. - [Release notes](https://github.com/symfony/http-client/releases) - [Changelog](https://github.com/symfony/http-client/blob/7.0/CHANGELOG.md) - [Commits](https://github.com/symfony/http-client/compare/v6.4.0...v6.4.2) --- updated-dependencies: - dependency-name: symfony/http-client dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 6500545c7..b0ee89e30 100644 --- a/composer.lock +++ b/composer.lock @@ -4119,16 +4119,16 @@ }, { "name": "symfony/http-client", - "version": "v6.4.0", + "version": "v6.4.2", "source": { "type": "git", "url": "https://github.com/symfony/http-client.git", - "reference": "5c584530b77aa10ae216989ffc48b4bedc9c0b29" + "reference": "fc0944665bd932cf32a7b8a1d009466afc16528f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/5c584530b77aa10ae216989ffc48b4bedc9c0b29", - "reference": "5c584530b77aa10ae216989ffc48b4bedc9c0b29", + "url": "https://api.github.com/repos/symfony/http-client/zipball/fc0944665bd932cf32a7b8a1d009466afc16528f", + "reference": "fc0944665bd932cf32a7b8a1d009466afc16528f", "shasum": "" }, "require": { @@ -4192,7 +4192,7 @@ "http" ], "support": { - "source": "https://github.com/symfony/http-client/tree/v6.4.0" + "source": "https://github.com/symfony/http-client/tree/v6.4.2" }, "funding": [ { @@ -4208,7 +4208,7 @@ "type": "tidelift" } ], - "time": "2023-11-28T20:55:58+00:00" + "time": "2023-12-02T12:49:56+00:00" }, { "name": "symfony/http-client-contracts", From 220eaece776b17e452df6473039d44132b9bc046 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Jan 2024 15:00:21 +0000 Subject: [PATCH 52/81] Bump symfony/expression-language from 6.4.0 to 6.4.2 (#481) Bumps [symfony/expression-language](https://github.com/symfony/expression-language) from 6.4.0 to 6.4.2. - [Release notes](https://github.com/symfony/expression-language/releases) - [Changelog](https://github.com/symfony/expression-language/blob/7.0/CHANGELOG.md) - [Commits](https://github.com/symfony/expression-language/compare/v6.4.0...v6.4.2) --- updated-dependencies: - dependency-name: symfony/expression-language dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/composer.lock b/composer.lock index b0ee89e30..305cb658f 100644 --- a/composer.lock +++ b/composer.lock @@ -3277,16 +3277,16 @@ }, { "name": "symfony/cache", - "version": "v6.4.0", + "version": "v6.4.2", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "ac2d25f97b17eec6e19760b6b9962a4f7c44356a" + "reference": "14a75869bbb41cb35bc5d9d322473928c6f3f978" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/ac2d25f97b17eec6e19760b6b9962a4f7c44356a", - "reference": "ac2d25f97b17eec6e19760b6b9962a4f7c44356a", + "url": "https://api.github.com/repos/symfony/cache/zipball/14a75869bbb41cb35bc5d9d322473928c6f3f978", + "reference": "14a75869bbb41cb35bc5d9d322473928c6f3f978", "shasum": "" }, "require": { @@ -3353,7 +3353,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v6.4.0" + "source": "https://github.com/symfony/cache/tree/v6.4.2" }, "funding": [ { @@ -3369,7 +3369,7 @@ "type": "tidelift" } ], - "time": "2023-11-24T19:28:07+00:00" + "time": "2023-12-29T15:34:34+00:00" }, { "name": "symfony/cache-contracts", @@ -3927,16 +3927,16 @@ }, { "name": "symfony/expression-language", - "version": "v6.4.0", + "version": "v6.4.2", "source": { "type": "git", "url": "https://github.com/symfony/expression-language.git", - "reference": "6c8b12f1e5ee5d91b812fb8628fca86e2fe5d152" + "reference": "7d63ccd5331d4164961776eced5524e891e30ad3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/expression-language/zipball/6c8b12f1e5ee5d91b812fb8628fca86e2fe5d152", - "reference": "6c8b12f1e5ee5d91b812fb8628fca86e2fe5d152", + "url": "https://api.github.com/repos/symfony/expression-language/zipball/7d63ccd5331d4164961776eced5524e891e30ad3", + "reference": "7d63ccd5331d4164961776eced5524e891e30ad3", "shasum": "" }, "require": { @@ -3971,7 +3971,7 @@ "description": "Provides an engine that can compile and evaluate expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/expression-language/tree/v6.4.0" + "source": "https://github.com/symfony/expression-language/tree/v6.4.2" }, "funding": [ { @@ -3987,7 +3987,7 @@ "type": "tidelift" } ], - "time": "2023-07-27T06:52:43+00:00" + "time": "2023-12-10T16:15:48+00:00" }, { "name": "symfony/filesystem", @@ -5239,16 +5239,16 @@ }, { "name": "symfony/var-exporter", - "version": "v6.4.1", + "version": "v6.4.2", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "2d08ca6b9cc704dce525615d1e6d1788734f36d9" + "reference": "5fe9a0021b8d35e67d914716ec8de50716a68e7e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/2d08ca6b9cc704dce525615d1e6d1788734f36d9", - "reference": "2d08ca6b9cc704dce525615d1e6d1788734f36d9", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/5fe9a0021b8d35e67d914716ec8de50716a68e7e", + "reference": "5fe9a0021b8d35e67d914716ec8de50716a68e7e", "shasum": "" }, "require": { @@ -5294,7 +5294,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v6.4.1" + "source": "https://github.com/symfony/var-exporter/tree/v6.4.2" }, "funding": [ { @@ -5310,7 +5310,7 @@ "type": "tidelift" } ], - "time": "2023-11-30T10:32:10+00:00" + "time": "2023-12-27T08:18:35+00:00" }, { "name": "symfony/yaml", From 3de2635cd3893fb81723a10abf8b7fb6ddb3d5ef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Jan 2024 15:01:01 +0000 Subject: [PATCH 53/81] Bump symfony/dependency-injection from 6.4.1 to 6.4.2 (#482) Bumps [symfony/dependency-injection](https://github.com/symfony/dependency-injection) from 6.4.1 to 6.4.2. - [Release notes](https://github.com/symfony/dependency-injection/releases) - [Changelog](https://github.com/symfony/dependency-injection/blob/7.0/CHANGELOG.md) - [Commits](https://github.com/symfony/dependency-injection/compare/v6.4.1...v6.4.2) --- updated-dependencies: - dependency-name: symfony/dependency-injection dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 305cb658f..a55bb56cd 100644 --- a/composer.lock +++ b/composer.lock @@ -3623,16 +3623,16 @@ }, { "name": "symfony/dependency-injection", - "version": "v6.4.1", + "version": "v6.4.2", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "f88ff6428afbeb17cc648c8003bd608534750baf" + "reference": "226ea431b1eda6f0d9f5a4b278757171960bb195" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/f88ff6428afbeb17cc648c8003bd608534750baf", - "reference": "f88ff6428afbeb17cc648c8003bd608534750baf", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/226ea431b1eda6f0d9f5a4b278757171960bb195", + "reference": "226ea431b1eda6f0d9f5a4b278757171960bb195", "shasum": "" }, "require": { @@ -3684,7 +3684,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v6.4.1" + "source": "https://github.com/symfony/dependency-injection/tree/v6.4.2" }, "funding": [ { @@ -3700,7 +3700,7 @@ "type": "tidelift" } ], - "time": "2023-12-01T14:56:37+00:00" + "time": "2023-12-28T19:16:56+00:00" }, { "name": "symfony/deprecation-contracts", From 5dbb58517a10c2b661295743e161019b2247b20d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Jan 2024 14:45:09 +0000 Subject: [PATCH 54/81] Bump phpunit/phpunit from 9.6.15 to 9.6.16 (#485) Bumps [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) from 9.6.15 to 9.6.16. - [Changelog](https://github.com/sebastianbergmann/phpunit/blob/9.6.16/ChangeLog-9.6.md) - [Commits](https://github.com/sebastianbergmann/phpunit/compare/9.6.15...9.6.16) --- updated-dependencies: - dependency-name: phpunit/phpunit dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 74 ++++++++++++++++++++++++++------------------------- 1 file changed, 38 insertions(+), 36 deletions(-) diff --git a/composer.lock b/composer.lock index a55bb56cd..a33bb5f7f 100644 --- a/composer.lock +++ b/composer.lock @@ -5734,25 +5734,27 @@ }, { "name": "nikic/php-parser", - "version": "v4.17.1", + "version": "v5.0.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d" + "reference": "4a21235f7e56e713259a6f76bf4b5ea08502b9dc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", - "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4a21235f7e56e713259a6f76bf4b5ea08502b9dc", + "reference": "4a21235f7e56e713259a6f76bf4b5ea08502b9dc", "shasum": "" }, "require": { + "ext-ctype": "*", + "ext-json": "*", "ext-tokenizer": "*", - "php": ">=7.0" + "php": ">=7.4" }, "require-dev": { "ircmaxell/php-yacc": "^0.0.7", - "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0" + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" }, "bin": [ "bin/php-parse" @@ -5760,7 +5762,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.9-dev" + "dev-master": "5.0-dev" } }, "autoload": { @@ -5784,9 +5786,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.17.1" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.0.0" }, - "time": "2023-08-13T19:53:39+00:00" + "time": "2024-01-07T17:17:35+00:00" }, { "name": "phar-io/manifest", @@ -6190,23 +6192,23 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.29", + "version": "9.2.30", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76" + "reference": "ca2bd87d2f9215904682a9cb9bb37dda98e76089" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6a3a87ac2bbe33b25042753df8195ba4aa534c76", - "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ca2bd87d2f9215904682a9cb9bb37dda98e76089", + "reference": "ca2bd87d2f9215904682a9cb9bb37dda98e76089", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.15", + "nikic/php-parser": "^4.18 || ^5.0", "php": ">=7.3", "phpunit/php-file-iterator": "^3.0.3", "phpunit/php-text-template": "^2.0.2", @@ -6256,7 +6258,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.29" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.30" }, "funding": [ { @@ -6264,7 +6266,7 @@ "type": "github" } ], - "time": "2023-09-19T04:57:46+00:00" + "time": "2023-12-22T06:47:57+00:00" }, { "name": "phpunit/php-invoker", @@ -6449,16 +6451,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.15", + "version": "9.6.16", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "05017b80304e0eb3f31d90194a563fd53a6021f1" + "reference": "3767b2c56ce02d01e3491046f33466a1ae60a37f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/05017b80304e0eb3f31d90194a563fd53a6021f1", - "reference": "05017b80304e0eb3f31d90194a563fd53a6021f1", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3767b2c56ce02d01e3491046f33466a1ae60a37f", + "reference": "3767b2c56ce02d01e3491046f33466a1ae60a37f", "shasum": "" }, "require": { @@ -6532,7 +6534,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.15" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.16" }, "funding": [ { @@ -6548,7 +6550,7 @@ "type": "tidelift" } ], - "time": "2023-12-01T16:55:19+00:00" + "time": "2024-01-19T07:03:14+00:00" }, { "name": "sebastian/code-unit", @@ -6737,20 +6739,20 @@ }, { "name": "sebastian/complexity", - "version": "2.0.2", + "version": "2.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/complexity.git", - "reference": "739b35e53379900cc9ac327b2147867b8b6efd88" + "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/739b35e53379900cc9ac327b2147867b8b6efd88", - "reference": "739b35e53379900cc9ac327b2147867b8b6efd88", + "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/25f207c40d62b8b7aa32f5ab026c53561964053a", + "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a", "shasum": "" }, "require": { - "nikic/php-parser": "^4.7", + "nikic/php-parser": "^4.18 || ^5.0", "php": ">=7.3" }, "require-dev": { @@ -6782,7 +6784,7 @@ "homepage": "https://github.com/sebastianbergmann/complexity", "support": { "issues": "https://github.com/sebastianbergmann/complexity/issues", - "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.2" + "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.3" }, "funding": [ { @@ -6790,7 +6792,7 @@ "type": "github" } ], - "time": "2020-10-26T15:52:27+00:00" + "time": "2023-12-22T06:19:30+00:00" }, { "name": "sebastian/diff", @@ -7064,20 +7066,20 @@ }, { "name": "sebastian/lines-of-code", - "version": "1.0.3", + "version": "1.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/lines-of-code.git", - "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc" + "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/c1c2e997aa3146983ed888ad08b15470a2e22ecc", - "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc", + "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/e1e4a170560925c26d424b6a03aed157e7dcc5c5", + "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5", "shasum": "" }, "require": { - "nikic/php-parser": "^4.6", + "nikic/php-parser": "^4.18 || ^5.0", "php": ">=7.3" }, "require-dev": { @@ -7109,7 +7111,7 @@ "homepage": "https://github.com/sebastianbergmann/lines-of-code", "support": { "issues": "https://github.com/sebastianbergmann/lines-of-code/issues", - "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.3" + "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.4" }, "funding": [ { @@ -7117,7 +7119,7 @@ "type": "github" } ], - "time": "2020-11-28T06:42:11+00:00" + "time": "2023-12-22T06:20:34+00:00" }, { "name": "sebastian/object-enumerator", From d2b0b5c8c6f6c9041a1dfeb049626e76f059e8ad Mon Sep 17 00:00:00 2001 From: Sayan Goswami Date: Mon, 22 Jan 2024 19:58:37 +0530 Subject: [PATCH 55/81] Changes related to accommodate nightwatch tests in Gitlab CI (#483) * tests * tests * tests * tests * tests * tests * go to 4444 * remove core nightwatch * enable core tests and disable shm * remove core tests * change port * remoce chromedriver * use port 9515 for gitlab * minor fix * Ignore toolbar from nightwatch * cleanup * comments * comments * comments * Gitlab CI * add junit log for all phpunit tests * minor changes * minor changes 2 * Cleanup * change port for gitlab ci * remove chromedriver * change port * change port 2 * Add cobertura format instead of clover * Apply suggestions from code review --------- Co-authored-by: Travis Carden --- bin/ci/_includes.sh | 11 +++++++++++ bin/ci/script.sh | 10 +++++++--- bin/ci/self-test/script.sh | 17 ++++++++++++----- src/Domain/Server/ChromeDriverServer.php | 2 +- src/Domain/Tool/Phpunit/PhpUnitTask.php | 6 +++--- 5 files changed, 34 insertions(+), 12 deletions(-) diff --git a/bin/ci/_includes.sh b/bin/ci/_includes.sh index e939bb215..4c914cb0b 100755 --- a/bin/ci/_includes.sh +++ b/bin/ci/_includes.sh @@ -75,6 +75,17 @@ export DRUPAL_TEST_WEBDRIVER_HOSTNAME="localhost" export DRUPAL_TEST_WEBDRIVER_PORT="4444" export DRUPAL_NIGHTWATCH_SEARCH_DIRECTORY=../../ +if [[ "$GITLAB_CI" ]]; then + # In Gitlab we are using a separate container to run ChromeDriver on port 9515. + export DRUPAL_TEST_WEBDRIVER_PORT="9515" + # Nightwatch tests are crashing when they run on SHM due to size constraint, hence disabling. + export DRUPAL_TEST_WEBDRIVER_CHROME_ARGS="--disable-dev-shm-usage --disable-gpu --headless --no-sandbox" + # We are facing intermittent failures for Nightwatch tests of toolbar module, hence ignoring. + export DRUPAL_NIGHTWATCH_IGNORE_DIRECTORIES="node_modules,vendor,.*,sites/*/files,sites/*/private,sites/simpletest,/builds/project/orca-build/docroot/core/modules/toolbar/tests/src/Nightwatch/Tests/*" + # Set DRUPAL_NIGHTWATCH_OUTPUT to a path inside project dir. + export DRUPAL_NIGHTWATCH_OUTPUT="$CI_PROJECT_DIR/reports/nightwatch" +fi + if [[ ! "$ORCA_TEMP_DIR" ]]; then # GitHub Actions. if [[ "$RUNNER_TEMP" ]]; then diff --git a/bin/ci/script.sh b/bin/ci/script.sh index 3225e8d20..8846d0e40 100755 --- a/bin/ci/script.sh +++ b/bin/ci/script.sh @@ -17,9 +17,13 @@ if [[ "$ORCA_ENABLE_NIGHTWATCH" == "TRUE" && "$ORCA_SUT_HAS_NIGHTWATCH_TESTS" && orca fixture:run-server & SERVER_PID=$! - # @todo could we set DRUPAL_TEST_CHROMEDRIVER_AUTOSTART instead of launching Chromedriver manually? - chromedriver --disable-dev-shm-usage --disable-extensions --disable-gpu --headless --no-sandbox --port=4444 & - CHROMEDRIVER_PID=$! + if [[ "$GITLAB_CI" ]]; then + echo "ChromeDriver initialized via separate container..." + else + # @todo could we set DRUPAL_TEST_CHROMEDRIVER_AUTOSTART instead of launching Chromedriver manually? + chromedriver --disable-dev-shm-usage --disable-extensions --disable-gpu --headless --no-sandbox --port=4444 & + CHROMEDRIVER_PID=$! + fi eval "yarn test:nightwatch \\ --headless \\ diff --git a/bin/ci/self-test/script.sh b/bin/ci/self-test/script.sh index 342deb585..a58ebbfa3 100755 --- a/bin/ci/self-test/script.sh +++ b/bin/ci/self-test/script.sh @@ -34,7 +34,7 @@ if [[ "$ORCA_JOB" == "STATIC_CODE_ANALYSIS" ]]; then echo if [[ "$ORCA_COVERAGE_ENABLE" == TRUE ]]; then - eval './vendor/bin/phpunit --coverage-clover="$ORCA_SELF_TEST_COVERAGE_CLOVER"' + eval './vendor/bin/phpunit --coverage-cobertura="$ORCA_SELF_TEST_COVERAGE_CLOVER"' else eval './vendor/bin/phpunit' fi @@ -50,9 +50,14 @@ if [[ "$ORCA_ENABLE_NIGHTWATCH" == "TRUE" && "$ORCA_SUT_HAS_NIGHTWATCH_TESTS" && orca fixture:run-server & SERVER_PID=$! - # @todo could we set DRUPAL_TEST_CHROMEDRIVER_AUTOSTART instead of launching Chromedriver manually? - chromedriver --disable-dev-shm-usage --disable-extensions --disable-gpu --headless --no-sandbox --port=4444 & - CHROMEDRIVER_PID=$! + if [[ "$GITLAB_CI" ]]; then + echo "ChromeDriver initialized via separate container..." + else + # @todo Could we set DRUPAL_TEST_CHROMEDRIVER_AUTOSTART instead of launching ChromeDriver manually? + chromedriver --disable-dev-shm-usage --disable-extensions --disable-gpu --headless --no-sandbox --port=4444 & + CHROMEDRIVER_PID=$! + fi + eval "yarn test:nightwatch \\ --headless \\ @@ -65,6 +70,8 @@ if [[ "$ORCA_ENABLE_NIGHTWATCH" == "TRUE" && "$ORCA_SUT_HAS_NIGHTWATCH_TESTS" && --tag=core" kill -0 $SERVER_PID - kill -0 $CHROMEDRIVER_PID + if [ $CHROMEDRIVER_PID ]; then + kill -0 $CHROMEDRIVER_PID + fi ) fi diff --git a/src/Domain/Server/ChromeDriverServer.php b/src/Domain/Server/ChromeDriverServer.php index 65e38f448..57593e4eb 100644 --- a/src/Domain/Server/ChromeDriverServer.php +++ b/src/Domain/Server/ChromeDriverServer.php @@ -45,7 +45,7 @@ protected function createProcess(): Process { '--disable-gpu', '--headless', '--no-sandbox', - '--port=4444', + '--port=9515', ]; return new Process($command); } diff --git a/src/Domain/Tool/Phpunit/PhpUnitTask.php b/src/Domain/Tool/Phpunit/PhpUnitTask.php index ef9099c5c..c60bd4dc9 100644 --- a/src/Domain/Tool/Phpunit/PhpUnitTask.php +++ b/src/Domain/Tool/Phpunit/PhpUnitTask.php @@ -308,7 +308,7 @@ private function getMinkWebDriverArguments(): string { ], ], ], - 'http://localhost:4444', + 'http://localhost:9515', ], JSON_UNESCAPED_SLASHES); } @@ -324,8 +324,7 @@ protected function runPhpUnit(): void { '--verbose', ]; if ($this->shouldGenerateCodeCoverage()) { - $command[] = "--coverage-clover={$this->cloverCoverage}"; - $command[] = "--log-junit={$this->junitLog}"; + $command[] = "--coverage-cobertura={$this->cloverCoverage}"; $this->processRunner->addEnvVar("XDEBUG_MODE", "coverage"); } $command = array_merge($command, [ @@ -334,6 +333,7 @@ protected function runPhpUnit(): void { "--configuration={$this->fixture->getPath('docroot/core/phpunit.xml')}", '--exclude-group=orca_ignore', '--testsuite=orca', + "--log-junit={$this->junitLog}", ]); if ($this->isPublicTestsOnly()) { $command[] = '--group=orca_public'; From bc7581df8550e2b1af3ca273457089aa068b92f1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Jan 2024 10:31:48 +0530 Subject: [PATCH 56/81] Bump symfony/process from 5.4.28 to 6.4.2 (#476) * Bump symfony/process from 5.4.28 to 6.4.2 Bumps [symfony/process](https://github.com/symfony/process) from 5.4.28 to 6.4.2. - [Release notes](https://github.com/symfony/process/releases) - [Changelog](https://github.com/symfony/process/blob/7.0/CHANGELOG.md) - [Commits](https://github.com/symfony/process/compare/v5.4.28...v6.4.2) --- updated-dependencies: - dependency-name: symfony/process dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * Modify tests to accomodate updated symfony/process --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: sayan goswami --- composer.json | 2 +- composer.lock | 17 ++++++++--------- tests/Domain/Tool/DrupalCheckToolTest.php | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/composer.json b/composer.json index ef1ede774..5516ab2dd 100644 --- a/composer.json +++ b/composer.json @@ -52,7 +52,7 @@ "symfony/http-client": "^6.2.10", "symfony/options-resolver": "^6.3.0", "symfony/phpunit-bridge": "^7.0.1", - "symfony/process": "^5.4.22", + "symfony/process": "^6.4.2", "symfony/yaml": "^6.3.0", "weitzman/drupal-test-traits": "^2.1" }, diff --git a/composer.lock b/composer.lock index a33bb5f7f..8be91ebbf 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": "99558f6013cad17097d609f0f70f8aa9", + "content-hash": "59e1a334265cfe4093f60e8f538cd326", "packages": [ { "name": "acquia/coding-standards", @@ -5009,21 +5009,20 @@ }, { "name": "symfony/process", - "version": "v5.4.28", + "version": "v6.4.2", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "45261e1fccad1b5447a8d7a8e67aa7b4a9798b7b" + "reference": "c4b1ef0bc80533d87a2e969806172f1c2a980241" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/45261e1fccad1b5447a8d7a8e67aa7b4a9798b7b", - "reference": "45261e1fccad1b5447a8d7a8e67aa7b4a9798b7b", + "url": "https://api.github.com/repos/symfony/process/zipball/c4b1ef0bc80533d87a2e969806172f1c2a980241", + "reference": "c4b1ef0bc80533d87a2e969806172f1c2a980241", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/polyfill-php80": "^1.16" + "php": ">=8.1" }, "type": "library", "autoload": { @@ -5051,7 +5050,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v5.4.28" + "source": "https://github.com/symfony/process/tree/v6.4.2" }, "funding": [ { @@ -5067,7 +5066,7 @@ "type": "tidelift" } ], - "time": "2023-08-07T10:36:04+00:00" + "time": "2023-12-22T16:42:54+00:00" }, { "name": "symfony/service-contracts", diff --git a/tests/Domain/Tool/DrupalCheckToolTest.php b/tests/Domain/Tool/DrupalCheckToolTest.php index ec95a4d55..2fb8ae4f7 100644 --- a/tests/Domain/Tool/DrupalCheckToolTest.php +++ b/tests/Domain/Tool/DrupalCheckToolTest.php @@ -179,7 +179,7 @@ public function testRunLogResult(): void { ->shouldBeCalledOnce(); $process = $this->prophesize(Process::class); $process->setWorkingDirectory(self::FIXTURE_PATH) - ->shouldBeCalledOnce(); + ->willReturn($process); $process->run() ->shouldBeCalledOnce(); $process From e5b70303d293ae3caf5754e4736836493ccdabfe Mon Sep 17 00:00:00 2001 From: Sayan Goswami Date: Mon, 29 Jan 2024 14:22:54 +0530 Subject: [PATCH 57/81] ORCA-647: Support PHP 8.3 (#488) * Support PHP 8.3 * upgrade nette/neon --- .github/workflows/orca.yml | 7 +++++++ composer.lock | 14 +++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.github/workflows/orca.yml b/.github/workflows/orca.yml index 27369a562..1d90527a3 100644 --- a/.github/workflows/orca.yml +++ b/.github/workflows/orca.yml @@ -74,11 +74,18 @@ jobs: # Testing Drupal 10 in php 8.2. - orca-job: ISOLATED_TEST_ON_CURRENT php-version: "8.2" + orca-enable-nightwatch: "TRUE" + orca-coverage-enable: "TRUE" # Testing latest Drupal 9 in php 8.2. - orca-job: INTEGRATED_TEST_ON_LATEST_LTS php-version: "8.2" + # Testing Drupal 10 in php 8.3. + - orca-job: ISOLATED_TEST_ON_CURRENT + php-version: "8.3" + orca-enable-nightwatch: "TRUE" + orca-coverage-enable: "TRUE" steps: - uses: actions/checkout@v3 diff --git a/composer.lock b/composer.lock index 8be91ebbf..4f7767f5d 100644 --- a/composer.lock +++ b/composer.lock @@ -1781,21 +1781,21 @@ }, { "name": "nette/neon", - "version": "v3.4.0", + "version": "v3.4.1", "source": { "type": "git", "url": "https://github.com/nette/neon.git", - "reference": "372d945c156ee7f35c953339fb164538339e6283" + "reference": "457bfbf0560f600b30d9df4233af382a478bb44d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/neon/zipball/372d945c156ee7f35c953339fb164538339e6283", - "reference": "372d945c156ee7f35c953339fb164538339e6283", + "url": "https://api.github.com/repos/nette/neon/zipball/457bfbf0560f600b30d9df4233af382a478bb44d", + "reference": "457bfbf0560f600b30d9df4233af382a478bb44d", "shasum": "" }, "require": { "ext-json": "*", - "php": ">=8.0 <8.3" + "php": "8.0 - 8.3" }, "require-dev": { "nette/tester": "^2.4", @@ -1843,9 +1843,9 @@ ], "support": { "issues": "https://github.com/nette/neon/issues", - "source": "https://github.com/nette/neon/tree/v3.4.0" + "source": "https://github.com/nette/neon/tree/v3.4.1" }, - "time": "2023-01-13T03:08:29+00:00" + "time": "2023-09-27T08:59:11+00:00" }, { "name": "oscarotero/env", From 15638d9f7f88340d5b4ad6573e2897e62792729b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jan 2024 14:32:19 +0530 Subject: [PATCH 58/81] Bump symfony/filesystem from 5.4.25 to 6.4.0 (#457) * Bump symfony/filesystem from 5.4.25 to 6.4.0 Bumps [symfony/filesystem](https://github.com/symfony/filesystem) from 5.4.25 to 6.4.0. - [Release notes](https://github.com/symfony/filesystem/releases) - [Changelog](https://github.com/symfony/filesystem/blob/7.0/CHANGELOG.md) - [Commits](https://github.com/symfony/filesystem/compare/v5.4.25...v6.4.0) --- updated-dependencies: - dependency-name: symfony/filesystem dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * modify tests to accomodate symfony/filesystem --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: sayan goswami --- composer.json | 2 +- composer.lock | 19 +++++++++---------- tests/Domain/Fixture/CodebaseCreatorTest.php | 6 ++++++ 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/composer.json b/composer.json index 5516ab2dd..87c4e9d6d 100644 --- a/composer.json +++ b/composer.json @@ -47,7 +47,7 @@ "symfony/dependency-injection": "^6.0.20", "symfony/event-dispatcher": "^6.3", "symfony/expression-language": "^6.3.0", - "symfony/filesystem": "^5.4.21", + "symfony/filesystem": "^6.4.0", "symfony/finder": "^6.2.7", "symfony/http-client": "^6.2.10", "symfony/options-resolver": "^6.3.0", diff --git a/composer.lock b/composer.lock index 4f7767f5d..e2af96bda 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": "59e1a334265cfe4093f60e8f538cd326", + "content-hash": "a9b2ba95322cc8adbcfdd4404c9531f1", "packages": [ { "name": "acquia/coding-standards", @@ -3991,23 +3991,22 @@ }, { "name": "symfony/filesystem", - "version": "v5.4.25", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "0ce3a62c9579a53358d3a7eb6b3dfb79789a6364" + "reference": "952a8cb588c3bc6ce76f6023000fb932f16a6e59" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/0ce3a62c9579a53358d3a7eb6b3dfb79789a6364", - "reference": "0ce3a62c9579a53358d3a7eb6b3dfb79789a6364", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/952a8cb588c3bc6ce76f6023000fb932f16a6e59", + "reference": "952a8cb588c3bc6ce76f6023000fb932f16a6e59", "shasum": "" }, "require": { - "php": ">=7.2.5", + "php": ">=8.1", "symfony/polyfill-ctype": "~1.8", - "symfony/polyfill-mbstring": "~1.8", - "symfony/polyfill-php80": "^1.16" + "symfony/polyfill-mbstring": "~1.8" }, "type": "library", "autoload": { @@ -4035,7 +4034,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v5.4.25" + "source": "https://github.com/symfony/filesystem/tree/v6.4.0" }, "funding": [ { @@ -4051,7 +4050,7 @@ "type": "tidelift" } ], - "time": "2023-05-31T13:04:02+00:00" + "time": "2023-07-26T17:27:13+00:00" }, { "name": "symfony/finder", diff --git a/tests/Domain/Fixture/CodebaseCreatorTest.php b/tests/Domain/Fixture/CodebaseCreatorTest.php index 743a48287..7964092c9 100644 --- a/tests/Domain/Fixture/CodebaseCreatorTest.php +++ b/tests/Domain/Fixture/CodebaseCreatorTest.php @@ -61,6 +61,12 @@ protected function setUp(): void { $this->git = $this->prophesize(GitFacade::class); $this->orca = $this->prophesize(OrcaPathHandler::class); $this->filesystem = $this->prophesize(Filesystem::class); + $this->filesystem + ->exists(self::COMPOSER_LOCK_PATH) + ->willReturn(FALSE); + $this->filesystem + ->remove(self::COMPOSER_LOCK_PATH) + ->shouldNotBeCalled(); $this->packageManager = $this->prophesize(PackageManager::class); $this->packageManager ->exists(Argument::any()) From d1286bc94a20128c982434a39af050f1665adc65 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jan 2024 14:50:23 +0530 Subject: [PATCH 59/81] Bump oscarotero/env from 1.2.0 to 2.1.0 (#324) * Bump oscarotero/env from 1.2.0 to 2.1.0 Bumps [oscarotero/env](https://github.com/oscarotero/env) from 1.2.0 to 2.1.0. - [Release notes](https://github.com/oscarotero/env/releases) - [Changelog](https://github.com/oscarotero/env/blob/master/CHANGELOG.md) - [Commits](https://github.com/oscarotero/env/compare/v1.2.0...v2.1.0) --- updated-dependencies: - dependency-name: oscarotero/env dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * Minor changes to accodmodate Env update --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: sayan goswami --- composer.json | 2 +- composer.lock | 27 ++++++++++++------- config/services.yml | 4 +-- src/Helper/EnvFacade.php | 4 ++- .../Log/TelemetryEventPropertiesBuilder.php | 7 ++--- .../TelemetryEventPropertiesBuilderTest.php | 7 ++--- 6 files changed, 31 insertions(+), 20 deletions(-) diff --git a/composer.json b/composer.json index 87c4e9d6d..f389f63db 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,7 @@ "hassankhan/config": "^3.1", "mglaman/drupal-check": "^1.4", "myclabs/php-enum": "^1.8.4", - "oscarotero/env": "^1.2", + "oscarotero/env": "^2.1", "php-parallel-lint/php-console-highlighter": "^1.0", "php-parallel-lint/php-parallel-lint": "^1.3.2", "phploc/phploc": "^7.0.2", diff --git a/composer.lock b/composer.lock index e2af96bda..3a5e6cc14 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": "a9b2ba95322cc8adbcfdd4404c9531f1", + "content-hash": "43e9b044517d81af41e9c89dd6a621d3", "packages": [ { "name": "acquia/coding-standards", @@ -1849,26 +1849,33 @@ }, { "name": "oscarotero/env", - "version": "v1.2.0", + "version": "v2.1.0", "source": { "type": "git", "url": "https://github.com/oscarotero/env.git", - "reference": "4ab45ce5c1f2c62549208426bfa20a3d5fa008c6" + "reference": "0da22cadc6924155fa9bbea2cdda2e84ab7cbdd3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/oscarotero/env/zipball/4ab45ce5c1f2c62549208426bfa20a3d5fa008c6", - "reference": "4ab45ce5c1f2c62549208426bfa20a3d5fa008c6", + "url": "https://api.github.com/repos/oscarotero/env/zipball/0da22cadc6924155fa9bbea2cdda2e84ab7cbdd3", + "reference": "0da22cadc6924155fa9bbea2cdda2e84ab7cbdd3", "shasum": "" }, "require": { "ext-ctype": "*", - "php": ">=5.2" + "php": ">=7.1" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^2.16", + "phpunit/phpunit": "^7.0" }, "type": "library", "autoload": { - "psr-0": { - "Env": "src/" + "files": [ + "src/env_function.php" + ], + "psr-4": { + "Env\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -1891,9 +1898,9 @@ "support": { "email": "oom@oscarotero.com", "issues": "https://github.com/oscarotero/env/issues", - "source": "https://github.com/oscarotero/env/tree/v1.2.0" + "source": "https://github.com/oscarotero/env/tree/v2.1.0" }, - "time": "2019-04-03T18:28:43+00:00" + "time": "2020-06-11T10:59:27+00:00" }, { "name": "pdepend/pdepend", diff --git a/config/services.yml b/config/services.yml index 595203ec7..d4bd189a3 100644 --- a/config/services.yml +++ b/config/services.yml @@ -55,8 +55,8 @@ services: Composer\Semver\VersionParser: ~ - Env: - class: Env + Env\Env: + class: Env\Env Symfony\Component\Console\Application: ~ diff --git a/src/Helper/EnvFacade.php b/src/Helper/EnvFacade.php index e4ed67dd2..67396045f 100644 --- a/src/Helper/EnvFacade.php +++ b/src/Helper/EnvFacade.php @@ -2,6 +2,8 @@ namespace Acquia\Orca\Helper; +use Env\Env; + /** * Provides a facade for environment variables. * @@ -44,7 +46,7 @@ public function get(string $variable, $default = NULL) { * @codeCoverageIgnore */ protected function getVar($variable) { - return \Env::get($variable); + return Env::get($variable); } } diff --git a/src/Helper/Log/TelemetryEventPropertiesBuilder.php b/src/Helper/Log/TelemetryEventPropertiesBuilder.php index e1095a8c5..b5283d2f8 100644 --- a/src/Helper/Log/TelemetryEventPropertiesBuilder.php +++ b/src/Helper/Log/TelemetryEventPropertiesBuilder.php @@ -7,6 +7,7 @@ use Acquia\Orca\Domain\Tool\Phploc\PhplocTask; use Acquia\Orca\Enum\TelemetryEventNameEnum; use Acquia\Orca\Helper\Filesystem\OrcaPathHandler; +use Env\Env; use Symfony\Component\Filesystem\Filesystem; /** @@ -17,7 +18,7 @@ class TelemetryEventPropertiesBuilder { /** * The environment variables service. * - * @var \Env + * @var \Env\Env */ private $env; @@ -45,14 +46,14 @@ class TelemetryEventPropertiesBuilder { /** * Constructs an instance. * - * @param \Env $env + * @param \Env\Env $env * The environment variables service. * @param \Symfony\Component\Filesystem\Filesystem $filesystem * The filesystem. * @param \Acquia\Orca\Helper\Filesystem\OrcaPathHandler $orca_path_handler * The ORCA path handler. */ - public function __construct(\Env $env, Filesystem $filesystem, OrcaPathHandler $orca_path_handler) { + public function __construct(Env $env, Filesystem $filesystem, OrcaPathHandler $orca_path_handler) { $this->env = $env; $this->filesystem = $filesystem; $this->orca = $orca_path_handler; diff --git a/tests/Helper/Log/TelemetryEventPropertiesBuilderTest.php b/tests/Helper/Log/TelemetryEventPropertiesBuilderTest.php index f22dfbab2..30a2278ad 100644 --- a/tests/Helper/Log/TelemetryEventPropertiesBuilderTest.php +++ b/tests/Helper/Log/TelemetryEventPropertiesBuilderTest.php @@ -6,22 +6,23 @@ use Acquia\Orca\Helper\Filesystem\OrcaPathHandler; use Acquia\Orca\Helper\Log\TelemetryEventPropertiesBuilder; use Acquia\Orca\Tests\TestCase; +use Env\Env; use Prophecy\Prophecy\ObjectProphecy; use Symfony\Component\Filesystem\Filesystem; /** - * @property \Prophecy\Prophecy\ObjectProphecy|\Env $env + * @property \Prophecy\Prophecy\ObjectProphecy|Env $env * @property \Prophecy\Prophecy\ObjectProphecy|\Symfony\Component\Filesystem\Filesystem $filesystem * @property \Acquia\Orca\Helper\Filesystem\OrcaPathHandler|\Prophecy\Prophecy\ObjectProphecy $orca */ class TelemetryEventPropertiesBuilderTest extends TestCase { - protected ObjectProphecy|\Env $env; + protected ObjectProphecy|Env $env; protected ObjectProphecy|Filesystem $filesystem; protected OrcaPathHandler|ObjectProphecy $orca; protected function setUp(): void { - $this->env = $this->prophesize(\Env::class); + $this->env = $this->prophesize(Env::class); $this->filesystem = $this->prophesize(Filesystem::class); $this->orca = $this->prophesize(OrcaPathHandler::class); } From b0b97fa77c012cc69108b8d992d361ad2c028b93 Mon Sep 17 00:00:00 2001 From: Sayan Goswami Date: Tue, 30 Jan 2024 10:19:51 +0530 Subject: [PATCH 60/81] Add back ACMS (#489) --- config/packages.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/config/packages.yml b/config/packages.yml index d54c4a41f..38453e52a 100644 --- a/config/packages.yml +++ b/config/packages.yml @@ -50,10 +50,9 @@ # config/services.yml for the relevant code or bin/self-test for a usage # example. -# ORCA-567 : ACMS was temporarily removed due to an outage. -#acquia/acquia_cms: -# version: 2.x -# version_dev: 2.x-dev +acquia/acquia_cms: + version: 2.x + version_dev: 2.x-dev drupal/acquia_connector: version: 4.x From 3efe4880af5e0b827c33b480e34098f9ef8a4e25 Mon Sep 17 00:00:00 2001 From: Sayan Goswami Date: Tue, 30 Jan 2024 12:52:01 +0530 Subject: [PATCH 61/81] Revert "Add back ACMS" (#490) --- config/packages.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/config/packages.yml b/config/packages.yml index 38453e52a..d54c4a41f 100644 --- a/config/packages.yml +++ b/config/packages.yml @@ -50,9 +50,10 @@ # config/services.yml for the relevant code or bin/self-test for a usage # example. -acquia/acquia_cms: - version: 2.x - version_dev: 2.x-dev +# ORCA-567 : ACMS was temporarily removed due to an outage. +#acquia/acquia_cms: +# version: 2.x +# version_dev: 2.x-dev drupal/acquia_connector: version: 4.x From c18abddf52ecba0e9b38e15bb62e457027887aa2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Jan 2024 14:49:32 +0000 Subject: [PATCH 62/81] Bump ergebnis/composer-normalize from 2.41.1 to 2.42.0 (#491) Bumps [ergebnis/composer-normalize](https://github.com/ergebnis/composer-normalize) from 2.41.1 to 2.42.0. - [Release notes](https://github.com/ergebnis/composer-normalize/releases) - [Changelog](https://github.com/ergebnis/composer-normalize/blob/main/CHANGELOG.md) - [Commits](https://github.com/ergebnis/composer-normalize/compare/2.41.1...2.42.0) --- updated-dependencies: - dependency-name: ergebnis/composer-normalize dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 203 ++++++++++++++++++++++++-------------------------- 1 file changed, 99 insertions(+), 104 deletions(-) diff --git a/composer.lock b/composer.lock index 3a5e6cc14..2ad3290e1 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": "43e9b044517d81af41e9c89dd6a621d3", + "content-hash": "dcb47558d19177343b8becde61ef479e", "packages": [ { "name": "acquia/coding-standards", @@ -874,41 +874,40 @@ }, { "name": "ergebnis/composer-normalize", - "version": "2.41.1", + "version": "2.42.0", "source": { "type": "git", "url": "https://github.com/ergebnis/composer-normalize.git", - "reference": "01eb2d9b8623828ec2264f54d7782a25558d27b2" + "reference": "02cf2b69ad2a74c6f11a8c3f5f054b8f949df910" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ergebnis/composer-normalize/zipball/01eb2d9b8623828ec2264f54d7782a25558d27b2", - "reference": "01eb2d9b8623828ec2264f54d7782a25558d27b2", + "url": "https://api.github.com/repos/ergebnis/composer-normalize/zipball/02cf2b69ad2a74c6f11a8c3f5f054b8f949df910", + "reference": "02cf2b69ad2a74c6f11a8c3f5f054b8f949df910", "shasum": "" }, "require": { "composer-plugin-api": "^2.0.0", - "ergebnis/json": "^1.1.0", - "ergebnis/json-normalizer": "^4.4.1", - "ergebnis/json-printer": "^3.4.0", + "ergebnis/json": "^1.2.0", + "ergebnis/json-normalizer": "^4.5.0", + "ergebnis/json-printer": "^3.5.0", "ext-json": "*", "justinrainbow/json-schema": "^5.2.12", "localheinz/diff": "^1.1.1", - "php": "~8.1.0 || ~8.2.0 || ~8.3.0" + "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0" }, "require-dev": { "composer/composer": "^2.6.6", "ergebnis/license": "^2.4.0", - "ergebnis/php-cs-fixer-config": "~6.14.0", - "ergebnis/phpunit-slow-test-detector": "^2.7.0", - "fakerphp/faker": "^1.23.0", - "infection/infection": "~0.27.9", - "phpunit/phpunit": "^10.5.3", + "ergebnis/php-cs-fixer-config": "^6.20.0", + "ergebnis/phpunit-slow-test-detector": "^2.9.0", + "fakerphp/faker": "^1.23.1", + "infection/infection": "~0.26.6", + "phpunit/phpunit": "^9.6.16", "psalm/plugin-phpunit": "~0.18.4", - "rector/rector": "~0.18.12", - "roave/backward-compatibility-check": "^8.4.0", - "symfony/filesystem": "^6.4.0", - "vimeo/psalm": "^5.17.0" + "rector/rector": "~0.19.2", + "symfony/filesystem": "^5.4.25", + "vimeo/psalm": "^5.20.0" }, "type": "composer-plugin", "extra": { @@ -948,37 +947,37 @@ "security": "https://github.com/ergebnis/composer-normalize/blob/main/.github/SECURITY.md", "source": "https://github.com/ergebnis/composer-normalize" }, - "time": "2023-12-14T09:37:52+00:00" + "time": "2024-01-30T11:54:02+00:00" }, { "name": "ergebnis/json", - "version": "1.1.0", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/ergebnis/json.git", - "reference": "9f2b9086c43b189d7044a5b6215a931fb6e9125d" + "reference": "a457f25a5ba7ea11fc94f84d53678c5211abfce0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ergebnis/json/zipball/9f2b9086c43b189d7044a5b6215a931fb6e9125d", - "reference": "9f2b9086c43b189d7044a5b6215a931fb6e9125d", + "url": "https://api.github.com/repos/ergebnis/json/zipball/a457f25a5ba7ea11fc94f84d53678c5211abfce0", + "reference": "a457f25a5ba7ea11fc94f84d53678c5211abfce0", "shasum": "" }, "require": { - "php": "~8.1.0 || ~8.2.0 || ~8.3.0" + "ext-json": "*", + "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0" }, "require-dev": { - "ergebnis/composer-normalize": "^2.29.0", - "ergebnis/data-provider": "^3.0.0", - "ergebnis/license": "^2.2.0", - "ergebnis/php-cs-fixer-config": "^6.6.0", - "ergebnis/phpunit-slow-test-detector": "^2.3.0", - "fakerphp/faker": "^1.23.0", - "infection/infection": "~0.27.4", - "phpunit/phpunit": "^10.4.1", + "ergebnis/data-provider": "^3.2.0", + "ergebnis/license": "^2.4.0", + "ergebnis/php-cs-fixer-config": "^6.20.0", + "ergebnis/phpunit-slow-test-detector": "^2.9.0", + "fakerphp/faker": "^1.23.1", + "infection/infection": "~0.26.6", + "phpunit/phpunit": "^9.6.16", "psalm/plugin-phpunit": "~0.18.4", - "rector/rector": "~0.18.5", - "vimeo/psalm": "^5.15.0" + "rector/rector": "~0.19.2", + "vimeo/psalm": "^5.20.0" }, "type": "library", "extra": { @@ -1013,46 +1012,43 @@ "security": "https://github.com/ergebnis/json/blob/main/.github/SECURITY.md", "source": "https://github.com/ergebnis/json" }, - "time": "2023-10-10T07:57:48+00:00" + "time": "2024-01-29T15:09:24+00:00" }, { "name": "ergebnis/json-normalizer", - "version": "4.4.1", + "version": "4.5.0", "source": { "type": "git", "url": "https://github.com/ergebnis/json-normalizer.git", - "reference": "d28f36af9763ee6bc4e2a2390c0348963df7881b" + "reference": "f0ee9e70739f121b27fac8b743e4a52b23de2152" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ergebnis/json-normalizer/zipball/d28f36af9763ee6bc4e2a2390c0348963df7881b", - "reference": "d28f36af9763ee6bc4e2a2390c0348963df7881b", + "url": "https://api.github.com/repos/ergebnis/json-normalizer/zipball/f0ee9e70739f121b27fac8b743e4a52b23de2152", + "reference": "f0ee9e70739f121b27fac8b743e4a52b23de2152", "shasum": "" }, "require": { - "ergebnis/json": "^1.1.0", - "ergebnis/json-pointer": "^3.2.0", - "ergebnis/json-printer": "^3.4.0", - "ergebnis/json-schema-validator": "^4.1.0", + "ergebnis/json": "^1.2.0", + "ergebnis/json-pointer": "^3.4.0", + "ergebnis/json-printer": "^3.5.0", + "ergebnis/json-schema-validator": "^4.2.0", "ext-json": "*", "justinrainbow/json-schema": "^5.2.12", - "php": "~8.1.0 || ~8.2.0 || ~8.3.0" + "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0" }, "require-dev": { "composer/semver": "^3.4.0", "ergebnis/data-provider": "^3.2.0", "ergebnis/license": "^2.4.0", - "ergebnis/php-cs-fixer-config": "~6.14.0", - "ergebnis/phpunit-slow-test-detector": "^2.7.0", - "fakerphp/faker": "^1.23.0", - "infection/infection": "~0.27.9", - "phpunit/phpunit": "^10.5.3", + "ergebnis/php-cs-fixer-config": "^6.20.0", + "ergebnis/phpunit-slow-test-detector": "^2.9.0", + "fakerphp/faker": "^1.23.1", + "infection/infection": "~0.26.6", + "phpunit/phpunit": "^9.6.16", "psalm/plugin-phpunit": "~0.18.4", - "rector/rector": "~0.18.12", - "roave/backward-compatibility-check": "^8.4.0", - "symfony/filesystem": "^6.4.0", - "symfony/finder": "^6.4.0", - "vimeo/psalm": "^5.17.0" + "rector/rector": "~0.19.4", + "vimeo/psalm": "^5.20.0" }, "suggest": { "composer/semver": "If you want to use ComposerJsonNormalizer or VersionConstraintNormalizer" @@ -1085,37 +1081,36 @@ "security": "https://github.com/ergebnis/json-normalizer/blob/main/.github/SECURITY.md", "source": "https://github.com/ergebnis/json-normalizer" }, - "time": "2023-12-14T09:30:24+00:00" + "time": "2024-01-30T09:10:15+00:00" }, { "name": "ergebnis/json-pointer", - "version": "3.3.0", + "version": "3.4.0", "source": { "type": "git", "url": "https://github.com/ergebnis/json-pointer.git", - "reference": "8e517faefc06b7c761eaa041febef51a9375819a" + "reference": "b654757d873050622c2166f55ab25d04685261c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ergebnis/json-pointer/zipball/8e517faefc06b7c761eaa041febef51a9375819a", - "reference": "8e517faefc06b7c761eaa041febef51a9375819a", + "url": "https://api.github.com/repos/ergebnis/json-pointer/zipball/b654757d873050622c2166f55ab25d04685261c5", + "reference": "b654757d873050622c2166f55ab25d04685261c5", "shasum": "" }, "require": { - "php": "~8.1.0 || ~8.2.0 || ~8.3.0" + "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0" }, "require-dev": { - "ergebnis/composer-normalize": "^2.29.0", - "ergebnis/data-provider": "^3.0.0", - "ergebnis/license": "^2.2.0", - "ergebnis/php-cs-fixer-config": "~6.7.0", - "ergebnis/phpunit-slow-test-detector": "^2.3.0", - "fakerphp/faker": "^1.23.0", - "infection/infection": "~0.27.4", - "phpunit/phpunit": "^10.4.1", + "ergebnis/data-provider": "^3.2.0", + "ergebnis/license": "^2.4.0", + "ergebnis/php-cs-fixer-config": "^6.20.0", + "ergebnis/phpunit-slow-test-detector": "^2.9.0", + "fakerphp/faker": "^1.23.1", + "infection/infection": "~0.26.6", + "phpunit/phpunit": "^9.6.16", "psalm/plugin-phpunit": "~0.18.4", - "rector/rector": "~0.18.5", - "vimeo/psalm": "^5.15.0" + "rector/rector": "~0.19.2", + "vimeo/psalm": "^5.20.0" }, "type": "library", "extra": { @@ -1140,7 +1135,7 @@ "homepage": "https://localheinz.com" } ], - "description": "Provides JSON pointer as a value object.", + "description": "Provides an abstraction of a JSON pointer.", "homepage": "https://github.com/ergebnis/json-pointer", "keywords": [ "RFC6901", @@ -1152,37 +1147,38 @@ "security": "https://github.com/ergebnis/json-pointer/blob/main/.github/SECURITY.md", "source": "https://github.com/ergebnis/json-pointer" }, - "time": "2023-10-10T14:41:06+00:00" + "time": "2024-01-29T16:37:15+00:00" }, { "name": "ergebnis/json-printer", - "version": "3.4.0", + "version": "3.5.0", "source": { "type": "git", "url": "https://github.com/ergebnis/json-printer.git", - "reference": "05841593d72499de4f7ce4034a237c77e470558f" + "reference": "549e16fe6de34b8c3aee7b421be12caa552f3ced" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ergebnis/json-printer/zipball/05841593d72499de4f7ce4034a237c77e470558f", - "reference": "05841593d72499de4f7ce4034a237c77e470558f", + "url": "https://api.github.com/repos/ergebnis/json-printer/zipball/549e16fe6de34b8c3aee7b421be12caa552f3ced", + "reference": "549e16fe6de34b8c3aee7b421be12caa552f3ced", "shasum": "" }, "require": { "ext-json": "*", "ext-mbstring": "*", - "php": "~8.1.0 || ~8.2.0 || ~8.3.0" + "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0" }, "require-dev": { - "ergebnis/license": "^2.2.0", - "ergebnis/php-cs-fixer-config": "^6.6.0", - "ergebnis/phpunit-slow-test-detector": "^2.3.0", - "fakerphp/faker": "^1.23.0", - "infection/infection": "~0.27.3", - "phpunit/phpunit": "^10.4.1", + "ergebnis/data-provider": "^3.2.0", + "ergebnis/license": "^2.4.0", + "ergebnis/php-cs-fixer-config": "^6.20.0", + "ergebnis/phpunit-slow-test-detector": "^2.9.0", + "fakerphp/faker": "^1.23.1", + "infection/infection": "~0.26.6", + "phpunit/phpunit": "^9.6.16", "psalm/plugin-phpunit": "~0.18.4", - "rector/rector": "~0.18.5", - "vimeo/psalm": "^5.15.0" + "rector/rector": "~0.19.2", + "vimeo/psalm": "^5.20.0" }, "type": "library", "autoload": { @@ -1213,41 +1209,40 @@ "security": "https://github.com/ergebnis/json-printer/blob/main/.github/SECURITY.md", "source": "https://github.com/ergebnis/json-printer" }, - "time": "2023-10-10T07:42:48+00:00" + "time": "2024-01-29T15:33:37+00:00" }, { "name": "ergebnis/json-schema-validator", - "version": "4.1.0", + "version": "4.2.0", "source": { "type": "git", "url": "https://github.com/ergebnis/json-schema-validator.git", - "reference": "d568ed85d1cdc2e49d650c2fc234dc2516f3f25b" + "reference": "10ed514fdc3f9b71f8a92c567afea21a2f6fa1ef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ergebnis/json-schema-validator/zipball/d568ed85d1cdc2e49d650c2fc234dc2516f3f25b", - "reference": "d568ed85d1cdc2e49d650c2fc234dc2516f3f25b", + "url": "https://api.github.com/repos/ergebnis/json-schema-validator/zipball/10ed514fdc3f9b71f8a92c567afea21a2f6fa1ef", + "reference": "10ed514fdc3f9b71f8a92c567afea21a2f6fa1ef", "shasum": "" }, "require": { - "ergebnis/json": "^1.0.1", - "ergebnis/json-pointer": "^3.2.0", + "ergebnis/json": "^1.2.0", + "ergebnis/json-pointer": "^3.4.0", "ext-json": "*", "justinrainbow/json-schema": "^5.2.12", - "php": "~8.1.0 || ~8.2.0 || ~8.3.0" + "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0" }, "require-dev": { - "ergebnis/composer-normalize": "^2.21.0", - "ergebnis/data-provider": "^3.0.0", - "ergebnis/license": "^2.2.0", - "ergebnis/php-cs-fixer-config": "~6.6.0", - "ergebnis/phpunit-slow-test-detector": "^2.3.0", - "fakerphp/faker": "^1.23.0", - "infection/infection": "~0.27.4", - "phpunit/phpunit": "^10.4.1", + "ergebnis/data-provider": "^3.2.0", + "ergebnis/license": "^2.4.0", + "ergebnis/php-cs-fixer-config": "^6.20.0", + "ergebnis/phpunit-slow-test-detector": "^2.9.0", + "fakerphp/faker": "^1.23.1", + "infection/infection": "~0.26.6", + "phpunit/phpunit": "^9.6.16", "psalm/plugin-phpunit": "~0.18.4", - "rector/rector": "~0.18.5", - "vimeo/psalm": "^5.15.0" + "rector/rector": "~0.19.2", + "vimeo/psalm": "^5.20.0" }, "type": "library", "extra": { @@ -1284,7 +1279,7 @@ "security": "https://github.com/ergebnis/json-schema-validator/blob/main/.github/SECURITY.md", "source": "https://github.com/ergebnis/json-schema-validator" }, - "time": "2023-10-10T14:16:57+00:00" + "time": "2024-01-29T16:50:15+00:00" }, { "name": "hassankhan/config", From d7110a2f353a339e6013f453cdf90655df1aa57b Mon Sep 17 00:00:00 2001 From: Sayan Goswami Date: Tue, 30 Jan 2024 21:54:05 +0530 Subject: [PATCH 63/81] add back perz (#492) --- config/packages.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/config/packages.yml b/config/packages.yml index d54c4a41f..290ace9c3 100644 --- a/config/packages.yml +++ b/config/packages.yml @@ -63,10 +63,9 @@ drupal/acquia_contenthub: version: 3.3.x version_dev: 3.3.x -# ORCA-642: Acquia Perz was temporarily removed due to an outage. -#drupal/acquia_perz: -# version: 4.x -# version_dev: 4.x-dev +drupal/acquia_perz: + version: 4.x + version_dev: 4.x-dev drupal/acquia_purge: version: 1.x From 2da1d26e255edf6681cf1d4de664f2e0cd42b60e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 31 Jan 2024 14:16:23 +0000 Subject: [PATCH 64/81] Bump symfony/filesystem from 6.4.0 to 6.4.3 (#493) Bumps [symfony/filesystem](https://github.com/symfony/filesystem) from 6.4.0 to 6.4.3. - [Release notes](https://github.com/symfony/filesystem/releases) - [Changelog](https://github.com/symfony/filesystem/blob/7.0/CHANGELOG.md) - [Commits](https://github.com/symfony/filesystem/compare/v6.4.0...v6.4.3) --- updated-dependencies: - dependency-name: symfony/filesystem dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 2ad3290e1..f2efd594a 100644 --- a/composer.lock +++ b/composer.lock @@ -3993,16 +3993,16 @@ }, { "name": "symfony/filesystem", - "version": "v6.4.0", + "version": "v6.4.3", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "952a8cb588c3bc6ce76f6023000fb932f16a6e59" + "reference": "7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/952a8cb588c3bc6ce76f6023000fb932f16a6e59", - "reference": "952a8cb588c3bc6ce76f6023000fb932f16a6e59", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb", + "reference": "7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb", "shasum": "" }, "require": { @@ -4036,7 +4036,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v6.4.0" + "source": "https://github.com/symfony/filesystem/tree/v6.4.3" }, "funding": [ { @@ -4052,7 +4052,7 @@ "type": "tidelift" } ], - "time": "2023-07-26T17:27:13+00:00" + "time": "2024-01-23T14:51:35+00:00" }, { "name": "symfony/finder", From 7757f7bf85e4ff539348562a3072c7128312d9f4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 31 Jan 2024 14:16:42 +0000 Subject: [PATCH 65/81] Bump symfony/http-client from 6.4.2 to 6.4.3 (#495) Bumps [symfony/http-client](https://github.com/symfony/http-client) from 6.4.2 to 6.4.3. - [Release notes](https://github.com/symfony/http-client/releases) - [Changelog](https://github.com/symfony/http-client/blob/7.0/CHANGELOG.md) - [Commits](https://github.com/symfony/http-client/compare/v6.4.2...v6.4.3) --- updated-dependencies: - dependency-name: symfony/http-client dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index f2efd594a..dda8010da 100644 --- a/composer.lock +++ b/composer.lock @@ -4120,16 +4120,16 @@ }, { "name": "symfony/http-client", - "version": "v6.4.2", + "version": "v6.4.3", "source": { "type": "git", "url": "https://github.com/symfony/http-client.git", - "reference": "fc0944665bd932cf32a7b8a1d009466afc16528f" + "reference": "a9034bc119fab8238f76cf49c770f3135f3ead86" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/fc0944665bd932cf32a7b8a1d009466afc16528f", - "reference": "fc0944665bd932cf32a7b8a1d009466afc16528f", + "url": "https://api.github.com/repos/symfony/http-client/zipball/a9034bc119fab8238f76cf49c770f3135f3ead86", + "reference": "a9034bc119fab8238f76cf49c770f3135f3ead86", "shasum": "" }, "require": { @@ -4193,7 +4193,7 @@ "http" ], "support": { - "source": "https://github.com/symfony/http-client/tree/v6.4.2" + "source": "https://github.com/symfony/http-client/tree/v6.4.3" }, "funding": [ { @@ -4209,7 +4209,7 @@ "type": "tidelift" } ], - "time": "2023-12-02T12:49:56+00:00" + "time": "2024-01-29T15:01:07+00:00" }, { "name": "symfony/http-client-contracts", From ff0df5211183a7a6833bf8f89fbb4ec0b721b6d4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 31 Jan 2024 14:17:20 +0000 Subject: [PATCH 66/81] Bump symfony/event-dispatcher from 6.4.2 to 6.4.3 (#494) Bumps [symfony/event-dispatcher](https://github.com/symfony/event-dispatcher) from 6.4.2 to 6.4.3. - [Release notes](https://github.com/symfony/event-dispatcher/releases) - [Changelog](https://github.com/symfony/event-dispatcher/blob/7.0/CHANGELOG.md) - [Commits](https://github.com/symfony/event-dispatcher/compare/v6.4.2...v6.4.3) --- updated-dependencies: - dependency-name: symfony/event-dispatcher dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index dda8010da..c57d290a5 100644 --- a/composer.lock +++ b/composer.lock @@ -3773,16 +3773,16 @@ }, { "name": "symfony/event-dispatcher", - "version": "v6.4.2", + "version": "v6.4.3", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "e95216850555cd55e71b857eb9d6c2674124603a" + "reference": "ae9d3a6f3003a6caf56acd7466d8d52378d44fef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/e95216850555cd55e71b857eb9d6c2674124603a", - "reference": "e95216850555cd55e71b857eb9d6c2674124603a", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/ae9d3a6f3003a6caf56acd7466d8d52378d44fef", + "reference": "ae9d3a6f3003a6caf56acd7466d8d52378d44fef", "shasum": "" }, "require": { @@ -3833,7 +3833,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.2" + "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.3" }, "funding": [ { @@ -3849,7 +3849,7 @@ "type": "tidelift" } ], - "time": "2023-12-27T22:16:42+00:00" + "time": "2024-01-23T14:51:35+00:00" }, { "name": "symfony/event-dispatcher-contracts", From 01112345dc9b95482dea1e92c1829b036eeb0817 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 31 Jan 2024 14:17:40 +0000 Subject: [PATCH 67/81] Bump symfony/expression-language from 6.4.2 to 6.4.3 (#496) Bumps [symfony/expression-language](https://github.com/symfony/expression-language) from 6.4.2 to 6.4.3. - [Release notes](https://github.com/symfony/expression-language/releases) - [Changelog](https://github.com/symfony/expression-language/blob/7.0/CHANGELOG.md) - [Commits](https://github.com/symfony/expression-language/compare/v6.4.2...v6.4.3) --- updated-dependencies: - dependency-name: symfony/expression-language dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/composer.lock b/composer.lock index c57d290a5..45b4edaa9 100644 --- a/composer.lock +++ b/composer.lock @@ -3279,16 +3279,16 @@ }, { "name": "symfony/cache", - "version": "v6.4.2", + "version": "v6.4.3", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "14a75869bbb41cb35bc5d9d322473928c6f3f978" + "reference": "49f8cdee544a621a621cd21b6cda32a38926d310" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/14a75869bbb41cb35bc5d9d322473928c6f3f978", - "reference": "14a75869bbb41cb35bc5d9d322473928c6f3f978", + "url": "https://api.github.com/repos/symfony/cache/zipball/49f8cdee544a621a621cd21b6cda32a38926d310", + "reference": "49f8cdee544a621a621cd21b6cda32a38926d310", "shasum": "" }, "require": { @@ -3355,7 +3355,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v6.4.2" + "source": "https://github.com/symfony/cache/tree/v6.4.3" }, "funding": [ { @@ -3371,7 +3371,7 @@ "type": "tidelift" } ], - "time": "2023-12-29T15:34:34+00:00" + "time": "2024-01-23T14:51:35+00:00" }, { "name": "symfony/cache-contracts", @@ -3929,16 +3929,16 @@ }, { "name": "symfony/expression-language", - "version": "v6.4.2", + "version": "v6.4.3", "source": { "type": "git", "url": "https://github.com/symfony/expression-language.git", - "reference": "7d63ccd5331d4164961776eced5524e891e30ad3" + "reference": "b4a4ae33fbb33a99d23c5698faaecadb76ad0fe4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/expression-language/zipball/7d63ccd5331d4164961776eced5524e891e30ad3", - "reference": "7d63ccd5331d4164961776eced5524e891e30ad3", + "url": "https://api.github.com/repos/symfony/expression-language/zipball/b4a4ae33fbb33a99d23c5698faaecadb76ad0fe4", + "reference": "b4a4ae33fbb33a99d23c5698faaecadb76ad0fe4", "shasum": "" }, "require": { @@ -3973,7 +3973,7 @@ "description": "Provides an engine that can compile and evaluate expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/expression-language/tree/v6.4.2" + "source": "https://github.com/symfony/expression-language/tree/v6.4.3" }, "funding": [ { @@ -3989,7 +3989,7 @@ "type": "tidelift" } ], - "time": "2023-12-10T16:15:48+00:00" + "time": "2024-01-23T14:51:35+00:00" }, { "name": "symfony/filesystem", @@ -5239,16 +5239,16 @@ }, { "name": "symfony/var-exporter", - "version": "v6.4.2", + "version": "v6.4.3", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "5fe9a0021b8d35e67d914716ec8de50716a68e7e" + "reference": "a8c12b5448a5ac685347f5eeb2abf6a571ec16b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/5fe9a0021b8d35e67d914716ec8de50716a68e7e", - "reference": "5fe9a0021b8d35e67d914716ec8de50716a68e7e", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/a8c12b5448a5ac685347f5eeb2abf6a571ec16b8", + "reference": "a8c12b5448a5ac685347f5eeb2abf6a571ec16b8", "shasum": "" }, "require": { @@ -5294,7 +5294,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v6.4.2" + "source": "https://github.com/symfony/var-exporter/tree/v6.4.3" }, "funding": [ { @@ -5310,7 +5310,7 @@ "type": "tidelift" } ], - "time": "2023-12-27T08:18:35+00:00" + "time": "2024-01-23T14:51:35+00:00" }, { "name": "symfony/yaml", From 99541a1010a96d36347fd3c8a0fdd9be6f611ea9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Feb 2024 14:47:35 +0000 Subject: [PATCH 68/81] Bump symfony/console from 5.4.34 to 5.4.35 (#498) Bumps [symfony/console](https://github.com/symfony/console) from 5.4.34 to 5.4.35. - [Release notes](https://github.com/symfony/console/releases) - [Changelog](https://github.com/symfony/console/blob/7.0/CHANGELOG.md) - [Commits](https://github.com/symfony/console/compare/v5.4.34...v5.4.35) --- updated-dependencies: - dependency-name: symfony/console dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/composer.lock b/composer.lock index 45b4edaa9..a720b8dc7 100644 --- a/composer.lock +++ b/composer.lock @@ -3526,16 +3526,16 @@ }, { "name": "symfony/console", - "version": "v5.4.34", + "version": "v5.4.35", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "4b4d8cd118484aa604ec519062113dd87abde18c" + "reference": "dbdf6adcb88d5f83790e1efb57ef4074309d3931" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/4b4d8cd118484aa604ec519062113dd87abde18c", - "reference": "4b4d8cd118484aa604ec519062113dd87abde18c", + "url": "https://api.github.com/repos/symfony/console/zipball/dbdf6adcb88d5f83790e1efb57ef4074309d3931", + "reference": "dbdf6adcb88d5f83790e1efb57ef4074309d3931", "shasum": "" }, "require": { @@ -3605,7 +3605,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.34" + "source": "https://github.com/symfony/console/tree/v5.4.35" }, "funding": [ { @@ -3621,7 +3621,7 @@ "type": "tidelift" } ], - "time": "2023-12-08T13:33:03+00:00" + "time": "2024-01-23T14:28:09+00:00" }, { "name": "symfony/dependency-injection", @@ -5153,16 +5153,16 @@ }, { "name": "symfony/string", - "version": "v6.4.2", + "version": "v6.4.3", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "7cb80bc10bfcdf6b5492741c0b9357dac66940bc" + "reference": "7a14736fb179876575464e4658fce0c304e8c15b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/7cb80bc10bfcdf6b5492741c0b9357dac66940bc", - "reference": "7cb80bc10bfcdf6b5492741c0b9357dac66940bc", + "url": "https://api.github.com/repos/symfony/string/zipball/7a14736fb179876575464e4658fce0c304e8c15b", + "reference": "7a14736fb179876575464e4658fce0c304e8c15b", "shasum": "" }, "require": { @@ -5219,7 +5219,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.4.2" + "source": "https://github.com/symfony/string/tree/v6.4.3" }, "funding": [ { @@ -5235,7 +5235,7 @@ "type": "tidelift" } ], - "time": "2023-12-10T16:15:48+00:00" + "time": "2024-01-25T09:26:29+00:00" }, { "name": "symfony/var-exporter", From 911ec448f04ca4c6bcdb5e1c3efd01782a28c5c2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Feb 2024 14:47:43 +0000 Subject: [PATCH 69/81] Bump symfony/dependency-injection from 6.4.2 to 6.4.3 (#499) Bumps [symfony/dependency-injection](https://github.com/symfony/dependency-injection) from 6.4.2 to 6.4.3. - [Release notes](https://github.com/symfony/dependency-injection/releases) - [Changelog](https://github.com/symfony/dependency-injection/blob/7.0/CHANGELOG.md) - [Commits](https://github.com/symfony/dependency-injection/compare/v6.4.2...v6.4.3) --- updated-dependencies: - dependency-name: symfony/dependency-injection dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index a720b8dc7..342ee9187 100644 --- a/composer.lock +++ b/composer.lock @@ -3625,16 +3625,16 @@ }, { "name": "symfony/dependency-injection", - "version": "v6.4.2", + "version": "v6.4.3", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "226ea431b1eda6f0d9f5a4b278757171960bb195" + "reference": "6871811c5a5c5e180244ddb689746446db02c05b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/226ea431b1eda6f0d9f5a4b278757171960bb195", - "reference": "226ea431b1eda6f0d9f5a4b278757171960bb195", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/6871811c5a5c5e180244ddb689746446db02c05b", + "reference": "6871811c5a5c5e180244ddb689746446db02c05b", "shasum": "" }, "require": { @@ -3686,7 +3686,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v6.4.2" + "source": "https://github.com/symfony/dependency-injection/tree/v6.4.3" }, "funding": [ { @@ -3702,7 +3702,7 @@ "type": "tidelift" } ], - "time": "2023-12-28T19:16:56+00:00" + "time": "2024-01-30T08:32:12+00:00" }, { "name": "symfony/deprecation-contracts", From 883be80e7e1d4d8c0bad03cf8cfd440df38b674f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Feb 2024 14:48:00 +0000 Subject: [PATCH 70/81] Bump symfony/config from 6.4.0 to 6.4.3 (#497) Bumps [symfony/config](https://github.com/symfony/config) from 6.4.0 to 6.4.3. - [Release notes](https://github.com/symfony/config/releases) - [Changelog](https://github.com/symfony/config/blob/7.0/CHANGELOG.md) - [Commits](https://github.com/symfony/config/compare/v6.4.0...v6.4.3) --- updated-dependencies: - dependency-name: symfony/config dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 342ee9187..9167cfd02 100644 --- a/composer.lock +++ b/composer.lock @@ -3451,16 +3451,16 @@ }, { "name": "symfony/config", - "version": "v6.4.0", + "version": "v6.4.3", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "5d33e0fb707d603330e0edfd4691803a1253572e" + "reference": "206482ff3ed450495b1d5b7bad1bc3a852def96f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/5d33e0fb707d603330e0edfd4691803a1253572e", - "reference": "5d33e0fb707d603330e0edfd4691803a1253572e", + "url": "https://api.github.com/repos/symfony/config/zipball/206482ff3ed450495b1d5b7bad1bc3a852def96f", + "reference": "206482ff3ed450495b1d5b7bad1bc3a852def96f", "shasum": "" }, "require": { @@ -3506,7 +3506,7 @@ "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/config/tree/v6.4.0" + "source": "https://github.com/symfony/config/tree/v6.4.3" }, "funding": [ { @@ -3522,7 +3522,7 @@ "type": "tidelift" } ], - "time": "2023-11-09T08:28:32+00:00" + "time": "2024-01-29T13:26:27+00:00" }, { "name": "symfony/console", From 3fde5d40a44923fd618bff57cef13ae465a3c01d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Feb 2024 14:48:29 +0000 Subject: [PATCH 71/81] Bump symfony/phpunit-bridge from 7.0.2 to 7.0.3 (#500) Bumps [symfony/phpunit-bridge](https://github.com/symfony/phpunit-bridge) from 7.0.2 to 7.0.3. - [Release notes](https://github.com/symfony/phpunit-bridge/releases) - [Changelog](https://github.com/symfony/phpunit-bridge/blob/6.3/CHANGELOG.md) - [Commits](https://github.com/symfony/phpunit-bridge/compare/v7.0.2...v7.0.3) --- updated-dependencies: - dependency-name: symfony/phpunit-bridge dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 9167cfd02..cb68832ae 100644 --- a/composer.lock +++ b/composer.lock @@ -4358,16 +4358,16 @@ }, { "name": "symfony/phpunit-bridge", - "version": "v7.0.2", + "version": "v7.0.3", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "92df075808c9437beca9540e25ae0c40eea1c061" + "reference": "0a2eeb0d9e68bf01660e3e903f8113508bb46132" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/92df075808c9437beca9540e25ae0c40eea1c061", - "reference": "92df075808c9437beca9540e25ae0c40eea1c061", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/0a2eeb0d9e68bf01660e3e903f8113508bb46132", + "reference": "0a2eeb0d9e68bf01660e3e903f8113508bb46132", "shasum": "" }, "require": { @@ -4419,7 +4419,7 @@ "description": "Provides utilities for PHPUnit, especially user deprecation notices management", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/phpunit-bridge/tree/v7.0.2" + "source": "https://github.com/symfony/phpunit-bridge/tree/v7.0.3" }, "funding": [ { @@ -4435,7 +4435,7 @@ "type": "tidelift" } ], - "time": "2023-12-19T11:23:03+00:00" + "time": "2024-01-23T15:02:46+00:00" }, { "name": "symfony/polyfill-ctype", From e2579e9f86b7d027f57e409614f6fe6b3ad67f23 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Feb 2024 15:12:42 +0000 Subject: [PATCH 72/81] Bump symfony/yaml from 6.4.0 to 6.4.3 (#502) Bumps [symfony/yaml](https://github.com/symfony/yaml) from 6.4.0 to 6.4.3. - [Release notes](https://github.com/symfony/yaml/releases) - [Changelog](https://github.com/symfony/yaml/blob/7.0/CHANGELOG.md) - [Commits](https://github.com/symfony/yaml/compare/v6.4.0...v6.4.3) --- updated-dependencies: - dependency-name: symfony/yaml dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index cb68832ae..f0052a115 100644 --- a/composer.lock +++ b/composer.lock @@ -5314,16 +5314,16 @@ }, { "name": "symfony/yaml", - "version": "v6.4.0", + "version": "v6.4.3", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "4f9237a1bb42455d609e6687d2613dde5b41a587" + "reference": "d75715985f0f94f978e3a8fa42533e10db921b90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/4f9237a1bb42455d609e6687d2613dde5b41a587", - "reference": "4f9237a1bb42455d609e6687d2613dde5b41a587", + "url": "https://api.github.com/repos/symfony/yaml/zipball/d75715985f0f94f978e3a8fa42533e10db921b90", + "reference": "d75715985f0f94f978e3a8fa42533e10db921b90", "shasum": "" }, "require": { @@ -5366,7 +5366,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v6.4.0" + "source": "https://github.com/symfony/yaml/tree/v6.4.3" }, "funding": [ { @@ -5382,7 +5382,7 @@ "type": "tidelift" } ], - "time": "2023-11-06T11:00:25+00:00" + "time": "2024-01-23T14:51:35+00:00" }, { "name": "webflo/drupal-finder", From 4f2de9572cda910bc011c4bd6c21cf3b7704f9aa Mon Sep 17 00:00:00 2001 From: Sayan Goswami Date: Fri, 9 Feb 2024 13:28:39 +0530 Subject: [PATCH 73/81] adding acms (#504) --- config/packages.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/config/packages.yml b/config/packages.yml index 290ace9c3..b45dbb390 100644 --- a/config/packages.yml +++ b/config/packages.yml @@ -50,10 +50,9 @@ # config/services.yml for the relevant code or bin/self-test for a usage # example. -# ORCA-567 : ACMS was temporarily removed due to an outage. -#acquia/acquia_cms: -# version: 2.x -# version_dev: 2.x-dev +acquia/acquia_cms: + version: 2.x + version_dev: 2.x-dev drupal/acquia_connector: version: 4.x From 14bc9b29477b2358dad20c43b736065d70d148ea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Feb 2024 14:27:37 +0000 Subject: [PATCH 74/81] Bump composer/composer from 2.6.6 to 2.7.0 (#506) Bumps [composer/composer](https://github.com/composer/composer) from 2.6.6 to 2.7.0. - [Release notes](https://github.com/composer/composer/releases) - [Changelog](https://github.com/composer/composer/blob/main/CHANGELOG.md) - [Commits](https://github.com/composer/composer/compare/2.6.6...2.7.0) --- updated-dependencies: - dependency-name: composer/composer dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 163 ++++++++++++++++++++++---------------------------- 1 file changed, 71 insertions(+), 92 deletions(-) diff --git a/composer.lock b/composer.lock index f0052a115..4de5dbe6b 100644 --- a/composer.lock +++ b/composer.lock @@ -67,16 +67,16 @@ }, { "name": "composer/ca-bundle", - "version": "1.3.7", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "76e46335014860eec1aa5a724799a00a2e47cc85" + "reference": "b66d11b7479109ab547f9405b97205640b17d385" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/76e46335014860eec1aa5a724799a00a2e47cc85", - "reference": "76e46335014860eec1aa5a724799a00a2e47cc85", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/b66d11b7479109ab547f9405b97205640b17d385", + "reference": "b66d11b7479109ab547f9405b97205640b17d385", "shasum": "" }, "require": { @@ -88,7 +88,7 @@ "phpstan/phpstan": "^0.12.55", "psr/log": "^1.0", "symfony/phpunit-bridge": "^4.2 || ^5", - "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0 || ^6.0" + "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0" }, "type": "library", "extra": { @@ -123,7 +123,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/ca-bundle/issues", - "source": "https://github.com/composer/ca-bundle/tree/1.3.7" + "source": "https://github.com/composer/ca-bundle/tree/1.4.0" }, "funding": [ { @@ -139,7 +139,7 @@ "type": "tidelift" } ], - "time": "2023-08-30T09:31:38+00:00" + "time": "2023-12-18T12:05:55+00:00" }, { "name": "composer/class-map-generator", @@ -216,16 +216,16 @@ }, { "name": "composer/composer", - "version": "2.6.6", + "version": "2.7.0", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "683557bd2466072777309d039534bb1332d0dda5" + "reference": "96d107e2bfe61bb9eafe55a9d45bd7faed1dd461" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/683557bd2466072777309d039534bb1332d0dda5", - "reference": "683557bd2466072777309d039534bb1332d0dda5", + "url": "https://api.github.com/repos/composer/composer/zipball/96d107e2bfe61bb9eafe55a9d45bd7faed1dd461", + "reference": "96d107e2bfe61bb9eafe55a9d45bd7faed1dd461", "shasum": "" }, "require": { @@ -243,7 +243,7 @@ "seld/jsonlint": "^1.4", "seld/phar-utils": "^1.2", "seld/signal-handler": "^2.0", - "symfony/console": "^5.4.11 || ^6.0.11", + "symfony/console": "^5.4.11 || ^6.0.11 || ^7", "symfony/filesystem": "^5.4 || ^6.0 || ^7", "symfony/finder": "^5.4 || ^6.0 || ^7", "symfony/polyfill-php73": "^1.24", @@ -257,7 +257,7 @@ "phpstan/phpstan-phpunit": "^1.0", "phpstan/phpstan-strict-rules": "^1", "phpstan/phpstan-symfony": "^1.2.10", - "symfony/phpunit-bridge": "^6.0 || ^7" + "symfony/phpunit-bridge": "^6.4.1 || ^7.0.1" }, "suggest": { "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", @@ -270,7 +270,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.6-dev" + "dev-main": "2.7-dev" }, "phpstan": { "includes": [ @@ -310,7 +310,7 @@ "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/composer/issues", "security": "https://github.com/composer/composer/security/policy", - "source": "https://github.com/composer/composer/tree/2.6.6" + "source": "https://github.com/composer/composer/tree/2.7.0" }, "funding": [ { @@ -326,7 +326,7 @@ "type": "tidelift" } ], - "time": "2023-12-08T17:32:26+00:00" + "time": "2024-02-08T14:09:19+00:00" }, { "name": "composer/metadata-minifier", @@ -2926,16 +2926,16 @@ }, { "name": "seld/jsonlint", - "version": "1.10.0", + "version": "1.10.2", "source": { "type": "git", "url": "https://github.com/Seldaek/jsonlint.git", - "reference": "594fd6462aad8ecee0b45ca5045acea4776667f1" + "reference": "9bb7db07b5d66d90f6ebf542f09fc67d800e5259" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/594fd6462aad8ecee0b45ca5045acea4776667f1", - "reference": "594fd6462aad8ecee0b45ca5045acea4776667f1", + "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/9bb7db07b5d66d90f6ebf542f09fc67d800e5259", + "reference": "9bb7db07b5d66d90f6ebf542f09fc67d800e5259", "shasum": "" }, "require": { @@ -2962,7 +2962,7 @@ { "name": "Jordi Boggiano", "email": "j.boggiano@seld.be", - "homepage": "http://seld.be" + "homepage": "https://seld.be" } ], "description": "JSON Linter", @@ -2974,7 +2974,7 @@ ], "support": { "issues": "https://github.com/Seldaek/jsonlint/issues", - "source": "https://github.com/Seldaek/jsonlint/tree/1.10.0" + "source": "https://github.com/Seldaek/jsonlint/tree/1.10.2" }, "funding": [ { @@ -2986,7 +2986,7 @@ "type": "tidelift" } ], - "time": "2023-05-11T13:16:46+00:00" + "time": "2024-02-07T12:57:50+00:00" }, { "name": "seld/phar-utils", @@ -4439,16 +4439,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb" + "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", - "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4", + "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4", "shasum": "" }, "require": { @@ -4462,9 +4462,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -4501,7 +4498,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0" }, "funding": [ { @@ -4517,20 +4514,20 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "875e90aeea2777b6f135677f618529449334a612" + "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/875e90aeea2777b6f135677f618529449334a612", - "reference": "875e90aeea2777b6f135677f618529449334a612", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f", + "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f", "shasum": "" }, "require": { @@ -4541,9 +4538,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -4582,7 +4576,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.29.0" }, "funding": [ { @@ -4598,20 +4592,20 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92" + "reference": "bc45c394692b948b4d383a08d7753968bed9a83d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", - "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d", + "reference": "bc45c394692b948b4d383a08d7753968bed9a83d", "shasum": "" }, "require": { @@ -4622,9 +4616,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -4666,7 +4657,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.29.0" }, "funding": [ { @@ -4682,20 +4673,20 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "42292d99c55abe617799667f454222c54c60e229" + "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229", - "reference": "42292d99c55abe617799667f454222c54c60e229", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec", + "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec", "shasum": "" }, "require": { @@ -4709,9 +4700,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -4749,7 +4737,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0" }, "funding": [ { @@ -4765,20 +4753,20 @@ "type": "tidelift" } ], - "time": "2023-07-28T09:04:16+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "fe2f306d1d9d346a7fee353d0d5012e401e984b5" + "reference": "21bd091060673a1177ae842c0ef8fe30893114d2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fe2f306d1d9d346a7fee353d0d5012e401e984b5", - "reference": "fe2f306d1d9d346a7fee353d0d5012e401e984b5", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/21bd091060673a1177ae842c0ef8fe30893114d2", + "reference": "21bd091060673a1177ae842c0ef8fe30893114d2", "shasum": "" }, "require": { @@ -4786,9 +4774,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -4828,7 +4813,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.29.0" }, "funding": [ { @@ -4844,20 +4829,20 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5" + "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5", - "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", + "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", "shasum": "" }, "require": { @@ -4865,9 +4850,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -4911,7 +4893,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0" }, "funding": [ { @@ -4927,20 +4909,20 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-php81", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b" + "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/7581cd600fa9fd681b797d00b02f068e2f13263b", - "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/c565ad1e63f30e7477fc40738343c62b40bc672d", + "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d", "shasum": "" }, "require": { @@ -4948,9 +4930,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -4990,7 +4969,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-php81/tree/v1.29.0" }, "funding": [ { @@ -5006,20 +4985,20 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/process", - "version": "v6.4.2", + "version": "v6.4.3", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "c4b1ef0bc80533d87a2e969806172f1c2a980241" + "reference": "31642b0818bfcff85930344ef93193f8c607e0a3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/c4b1ef0bc80533d87a2e969806172f1c2a980241", - "reference": "c4b1ef0bc80533d87a2e969806172f1c2a980241", + "url": "https://api.github.com/repos/symfony/process/zipball/31642b0818bfcff85930344ef93193f8c607e0a3", + "reference": "31642b0818bfcff85930344ef93193f8c607e0a3", "shasum": "" }, "require": { @@ -5051,7 +5030,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v6.4.2" + "source": "https://github.com/symfony/process/tree/v6.4.3" }, "funding": [ { @@ -5067,7 +5046,7 @@ "type": "tidelift" } ], - "time": "2023-12-22T16:42:54+00:00" + "time": "2024-01-23T14:51:35+00:00" }, { "name": "symfony/service-contracts", From f99a95c5a7efa8294a6dde9de78a96317595d453 Mon Sep 17 00:00:00 2001 From: Sayan Goswami Date: Sat, 10 Feb 2024 09:26:06 +0530 Subject: [PATCH 75/81] Add Acquia CMS Common module (#505) * Acquia CMS Common version switch * Fix debug statements --- config/packages.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/config/packages.yml b/config/packages.yml index b45dbb390..2a7ef7415 100644 --- a/config/packages.yml +++ b/config/packages.yml @@ -54,6 +54,13 @@ acquia/acquia_cms: version: 2.x version_dev: 2.x-dev +drupal/acquia_cms_common: + core_matrix: + 10.1.x: + version: 3.2.x + version_dev: 1.x-dev + '*': [] + drupal/acquia_connector: version: 4.x version_dev: 4.x-dev From 3762ac720db5436c1e88a49a26c41817c1fff85d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Feb 2024 18:00:14 +0000 Subject: [PATCH 76/81] Bump composer/composer from 2.7.0 to 2.7.1 (#507) Bumps [composer/composer](https://github.com/composer/composer) from 2.7.0 to 2.7.1. - [Release notes](https://github.com/composer/composer/releases) - [Changelog](https://github.com/composer/composer/blob/main/CHANGELOG.md) - [Commits](https://github.com/composer/composer/compare/2.7.0...2.7.1) --- updated-dependencies: - dependency-name: composer/composer dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 4de5dbe6b..5eb9f9775 100644 --- a/composer.lock +++ b/composer.lock @@ -216,16 +216,16 @@ }, { "name": "composer/composer", - "version": "2.7.0", + "version": "2.7.1", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "96d107e2bfe61bb9eafe55a9d45bd7faed1dd461" + "reference": "aaf6ed5ccd27c23f79a545e351b4d7842a99d0bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/96d107e2bfe61bb9eafe55a9d45bd7faed1dd461", - "reference": "96d107e2bfe61bb9eafe55a9d45bd7faed1dd461", + "url": "https://api.github.com/repos/composer/composer/zipball/aaf6ed5ccd27c23f79a545e351b4d7842a99d0bc", + "reference": "aaf6ed5ccd27c23f79a545e351b4d7842a99d0bc", "shasum": "" }, "require": { @@ -310,7 +310,7 @@ "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/composer/issues", "security": "https://github.com/composer/composer/security/policy", - "source": "https://github.com/composer/composer/tree/2.7.0" + "source": "https://github.com/composer/composer/tree/2.7.1" }, "funding": [ { @@ -326,7 +326,7 @@ "type": "tidelift" } ], - "time": "2024-02-08T14:09:19+00:00" + "time": "2024-02-09T14:26:28+00:00" }, { "name": "composer/metadata-minifier", From 2cb3fb1e5a554ce866cb2a80cae7466aac07ebe9 Mon Sep 17 00:00:00 2001 From: Sayan Goswami Date: Tue, 13 Feb 2024 21:36:59 +0530 Subject: [PATCH 77/81] Gitlab directory name mismatch fix (#503) * save * Save work * tests passing * tests fix * latest changes * PR feedback * Fix comments * Update src/Domain/Package/PackageManager.php Co-authored-by: Travis Carden * Update tests/Domain/Package/PackageManagerTest.php Co-authored-by: Travis Carden --------- Co-authored-by: Travis Carden --- src/Domain/Package/Package.php | 2 +- src/Domain/Package/PackageManager.php | 41 +++++++++++++++++++-- tests/Domain/Package/PackageManagerTest.php | 40 +++++++++++++++++++- 3 files changed, 77 insertions(+), 6 deletions(-) diff --git a/src/Domain/Package/Package.php b/src/Domain/Package/Package.php index 19eaa5b57..0276caf86 100644 --- a/src/Domain/Package/Package.php +++ b/src/Domain/Package/Package.php @@ -226,7 +226,7 @@ public function getRepositoryUrlRaw(): string { * Gets the absolute URL for the Composer "path" repository. * * @return string - * The absolute URL the Composer package is cloned at at, e.g., + * The absolute URL the Composer package is cloned at, e.g., * "/var/www/example". */ public function getRepositoryUrlAbsolute(): string { diff --git a/src/Domain/Package/PackageManager.php b/src/Domain/Package/PackageManager.php index 9bfcb7b9d..65bcb09b0 100644 --- a/src/Domain/Package/PackageManager.php +++ b/src/Domain/Package/PackageManager.php @@ -2,6 +2,7 @@ namespace Acquia\Orca\Domain\Package; +use Acquia\Orca\Helper\EnvFacade; use Acquia\Orca\Helper\Filesystem\FixturePathHandler; use Acquia\Orca\Helper\Filesystem\OrcaPathHandler; use Symfony\Component\Filesystem\Filesystem; @@ -61,9 +62,18 @@ class PackageManager { */ private $parser; + /** + * The environment facade. + * + * @var \Acquia\Orca\Helper\EnvFacade + */ + private EnvFacade $env; + /** * Constructs an instance. * + * @param \Acquia\Orca\Helper\EnvFacade $envFacade + * The environment facade. * @param \Symfony\Component\Filesystem\Filesystem $filesystem * The filesystem. * @param \Acquia\Orca\Helper\Filesystem\FixturePathHandler $fixture_path_handler @@ -80,7 +90,8 @@ class PackageManager { * project directory whose contents will be merged into the main packages * configuration. */ - public function __construct(Filesystem $filesystem, FixturePathHandler $fixture_path_handler, OrcaPathHandler $orca_path_handler, Parser $parser, string $packages_config, ?string $packages_config_alter) { + public function __construct(EnvFacade $envFacade, Filesystem $filesystem, FixturePathHandler $fixture_path_handler, OrcaPathHandler $orca_path_handler, Parser $parser, string $packages_config, ?string $packages_config_alter) { + $this->env = $envFacade; $this->filesystem = $filesystem; $this->fixture = $fixture_path_handler; $this->orca = $orca_path_handler; @@ -205,7 +216,12 @@ public function getAlterData(): array { private function initializePackages(FixturePathHandler $fixture_path_handler, string $packages_config, ?string $packages_config_alter): void { $data = $this->parseYamlFile($this->orca->getPath($packages_config)); if ($packages_config_alter) { - $alter_path = $this->orca->getPath($packages_config_alter); + if ($this->filesystem->isAbsolutePath($packages_config_alter)) { + $alter_path = $packages_config_alter; + } + else { + $alter_path = $this->orca->getPath($packages_config_alter); + } $this->alterData = $this->parseYamlFile($alter_path); $data = array_merge($data, $this->alterData); } @@ -267,8 +283,7 @@ private function parseYamlFile(string $file): array { /** * Checks if a package is null. */ - private function containsValidVersion($data) : bool { - + private function containsValidVersion($data): bool { if (!is_array($data)) { return FALSE; } @@ -284,6 +299,9 @@ private function containsValidVersion($data) : bool { * Adds a package to the list of packages. */ private function addPackage(array $datum, FixturePathHandler $fixture_path_handler, string $package_name): void { + if ($this->env->get('ORCA_SUT_NAME') === $package_name) { + $datum = $this->setSutUrl($datum); + } $package = new Package($datum, $fixture_path_handler, $this->orca, $package_name); $this->packages[$package_name] = $package; } @@ -306,4 +324,19 @@ private function initializeBlt(): void { $this->blt = new Package($data[$package_name], $this->fixture, $this->orca, $package_name); } + /** + * Sets the URL for the SUT. + */ + private function setSutUrl($datum): array { + $orca_sut_dir = $this->env->get('ORCA_SUT_DIR'); + if (!empty($datum['url']) || is_null($orca_sut_dir)) { + return $datum; + } + + $package_name_parts = explode('/', $orca_sut_dir); + $datum['url'] = "../" . end($package_name_parts); + + return $datum; + } + } diff --git a/tests/Domain/Package/PackageManagerTest.php b/tests/Domain/Package/PackageManagerTest.php index b1d7a1bdd..e0fb44ad4 100644 --- a/tests/Domain/Package/PackageManagerTest.php +++ b/tests/Domain/Package/PackageManagerTest.php @@ -4,6 +4,7 @@ use Acquia\Orca\Domain\Package\Package; use Acquia\Orca\Domain\Package\PackageManager; +use Acquia\Orca\Helper\EnvFacade; use Acquia\Orca\Helper\Filesystem\FixturePathHandler; use Acquia\Orca\Helper\Filesystem\OrcaPathHandler; use Acquia\Orca\Tests\TestCase; @@ -80,6 +81,7 @@ class PackageManagerTest extends TestCase { '*' => ['version' => '12.x', 'version_dev' => '12.x-dev'], ], ], + 'drupal/example_sut' => [], ]; private const EXPECTED_PACKAGE_LIST = [ @@ -97,6 +99,7 @@ class PackageManagerTest extends TestCase { 'drupal/package' => 0, 'drupal/theme1' => 0, 'drupal/theme2' => 0, + 'drupal/example_sut' => 0, ]; private const EXPECTED_DEPENDENCY_LIST = [ @@ -106,17 +109,30 @@ class PackageManagerTest extends TestCase { private const ORCA_PATH = '/var/www/orca'; + private const ORCA_SUT_DIR = '/var/www/example-123'; + + private const ORCA_SUT_NAME = 'drupal/example_sut'; + private const PACKAGES_CONFIG_FILE = 'config/packages.yml'; private const PACKAGES_CONFIG_ALTER_FILE = '../example/packages.yml'; protected OrcaPathHandler|ObjectProphecy $orca; + protected ObjectProphecy|Filesystem $filesystem; + protected ObjectProphecy|FixturePathHandler $fixture; + protected ObjectProphecy|Parser $parser; + protected ObjectProphecy|EnvFacade $env; + protected function setUp(): void { + $this->env = $this->prophesize(EnvFacade::class); $this->filesystem = $this->prophesize(Filesystem::class); + $this->filesystem + ->isAbsolutePath(Argument::any()) + ->willReturn(TRUE); $this->filesystem ->exists(Argument::any()) ->willReturn(TRUE); @@ -141,11 +157,12 @@ protected function setUp(): void { } private function createPackageManager(): PackageManager { + $env = $this->env->reveal(); $filesystem = $this->filesystem->reveal(); $fixture_path_handler = $this->fixture->reveal(); $orca_path_handler = $this->orca->reveal(); $parser = $this->parser->reveal(); - return new PackageManager($filesystem, $fixture_path_handler, $orca_path_handler, $parser, self::PACKAGES_CONFIG_FILE, self::PACKAGES_CONFIG_ALTER_FILE); + return new PackageManager($env, $filesystem, $fixture_path_handler, $orca_path_handler, $parser, self::PACKAGES_CONFIG_FILE, self::PACKAGES_CONFIG_ALTER_FILE); } public function testConstructionAndGetters(): void { @@ -225,4 +242,25 @@ public function testParseInvalidYamlFile(): void { $manager->getAlterData(); } + public function testSetSutUrl(): void { + $this->env + ->get('ORCA_SUT_NAME') + ->willReturn(self::ORCA_SUT_NAME); + $this->env + ->get('ORCA_SUT_DIR') + ->willReturn(self::ORCA_SUT_DIR); + $manager = $this->createPackageManager(); + $example_sut = $manager->get('drupal/example_sut'); + $non_sut = $manager->get('drupal/module2'); + + $package_name_parts = explode('/', self::ORCA_SUT_DIR); + $expected_sut_url = "../" . end($package_name_parts); + + $sut_url = $example_sut->getRepositoryUrlRaw(); + $non_sut_url = $non_sut->getRepositoryUrlRaw(); + + self::assertEquals($expected_sut_url, $sut_url, 'Url correctly set.'); + self::assertNotEquals($non_sut_url, $sut_url, "Non sut packages don't contain sut url."); + } + } From 185d634f96486933a2805bb75e74f35ee1d2397d Mon Sep 17 00:00:00 2001 From: Sayan Goswami Date: Tue, 13 Feb 2024 23:50:21 +0530 Subject: [PATCH 78/81] Add Latest EOL Major job (#508) * Job created * Modifying packages.yml * Renaming files * save * Create new Job * Add new job to github actions * Update tests/Domain/Composer/Version/DrupalCoreVersionResolverTest.php Co-authored-by: Travis Carden * Remove unnecessary services from Job --------- Co-authored-by: Travis Carden --- .github/workflows/orca.yml | 1 + config/packages.yml | 12 +++- src/Domain/Ci/CiJobFactory.php | 4 ++ .../IntegratedTestOnLatestEolMajorCiJob.php | 72 +++++++++++++++++++ .../Version/DrupalCoreVersionResolver.php | 32 +++++++++ src/Enum/CiJobEnum.php | 7 ++ src/Enum/DrupalCoreVersionEnum.php | 5 ++ tests/Domain/Ci/CiJobFactoryTest.php | 6 ++ .../Version/DrupalCoreVersionResolverTest.php | 28 +++++++- 9 files changed, 164 insertions(+), 3 deletions(-) create mode 100644 src/Domain/Ci/Job/IntegratedTestOnLatestEolMajorCiJob.php diff --git a/.github/workflows/orca.yml b/.github/workflows/orca.yml index 1d90527a3..eac925f15 100644 --- a/.github/workflows/orca.yml +++ b/.github/workflows/orca.yml @@ -40,6 +40,7 @@ jobs: matrix: orca-job: - STATIC_CODE_ANALYSIS + - INTEGRATED_TEST_ON_LATEST_EOL_MAJOR - INTEGRATED_TEST_ON_OLDEST_SUPPORTED - INTEGRATED_TEST_ON_PREVIOUS_MINOR - INTEGRATED_TEST_ON_LATEST_LTS diff --git a/config/packages.yml b/config/packages.yml index 2a7ef7415..815b55fb1 100644 --- a/config/packages.yml +++ b/config/packages.yml @@ -56,10 +56,18 @@ acquia/acquia_cms: drupal/acquia_cms_common: core_matrix: + '>=10.2.2': + version: 3.3.x + version_dev: 3.3.x-dev 10.1.x: version: 3.2.x - version_dev: 1.x-dev - '*': [] + version_dev: 3.2.x-dev + '>=10.0.9 <10.1': + version: 3.1.x + version_dev: 3.1.x-dev + '>=9.5.10 <10.0.9': + version: 2.x + version_dev: 2.x-dev drupal/acquia_connector: version: 4.x diff --git a/src/Domain/Ci/CiJobFactory.php b/src/Domain/Ci/CiJobFactory.php index 274197532..48b2f2031 100644 --- a/src/Domain/Ci/CiJobFactory.php +++ b/src/Domain/Ci/CiJobFactory.php @@ -6,6 +6,7 @@ use Acquia\Orca\Domain\Ci\Job\DeprecatedCodeScanWContribCiJob; use Acquia\Orca\Domain\Ci\Job\IntegratedTestOnCurrentCiJob; use Acquia\Orca\Domain\Ci\Job\IntegratedTestOnCurrentDevCiJob; +use Acquia\Orca\Domain\Ci\Job\IntegratedTestOnLatestEolMajorCiJob; use Acquia\Orca\Domain\Ci\Job\IntegratedTestOnLatestLtsCiJob; use Acquia\Orca\Domain\Ci\Job\IntegratedTestOnNextMajorLatestMinorBetaOrLaterCiJob; use Acquia\Orca\Domain\Ci\Job\IntegratedTestOnNextMajorLatestMinorDevCiJob; @@ -50,6 +51,8 @@ class CiJobFactory { * Integrated test on current dev Drupal core version. * @param \Acquia\Orca\Domain\Ci\Job\IntegratedTestOnCurrentDevCiJob $integrated_test_on_current_dev_ci_job * Integrated test on latest LTS Drupal core version. + * @param \Acquia\Orca\Domain\Ci\Job\IntegratedTestOnLatestEolMajorCiJob $integrated_test_on_latest_eol_major_ci_job + * Integrated test on latest EOL major Drupal core version. * @param \Acquia\Orca\Domain\Ci\Job\IntegratedTestOnLatestLtsCiJob $integrated_test_on_latest_lts_ci_job * Integrated test on current Drupal core version. * @param \Acquia\Orca\Domain\Ci\Job\IntegratedTestOnNextMajorLatestMinorBetaOrLaterCiJob $integrated_test_on_next_major_latest_minor_beta_or_later_ci_job @@ -99,6 +102,7 @@ public function __construct( DeprecatedCodeScanWContribCiJob $deprecated_code_scan_w_contrib_ci_job, IntegratedTestOnCurrentCiJob $integrated_test_on_current_ci_job, IntegratedTestOnCurrentDevCiJob $integrated_test_on_current_dev_ci_job, + IntegratedTestOnLatestEolMajorCiJob $integrated_test_on_latest_eol_major_ci_job, IntegratedTestOnLatestLtsCiJob $integrated_test_on_latest_lts_ci_job, IntegratedTestOnNextMajorLatestMinorBetaOrLaterCiJob $integrated_test_on_next_major_latest_minor_beta_or_later_ci_job, IntegratedTestOnNextMajorLatestMinorDevCiJob $integrated_test_on_next_major_latest_minor_dev_ci_job, diff --git a/src/Domain/Ci/Job/IntegratedTestOnLatestEolMajorCiJob.php b/src/Domain/Ci/Job/IntegratedTestOnLatestEolMajorCiJob.php new file mode 100644 index 000000000..abff4673f --- /dev/null +++ b/src/Domain/Ci/Job/IntegratedTestOnLatestEolMajorCiJob.php @@ -0,0 +1,72 @@ +envFacade = $env_facade; + $this->processRunner = $process_runner; + } + + /** + * {@inheritdoc} + */ + protected function jobName(): CiJobEnum { + return CiJobEnum::INTEGRATED_TEST_ON_LATEST_EOL_MAJOR(); + } + + /** + * {@inheritdoc} + */ + protected function install(CiRunOptions $options): void { + $this->runOrcaFixtureInit([ + '--force', + "--sut={$options->getSut()->getPackageName()}", + "--core={$this->getDrupalCoreVersion()}", + ], $this->envFacade, $this->processRunner); + } + + /** + * {@inheritdoc} + */ + protected function script(CiRunOptions $options): void { + $this->processRunner + ->runOrca(['fixture:status']); + + $this->runOrcaQaAutomatedTests([ + "--sut={$options->getSut()->getPackageName()}", + ], $this->envFacade, $this->processRunner); + } + +} diff --git a/src/Domain/Composer/Version/DrupalCoreVersionResolver.php b/src/Domain/Composer/Version/DrupalCoreVersionResolver.php index d276c78a0..e5518bc87 100644 --- a/src/Domain/Composer/Version/DrupalCoreVersionResolver.php +++ b/src/Domain/Composer/Version/DrupalCoreVersionResolver.php @@ -25,6 +25,13 @@ class DrupalCoreVersionResolver { */ private $drupalDotOrgApiClient; + /** + * The latest EOL Major Drupal core version. + * + * @var string|null + */ + private $latestEolMajor; + /** * The latest LTS Drupal core version. * @@ -126,6 +133,9 @@ public function existsPredefined(DrupalCoreVersionEnum $version): bool { */ public function resolvePredefined(DrupalCoreVersionEnum $version): string { switch ($version->getValue()) { + case DrupalCoreVersionEnum::LATEST_EOL_MAJOR(): + return $this->findLatestEolMajor(); + case DrupalCoreVersionEnum::OLDEST_SUPPORTED(): return $this->findOldestSupported(); @@ -210,6 +220,28 @@ public function resolveArbitrary(string $version, string $preferred_stability = throw new OrcaVersionNotFoundException($message); } + /** + * Finds the latest EOL Major version of Drupal core. + * + * @return string + * The semver version string, e.g., 9.5.11. + * + * @throws \Acquia\Orca\Exception\OrcaVersionNotFoundException + */ + private function findLatestEolMajor(): string { + if ($this->latestEolMajor) { + return $this->latestEolMajor; + } + + $parts = explode('.', $this->findOldestSupported()); + $oldest_supported_major = $parts[0]; + + $this->latestEolMajor = $this + ->resolveArbitrary("<{$oldest_supported_major}", 'stable'); + return $this->latestEolMajor; + + } + /** * Finds the oldest supported version of Drupal core. * diff --git a/src/Enum/CiJobEnum.php b/src/Enum/CiJobEnum.php index e63daa1c5..7c4add642 100644 --- a/src/Enum/CiJobEnum.php +++ b/src/Enum/CiJobEnum.php @@ -8,6 +8,7 @@ * Provides CI job special values. * * @method static CiJobEnum STATIC_CODE_ANALYSIS() + * @method static CiJobEnum INTEGRATED_TEST_ON_LATEST_EOL_MAJOR() * @method static CiJobEnum INTEGRATED_TEST_ON_OLDEST_SUPPORTED() * @method static CiJobEnum INTEGRATED_TEST_ON_LATEST_LTS() * @method static CiJobEnum INTEGRATED_TEST_ON_PREVIOUS_MINOR() @@ -36,6 +37,8 @@ final class CiJobEnum extends Enum { public const STATIC_CODE_ANALYSIS = 'STATIC_CODE_ANALYSIS'; + public const INTEGRATED_TEST_ON_LATEST_EOL_MAJOR = 'INTEGRATED_TEST_ON_LATEST_EOL_MAJOR'; + public const INTEGRATED_TEST_ON_OLDEST_SUPPORTED = 'INTEGRATED_TEST_ON_OLDEST_SUPPORTED'; public const INTEGRATED_TEST_ON_LATEST_LTS = 'INTEGRATED_TEST_ON_LATEST_LTS'; @@ -91,6 +94,7 @@ final class CiJobEnum extends Enum { public static function descriptions(): array { return [ self::STATIC_CODE_ANALYSIS => 'Static code analysis', + self::INTEGRATED_TEST_ON_LATEST_EOL_MAJOR => 'Integrated test on latest EOL major Drupal core version', self::INTEGRATED_TEST_ON_OLDEST_SUPPORTED => 'Integrated test on oldest supported Drupal core version', self::INTEGRATED_TEST_ON_LATEST_LTS => 'Integrated test on latest LTS Drupal core version', self::INTEGRATED_TEST_ON_PREVIOUS_MINOR => 'Integrated test on previous minor Drupal core version', @@ -136,6 +140,9 @@ public function getDescription(): string { */ public function getDrupalCoreVersion(): ?DrupalCoreVersionEnum { switch ($this->getKey()) { + case self::INTEGRATED_TEST_ON_LATEST_EOL_MAJOR(): + return DrupalCoreVersionEnum::LATEST_EOL_MAJOR(); + case self::INTEGRATED_TEST_ON_OLDEST_SUPPORTED: return DrupalCoreVersionEnum::OLDEST_SUPPORTED(); diff --git a/src/Enum/DrupalCoreVersionEnum.php b/src/Enum/DrupalCoreVersionEnum.php index 128535234..a541a206b 100644 --- a/src/Enum/DrupalCoreVersionEnum.php +++ b/src/Enum/DrupalCoreVersionEnum.php @@ -7,6 +7,7 @@ /** * Provides Drupal core version special values. * + * @method static DrupalCoreVersionEnum LATEST_EOL_MAJOR() * @method static DrupalCoreVersionEnum OLDEST_SUPPORTED() * @method static DrupalCoreVersionEnum LATEST_LTS() * @method static DrupalCoreVersionEnum PREVIOUS_MINOR() @@ -19,6 +20,8 @@ */ class DrupalCoreVersionEnum extends Enum { + public const LATEST_EOL_MAJOR = 'LATEST_EOL_MAJOR'; + public const OLDEST_SUPPORTED = 'OLDEST_SUPPORTED'; public const LATEST_LTS = 'LATEST_LTS'; @@ -45,6 +48,7 @@ class DrupalCoreVersionEnum extends Enum { */ public static function descriptions(): array { return [ + self::LATEST_EOL_MAJOR => 'Latest EOL Major Drupal core version', self::OLDEST_SUPPORTED => 'Oldest supported Drupal core version', self::LATEST_LTS => 'Latest LTS Drupal core version', self::PREVIOUS_MINOR => 'Previous minor Drupal core version', @@ -65,6 +69,7 @@ public static function descriptions(): array { */ public static function examples(): array { return [ + self::LATEST_EOL_MAJOR => '7.99', self::OLDEST_SUPPORTED => '8.8.1', self::LATEST_LTS => '8.9.1', self::PREVIOUS_MINOR => '9.1.1', diff --git a/tests/Domain/Ci/CiJobFactoryTest.php b/tests/Domain/Ci/CiJobFactoryTest.php index 1812613df..19e017268 100644 --- a/tests/Domain/Ci/CiJobFactoryTest.php +++ b/tests/Domain/Ci/CiJobFactoryTest.php @@ -6,6 +6,7 @@ use Acquia\Orca\Domain\Ci\Job\DeprecatedCodeScanWContribCiJob; use Acquia\Orca\Domain\Ci\Job\IntegratedTestOnCurrentCiJob; use Acquia\Orca\Domain\Ci\Job\IntegratedTestOnCurrentDevCiJob; +use Acquia\Orca\Domain\Ci\Job\IntegratedTestOnLatestEolMajorCiJob; use Acquia\Orca\Domain\Ci\Job\IntegratedTestOnLatestLtsCiJob; use Acquia\Orca\Domain\Ci\Job\IntegratedTestOnNextMajorLatestMinorBetaOrLaterCiJob; use Acquia\Orca\Domain\Ci\Job\IntegratedTestOnNextMajorLatestMinorDevCiJob; @@ -36,6 +37,7 @@ * @property \Acquia\Orca\Domain\Ci\Job\DeprecatedCodeScanWContribCiJob|\Prophecy\Prophecy\ObjectProphecy $deprecatedCodeScanWContribCiJob * @property \Acquia\Orca\Domain\Ci\Job\IntegratedTestOnCurrentCiJob|\Prophecy\Prophecy\ObjectProphecy $integratedTestOnCurrentCiJob * @property \Acquia\Orca\Domain\Ci\Job\IntegratedTestOnCurrentDevCiJob|\Prophecy\Prophecy\ObjectProphecy $integratedTestOnCurrentDevCiJob + * @property \Acquia\Orca\Domain\Ci\Job\IntegratedTestOnLatestEolMajorCiJob|\Prophecy\Prophecy\ObjectProphecy $integratedTestOnLatestEolMajorCiJob * @property \Acquia\Orca\Domain\Ci\Job\IntegratedTestOnLatestLtsCiJob|\Prophecy\Prophecy\ObjectProphecy $integratedTestOnLatestLtsCiJob * @property \Acquia\Orca\Domain\Ci\Job\IntegratedTestOnNextMajorLatestMinorBetaOrLaterCiJob|\Prophecy\Prophecy\ObjectProphecy $integratedTestOnNextMajorLatestMinorBetaOrLaterCiJob * @property \Acquia\Orca\Domain\Ci\Job\IntegratedTestOnNextMajorLatestMinorDevCiJob|\Prophecy\Prophecy\ObjectProphecy $integratedTestOnNextMajorLatestMinorDevCiJob @@ -64,6 +66,7 @@ class CiJobFactoryTest extends TestCase { protected DeprecatedCodeScanWContribCiJob|ObjectProphecy $deprecatedCodeScanWContribCiJob; protected IntegratedTestOnCurrentCiJob|ObjectProphecy $integratedTestOnCurrentCiJob; protected IntegratedTestOnCurrentDevCiJob|ObjectProphecy $integratedTestOnCurrentDevCiJob; + protected IntegratedTestOnLatestLtsCiJob|ObjectProphecy $integratedTestOnLatestEolMajorCiJob; protected IntegratedTestOnLatestLtsCiJob|ObjectProphecy $integratedTestOnLatestLtsCiJob; protected IntegratedTestOnNextMajorLatestMinorBetaOrLaterCiJob|ObjectProphecy $integratedTestOnNextMajorLatestMinorBetaOrLaterCiJob; protected IntegratedTestOnNextMajorLatestMinorDevCiJob|ObjectProphecy $integratedTestOnNextMajorLatestMinorDevCiJob; @@ -90,6 +93,7 @@ protected function setUp(): void { $this->deprecatedCodeScanWContribCiJob = $this->prophesize(DeprecatedCodeScanWContribCiJob::class); $this->integratedTestOnCurrentCiJob = $this->prophesize(IntegratedTestOnCurrentCiJob::class); $this->integratedTestOnCurrentDevCiJob = $this->prophesize(IntegratedTestOnCurrentDevCiJob::class); + $this->integratedTestOnLatestEolMajorCiJob = $this->prophesize(IntegratedTestOnLatestEolMajorCiJob::class); $this->integratedTestOnLatestLtsCiJob = $this->prophesize(IntegratedTestOnLatestLtsCiJob::class); $this->integratedTestOnNextMajorLatestMinorBetaOrLaterCiJob = $this->prophesize(IntegratedTestOnNextMajorLatestMinorBetaOrLaterCiJob::class); $this->integratedTestOnNextMajorLatestMinorDevCiJob = $this->prophesize(IntegratedTestOnNextMajorLatestMinorDevCiJob::class); @@ -117,6 +121,7 @@ private function createFactory(): CiJobFactory { $deprecated_code_scan_w_contrib_ci_job = $this->deprecatedCodeScanWContribCiJob->reveal(); $integrated_test_on_current_ci_job = $this->integratedTestOnCurrentCiJob->reveal(); $integrated_test_on_current_dev_ci_job = $this->integratedTestOnCurrentDevCiJob->reveal(); + $integrated_test_on_latest_eol_major_ci_job = $this->integratedTestOnLatestEolMajorCiJob->reveal(); $integrated_test_on_latest_lts = $this->integratedTestOnLatestLtsCiJob->reveal(); $integrated_test_on_next_major_latest_minor_beta_or_later_ci_job = $this->integratedTestOnNextMajorLatestMinorBetaOrLaterCiJob->reveal(); $integrated_test_on_next_major_latest_minor_dev_ci_job = $this->integratedTestOnNextMajorLatestMinorDevCiJob->reveal(); @@ -142,6 +147,7 @@ private function createFactory(): CiJobFactory { $deprecated_code_scan_w_contrib_ci_job, $integrated_test_on_current_ci_job, $integrated_test_on_current_dev_ci_job, + $integrated_test_on_latest_eol_major_ci_job, $integrated_test_on_latest_lts, $integrated_test_on_next_major_latest_minor_beta_or_later_ci_job, $integrated_test_on_next_major_latest_minor_dev_ci_job, diff --git a/tests/Domain/Composer/Version/DrupalCoreVersionResolverTest.php b/tests/Domain/Composer/Version/DrupalCoreVersionResolverTest.php index 1ca786b06..9237cf53a 100644 --- a/tests/Domain/Composer/Version/DrupalCoreVersionResolverTest.php +++ b/tests/Domain/Composer/Version/DrupalCoreVersionResolverTest.php @@ -80,7 +80,7 @@ private function expectGetCurrentToBeCalledOnce(): void { public function testExistsPredefinedTrue(): void { $this->selector ->findBestCandidate('drupal/core', Argument::any(), Argument::any()) - ->shouldBeCalledOnce() + ->shouldBeCalled() ->willReturn($this->package->reveal()); $resolver = $this->createDrupalCoreVersionResolver(); @@ -149,6 +149,32 @@ public function testResolvePredefinedAcceptsAllVersions($version): void { self::assertTrue(is_string($resolution), 'Accepted version and returned string.'); } + public function testResolvePredefinedLatestEolMajor(): void { + $this->drupalDotOrgApiClient + ->getOldestSupportedDrupalCoreBranch() + ->willReturn('10.1.x') + ->shouldBeCalledOnce(); + $this->package + ->getPrettyVersion() + ->willReturn('10.1.8', '9.5.11') + ->shouldBeCalledTimes(2); + $this->selector + ->findBestCandidate('drupal/core', '10.1.x', 'stable') + ->willReturn($this->package->reveal()) + ->shouldBeCalledTimes(1); + $this->selector + ->findBestCandidate('drupal/core', '<10', 'stable') + ->willReturn($this->package->reveal()) + ->shouldBeCalledTimes(1); + $resolver = $this->createDrupalCoreVersionResolver(); + + $actual = $resolver->resolvePredefined(DrupalCoreVersionEnum::LATEST_EOL_MAJOR()); + // Call again to test value caching. + $resolver->resolvePredefined(DrupalCoreVersionEnum::LATEST_EOL_MAJOR()); + + self::assertSame('9.5.11', $actual); + } + public function testResolvePredefinedOldestSupported(): void { $this->drupalDotOrgApiClient ->getOldestSupportedDrupalCoreBranch() From 0a299d871942ea7e2947bc154d8a001212770439 Mon Sep 17 00:00:00 2001 From: Sayan Goswami Date: Wed, 14 Feb 2024 23:48:21 +0530 Subject: [PATCH 79/81] Change coverage clover to cobertura for Gitlab CI (#484) * Replaced all 'clover' to 'cobertura' everywhere * Keep clover and cobertura both. * Add ORCA_COVERAGE_COBERTURA_ENABLE variable * Update src/Enum/EnvVarEnum.php Co-authored-by: Travis Carden * Cleanup text * Modifying text to address PR feedback * save * Modifcations related to PR feedback * Proof of work * cleaning up * Improve new variable documentation docs/advanced-usage.md. [skip ci] * Update src/Enum/EnvVarEnum.php Co-authored-by: Travis Carden * Addressing PR feedback * Introduce new variable * PR feedback --------- Co-authored-by: Travis Carden Co-authored-by: Travis Carden --- .github/workflows/live-test.yml | 2 +- .github/workflows/orca.yml | 12 +++- bin/ci/_includes.sh | 9 +++ bin/ci/before_install.sh | 2 +- bin/ci/self-test/script.sh | 14 ++-- config/services.yml | 2 + docs/advanced-usage.md | 8 ++- src/Domain/Tool/Phpunit/PhpUnitTask.php | 89 ++++++++++++++++++++++++- src/Domain/Tool/TaskBase.php | 12 +++- src/Enum/EnvVarEnum.php | 13 +++- tests/Domain/Tool/TasksTest.php | 30 ++++++++- 11 files changed, 176 insertions(+), 17 deletions(-) diff --git a/.github/workflows/live-test.yml b/.github/workflows/live-test.yml index 704e17936..644ddf8b2 100644 --- a/.github/workflows/live-test.yml +++ b/.github/workflows/live-test.yml @@ -26,7 +26,7 @@ jobs: # Hardcode path since GITHUB_WORKSPACE can't be used here. # @see https://github.community/t/how-to-use-env-context/16975/9 ORCA_SUT_DIR: /home/runner/work/orca/example - ORCA_SELF_TEST_COVERAGE_CLOVER: $HOME/build/logs/clover-self.xml + ORCA_SELF_TEST_COVERAGE_COBERTURA: $HOME/build/logs/cobertura-self.xml ORCA_LIVE_TEST: TRUE strategy: diff --git a/.github/workflows/orca.yml b/.github/workflows/orca.yml index eac925f15..f98d60710 100644 --- a/.github/workflows/orca.yml +++ b/.github/workflows/orca.yml @@ -27,9 +27,12 @@ jobs: # Hardcode path since GITHUB_WORKSPACE can't be used here. # @see https://github.community/t/how-to-use-env-context/16975/9 ORCA_SUT_DIR: /home/runner/work/orca/example + ORCA_SELF_TEST_COVERAGE_COBERTURA: /home/runner/build/logs/cobertura.xml ORCA_SELF_TEST_COVERAGE_CLOVER: /home/runner/build/logs/clover.xml ORCA_JOB: ${{ matrix.orca-job }} ORCA_ENABLE_NIGHTWATCH: ${{ matrix.orca-enable-nightwatch }} + ORCA_COVERAGE_COBERTURA_ENABLE: ${{ matrix.orca-coverage-cobertura-enable }} + ORCA_COVERAGE_CLOVER_ENABLE: ${{ matrix.orca-coverage-clover-enable }} ORCA_COVERAGE_ENABLE: ${{ matrix.orca-coverage-enable }} # Google env variables. ORCA_GOOGLE_API_CLIENT_ID: ${{ secrets.ORCA_GOOGLE_API_CLIENT_ID }} @@ -70,13 +73,15 @@ jobs: - orca-job: ISOLATED_TEST_ON_CURRENT php-version: "8.1" orca-enable-nightwatch: "TRUE" + # Testing coverage generation in Clover format when ORCA_COVERAGE_ENABLE is TRUE. orca-coverage-enable: "TRUE" # Testing Drupal 10 in php 8.2. - orca-job: ISOLATED_TEST_ON_CURRENT php-version: "8.2" orca-enable-nightwatch: "TRUE" - orca-coverage-enable: "TRUE" + # Testing coverage generation in COBERTURA format. + orca-coverage-cobertura-enable: "TRUE" # Testing latest Drupal 9 in php 8.2. - orca-job: INTEGRATED_TEST_ON_LATEST_LTS @@ -86,7 +91,8 @@ jobs: - orca-job: ISOLATED_TEST_ON_CURRENT php-version: "8.3" orca-enable-nightwatch: "TRUE" - orca-coverage-enable: "TRUE" + # Testing coverage generation in CLOVER format. + orca-coverage-clover-enable: "TRUE" steps: - uses: actions/checkout@v3 @@ -148,6 +154,8 @@ jobs: - name: After script run: | ../orca/bin/ci/self-test/after_success.sh + unset ORCA_COVERAGE_COBERTURA_ENABLE + unset ORCA_COVERAGE_CLOVER_ENABLE unset ORCA_COVERAGE_ENABLE ../orca/bin/ci/after_success.sh ../orca/bin/ci/after_failure.sh diff --git a/bin/ci/_includes.sh b/bin/ci/_includes.sh index 4c914cb0b..3461a44ae 100755 --- a/bin/ci/_includes.sh +++ b/bin/ci/_includes.sh @@ -53,7 +53,10 @@ fi ORCA_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)" export ORCA_ROOT export ORCA_COVERAGE_CLOVER=${ORCA_COVERAGE_CLOVER:="$HOME/build/logs/clover.xml"} +export ORCA_COVERAGE_COBERTURA=${ORCA_COVERAGE_COBERTURA:="$HOME/build/logs/cobertura.xml"} export ORCA_COVERAGE_ENABLE=${ORCA_COVERAGE_ENABLE:="FALSE"} +export ORCA_COVERAGE_COBERTURA_ENABLE=${ORCA_COVERAGE_COBERTURA_ENABLE:="FALSE"} +export ORCA_COVERAGE_CLOVER_ENABLE=${ORCA_COVERAGE_CLOVER_ENABLE:="FALSE"} export ORCA_FIXTURE_DIR=${ORCA_FIXTURE_DIR:="$ORCA_ROOT/../orca-build"} export ORCA_FIXTURE_PROFILE=${ORCA_FIXTURE_PROFILE:="orca"} export ORCA_JUNIT_LOG=${ORCA_JUNIT_LOG:="$HOME/build/logs/junitLog.xml"} @@ -114,6 +117,12 @@ export PATH="/usr/local/bin/:$PATH" # Add convenient aliases. alias drush='drush -r "$ORCA_FIXTURE_DIR"' +if [[ "$ORCA_COVERAGE_ENABLE" == TRUE || "$ORCA_COVERAGE_COBERTURA_ENABLE" == TRUE || "$ORCA_COVERAGE_CLOVER_ENABLE" == TRUE ]]; then + export ORCA_ANY_COVERAGE_IS_ENABLED=TRUE +else + export ORCA_ANY_COVERAGE_IS_ENABLED=FALSE +fi + # Commands exiting with a non-zero status prior to this point constitute an # error, i.e. an ORCA configuration problem, and always stop execution. # Commands exiting with a non-zero status after this point constitute a failure, diff --git a/bin/ci/before_install.sh b/bin/ci/before_install.sh index 4d2544be9..3ff531f89 100755 --- a/bin/ci/before_install.sh +++ b/bin/ci/before_install.sh @@ -21,7 +21,7 @@ cd "$(dirname "$0")" || exit; source _includes.sh yarn --version # Disable Xdebug except on code coverage jobs. -if [[ ! "$ORCA_COVERAGE_ENABLE" == TRUE ]]; then +if [[ ! "$ORCA_ANY_COVERAGE_IS_ENABLED" == TRUE ]]; then if [[ "$GITHUB_ACTIONS" ]]; then # phpdismod would be simpler but flaky # @see https://github.com/shivammathur/setup-php/issues/350#issuecomment-735370872 diff --git a/bin/ci/self-test/script.sh b/bin/ci/self-test/script.sh index a58ebbfa3..7c9d558a3 100755 --- a/bin/ci/self-test/script.sh +++ b/bin/ci/self-test/script.sh @@ -15,13 +15,13 @@ cd ../../../ || exit 1 XDEBUG_IS_ENABLED=$(php -r 'echo function_exists("xdebug_get_code_coverage") ? "TRUE" : "FALSE";') -if [[ "$ORCA_COVERAGE_ENABLE" == TRUE && "$XDEBUG_IS_ENABLED" == "FALSE" ]]; then - echo "ORCA_COVERAGE_ENABLE is on but Xdebug is disabled" +if [[ "$ORCA_ANY_COVERAGE_IS_ENABLED" == TRUE && "$XDEBUG_IS_ENABLED" == "FALSE" ]]; then + echo "Coverage generation is on but Xdebug is disabled" exit 1 fi -if [[ "$ORCA_COVERAGE_ENABLE" == FALSE && "$XDEBUG_IS_ENABLED" == "TRUE" ]]; then - echo "ORCA_COVERAGE_ENABLE is off but Xdebug is enabled" +if [[ "$ORCA_ANY_COVERAGE_IS_ENABLED" == FALSE && "$XDEBUG_IS_ENABLED" == "TRUE" ]]; then + echo "Coverage generation is off but Xdebug is enabled" exit 1 fi @@ -33,8 +33,10 @@ if [[ "$ORCA_JOB" == "STATIC_CODE_ANALYSIS" ]]; then echo - if [[ "$ORCA_COVERAGE_ENABLE" == TRUE ]]; then - eval './vendor/bin/phpunit --coverage-cobertura="$ORCA_SELF_TEST_COVERAGE_CLOVER"' + if [[ "$ORCA_COVERAGE_ENABLE" == TRUE || "$ORCA_COVERAGE_CLOVER_ENABLE" == TRUE ]]; then + eval './vendor/bin/phpunit --coverage-clover="$ORCA_SELF_TEST_COVERAGE_CLOVER"' + elif [[ "$ORCA_COVERAGE_COBERTURA_ENABLE" == TRUE ]]; then + eval './vendor/bin/phpunit --coverage-cobertura="$ORCA_SELF_TEST_COVERAGE_COBERTURA"' else eval './vendor/bin/phpunit' fi diff --git a/config/services.yml b/config/services.yml index d4bd189a3..29601bf02 100644 --- a/config/services.yml +++ b/config/services.yml @@ -6,6 +6,7 @@ parameters: env(ORCA_GOOGLE_API_CLIENT_SECRET): ~ env(ORCA_GOOGLE_API_REFRESH_TOKEN): ~ env(ORCA_COVERAGE_CLOVER): "%app.project_dir%/var/coverage/clover.xml" + env(ORCA_COVERAGE_COBERTURA): "%app.project_dir%/var/coverage/cobertura.xml" env(ORCA_FIXTURE_DIR): "%app.fixture_dir%" env(ORCA_JUNIT_LOG): "%app.project_dir%/var/junit/junitLog.xml" env(ORCA_PACKAGES_CONFIG): config/packages.yml @@ -25,6 +26,7 @@ services: $google_api_client_secret: "%env(ORCA_GOOGLE_API_CLIENT_SECRET)%" $google_refresh_token: "%env(ORCA_GOOGLE_API_REFRESH_TOKEN)%" $clover_coverage: "%env(ORCA_COVERAGE_CLOVER)%" + $cobertura_coverage: "%env(ORCA_COVERAGE_COBERTURA)%" $default_phpcs_standard: "%env(ORCA_PHPCS_STANDARD)%" $fixture_dir: "%env(ORCA_FIXTURE_DIR)%" $junit_log: "%env(ORCA_JUNIT_LOG)%" diff --git a/docs/advanced-usage.md b/docs/advanced-usage.md index 760a0f6fc..a61f0cf0a 100644 --- a/docs/advanced-usage.md +++ b/docs/advanced-usage.md @@ -10,7 +10,13 @@ These affect ORCA in all contexts. * **`ORCA_COVERAGE_CLOVER`**: Change the path where ORCA saves the PHPUnit test coverage Clover XML file. -* **`ORCA_COVERAGE_ENABLE`**: Set to `TRUE` to generate test coverage data . The resulting Clover file will be saved at the location set in [`ORCA_COVERAGE_CLOVER`](#ORCA_COVERAGE_CLOVER). Test coverage generation greatly increases build times, so only enable it on one job--all that makes sense anyway. +* **`ORCA_COVERAGE_CLOVER_ENABLE`**: Set to `TRUE` to generate test coverage data in Clover format. + +* **`ORCA_COVERAGE_COBERTURA`**: Change the path where ORCA saves the PHPUnit test coverage Cobertura XML file. + +* **`ORCA_COVERAGE_COBERTURA_ENABLE`**: Set to `TRUE` to generate test coverage data in Cobertura format instead of the default Clover format. + +* **`ORCA_COVERAGE_ENABLE`**: Deprecated. Alias of **`ORCA_COVERAGE_CLOVER_ENABLE`**. * **`ORCA_FIXTURE_DIR`**: Change the directory ORCA uses for test fixtures. Acceptable values are any valid, local directory reference, e.g., `/var/www/example`, or `../example`. diff --git a/src/Domain/Tool/Phpunit/PhpUnitTask.php b/src/Domain/Tool/Phpunit/PhpUnitTask.php index c60bd4dc9..246e5bcd6 100644 --- a/src/Domain/Tool/Phpunit/PhpUnitTask.php +++ b/src/Domain/Tool/Phpunit/PhpUnitTask.php @@ -2,10 +2,22 @@ namespace Acquia\Orca\Domain\Tool\Phpunit; +use Acquia\Orca\Domain\Composer\ComposerFacade; use Acquia\Orca\Domain\Server\WebServer; +use Acquia\Orca\Domain\Tool\PhpcbfTool; +use Acquia\Orca\Domain\Tool\Phpcs\PhpcsConfigurator; +use Acquia\Orca\Domain\Tool\PhpLintTool; +use Acquia\Orca\Domain\Tool\PhpmdTool; use Acquia\Orca\Domain\Tool\TestFrameworkBase; use Acquia\Orca\Exception\OrcaTaskFailureException; +use Acquia\Orca\Helper\Config\ConfigFileOverrider; +use Acquia\Orca\Helper\EnvFacade; +use Acquia\Orca\Helper\Filesystem\FixturePathHandler; +use Acquia\Orca\Helper\Filesystem\OrcaPathHandler; +use Acquia\Orca\Helper\Process\ProcessRunner; use Acquia\Orca\Helper\SutSettingsTrait; +use Symfony\Component\Console\Style\SymfonyStyle; +use Symfony\Component\Filesystem\Filesystem; use Symfony\Component\Process\Exception\ProcessFailedException; /** @@ -29,6 +41,52 @@ class PhpUnitTask extends TestFrameworkBase { */ private $xpath; + /** + * The environment facade. + * + * @var \Acquia\Orca\Helper\EnvFacade + */ + private $envFacade; + + /** + * Constructs an instance. + * + * @param string $clover_coverage + * The Clover coverage XML path. + * @param string $cobertura_coverage + * The Cobertura coverage XML path. + * @param \Acquia\Orca\Helper\Config\ConfigFileOverrider $config_file_overrider + * The config file overrider. + * @param \Acquia\Orca\Domain\Composer\ComposerFacade $composer_facade + * The composer facade. + * @param \Symfony\Component\Filesystem\Filesystem $filesystem + * The filesystem. + * @param \Acquia\Orca\Helper\Filesystem\FixturePathHandler $fixture_path_handler + * The fixture path handler. + * @param string $junit_log + * The Junit XML path. + * @param \Acquia\Orca\Helper\Filesystem\OrcaPathHandler $orca_path_handler + * The ORCA path handler. + * @param \Symfony\Component\Console\Style\SymfonyStyle $output + * The output decorator. + * @param \Acquia\Orca\Domain\Tool\PhpcbfTool $phpcbf_tool + * The PHPCBF tool. + * @param \Acquia\Orca\Domain\Tool\Phpcs\PhpcsConfigurator $phpcs_configurator + * The PHPCS configurator. + * @param \Acquia\Orca\Domain\Tool\PhpLintTool $php_lint_tool + * The PHP lint tool. + * @param \Acquia\Orca\Domain\Tool\PhpmdTool $phpmd_tool + * The PHPMD tool. + * @param \Acquia\Orca\Helper\Process\ProcessRunner $process_runner + * The process runner. + * @param \Acquia\Orca\Helper\EnvFacade $envFacade + * The Environment Facade. + */ + public function __construct(string $clover_coverage, string $cobertura_coverage, ConfigFileOverrider $config_file_overrider, ComposerFacade $composer_facade, Filesystem $filesystem, FixturePathHandler $fixture_path_handler, string $junit_log, OrcaPathHandler $orca_path_handler, SymfonyStyle $output, PhpcbfTool $phpcbf_tool, PhpcsConfigurator $phpcs_configurator, PhpLintTool $php_lint_tool, PhpmdTool $phpmd_tool, ProcessRunner $process_runner, EnvFacade $envFacade) { + parent::__construct($clover_coverage, $cobertura_coverage, $config_file_overrider, $composer_facade, $filesystem, $fixture_path_handler, $junit_log, $orca_path_handler, $output, $phpcbf_tool, $phpcs_configurator, $php_lint_tool, $phpmd_tool, $process_runner); + $this->envFacade = $envFacade; + } + /** * {@inheritdoc} */ @@ -323,10 +381,17 @@ protected function runPhpUnit(): void { 'phpunit', '--verbose', ]; - if ($this->shouldGenerateCodeCoverage()) { - $command[] = "--coverage-cobertura={$this->cloverCoverage}"; + + if ($this->shouldGenerateCodeCoverageInClover()) { + $command[] = "--coverage-clover={$this->cloverCoverage}"; + $this->processRunner->addEnvVar("XDEBUG_MODE", "coverage"); + } + + if ($this->shouldGenerateCodeCoverageInCobertura()) { + $command[] = "--coverage-cobertura={$this->coberturaCoverage}"; $this->processRunner->addEnvVar("XDEBUG_MODE", "coverage"); } + $command = array_merge($command, [ '--colors=always', '--debug', @@ -363,4 +428,24 @@ public function restoreConfig(): void { $this->configFileOverrider->restore(); } + /** + * Determines whether the test should generate code coverage in Cobertura format. + * + * @return bool + * TRUE to generate code coverage or FALSE not to. + */ + private function shouldGenerateCodeCoverageInCobertura(): bool { + return $this->envFacade->get('ORCA_COVERAGE_COBERTURA_ENABLE', FALSE); + } + + /** + * Determines whether the test should generate code coverage in Clover format. + * + * @return bool + * TRUE to generate code coverage or FALSE not to. + */ + private function shouldGenerateCodeCoverageInClover(): bool { + return $this->envFacade->get('ORCA_COVERAGE_CLOVER_ENABLE', FALSE) || $this->envFacade->get('ORCA_COVERAGE_ENABLE', FALSE); + } + } diff --git a/src/Domain/Tool/TaskBase.php b/src/Domain/Tool/TaskBase.php index 70fca9397..85d7d362b 100644 --- a/src/Domain/Tool/TaskBase.php +++ b/src/Domain/Tool/TaskBase.php @@ -23,6 +23,13 @@ abstract class TaskBase implements TaskInterface { */ protected $cloverCoverage; + /** + * The Cobertura coverage XML path. + * + * @var string + */ + protected $coberturaCoverage; + /** * The config file overrider. * @@ -119,6 +126,8 @@ abstract class TaskBase implements TaskInterface { * * @param string $clover_coverage * The Clover coverage XML path. + * @param string $cobertura_coverage + * The Cobertura coverage XML path. * @param \Acquia\Orca\Helper\Config\ConfigFileOverrider $config_file_overrider * The config file overrider. * @param \Acquia\Orca\Domain\Composer\ComposerFacade $composer_facade @@ -144,7 +153,7 @@ abstract class TaskBase implements TaskInterface { * @param \Acquia\Orca\Helper\Process\ProcessRunner $process_runner * The process runner. */ - public function __construct(string $clover_coverage, ConfigFileOverrider $config_file_overrider, ComposerFacade $composer_facade, Filesystem $filesystem, FixturePathHandler $fixture_path_handler, string $junit_log, OrcaPathHandler $orca_path_handler, SymfonyStyle $output, PhpcbfTool $phpcbf_tool, PhpcsConfigurator $phpcs_configurator, PhpLintTool $php_lint_tool, PhpmdTool $phpmd_tool, ProcessRunner $process_runner) { + public function __construct(string $clover_coverage, string $cobertura_coverage, ConfigFileOverrider $config_file_overrider, ComposerFacade $composer_facade, Filesystem $filesystem, FixturePathHandler $fixture_path_handler, string $junit_log, OrcaPathHandler $orca_path_handler, SymfonyStyle $output, PhpcbfTool $phpcbf_tool, PhpcsConfigurator $phpcs_configurator, PhpLintTool $php_lint_tool, PhpmdTool $phpmd_tool, ProcessRunner $process_runner) { $this->configFileOverrider = $config_file_overrider; $this->filesystem = $filesystem; $this->fixture = $fixture_path_handler; @@ -156,6 +165,7 @@ public function __construct(string $clover_coverage, ConfigFileOverrider $config // not all of its its children use them. This is an indication for // refactoring to use some form of composition instead of inheritance. $this->cloverCoverage = $clover_coverage; + $this->coberturaCoverage = $cobertura_coverage; $this->composerFacade = $composer_facade; $this->junitLog = $junit_log; $this->phpcsConfigurator = $phpcs_configurator; diff --git a/src/Enum/EnvVarEnum.php b/src/Enum/EnvVarEnum.php index ba2698d6f..cf3d74be0 100644 --- a/src/Enum/EnvVarEnum.php +++ b/src/Enum/EnvVarEnum.php @@ -8,6 +8,8 @@ * Provides environment variables. * * @method static EnvVarEnum ORCA_COVERAGE_CLOVER() + * @method static EnvVarEnum ORCA_COVERAGE_COBERTURA() + * @method static EnvVarEnum ORCA_COVERAGE_COBERTURA_ENABLE() * @method static EnvVarEnum ORCA_COVERAGE_ENABLE() * @method static EnvVarEnum ORCA_ENABLE_NIGHTWATCH() * @method static EnvVarEnum ORCA_FIXTURE_DIR() @@ -38,6 +40,12 @@ class EnvVarEnum extends Enum { public const ORCA_COVERAGE_CLOVER = 'ORCA_COVERAGE_CLOVER'; + public const ORCA_COVERAGE_COBERTURA = 'ORCA_COVERAGE_COBERTURA'; + + public const ORCA_COVERAGE_COBERTURA_ENABLE = 'ORCA_COVERAGE_COBERTURA_ENABLE'; + + public const ORCA_COVERAGE_CLOVER_ENABLE = 'ORCA_COVERAGE_CLOVER_ENABLE'; + public const ORCA_COVERAGE_ENABLE = 'ORCA_COVERAGE_ENABLE'; public const ORCA_ENABLE_NIGHTWATCH = 'ORCA_ENABLE_NIGHTWATCH'; @@ -103,7 +111,10 @@ class EnvVarEnum extends Enum { public static function descriptions(): array { return [ self::ORCA_COVERAGE_CLOVER => 'The path where ORCA saves the PHPUnit test coverage Clover XML file', - self::ORCA_COVERAGE_ENABLE => 'Whether or not to generate test coverage data', + self::ORCA_COVERAGE_COBERTURA => 'The path where ORCA saves the PHPUnit test coverage Cobertura XML file', + self::ORCA_COVERAGE_COBERTURA_ENABLE => 'Whether or not to generate test coverage data in Cobertura format', + self::ORCA_COVERAGE_CLOVER_ENABLE => 'Whether or not to generate test coverage data in Clover format', + self::ORCA_COVERAGE_ENABLE => 'Whether or not to generate test coverage data in Clover format', self::ORCA_ENABLE_NIGHTWATCH => 'Whether or not to run Nightwatch.js tests', self::ORCA_FIXTURE_DIR => 'The directory ORCA uses for test fixtures', self::ORCA_FIXTURE_PROFILE => 'The Drupal installation profile ORCA installs in fixtures', diff --git a/tests/Domain/Tool/TasksTest.php b/tests/Domain/Tool/TasksTest.php index cdb24ff8e..b835e2044 100644 --- a/tests/Domain/Tool/TasksTest.php +++ b/tests/Domain/Tool/TasksTest.php @@ -13,6 +13,7 @@ use Acquia\Orca\Domain\Tool\PhpmdTool; use Acquia\Orca\Domain\Tool\Phpunit\PhpUnitTask; use Acquia\Orca\Helper\Config\ConfigFileOverrider; +use Acquia\Orca\Helper\EnvFacade; use Acquia\Orca\Helper\Filesystem\FixturePathHandler; use Acquia\Orca\Helper\Filesystem\OrcaPathHandler; use Acquia\Orca\Helper\Process\ProcessRunner; @@ -27,6 +28,7 @@ class TasksTest extends TestCase { */ public function testConstruction($class): void { $clover_coverage = '/var/coverage/clover.xml'; + $cobertura_coverage = '/var/coverage/cobertura.xml'; $config_file_overrider = $this->prophesize(ConfigFileOverrider::class)->reveal(); $composer_facade = $this->prophesize(ComposerFacade::class)->reveal(); $filesystem = $this->prophesize(Filesystem::class)->reveal(); @@ -40,7 +42,7 @@ public function testConstruction($class): void { $phpmd_tool = $this->prophesize(PhpmdTool::class)->reveal(); $process_runner = $this->prophesize(ProcessRunner::class)->reveal(); - $object = new $class($clover_coverage, $config_file_overrider, $composer_facade, $filesystem, $fixture, $junit_log, $orca_path_handler, $output, $phpcbf_tool, $phpcs_configurator, $php_lint_tool, $phpmd_tool, $process_runner); + $object = new $class($clover_coverage, $cobertura_coverage, $config_file_overrider, $composer_facade, $filesystem, $fixture, $junit_log, $orca_path_handler, $output, $phpcbf_tool, $phpcs_configurator, $php_lint_tool, $phpmd_tool, $process_runner); self::assertInstanceOf($class, $object, sprintf('Successfully instantiated class: %s.', $class)); } @@ -51,8 +53,32 @@ public function providerConstruction(): array { [PhpcsTask::class], [PhpLintTask::class], [PhpmdTask::class], - [PhpUnitTask::class], ]; } + public function testConstructionPhpUnit() { + + $clover_coverage = '/var/coverage/clover.xml'; + $cobertura_coverage = '/var/coverage/cobertura.xml'; + $config_file_overrider = $this->prophesize(ConfigFileOverrider::class)->reveal(); + $composer_facade = $this->prophesize(ComposerFacade::class)->reveal(); + $filesystem = $this->prophesize(Filesystem::class)->reveal(); + $fixture = $this->prophesize(FixturePathHandler::class)->reveal(); + $junit_log = '/var/junit/junitLog.xml'; + $orca_path_handler = $this->prophesize(OrcaPathHandler::class)->reveal(); + $output = $this->prophesize(SymfonyStyle::class)->reveal(); + $phpcbf_tool = $this->prophesize(PhpcbfTool::class)->reveal(); + $phpcs_configurator = $this->prophesize(PhpcsConfigurator::class)->reveal(); + $php_lint_tool = $this->prophesize(PhpLintTool::class)->reveal(); + $phpmd_tool = $this->prophesize(PhpmdTool::class)->reveal(); + $process_runner = $this->prophesize(ProcessRunner::class)->reveal(); + $env_facade = $this->prophesize(EnvFacade::class)->reveal(); + + $object = new PhpUnitTask($clover_coverage, $cobertura_coverage, $config_file_overrider, $composer_facade, $filesystem, $fixture, $junit_log, $orca_path_handler, + $output, $phpcbf_tool, $phpcs_configurator, $php_lint_tool, $phpmd_tool, $process_runner, $env_facade); + + self::assertInstanceOf(PhpUnitTask::class, $object, sprintf('Successfully instantiated class: %s.', PhpUnitTask::class)); + + } + } From 76934bb01334ff68b40e2e697c299b64d832f6af Mon Sep 17 00:00:00 2001 From: Sayan Goswami Date: Fri, 16 Feb 2024 23:03:15 +0530 Subject: [PATCH 80/81] Add PHP 8.3 testing (#509) * add php 8.3 testing * Remove PHP 7.4 job * Modify jobs matrix --- .github/workflows/orca.yml | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/.github/workflows/orca.yml b/.github/workflows/orca.yml index f98d60710..bac32c91c 100644 --- a/.github/workflows/orca.yml +++ b/.github/workflows/orca.yml @@ -43,7 +43,6 @@ jobs: matrix: orca-job: - STATIC_CODE_ANALYSIS - - INTEGRATED_TEST_ON_LATEST_EOL_MAJOR - INTEGRATED_TEST_ON_OLDEST_SUPPORTED - INTEGRATED_TEST_ON_PREVIOUS_MINOR - INTEGRATED_TEST_ON_LATEST_LTS @@ -65,7 +64,7 @@ jobs: - INTEGRATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_BETA_OR_LATER - ISOLATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV - INTEGRATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV - php-version: [ "8.1" ] + php-version: [ "8.1", "8.3" ] orca-enable-nightwatch: [ "FALSE" ] orca-coverage-enable: [ "FALSE" ] include: @@ -76,17 +75,6 @@ jobs: # Testing coverage generation in Clover format when ORCA_COVERAGE_ENABLE is TRUE. orca-coverage-enable: "TRUE" - # Testing Drupal 10 in php 8.2. - - orca-job: ISOLATED_TEST_ON_CURRENT - php-version: "8.2" - orca-enable-nightwatch: "TRUE" - # Testing coverage generation in COBERTURA format. - orca-coverage-cobertura-enable: "TRUE" - - # Testing latest Drupal 9 in php 8.2. - - orca-job: INTEGRATED_TEST_ON_LATEST_LTS - php-version: "8.2" - # Testing Drupal 10 in php 8.3. - orca-job: ISOLATED_TEST_ON_CURRENT php-version: "8.3" @@ -94,6 +82,10 @@ jobs: # Testing coverage generation in CLOVER format. orca-coverage-clover-enable: "TRUE" + # Testing Drupal 9 in php 8.1. + - orca-job: INTEGRATED_TEST_ON_LATEST_EOL_MAJOR + php-version: "8.1" + steps: - uses: actions/checkout@v3 From bef07ae22563304f9887c1b31195052634360a8f Mon Sep 17 00:00:00 2001 From: sayan goswami Date: Mon, 19 Feb 2024 23:40:27 +0530 Subject: [PATCH 81/81] Updated version --- config/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/VERSION b/config/VERSION index 0ad170fbe..79214dce1 100644 --- a/config/VERSION +++ b/config/VERSION @@ -1 +1 @@ -v4.7.0-dev +v4.7.0