From 32e75bbda7d9708613e81a0fad51b6cc68ffd22a Mon Sep 17 00:00:00 2001 From: rajeshreeputra Date: Fri, 13 Sep 2024 13:07:51 +0530 Subject: [PATCH] ACMS-4173: Update Workflow as per Drupal 11 release. --- .github/workflows/acquia_cms_ci.workflow.yml | 19 +- .github/workflows/acquia_cms_cron.yml | 88 +---- composer.json | 4 - composer.lock | 321 ++++++++----------- modules/acquia_cms_dam/composer.json | 2 +- 5 files changed, 152 insertions(+), 282 deletions(-) diff --git a/.github/workflows/acquia_cms_ci.workflow.yml b/.github/workflows/acquia_cms_ci.workflow.yml index 180bcb72f..602560db7 100644 --- a/.github/workflows/acquia_cms_ci.workflow.yml +++ b/.github/workflows/acquia_cms_ci.workflow.yml @@ -55,12 +55,7 @@ jobs: curl https://gist.githubusercontent.com/rajeshreeputra/170586f217b422eb9cdfd9ca9457a2e3/raw/c2f277ba9005b91d7f662cacf37b3940a66a9b8c/sut-path-reposories.patch | git -C ../orca apply curl https://gist.githubusercontent.com/rajeshreeputra/efe6fd50fc839e0e05480a5eb58d1ba4/raw/c5e81aa3c0fba9f4abe42460f3d24c7ca976a527/remove-local-settings.patch | git -C ../orca apply - name: Before Install - run: | - # Added below in CI to test acquia_cms on Drupal Core >=9.5. - composer require "drupal/core:>=9.5" --no-update --no-install -d modules/acquia_cms_common - sed -i 's/^core_version_requirement.*/core_version_requirement: ">=9.5"/' modules/acquia_cms_common/acquia_cms_common.info.yml - - ../orca/bin/ci/before_install.sh + run: ../orca/bin/ci/before_install.sh - name: Install shell: 'script -q -e -c "bash {0}"' run: ./tests/ci/install.sh @@ -181,10 +176,6 @@ jobs: # Update the CI by adding patches without pinning the following modules. #composer require "drupal/facets:^2.0.6" --no-update --no-install -d modules/acquia_cms_search - # Added below in CI to test acquia_cms on Drupal Core >=9.5. - composer require "drupal/core:>=9.5" --no-update --no-install -d modules/acquia_cms_common - sed -i 's/^core_version_requirement.*/core_version_requirement: ">=9.5"/' modules/acquia_cms_common/acquia_cms_common.info.yml - # Remove all PHPUnit tests from individual modules, except the integrated & ExistingSite tests. if [ "${ACMS_JOB}" = "integrated_existing_site_tests" ]; then find modules/*/tests tests -type f -name "*Test.php" ! -path "*/ExistingSite*/*" -exec rm -fr '{}' ';' @@ -377,8 +368,6 @@ jobs: composer self-update composer create-project --no-dev --ignore-platform-req=php acquia/orca ../orca "$ORCA_VERSION" -n curl https://gist.githubusercontent.com/rajeshreeputra/170586f217b422eb9cdfd9ca9457a2e3/raw/c2f277ba9005b91d7f662cacf37b3940a66a9b8c/sut-path-reposories.patch | git -C ../orca apply - # Remove Drupal core 9.5.x as oldest support in favor of 10.3.x - # curl https://gist.githubusercontent.com/vishalkhode1/342a0eee801e51f48b4d9701749c1c94/raw/orca-oldest-support.patch | git -C ../orca apply - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v1 with: @@ -394,9 +383,6 @@ jobs: rm -fr modules/acquia_cms_headless # Unset the repository path. composer config repositories.acquia_cms_headless --unset - # Added below in CI to test acquia_cms on Drupal Core >=9.5. - # composer require "drupal/core:>=9.5" --no-update --no-install -d modules/acquia_cms_common - # sed -i 's/^core_version_requirement.*/core_version_requirement: ">=9.5"/' modules/acquia_cms_common/acquia_cms_common.info.yml # Remove all PHPunit tests from acquia_cms modules. find modules/*/tests tests/src -type f -name "*Test.php" -exec rm -fr '{}' ';' @@ -481,9 +467,6 @@ jobs: # curl https://gist.githubusercontent.com/rajeshreeputra/efe6fd50fc839e0e05480a5eb58d1ba4/raw/c5e81aa3c0fba9f4abe42460f3d24c7ca976a527/remove-local-settings.patch | git -C ../orca apply # - name: Before Install # run: | -# # Added below in CI to test acquia_cms on Drupal Core >=9.5. -# composer require "drupal/core:>=9.5" --no-update --no-install -d modules/acquia_cms_common -# sed -i 's/^core_version_requirement.*/core_version_requirement: ">=9.5"/' modules/acquia_cms_common/acquia_cms_common.info.yml # ./tests/ci/before_install.blt.sh # - name: Install # shell: 'script -q -e -c "bash {0}"' diff --git a/.github/workflows/acquia_cms_cron.yml b/.github/workflows/acquia_cms_cron.yml index 878ce0120..29adb6311 100644 --- a/.github/workflows/acquia_cms_cron.yml +++ b/.github/workflows/acquia_cms_cron.yml @@ -35,7 +35,6 @@ jobs: orca-job: - STATIC_CODE_ANALYSIS - STRICT_DEPRECATED_CODE_SCAN - #php-version: [ "8.1" ] steps: - uses: actions/checkout@v4 - name: Use Node.js 20.x @@ -52,11 +51,7 @@ jobs: composer create-project --no-dev --ignore-platform-req=php acquia/orca ../orca "$ORCA_VERSION" -n curl https://gist.githubusercontent.com/rajeshreeputra/170586f217b422eb9cdfd9ca9457a2e3/raw/c2f277ba9005b91d7f662cacf37b3940a66a9b8c/sut-path-reposories.patch | git -C ../orca apply - name: Before Install - run: | - # Added below in CI to test acquia_cms on Drupal Core >=9.5. - composer require "drupal/core:>=9.5" --no-update --no-install -d modules/acquia_cms_common - sed -i 's/^core_version_requirement.*/core_version_requirement: ">=9.5"/' modules/acquia_cms_common/acquia_cms_common.info.yml - ../orca/bin/ci/before_install.sh + run: ../orca/bin/ci/before_install.sh - name: Install shell: 'script -q -e -c "bash {0}"' run: ./tests/ci/install.sh @@ -95,7 +90,7 @@ jobs: node-version: 20.x - uses: shivammathur/setup-php@v2 with: - php-version: 8.2 + php-version: 8.3 - name: Setup MySQL run: | sudo /etc/init.d/mysql start @@ -108,21 +103,6 @@ jobs: curl https://gist.githubusercontent.com/vishalkhode1/342a0eee801e51f48b4d9701749c1c94/raw/orca-oldest-support.patch | git -C ../orca apply - name: Before Install run: | - # Added below in CI to test acquia_cms on Drupal Core >=9.5. - composer require "drupal/core:>=9.5" --no-update --no-install -d modules/acquia_cms_common - sed -i 's/^core_version_requirement.*/core_version_requirement: ">=9.5"/' modules/acquia_cms_common/acquia_cms_common.info.yml - - # One of the patch is failing on Drupal Core 9.5. So remove that patch. - if [ "${ORCA_JOB}" = "INTEGRATED_TEST_ON_LATEST_LTS" ]; then - # Remove the failing php on Drupal Core 9.5. - # NEW_JSON=$(composer config extra.patches."drupal/core" | sed -r 's/,?"3328187.*3142.patch"//') - - # Remove drupal/core patch as it's needed for latest Drupal Core only. - composer config extra.patches.drupal/core {} --json - sed -i 's/2598.patch",/2598.patch"/' modules/acquia_cms_common/composer.json - sed -i '/3356894-mr_3896.patch/d' modules/acquia_cms_common/composer.json - sed -i '/3370946-page-title-backport-10-2-2_0.patch/d' modules/acquia_cms_common/composer.json - fi # Remove all PHPUnit tests from individual modules, except the integrated & ExistingSite tests. if [ "${ACMS_JOB}" = "integrated_existing_site_tests" ]; then @@ -179,12 +159,12 @@ jobs: - ISOLATED_TEST_ON_NEXT_MINOR_DEV - INTEGRATED_TEST_ON_LATEST_LTS php-version: - - 8.2 + - 8.1 - 8.3 exclude: - php-version: 8.3 orca-job: INTEGRATED_TEST_ON_LATEST_LTS - - php-version: 8.2 + - php-version: 8.1 orca-job: [ ISOLATED_TEST_ON_CURRENT_DEV, ISOLATED_TEST_ON_NEXT_MINOR_DEV] steps: - uses: actions/checkout@v4 @@ -204,26 +184,6 @@ jobs: curl https://gist.githubusercontent.com/vishalkhode1/342a0eee801e51f48b4d9701749c1c94/raw/orca-oldest-support.patch | git -C ../orca apply - name: Before Install run: | - # Added below in CI to test acquia_cms on Drupal Core >=9.5. - composer require "drupal/core:>=9.5" --no-update --no-install -d modules/acquia_cms_common - sed -i 's/^core_version_requirement.*/core_version_requirement: ">=9.5"/' modules/acquia_cms_common/acquia_cms_common.info.yml - - if [ "${ORCA_JOB}" = "INTEGRATED_TEST_ON_LATEST_LTS" ]; then - # NEW_JSON=$(composer config extra.patches."drupal/core" | sed -r 's/,?"3328187.*3142.patch"//') - - # Remove drupal/core patch as it's needed for latest Drupal Core only. - composer config extra.patches.drupal/core {} --json - sed -i 's/2598.patch",/2598.patch"/' modules/acquia_cms_common/composer.json - sed -i '/3370946-page-title-backport-10-2-2_0.patch/d' modules/acquia_cms_common/composer.json - fi - - # For Drupal 10.2.x i.e ISOLATED_TEST_ON_CURRENT_DEV, we are removing the patch. - # @todo: Update it accordingly in ticket ACMS-3598. - if [ "${ORCA_JOB}" = "ISOLATED_TEST_ON_CURRENT_DEV" ]; then - sed -i 's/2598.patch",/2598.patch"/' modules/acquia_cms_common/composer.json - sed -i '/3370946-page-title-backport-10-2-2_0.patch/d' modules/acquia_cms_common/composer.json - fi - # Do not run any existing site tests. We run them seperately. find tests/src modules -type f -name "*Test.php" -path "*/ExistingSite*/*" -exec rm -fr '{}' ';' ../orca/bin/ci/before_install.sh @@ -289,12 +249,7 @@ jobs: composer create-project --no-dev --ignore-platform-req=php acquia/orca ../orca "$ORCA_VERSION" -n curl https://gist.githubusercontent.com/rajeshreeputra/170586f217b422eb9cdfd9ca9457a2e3/raw/c2f277ba9005b91d7f662cacf37b3940a66a9b8c/sut-path-reposories.patch | git -C ../orca apply - name: Before Install - run: | - # Added below in CI to test acquia_cms on Drupal Core >=9.5. - composer require "drupal/core:>=9.5" --no-update --no-install -d modules/acquia_cms_common - sed -i 's/^core_version_requirement.*/core_version_requirement: ">=9.5"/' modules/acquia_cms_common/acquia_cms_common.info.yml - - ../orca/bin/ci/before_install.sh + run: ../orca/bin/ci/before_install.sh - name: Install shell: 'script -q -e -c "bash {0}"' run: ./tests/ci/install.sh @@ -336,11 +291,10 @@ jobs: - ISOLATED_TEST_ON_CURRENT - INTEGRATED_TEST_ON_PREVIOUS_MINOR php-version: - - 8.1 - 8.3 - exclude: - - php-version: 8.3 - orca-job: INTEGRATED_TEST_ON_PREVIOUS_MINOR +# exclude: +# - php-version: 8.3 +# orca-job: INTEGRATED_TEST_ON_PREVIOUS_MINOR steps: - uses: actions/checkout@v4 - name: Use Node.js 20.x @@ -363,36 +317,10 @@ jobs: curl https://gist.githubusercontent.com/vishalkhode1/342a0eee801e51f48b4d9701749c1c94/raw/orca-oldest-support.patch | git -C ../orca apply - name: Before Install run: | - # Added below in CI to test acquia_cms on Drupal Core >=9.5. - composer require "drupal/core:>=9.5" --no-update --no-install -d modules/acquia_cms_common - sed -i 's/^core_version_requirement.*/core_version_requirement: ">=9.5"/' modules/acquia_cms_common/acquia_cms_common.info.yml # Remove all PHPunit tests from acquia_cms modules. find modules/*/tests tests/src -type f -name "*Test.php" -exec rm -fr '{}' ';' - # Remove the failing php on Drupal Core 9.5. - if [ "${ORCA_JOB}" = "INTEGRATED_TEST_ON_LATEST_LTS" ]; then - # NEW_JSON=$(composer config extra.patches."drupal/core" | sed -r 's/,?"3328187.*3142.patch"//') - - # Remove drupal/core patch as it's needed for latest Drupal Core only. - composer config extra.patches.drupal/core {} --json - sed -i 's/2598.patch",/2598.patch"/' modules/acquia_cms_common/composer.json - sed -i '/3356894-mr_3896.patch/d' modules/acquia_cms_common/composer.json - sed -i '/3370946-page-title-backport-10-2-2_0.patch/d' modules/acquia_cms_common/composer.json - # Change requireSameDimensions to true in backstop settings. - sed -i '54s/"requireSameDimensions": true/"requireSameDimensions": false/' tests/backstop/backstop-settings.js - sed -i '111s/"requireSameDimensions": true/"requireSameDimensions": false/' tests/backstop/backstop-settings.js - sed -i '130s/"requireSameDimensions": true/"requireSameDimensions": false/' tests/backstop/backstop-settings.js - sed -i '149s/"requireSameDimensions": true/"requireSameDimensions": false/' tests/backstop/backstop-settings.js - sed -i '168s/"requireSameDimensions": true/"requireSameDimensions": false/' tests/backstop/backstop-settings.js - sed -i '187s/"requireSameDimensions": true/"requireSameDimensions": false/' tests/backstop/backstop-settings.js - fi - - if [ "${ORCA_JOB}" = "INTEGRATED_TEST_ON_PREVIOUS_MINOR" ]; then - # Update drupal/core patch as per Drupal Core version. - sed -i 's/2024-01-18\/3370946-page-title-backport-10-2-2_0.patch/2024-01-18\/3370946-page-title-backport-10-1-8.patch/g' modules/acquia_cms_common/composer.json - fi - ../orca/bin/ci/before_install.sh chromedriver --disable-dev-shm-usage --disable-extensions --disable-gpu --headless --no-sandbox --port=4444 & CHROMEDRIVER_PID=$! diff --git a/composer.json b/composer.json index d483e3ef8..9958b1bac 100644 --- a/composer.json +++ b/composer.json @@ -233,10 +233,6 @@ } } }, - "acquia_dam": { - "type": "vcs", - "url": "https://git.drupalcode.org/issue/acquia_dam-3471717.git" - }, "consumer_image_styles": { "type": "vcs", "url": "https://git.drupalcode.org/issue/consumer_image_styles-3429496.git" diff --git a/composer.lock b/composer.lock index d8bbdb7f0..234a05ee2 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": "9a5c8fadfa8e94f6d480dd19098c57f4", + "content-hash": "27bccd4f0c31eb8011206ae736f01300", "packages": [ { "name": "acquia/acquia-cms-starterkit", @@ -2483,12 +2483,12 @@ "dist": { "type": "path", "url": "./modules/acquia_cms_dam", - "reference": "dd4b4497f37a8cc4d3ba2a9f20c52335775c0955" + "reference": "6c3a2613d83f0044f91df7f09abf6b77c6ae1095" }, "require": { "drupal/acquia_cms_image": "^1.5.10", "drupal/acquia_cms_video": "^1.5.8", - "drupal/acquia_dam": "^1 || dev-3471717-upgrade-acquiacohesion-version" + "drupal/acquia_dam": "^1" }, "conflict": { "drupal/acquia_cms_article": "<1.5", @@ -2981,13 +2981,14 @@ }, { "name": "drupal/acquia_dam", - "version": "dev-3471717-upgrade-acquiacohesion-version", + "version": "dev-1.0.x", "source": { "type": "git", - "url": "https://git.drupalcode.org/issue/acquia_dam-3471717.git", - "reference": "cd856631518f73467e475b4f69c28b7bc19a0427" + "url": "https://git.drupalcode.org/project/acquia_dam.git", + "reference": "05477388eb84cc6b2eab90fa1f90156a38cad52b" }, "require": { + "drupal/core": "^9.5 || ^10 || ^11", "drupal/views_remote_data": "^1.0.1", "guzzlehttp/psr7": "^1.0 || ^2.0" }, @@ -3004,11 +3005,46 @@ "drupal/token": "^1.10" }, "type": "drupal-module", + "extra": { + "branch-alias": { + "dev-1.0.x": "1.0.x-dev" + }, + "drupal": { + "version": "1.0.14+1-dev", + "datestamp": "1725377962", + "security-coverage": { + "status": "not-covered", + "message": "Dev releases are not covered by Drupal security advisories." + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", "license": [ "GPL-2.0-or-later" ], + "authors": [ + { + "name": "acquia", + "homepage": "https://www.drupal.org/user/1231722" + }, + { + "name": "baluertl", + "homepage": "https://www.drupal.org/user/1086292" + }, + { + "name": "japerry", + "homepage": "https://www.drupal.org/user/45640" + }, + { + "name": "mglaman", + "homepage": "https://www.drupal.org/user/2416470" + } + ], "description": "Integrates with Acquia DAM", - "time": "2024-09-03T03:48:36+00:00" + "homepage": "https://www.drupal.org/project/acquia_dam", + "support": { + "source": "https://git.drupalcode.org/project/acquia_dam" + } }, { "name": "drupal/acquia_purge", @@ -3986,16 +4022,16 @@ }, { "name": "drupal/core", - "version": "10.3.3", + "version": "10.3.5", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "900f85d93564fa8bea99519c11b564b22df7fb97" + "reference": "831a269a4d99957638977ec325c3346f896d9f08" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/900f85d93564fa8bea99519c11b564b22df7fb97", - "reference": "900f85d93564fa8bea99519c11b564b22df7fb97", + "url": "https://api.github.com/repos/drupal/core/zipball/831a269a4d99957638977ec325c3346f896d9f08", + "reference": "831a269a4d99957638977ec325c3346f896d9f08", "shasum": "" }, "require": { @@ -4041,7 +4077,7 @@ "symfony/serializer": "^6.4", "symfony/validator": "^6.4", "symfony/yaml": "^6.4", - "twig/twig": "^3.9.3" + "twig/twig": "^3.14.0" }, "conflict": { "drush/drush": "<12.4.3" @@ -4144,9 +4180,9 @@ ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", "support": { - "source": "https://github.com/drupal/core/tree/10.3.3" + "source": "https://github.com/drupal/core/tree/10.3.5" }, - "time": "2024-09-05T08:50:05+00:00" + "time": "2024-09-12T09:45:37+00:00" }, { "name": "drupal/crop", @@ -10847,16 +10883,16 @@ }, { "name": "psr/log", - "version": "3.0.1", + "version": "3.0.2", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "79dff0b268932c640297f5208d6298f71855c03e" + "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/79dff0b268932c640297f5208d6298f71855c03e", - "reference": "79dff0b268932c640297f5208d6298f71855c03e", + "url": "https://api.github.com/repos/php-fig/log/zipball/f16e1d5863e37f8d8c2a01719f5b34baa2b714d3", + "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3", "shasum": "" }, "require": { @@ -10891,9 +10927,9 @@ "psr-3" ], "support": { - "source": "https://github.com/php-fig/log/tree/3.0.1" + "source": "https://github.com/php-fig/log/tree/3.0.2" }, - "time": "2024-08-21T13:31:24+00:00" + "time": "2024-09-11T13:17:53+00:00" }, { "name": "psr/simple-cache", @@ -12707,20 +12743,20 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "0424dff1c58f028c451efff2045f5d92410bd540" + "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/0424dff1c58f028c451efff2045f5d92410bd540", - "reference": "0424dff1c58f028c451efff2045f5d92410bd540", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638", + "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "provide": { "ext-ctype": "*" @@ -12766,7 +12802,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0" }, "funding": [ { @@ -12782,24 +12818,24 @@ "type": "tidelift" } ], - "time": "2024-05-31T15:07:36+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-iconv", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", - "reference": "c027e6a3c6aee334663ec21f5852e89738abc805" + "reference": "48becf00c920479ca2e910c22a5a39e5d47ca956" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/c027e6a3c6aee334663ec21f5852e89738abc805", - "reference": "c027e6a3c6aee334663ec21f5852e89738abc805", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/48becf00c920479ca2e910c22a5a39e5d47ca956", + "reference": "48becf00c920479ca2e910c22a5a39e5d47ca956", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "provide": { "ext-iconv": "*" @@ -12846,7 +12882,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-iconv/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-iconv/tree/v1.31.0" }, "funding": [ { @@ -12862,24 +12898,24 @@ "type": "tidelift" } ], - "time": "2024-05-31T15:07:36+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "64647a7c30b2283f5d49b874d84a18fc22054b7a" + "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/64647a7c30b2283f5d49b874d84a18fc22054b7a", - "reference": "64647a7c30b2283f5d49b874d84a18fc22054b7a", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", + "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "suggest": { "ext-intl": "For best performance" @@ -12924,7 +12960,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.31.0" }, "funding": [ { @@ -12940,26 +12976,25 @@ "type": "tidelift" } ], - "time": "2024-05-31T15:07:36+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "a6e83bdeb3c84391d1dfe16f42e40727ce524a5c" + "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/a6e83bdeb3c84391d1dfe16f42e40727ce524a5c", - "reference": "a6e83bdeb3c84391d1dfe16f42e40727ce524a5c", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/c36586dcf89a12315939e00ec9b4474adcb1d773", + "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773", "shasum": "" }, "require": { - "php": ">=7.1", - "symfony/polyfill-intl-normalizer": "^1.10", - "symfony/polyfill-php72": "^1.10" + "php": ">=7.2", + "symfony/polyfill-intl-normalizer": "^1.10" }, "suggest": { "ext-intl": "For best performance" @@ -13008,7 +13043,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.31.0" }, "funding": [ { @@ -13024,24 +13059,24 @@ "type": "tidelift" } ], - "time": "2024-05-31T15:07:36+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb" + "reference": "3833d7255cc303546435cb650316bff708a1c75c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/a95281b0be0d9ab48050ebd988b967875cdb9fdb", - "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c", + "reference": "3833d7255cc303546435cb650316bff708a1c75c", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "suggest": { "ext-intl": "For best performance" @@ -13089,7 +13124,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.31.0" }, "funding": [ { @@ -13105,24 +13140,24 @@ "type": "tidelift" } ], - "time": "2024-05-31T15:07:36+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c" + "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fd22ab50000ef01661e2a31d850ebaa297f8e03c", - "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341", + "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "provide": { "ext-mbstring": "*" @@ -13169,80 +13204,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.30.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2024-06-19T12:30:46+00:00" - }, - { - "name": "symfony/polyfill-php72", - "version": "v1.30.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "10112722600777e02d2745716b70c5db4ca70442" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/10112722600777e02d2745716b70c5db4ca70442", - "reference": "10112722600777e02d2745716b70c5db4ca70442", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "library", - "extra": { - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Php72\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0" }, "funding": [ { @@ -13258,24 +13220,24 @@ "type": "tidelift" } ], - "time": "2024-06-19T12:30:46+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "ec444d3f3f6505bb28d11afa41e75faadebc10a1" + "reference": "0f68c03565dcaaf25a890667542e8bd75fe7e5bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/ec444d3f3f6505bb28d11afa41e75faadebc10a1", - "reference": "ec444d3f3f6505bb28d11afa41e75faadebc10a1", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/0f68c03565dcaaf25a890667542e8bd75fe7e5bb", + "reference": "0f68c03565dcaaf25a890667542e8bd75fe7e5bb", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "type": "library", "extra": { @@ -13318,7 +13280,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.31.0" }, "funding": [ { @@ -13334,24 +13296,24 @@ "type": "tidelift" } ], - "time": "2024-05-31T15:07:36+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "77fa7995ac1b21ab60769b7323d600a991a90433" + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/77fa7995ac1b21ab60769b7323d600a991a90433", - "reference": "77fa7995ac1b21ab60769b7323d600a991a90433", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "type": "library", "extra": { @@ -13398,7 +13360,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0" }, "funding": [ { @@ -13414,24 +13376,24 @@ "type": "tidelift" } ], - "time": "2024-05-31T15:07:36+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-php81", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "3fb075789fb91f9ad9af537c4012d523085bd5af" + "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/3fb075789fb91f9ad9af537c4012d523085bd5af", - "reference": "3fb075789fb91f9ad9af537c4012d523085bd5af", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c", + "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "type": "library", "extra": { @@ -13474,7 +13436,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-php81/tree/v1.31.0" }, "funding": [ { @@ -13490,24 +13452,24 @@ "type": "tidelift" } ], - "time": "2024-06-19T12:30:46+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-php83", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php83.git", - "reference": "dbdcdf1a4dcc2743591f1079d0c35ab1e2dcbbc9" + "reference": "2fb86d65e2d424369ad2905e83b236a8805ba491" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/dbdcdf1a4dcc2743591f1079d0c35ab1e2dcbbc9", - "reference": "dbdcdf1a4dcc2743591f1079d0c35ab1e2dcbbc9", + "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/2fb86d65e2d424369ad2905e83b236a8805ba491", + "reference": "2fb86d65e2d424369ad2905e83b236a8805ba491", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "type": "library", "extra": { @@ -13550,7 +13512,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php83/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-php83/tree/v1.31.0" }, "funding": [ { @@ -13566,7 +13528,7 @@ "type": "tidelift" } ], - "time": "2024-06-19T12:35:24+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/process", @@ -14470,16 +14432,16 @@ }, { "name": "twig/twig", - "version": "v3.12.0", + "version": "v3.14.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "4d19472d4ac1838e0b1f0e029ce1fa4040eb34ea" + "reference": "126b2c97818dbff0cdf3fbfc881aedb3d40aae72" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/4d19472d4ac1838e0b1f0e029ce1fa4040eb34ea", - "reference": "4d19472d4ac1838e0b1f0e029ce1fa4040eb34ea", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/126b2c97818dbff0cdf3fbfc881aedb3d40aae72", + "reference": "126b2c97818dbff0cdf3fbfc881aedb3d40aae72", "shasum": "" }, "require": { @@ -14533,7 +14495,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.12.0" + "source": "https://github.com/twigphp/Twig/tree/v3.14.0" }, "funding": [ { @@ -14545,7 +14507,7 @@ "type": "tidelift" } ], - "time": "2024-08-29T09:51:12+00:00" + "time": "2024-09-09T17:55:12+00:00" }, { "name": "willdurand/geocoder", @@ -17475,16 +17437,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.30.0", + "version": "1.30.1", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "5ceb0e384997db59f38774bf79c2a6134252c08f" + "reference": "51b95ec8670af41009e2b2b56873bad96682413e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/5ceb0e384997db59f38774bf79c2a6134252c08f", - "reference": "5ceb0e384997db59f38774bf79c2a6134252c08f", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/51b95ec8670af41009e2b2b56873bad96682413e", + "reference": "51b95ec8670af41009e2b2b56873bad96682413e", "shasum": "" }, "require": { @@ -17516,9 +17478,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.30.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.30.1" }, - "time": "2024-08-29T09:54:52+00:00" + "time": "2024-09-07T20:13:05+00:00" }, { "name": "phpstan/phpstan", @@ -19863,11 +19825,12 @@ "drupal/gin": 5, "drupal/google_analytics": 20, "drupal/sitestudio_config_management": 20, - "drupal/sitestudio_gin": 20 + "drupal/sitestudio_gin": 20, + "drupal/acquia_dam": 20 }, "prefer-stable": true, "prefer-lowest": false, "platform": [], "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } diff --git a/modules/acquia_cms_dam/composer.json b/modules/acquia_cms_dam/composer.json index af8233304..317671bfc 100644 --- a/modules/acquia_cms_dam/composer.json +++ b/modules/acquia_cms_dam/composer.json @@ -6,7 +6,7 @@ "require": { "drupal/acquia_cms_image": "^1.5.10", "drupal/acquia_cms_video": "^1.5.8", - "drupal/acquia_dam": "^1 || dev-3471717-upgrade-acquiacohesion-version" + "drupal/acquia_dam": "^1" }, "conflict": { "drupal/acquia_cms_article": "<1.5",