diff --git a/.github/workflows/acquia_cms_ci.workflow.yml b/.github/workflows/acquia_cms_ci.workflow.yml index 0a3169a5b..5c87860fa 100644 --- a/.github/workflows/acquia_cms_ci.workflow.yml +++ b/.github/workflows/acquia_cms_ci.workflow.yml @@ -16,7 +16,7 @@ jobs: # Provide your package's name. ORCA_SUT_NAME: acquia/acquia_cms ORCA_SUT_BRANCH: develop - ORCA_VERSION: ^3 + ORCA_VERSION: ^4 ORCA_PACKAGES_CONFIG_ALTER: ../acquia_cms/tests/packages_alter.yml ORCA_FIXTURE_PROJECT_TEMPLATE: acquia/drupal-recommended-project ORCA_ENABLE_NIGHTWATCH: "FALSE" @@ -45,7 +45,7 @@ jobs: node-version: 12.13.1 - uses: shivammathur/setup-php@v2 with: - php-version: 8.2 + php-version: 8.3 #coverage: xdebug - name: Download ORCA run: | @@ -81,7 +81,7 @@ jobs: fail-fast: false matrix: php-version: - - "8.2" + - "8.3" # uncomment below once 8.3 have stable release. # - "8.3" steps: @@ -112,7 +112,7 @@ jobs: # Provide your package's name. ORCA_SUT_NAME: acquia/acquia_cms ORCA_SUT_BRANCH: develop - ORCA_VERSION: ^3 + ORCA_VERSION: ^4 ORCA_PACKAGES_CONFIG_ALTER: ../acquia_cms/tests/packages_alter.yml ORCA_FIXTURE_PROJECT_TEMPLATE: acquia/drupal-recommended-project ORCA_ENABLE_NIGHTWATCH: "FALSE" @@ -148,7 +148,7 @@ jobs: node-version: 12.13.1 - uses: shivammathur/setup-php@v2 with: - php-version: 8.2 + php-version: 8.3 #coverage: xdebug - name: Setup MySQL run: | @@ -246,9 +246,12 @@ jobs: orca-job: - ISOLATED_TEST_ON_NEXT_MINOR php-version: - - 8.1 - - 8.2 + # - 7.4 + # - 8.1 + # - 8.2 + - 8.3 orca-version: + #- ^3 - ^4 steps: - uses: actions/checkout@v3 @@ -317,7 +320,7 @@ jobs: # Set ORCA related environment variables. ORCA_SUT_NAME: acquia/acquia_cms ORCA_SUT_BRANCH: develop - ORCA_VERSION: ^3 + ORCA_VERSION: ^4 ORCA_PACKAGES_CONFIG_ALTER: ../acquia_cms/tests/packages_alter.yml ORCA_FIXTURE_PROJECT_TEMPLATE: acquia/drupal-recommended-project ORCA_ENABLE_NIGHTWATCH: "FALSE" @@ -375,7 +378,7 @@ jobs: node-version: 12.13.1 - uses: shivammathur/setup-php@v2 with: - php-version: 8.2 + php-version: 8.3 #coverage: xdebug - name: Download ORCA run: | @@ -430,7 +433,7 @@ jobs: # Set ORCA related environment variables. ORCA_SUT_NAME: acquia/acquia_cms ORCA_SUT_BRANCH: develop - ORCA_VERSION: ^3 + ORCA_VERSION: ^4 ORCA_PACKAGES_CONFIG_ALTER: ../acquia_cms/tests/packages_alter.yml ORCA_FIXTURE_PROJECT_TEMPLATE: acquia/drupal-recommended-project ORCA_ENABLE_NIGHTWATCH: "FALSE" @@ -465,7 +468,7 @@ jobs: node-version: 12.13.1 - uses: shivammathur/setup-php@v2 with: - php-version: 8.2 + php-version: 8.3 #coverage: xdebug - name: Setup MySQL run: | @@ -481,12 +484,10 @@ jobs: # 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}" = "ISOLATED_TEST_ON_CURRENT" ]; then - # Update drupal/core patch as per Drupal Core version. - sed -i 's/2023-11-30\/3370946-pagetitle-backport-10-2-x.patch/2023-09-11\/3370946-page-title-backport-10-1-x.patch/g' modules/acquia_cms_common/composer.json + # Update drupal/core patch as per Drupal Core version. + sed -i 's/2023-11-30\/3370946-pagetitle-backport-10-2-x.patch/2023-09-11\/3370946-page-title-backport-10-1-x.patch/g' modules/acquia_cms_common/composer.json fi - ./tests/ci/before_install.blt.sh - name: Install shell: 'script -q -e -c "bash {0}"' diff --git a/composer.json b/composer.json index 1428ca7f9..73e3c941d 100644 --- a/composer.json +++ b/composer.json @@ -1,9 +1,8 @@ { "name": "acquia/acquia_cms", - "type": "drupal-module", "description": "An implementation of Drupal 9 for running custom, low code websites on the Acquia platform.", - "homepage": "https://github.com/acquia/acquia_cms", "license": "GPL-2.0-or-later", + "type": "drupal-module", "authors": [ { "name": "Michael Sherron", @@ -16,6 +15,7 @@ "role": "Maintainer" } ], + "homepage": "https://github.com/acquia/acquia_cms", "require": { "acquia/acquia-cms-starterkit": "^1.0", "drupal/acquia_claro": "^1.3", @@ -39,133 +39,27 @@ "mnsami/composer-custom-directory-installer": "^2.0" }, "require-dev": { - "acquia/coding-standards": "^1.0", - "axelerant/drupal-quality-checker": "^1.1", - "drupal/core-composer-scaffold": "^9.0.0 || ^10", - "drupal/core-dev": "^9 || ^10", - "ergebnis/composer-normalize": "~2.15.0", + "acquia/coding-standards": "^1.0 || ^2.0", + "axelerant/drupal-quality-checker": "^1.3", + "drupal/core-composer-scaffold": "^10.2", + "drupal/core-dev": "^9 || ^10.2", + "ergebnis/composer-normalize": "~2.40.0", "mglaman/drupal-check": "^1.4", "oomphinc/composer-installers-extender": "^1.1 || ^2", - "phpspec/prophecy-phpunit": "^2.0", - "phpunit/phpunit": "~9.4.0 || ~9.5.0", + "phpspec/prophecy-phpunit": "^2", + "phpunit/phpunit": "^9.4 || ^10", "weitzman/drupal-test-traits": "^2" }, - "config": { - "allow-plugins": { - "composer/installers": true, - "cweagans/composer-patches": true, - "dealerdirect/phpcodesniffer-composer-installer": true, - "drupal/core-composer-scaffold": true, - "ergebnis/composer-normalize": true, - "mnsami/composer-custom-directory-installer": true, - "oomphinc/composer-installers-extender": true, - "php-http/discovery": true, - "phpro/grumphp-shim": true, - "phpstan/extension-installer": true, - "webdriver-binary/binary-chromedriver": true, - "wikimedia/composer-merge-plugin": true - }, - "preferred-install": { - "drupal/core": "dist" - }, - "process-timeout": 0, - "sort-packages": true - }, - "extra": { - "drupal-scaffold": { - "allowed-packages": [ - "drupal/core" - ], - "file-mapping": { - "[project-root]/.editorconfig": false, - "[project-root]/.gitattributes": false, - "[web-root]/.csslintrc": false, - "[web-root]/INSTALL.txt": false, - "[web-root]/drush/drush.yml": "drush/drush.yml", - "[web-root]/example.gitignore": false, - "[web-root]/modules/README.txt": false, - "[web-root]/profiles/README.txt": false, - "[web-root]/robots.txt": false, - "[web-root]/sites/README.txt": false, - "[web-root]/sites/default/default.settings.php": { - "append": "./patches/d9-acms-settings.patch" - }, - "[web-root]/themes/README.txt": false, - "[web-root]/themes/contrib/cohesion-theme/templates/maintenance-page.html.twig": "./patches/maintenance-page.patch", - "[web-root]/web.config": false - }, - "locations": { - "project-root": ".", - "web-root": "./docroot" - } - }, - "enable-patching": true, - "installer-paths": { - "docroot/core": [ - "type:drupal-core" - ], - "docroot/libraries/{$name}": [ - "type:drupal-library", - "type:bower-asset", - "type:npm-asset", - "swagger-api/swagger-ui", - "nnnick/chartjs" - ], - "docroot/modules/contrib/{$name}": [ - "type:drupal-module" - ], - "docroot/profiles/contrib/{$name}": [ - "type:drupal-profile" - ], - "docroot/themes/contrib/{$name}": [ - "type:drupal-theme" - ] - }, - "installer-types": [ - "bower-asset", - "npm-asset" - ], - "patchLevel": { - "drupal/core": "-p2" - }, - "patches": { - "drupal/core": { - "3328187 - PHP Deprecated: strpos(): Passing null to parameter #1 ($haystack) of type string is deprecated in docroot/core/lib/Drupal/Core/Mail/Plugin/Mail/PhpMail.php on line 112": "https://git.drupalcode.org/project/drupal/-/merge_requests/3142.patch", - "Fix failing test for site studio due to missing file": "https://gist.githubusercontent.com/chandan-singh7929/978c8c3c8b6f1e2de23492e7e562c0c3/raw/f0e7770d94be862e5495ca25662a0a0d5672b785/bypass-library-version-core.patch" - }, - "drupal/decoupled_router": { - "3111456 - Unable to resolve path on node in other language than default": "https://www.drupal.org/files/issues/2022-11-30/decouple_router-3111456-resolve-language-issue-58.patch", - "3176615 - RouteNotFoundException when a jsonapi individual route is not available": "https://www.drupal.org/files/issues/2023-04-26/route-not-found-exception.patch" - }, - "drupal/simple_sitemap": { - "3398996 - Declare min PHP version": "https://gist.githubusercontent.com/apathak18/fe33a24fa2009bb8c9e14761b54f3668/raw/9e4178a957ec16fd58ba3fc7a0b0d527f28d9f77/support-lower-phpversion-simplesitemap.patch" - }, - "drupal/subrequests": { - "3361224 - Fix Subrequests unit tests Deprecations": "https://git.drupalcode.org/project/subrequests/-/merge_requests/16.patch" - }, - "mglaman/drupal-check": { - "Add custom rules to bypass check for buildForm": "https://github.com/mglaman/drupal-check/pull/286.patch" - } - } - }, - "autoload": { - "psr-4": { - "Acquia\\Utility\\": "src/Utility" - }, - "classmap": [ - "src/Composer/ConfigureProject.php" - ] - }, "repositories": { "chart.js": { "type": "package", "package": { "name": "nnnick/chartjs", - "version": "v3.9.1", "type": "drupal-library", + "version": "v3.9.1", "dist": { - "url": "https://github.com/chartjs/Chart.js/releases/download/v3.9.1/chart.js-3.9.1.tgz", - "type": "tar" + "type": "tar", + "url": "https://github.com/chartjs/Chart.js/releases/download/v3.9.1/chart.js-3.9.1.tgz" } } }, @@ -347,6 +241,112 @@ }, "minimum-stability": "dev", "prefer-stable": true, + "autoload": { + "psr-4": { + "Acquia\\Utility\\": "src/Utility" + }, + "classmap": [ + "src/Composer/ConfigureProject.php" + ] + }, + "config": { + "allow-plugins": { + "composer/installers": true, + "cweagans/composer-patches": true, + "dealerdirect/phpcodesniffer-composer-installer": true, + "drupal/core-composer-scaffold": true, + "ergebnis/composer-normalize": true, + "mnsami/composer-custom-directory-installer": true, + "oomphinc/composer-installers-extender": true, + "php-http/discovery": true, + "phpro/grumphp-shim": true, + "phpstan/extension-installer": true, + "webdriver-binary/binary-chromedriver": true, + "wikimedia/composer-merge-plugin": true + }, + "preferred-install": { + "drupal/core": "dist" + }, + "process-timeout": 0, + "sort-packages": true + }, + "extra": { + "drupal-scaffold": { + "allowed-packages": [ + "drupal/core" + ], + "file-mapping": { + "[project-root]/.editorconfig": false, + "[project-root]/.gitattributes": false, + "[web-root]/.csslintrc": false, + "[web-root]/INSTALL.txt": false, + "[web-root]/drush/drush.yml": "drush/drush.yml", + "[web-root]/example.gitignore": false, + "[web-root]/modules/README.txt": false, + "[web-root]/profiles/README.txt": false, + "[web-root]/robots.txt": false, + "[web-root]/sites/README.txt": false, + "[web-root]/sites/default/default.settings.php": { + "append": "./patches/d9-acms-settings.patch" + }, + "[web-root]/themes/README.txt": false, + "[web-root]/themes/contrib/cohesion-theme/templates/maintenance-page.html.twig": "./patches/maintenance-page.patch", + "[web-root]/web.config": false + }, + "locations": { + "project-root": ".", + "web-root": "./docroot" + } + }, + "enable-patching": true, + "installer-paths": { + "docroot/core": [ + "type:drupal-core" + ], + "docroot/libraries/{$name}": [ + "type:drupal-library", + "type:bower-asset", + "type:npm-asset", + "swagger-api/swagger-ui", + "nnnick/chartjs" + ], + "docroot/modules/contrib/{$name}": [ + "type:drupal-module" + ], + "docroot/profiles/contrib/{$name}": [ + "type:drupal-profile" + ], + "docroot/themes/contrib/{$name}": [ + "type:drupal-theme" + ] + }, + "installer-types": [ + "bower-asset", + "npm-asset" + ], + "patchLevel": { + "drupal/core": "-p2" + }, + "patches": { + "drupal/core": { + "3328187 - PHP Deprecated: strpos(): Passing null to parameter #1 ($haystack) of type string is deprecated in docroot/core/lib/Drupal/Core/Mail/Plugin/Mail/PhpMail.php on line 112": "https://git.drupalcode.org/project/drupal/-/merge_requests/3142.patch", + "Fix failing test for site studio due to missing file": "https://gist.githubusercontent.com/chandan-singh7929/978c8c3c8b6f1e2de23492e7e562c0c3/raw/f0e7770d94be862e5495ca25662a0a0d5672b785/bypass-library-version-core.patch" + }, + "drupal/decoupled_router": { + "3111456 - Unable to resolve path on node in other language than default": "https://www.drupal.org/files/issues/2022-11-30/decouple_router-3111456-resolve-language-issue-58.patch", + "3176615 - RouteNotFoundException when a jsonapi individual route is not available": "https://www.drupal.org/files/issues/2023-04-26/route-not-found-exception.patch" + }, + "drupal/simple_sitemap": { + "3398996 - Declare min PHP version": "https://gist.githubusercontent.com/apathak18/fe33a24fa2009bb8c9e14761b54f3668/raw/9e4178a957ec16fd58ba3fc7a0b0d527f28d9f77/support-lower-phpversion-simplesitemap.patch" + }, + "drupal/subrequests": { + "3361224 - Fix Subrequests unit tests Deprecations": "https://git.drupalcode.org/project/subrequests/-/merge_requests/16.patch" + }, + "mglaman/drupal-check": { + "Add custom rules to bypass check for buildForm": "https://github.com/mglaman/drupal-check/pull/286.patch" + } + } + }, "scripts": { "pre-update-cmd": [ "@putenv COMPOSER_MEMORY_LIMIT=2G" diff --git a/composer.lock b/composer.lock index 55765e646..f725417ad 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": "f6054dd4abe7edc5b8a4d9c203a14693", + "content-hash": "bedbfd5e4e7b69b0006baef98bccb1d5", "packages": [ { "name": "acquia/acquia-cms-starterkit", @@ -10092,34 +10092,34 @@ }, { "name": "lcobucci/clock", - "version": "3.0.0", + "version": "3.2.0", "source": { "type": "git", "url": "https://github.com/lcobucci/clock.git", - "reference": "039ef98c6b57b101d10bd11d8fdfda12cbd996dc" + "reference": "6f28b826ea01306b07980cb8320ab30b966cd715" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/lcobucci/clock/zipball/039ef98c6b57b101d10bd11d8fdfda12cbd996dc", - "reference": "039ef98c6b57b101d10bd11d8fdfda12cbd996dc", + "url": "https://api.github.com/repos/lcobucci/clock/zipball/6f28b826ea01306b07980cb8320ab30b966cd715", + "reference": "6f28b826ea01306b07980cb8320ab30b966cd715", "shasum": "" }, "require": { - "php": "~8.1.0 || ~8.2.0", + "php": "~8.2.0 || ~8.3.0", "psr/clock": "^1.0" }, "provide": { "psr/clock-implementation": "1.0" }, "require-dev": { - "infection/infection": "^0.26", - "lcobucci/coding-standard": "^9.0", - "phpstan/extension-installer": "^1.2", - "phpstan/phpstan": "^1.9.4", - "phpstan/phpstan-deprecation-rules": "^1.1.1", - "phpstan/phpstan-phpunit": "^1.3.2", - "phpstan/phpstan-strict-rules": "^1.4.4", - "phpunit/phpunit": "^9.5.27" + "infection/infection": "^0.27", + "lcobucci/coding-standard": "^11.0.0", + "phpstan/extension-installer": "^1.3.1", + "phpstan/phpstan": "^1.10.25", + "phpstan/phpstan-deprecation-rules": "^1.1.3", + "phpstan/phpstan-phpunit": "^1.3.13", + "phpstan/phpstan-strict-rules": "^1.5.1", + "phpunit/phpunit": "^10.2.3" }, "type": "library", "autoload": { @@ -10140,7 +10140,7 @@ "description": "Yet another clock abstraction", "support": { "issues": "https://github.com/lcobucci/clock/issues", - "source": "https://github.com/lcobucci/clock/tree/3.0.0" + "source": "https://github.com/lcobucci/clock/tree/3.2.0" }, "funding": [ { @@ -10152,7 +10152,7 @@ "type": "patreon" } ], - "time": "2022-12-19T15:00:24+00:00" + "time": "2023-11-17T17:00:27+00:00" }, { "name": "lcobucci/jwt", @@ -15774,24 +15774,23 @@ }, { "name": "symfony/var-exporter", - "version": "v6.4.1", + "version": "v7.0.1", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "2d08ca6b9cc704dce525615d1e6d1788734f36d9" + "reference": "a3d7c877414fcd59ab7075ecdc3b8f9c00f7bcc3" }, "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/a3d7c877414fcd59ab7075ecdc3b8f9c00f7bcc3", + "reference": "a3d7c877414fcd59ab7075ecdc3b8f9c00f7bcc3", "shasum": "" }, "require": { - "php": ">=8.1", - "symfony/deprecation-contracts": "^2.5|^3" + "php": ">=8.2" }, "require-dev": { - "symfony/var-dumper": "^5.4|^6.0|^7.0" + "symfony/var-dumper": "^6.4|^7.0" }, "type": "library", "autoload": { @@ -15829,7 +15828,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v6.4.1" + "source": "https://github.com/symfony/var-exporter/tree/v7.0.1" }, "funding": [ { @@ -15845,7 +15844,7 @@ "type": "tidelift" } ], - "time": "2023-11-30T10:32:10+00:00" + "time": "2023-11-30T11:38:21+00:00" }, { "name": "symfony/yaml", @@ -16101,16 +16100,16 @@ "packages-dev": [ { "name": "acquia/coding-standards", - "version": "v1.1.0", + "version": "v2.0.0", "source": { "type": "git", "url": "https://github.com/acquia/coding-standards-php.git", - "reference": "92f87ecabcd0e54ff347fb86a041540e0bbc18e5" + "reference": "bb52b780a00ca7586e8b2e502e09dc53c5e90a60" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/acquia/coding-standards-php/zipball/92f87ecabcd0e54ff347fb86a041540e0bbc18e5", - "reference": "92f87ecabcd0e54ff347fb86a041540e0bbc18e5", + "url": "https://api.github.com/repos/acquia/coding-standards-php/zipball/bb52b780a00ca7586e8b2e502e09dc53c5e90a60", + "reference": "bb52b780a00ca7586e8b2e502e09dc53c5e90a60", "shasum": "" }, "require": { @@ -16126,7 +16125,7 @@ "type": "phpcodesniffer-standard", "extra": { "branch-alias": { - "dev-develop": "0.x-dev" + "dev-develop": "2.x-dev" } }, "autoload": { @@ -16156,7 +16155,7 @@ "issues": "https://github.com/acquia/coding-standards/issues", "source": "https://github.com/acquia/coding-standards" }, - "time": "2023-03-03T22:51:37+00:00" + "time": "2023-03-06T17:49:20+00:00" }, { "name": "axelerant/drupal-quality-checker", @@ -16849,16 +16848,16 @@ }, { "name": "drupal/core-composer-scaffold", - "version": "10.1.7", + "version": "10.2.0-rc1", "source": { "type": "git", "url": "https://github.com/drupal/core-composer-scaffold.git", - "reference": "6a2d817ccb59fdb7e6b3720a1478b0d00b475445" + "reference": "97bd91856535a354e9b1b815f0957893e26b6622" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core-composer-scaffold/zipball/6a2d817ccb59fdb7e6b3720a1478b0d00b475445", - "reference": "6a2d817ccb59fdb7e6b3720a1478b0d00b475445", + "url": "https://api.github.com/repos/drupal/core-composer-scaffold/zipball/97bd91856535a354e9b1b815f0957893e26b6622", + "reference": "97bd91856535a354e9b1b815f0957893e26b6622", "shasum": "" }, "require": { @@ -16893,22 +16892,22 @@ "drupal" ], "support": { - "source": "https://github.com/drupal/core-composer-scaffold/tree/10.1.7" + "source": "https://github.com/drupal/core-composer-scaffold/tree/10.2.0-rc1" }, - "time": "2023-11-15T23:23:43+00:00" + "time": "2023-11-15T23:23:28+00:00" }, { "name": "drupal/core-dev", - "version": "10.1.7", + "version": "10.2.0-rc1", "source": { "type": "git", "url": "https://github.com/drupal/core-dev.git", - "reference": "5d02df4f05f5033e7d8bf4098efa55cc0847e2b9" + "reference": "873ff193a7e863c45034956c839215edb0235e68" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core-dev/zipball/5d02df4f05f5033e7d8bf4098efa55cc0847e2b9", - "reference": "5d02df4f05f5033e7d8bf4098efa55cc0847e2b9", + "url": "https://api.github.com/repos/drupal/core-dev/zipball/873ff193a7e863c45034956c839215edb0235e68", + "reference": "873ff193a7e863c45034956c839215edb0235e68", "shasum": "" }, "require": { @@ -16920,22 +16919,24 @@ "drupal/coder": "^8.3.10", "instaclick/php-webdriver": "^1.4.1", "justinrainbow/json-schema": "^5.2", - "mglaman/phpstan-drupal": "^1.1.34", + "mglaman/phpstan-drupal": "^1.2.1", + "micheh/phpcs-gitlab": "^1.1", "mikey179/vfsstream": "^1.6.11", + "open-telemetry/exporter-otlp": "^1", + "open-telemetry/sdk": "^1", + "php-http/guzzle7-adapter": "^1.0", "phpspec/prophecy-phpunit": "^2", "phpstan/extension-installer": "^1.1", - "phpstan/phpstan": "^1.10.1", + "phpstan/phpstan": "^1.10.38", "phpstan/phpstan-phpunit": "^1.3.11", - "phpunit/phpunit": "^9.5", - "symfony/browser-kit": "^6.3", - "symfony/css-selector": "^6.3", - "symfony/dom-crawler": "^6.3", - "symfony/error-handler": "^6.3", - "symfony/filesystem": "^6.3", - "symfony/finder": "^6.3", - "symfony/lock": "^6.3", - "symfony/phpunit-bridge": "^6.3", - "symfony/var-dumper": "^6.3" + "phpunit/phpunit": "^9.6.13", + "symfony/browser-kit": "^6.4", + "symfony/css-selector": "^6.4", + "symfony/dom-crawler": "^6.4", + "symfony/error-handler": "^6.4", + "symfony/lock": "^6.4", + "symfony/phpunit-bridge": "^6.4", + "symfony/var-dumper": "^6.4" }, "conflict": { "webflo/drupal-core-require-dev": "*" @@ -16947,47 +16948,49 @@ ], "description": "require-dev dependencies from drupal/drupal; use in addition to drupal/core-recommended to run tests from drupal/core.", "support": { - "source": "https://github.com/drupal/core-dev/tree/10.1.7" + "source": "https://github.com/drupal/core-dev/tree/10.2.0-rc1" }, - "time": "2023-10-05T21:10:12+00:00" + "time": "2023-11-11T11:40:40+00:00" }, { "name": "ergebnis/composer-normalize", - "version": "2.15.0", + "version": "2.40.0", "source": { "type": "git", "url": "https://github.com/ergebnis/composer-normalize.git", - "reference": "d469a15b916441959446d52a0f5d3fc9f7720317" + "reference": "665de8e2bbe7c3e31b0a819b4dc0165289c0d230" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ergebnis/composer-normalize/zipball/d469a15b916441959446d52a0f5d3fc9f7720317", - "reference": "d469a15b916441959446d52a0f5d3fc9f7720317", + "url": "https://api.github.com/repos/ergebnis/composer-normalize/zipball/665de8e2bbe7c3e31b0a819b4dc0165289c0d230", + "reference": "665de8e2bbe7c3e31b0a819b4dc0165289c0d230", "shasum": "" }, "require": { - "composer-plugin-api": "^1.1.0 || ^2.0.0", - "ergebnis/json-normalizer": "^1.0.3", - "ergebnis/json-printer": "^3.1.1", - "justinrainbow/json-schema": "^5.2.10", + "composer-plugin-api": "^2.0.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": "^7.2 || ^8.0" + "php": "~8.1.0 || ~8.2.0 || ~8.3.0" + }, + "conflict": { + "symfony/console": "^7.0.0" }, "require-dev": { - "composer/composer": "^1.10.22 || ^2.0.13", - "ergebnis/license": "^1.1.0", - "ergebnis/php-cs-fixer-config": "^2.14.0", - "ergebnis/phpstan-rules": "~0.15.3", - "ergebnis/test-util": "^1.5.0", - "phpstan/extension-installer": "^1.1.0", - "phpstan/phpstan": "~0.12.89", - "phpstan/phpstan-deprecation-rules": "~0.12.6", - "phpstan/phpstan-phpunit": "~0.12.19", - "phpstan/phpstan-strict-rules": "~0.12.9", - "phpunit/phpunit": "^8.5.16", - "psalm/plugin-phpunit": "~0.16.0", - "symfony/filesystem": "^5.3.0", - "vimeo/psalm": "^4.7.3" + "composer/composer": "^2.6.5", + "ergebnis/license": "^2.4.0", + "ergebnis/php-cs-fixer-config": "~6.13.1", + "ergebnis/phpunit-slow-test-detector": "^2.7.0", + "fakerphp/faker": "^1.23.0", + "infection/infection": "~0.27.8", + "phpunit/phpunit": "^10.4.2", + "psalm/plugin-phpunit": "~0.18.4", + "rector/rector": "~0.18.12", + "symfony/filesystem": "^6.4.0", + "vimeo/psalm": "^5.17.0" }, "type": "composer-plugin", "extra": { @@ -16995,7 +16998,8 @@ "composer-normalize": { "indent-size": 2, "indent-style": "space" - } + }, + "plugin-optional": true }, "autoload": { "psr-4": { @@ -17009,7 +17013,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.", @@ -17022,51 +17027,117 @@ ], "support": { "issues": "https://github.com/ergebnis/composer-normalize/issues", + "security": "https://github.com/ergebnis/composer-normalize/blob/main/.github/SECURITY.md", "source": "https://github.com/ergebnis/composer-normalize" }, - "funding": [ + "time": "2023-12-05T16:07:43+00:00" + }, + { + "name": "ergebnis/json", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/ergebnis/json.git", + "reference": "9f2b9086c43b189d7044a5b6215a931fb6e9125d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ergebnis/json/zipball/9f2b9086c43b189d7044a5b6215a931fb6e9125d", + "reference": "9f2b9086c43b189d7044a5b6215a931fb6e9125d", + "shasum": "" + }, + "require": { + "php": "~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", + "psalm/plugin-phpunit": "~0.18.4", + "rector/rector": "~0.18.5", + "vimeo/psalm": "^5.15.0" + }, + "type": "library", + "extra": { + "composer-normalize": { + "indent-size": 2, + "indent-style": "space" + } + }, + "autoload": { + "psr-4": { + "Ergebnis\\Json\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ { - "url": "https://github.com/localheinz", - "type": "github" + "name": "Andreas Möller", + "email": "am@localheinz.com", + "homepage": "https://localheinz.com" } ], - "time": "2021-06-15T08:06:45+00:00" + "description": "Provides a Json value object for representing a valid JSON string.", + "homepage": "https://github.com/ergebnis/json", + "keywords": [ + "json" + ], + "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": "2023-10-10T07:57:48+00:00" }, { "name": "ergebnis/json-normalizer", - "version": "1.0.3", + "version": "4.4.0", "source": { "type": "git", "url": "https://github.com/ergebnis/json-normalizer.git", - "reference": "4a7f064ce34d5a2e382564565cdd433dbc5b9494" + "reference": "67fd0d513e5c79456b42ef5654ff29b5d4ce8256" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ergebnis/json-normalizer/zipball/4a7f064ce34d5a2e382564565cdd433dbc5b9494", - "reference": "4a7f064ce34d5a2e382564565cdd433dbc5b9494", + "url": "https://api.github.com/repos/ergebnis/json-normalizer/zipball/67fd0d513e5c79456b42ef5654ff29b5d4ce8256", + "reference": "67fd0d513e5c79456b42ef5654ff29b5d4ce8256", "shasum": "" }, "require": { - "ergebnis/json-printer": "^3.1.1", + "ergebnis/json": "^1.1.0", + "ergebnis/json-pointer": "^3.2.0", + "ergebnis/json-printer": "^3.4.0", + "ergebnis/json-schema-validator": "^4.1.0", "ext-json": "*", - "justinrainbow/json-schema": "^5.2.10", - "php": "^7.2 || ^8.0" + "justinrainbow/json-schema": "^5.2.12", + "php": "~8.1.0 || ~8.2.0 || ~8.3.0" }, "require-dev": { - "ergebnis/license": "^1.1.0", - "ergebnis/php-cs-fixer-config": "^2.10.0", - "ergebnis/phpstan-rules": "~0.15.3", - "ergebnis/test-util": "^1.4.0", - "infection/infection": "~0.15.3", - "jangregor/phpstan-prophecy": "~0.8.1", - "phpstan/extension-installer": "^1.1.0", - "phpstan/phpstan": "~0.12.80", - "phpstan/phpstan-deprecation-rules": "~0.12.6", - "phpstan/phpstan-phpunit": "~0.12.17", - "phpstan/phpstan-strict-rules": "~0.12.9", - "phpunit/phpunit": "^8.5.14", - "psalm/plugin-phpunit": "~0.12.2", - "vimeo/psalm": "^3.18" + "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.2", + "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" + }, + "suggest": { + "composer/semver": "If you want to use ComposerJsonNormalizer or VersionConstraintNormalizer" }, "type": "library", "autoload": { @@ -17081,7 +17152,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.", @@ -17092,15 +17164,77 @@ ], "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" }, - "funding": [ + "time": "2023-12-13T09:35:38+00:00" + }, + { + "name": "ergebnis/json-pointer", + "version": "3.3.0", + "source": { + "type": "git", + "url": "https://github.com/ergebnis/json-pointer.git", + "reference": "8e517faefc06b7c761eaa041febef51a9375819a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ergebnis/json-pointer/zipball/8e517faefc06b7c761eaa041febef51a9375819a", + "reference": "8e517faefc06b7c761eaa041febef51a9375819a", + "shasum": "" + }, + "require": { + "php": "~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", + "psalm/plugin-phpunit": "~0.18.4", + "rector/rector": "~0.18.5", + "vimeo/psalm": "^5.15.0" + }, + "type": "library", + "extra": { + "composer-normalize": { + "indent-size": 2, + "indent-style": "space" + } + }, + "autoload": { + "psr-4": { + "Ergebnis\\Json\\Pointer\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ { - "url": "https://github.com/localheinz", - "type": "github" + "name": "Andreas Möller", + "email": "am@localheinz.com", + "homepage": "https://localheinz.com" } ], - "time": "2021-03-06T13:33:57+00:00" + "description": "Provides JSON pointer as a value object.", + "homepage": "https://github.com/ergebnis/json-pointer", + "keywords": [ + "RFC6901", + "json", + "pointer" + ], + "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": "2023-10-10T14:41:06+00:00" }, { "name": "ergebnis/json-printer", @@ -17163,6 +17297,77 @@ }, "time": "2023-10-10T07:42:48+00:00" }, + { + "name": "ergebnis/json-schema-validator", + "version": "4.1.0", + "source": { + "type": "git", + "url": "https://github.com/ergebnis/json-schema-validator.git", + "reference": "d568ed85d1cdc2e49d650c2fc234dc2516f3f25b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ergebnis/json-schema-validator/zipball/d568ed85d1cdc2e49d650c2fc234dc2516f3f25b", + "reference": "d568ed85d1cdc2e49d650c2fc234dc2516f3f25b", + "shasum": "" + }, + "require": { + "ergebnis/json": "^1.0.1", + "ergebnis/json-pointer": "^3.2.0", + "ext-json": "*", + "justinrainbow/json-schema": "^5.2.12", + "php": "~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", + "psalm/plugin-phpunit": "~0.18.4", + "rector/rector": "~0.18.5", + "vimeo/psalm": "^5.15.0" + }, + "type": "library", + "extra": { + "composer-normalize": { + "indent-size": 2, + "indent-style": "space" + } + }, + "autoload": { + "psr-4": { + "Ergebnis\\Json\\SchemaValidator\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Andreas Möller", + "email": "am@localheinz.com", + "homepage": "https://localheinz.com" + } + ], + "description": "Provides a JSON schema validator, building on top of justinrainbow/json-schema.", + "homepage": "https://github.com/ergebnis/json-schema-validator", + "keywords": [ + "json", + "schema", + "validator" + ], + "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": "2023-10-10T14:16:57+00:00" + }, { "name": "friendsoftwig/twigcs", "version": "6.4.0", @@ -17218,6 +17423,50 @@ }, "time": "2023-12-05T07:36:35+00:00" }, + { + "name": "google/protobuf", + "version": "v3.25.1", + "source": { + "type": "git", + "url": "https://github.com/protocolbuffers/protobuf-php.git", + "reference": "1fb247e72df401c863ed239c1660f981644af5db" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/protocolbuffers/protobuf-php/zipball/1fb247e72df401c863ed239c1660f981644af5db", + "reference": "1fb247e72df401c863ed239c1660f981644af5db", + "shasum": "" + }, + "require": { + "php": ">=7.0.0" + }, + "require-dev": { + "phpunit/phpunit": ">=5.0.0" + }, + "suggest": { + "ext-bcmath": "Need to support JSON deserialization" + }, + "type": "library", + "autoload": { + "psr-4": { + "Google\\Protobuf\\": "src/Google/Protobuf", + "GPBMetadata\\Google\\Protobuf\\": "src/GPBMetadata/Google/Protobuf" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "proto library for PHP", + "homepage": "https://developers.google.com/protocol-buffers/", + "keywords": [ + "proto" + ], + "support": { + "source": "https://github.com/protocolbuffers/protobuf-php/tree/v3.25.1" + }, + "time": "2023-11-15T21:36:03+00:00" + }, { "name": "instaclick/php-webdriver", "version": "1.4.18", @@ -17579,6 +17828,58 @@ ], "time": "2023-11-14T22:47:32+00:00" }, + { + "name": "micheh/phpcs-gitlab", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/micheh/phpcs-gitlab.git", + "reference": "fd64e6579d9e30a82abba616fabcb9a2c837c7a8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/micheh/phpcs-gitlab/zipball/fd64e6579d9e30a82abba616fabcb9a2c837c7a8", + "reference": "fd64e6579d9e30a82abba616fabcb9a2c837c7a8", + "shasum": "" + }, + "require": { + "ext-json": "*" + }, + "require-dev": { + "phpunit/phpunit": "^8.0 || ^9.0", + "squizlabs/php_codesniffer": "^3.3.1", + "vimeo/psalm": "^4.3" + }, + "type": "library", + "autoload": { + "psr-4": { + "Micheh\\PhpCodeSniffer\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Michel Hunziker", + "email": "info@michelhunziker.com" + } + ], + "description": "Gitlab Report for PHP_CodeSniffer (display the violations in the Gitlab CI/CD Code Quality Report)", + "keywords": [ + "PHP_CodeSniffer", + "code quality", + "gitlab", + "phpcs", + "report" + ], + "support": { + "issues": "https://github.com/micheh/phpcs-gitlab/issues", + "source": "https://github.com/micheh/phpcs-gitlab/tree/1.1.0" + }, + "time": "2020-12-20T09:39:07+00:00" + }, { "name": "mikey179/vfsstream", "version": "v1.6.11", @@ -17815,21 +18116,413 @@ "time": "2021-12-15T12:32:42+00:00" }, { - "name": "pdepend/pdepend", - "version": "2.16.1", + "name": "open-telemetry/api", + "version": "1.0.0", "source": { "type": "git", - "url": "https://github.com/pdepend/pdepend.git", - "reference": "66ceb05eaa8bf358574143c974b04463911bc700" + "url": "https://github.com/opentelemetry-php/api.git", + "reference": "d577d732333d38a9a6c16936363ee25f1e3f1c3c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pdepend/pdepend/zipball/66ceb05eaa8bf358574143c974b04463911bc700", - "reference": "66ceb05eaa8bf358574143c974b04463911bc700", + "url": "https://api.github.com/repos/opentelemetry-php/api/zipball/d577d732333d38a9a6c16936363ee25f1e3f1c3c", + "reference": "d577d732333d38a9a6c16936363ee25f1e3f1c3c", "shasum": "" }, "require": { - "php": ">=5.3.7", + "open-telemetry/context": "^1.0", + "php": "^7.4 || ^8.0", + "psr/log": "^1.1|^2.0|^3.0", + "symfony/polyfill-php80": "^1.26", + "symfony/polyfill-php81": "^1.26", + "symfony/polyfill-php82": "^1.26" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.0.x-dev" + } + }, + "autoload": { + "files": [ + "Trace/functions.php" + ], + "psr-4": { + "OpenTelemetry\\API\\": "." + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "opentelemetry-php contributors", + "homepage": "https://github.com/open-telemetry/opentelemetry-php/graphs/contributors" + } + ], + "description": "API for OpenTelemetry PHP.", + "keywords": [ + "Metrics", + "api", + "apm", + "logging", + "opentelemetry", + "otel", + "tracing" + ], + "support": { + "chat": "https://app.slack.com/client/T08PSQ7BQ/C01NFPCV44V", + "docs": "https://opentelemetry.io/docs/php", + "issues": "https://github.com/open-telemetry/opentelemetry-php/issues", + "source": "https://github.com/open-telemetry/opentelemetry-php" + }, + "time": "2023-09-27T23:15:51+00:00" + }, + { + "name": "open-telemetry/context", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/opentelemetry-php/context.git", + "reference": "99f3d54fa9f9ff67421774feeef5e5b1f209ea21" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/opentelemetry-php/context/zipball/99f3d54fa9f9ff67421774feeef5e5b1f209ea21", + "reference": "99f3d54fa9f9ff67421774feeef5e5b1f209ea21", + "shasum": "" + }, + "require": { + "php": "^7.4 || ^8.0", + "symfony/polyfill-php80": "^1.26", + "symfony/polyfill-php81": "^1.26", + "symfony/polyfill-php82": "^1.26" + }, + "suggest": { + "ext-ffi": "To allow context switching in Fibers" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.0.x-dev" + } + }, + "autoload": { + "files": [ + "fiber/initialize_fiber_handler.php" + ], + "psr-4": { + "OpenTelemetry\\Context\\": "." + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "opentelemetry-php contributors", + "homepage": "https://github.com/open-telemetry/opentelemetry-php/graphs/contributors" + } + ], + "description": "Context implementation for OpenTelemetry PHP.", + "keywords": [ + "Context", + "opentelemetry", + "otel" + ], + "support": { + "chat": "https://app.slack.com/client/T08PSQ7BQ/C01NFPCV44V", + "docs": "https://opentelemetry.io/docs/php", + "issues": "https://github.com/open-telemetry/opentelemetry-php/issues", + "source": "https://github.com/open-telemetry/opentelemetry-php" + }, + "time": "2023-09-05T03:38:44+00:00" + }, + { + "name": "open-telemetry/exporter-otlp", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/opentelemetry-php/exporter-otlp.git", + "reference": "756092bdff472ea49adb7843c74011606d065b36" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/opentelemetry-php/exporter-otlp/zipball/756092bdff472ea49adb7843c74011606d065b36", + "reference": "756092bdff472ea49adb7843c74011606d065b36", + "shasum": "" + }, + "require": { + "open-telemetry/api": "^1.0", + "open-telemetry/gen-otlp-protobuf": "^1.0", + "open-telemetry/sdk": "^1.0", + "php": "^7.4 || ^8.0", + "php-http/discovery": "^1.14" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.0.x-dev" + } + }, + "autoload": { + "files": [ + "_register.php" + ], + "psr-4": { + "OpenTelemetry\\Contrib\\Otlp\\": "." + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "opentelemetry-php contributors", + "homepage": "https://github.com/open-telemetry/opentelemetry-php/graphs/contributors" + } + ], + "description": "OTLP exporter for OpenTelemetry.", + "keywords": [ + "Metrics", + "exporter", + "gRPC", + "http", + "opentelemetry", + "otel", + "otlp", + "tracing" + ], + "support": { + "chat": "https://app.slack.com/client/T08PSQ7BQ/C01NFPCV44V", + "docs": "https://opentelemetry.io/docs/php", + "issues": "https://github.com/open-telemetry/opentelemetry-php/issues", + "source": "https://github.com/open-telemetry/opentelemetry-php" + }, + "time": "2023-10-13T00:48:23+00:00" + }, + { + "name": "open-telemetry/gen-otlp-protobuf", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/opentelemetry-php/gen-otlp-protobuf.git", + "reference": "30fe95f10c2ec1a577f78257c86fbbebe739ca5e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/opentelemetry-php/gen-otlp-protobuf/zipball/30fe95f10c2ec1a577f78257c86fbbebe739ca5e", + "reference": "30fe95f10c2ec1a577f78257c86fbbebe739ca5e", + "shasum": "" + }, + "require": { + "google/protobuf": "^3.3.0", + "php": "^7.4 || ^8.0" + }, + "suggest": { + "ext-protobuf": "For better performance, when dealing with the protobuf format" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Opentelemetry\\Proto\\": "Opentelemetry/Proto/", + "GPBMetadata\\Opentelemetry\\": "GPBMetadata/Opentelemetry/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "opentelemetry-php contributors", + "homepage": "https://github.com/open-telemetry/opentelemetry-php/graphs/contributors" + } + ], + "description": "PHP protobuf files for communication with OpenTelemetry OTLP collectors/servers.", + "keywords": [ + "Metrics", + "apm", + "gRPC", + "logging", + "opentelemetry", + "otel", + "otlp", + "protobuf", + "tracing" + ], + "support": { + "chat": "https://app.slack.com/client/T08PSQ7BQ/C01NFPCV44V", + "docs": "https://opentelemetry.io/docs/php", + "issues": "https://github.com/open-telemetry/opentelemetry-php/issues", + "source": "https://github.com/open-telemetry/opentelemetry-php" + }, + "time": "2023-09-05T03:38:44+00:00" + }, + { + "name": "open-telemetry/sdk", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/opentelemetry-php/sdk.git", + "reference": "806b82d8312243c78bdf8b6cc9f724e9e2fc77a7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/opentelemetry-php/sdk/zipball/806b82d8312243c78bdf8b6cc9f724e9e2fc77a7", + "reference": "806b82d8312243c78bdf8b6cc9f724e9e2fc77a7", + "shasum": "" + }, + "require": { + "ext-json": "*", + "open-telemetry/api": "^1.0", + "open-telemetry/context": "^1.0", + "open-telemetry/sem-conv": "^1.0", + "php": "^7.4 || ^8.0", + "php-http/discovery": "^1.14", + "psr/http-client": "^1.0", + "psr/http-client-implementation": "^1.0", + "psr/http-factory-implementation": "^1.0", + "psr/http-message": "^1.0.1|^2.0", + "psr/log": "^1.1|^2.0|^3.0", + "symfony/polyfill-mbstring": "^1.23", + "symfony/polyfill-php80": "^1.26", + "symfony/polyfill-php81": "^1.26", + "symfony/polyfill-php82": "^1.26" + }, + "suggest": { + "ext-gmp": "To support unlimited number of synchronous metric readers", + "ext-mbstring": "To increase performance of string operations" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.0.x-dev" + } + }, + "autoload": { + "files": [ + "Common/Util/functions.php", + "Logs/Exporter/_register.php", + "Metrics/MetricExporter/_register.php", + "Propagation/_register.php", + "Trace/SpanExporter/_register.php", + "Common/Dev/Compatibility/_load.php", + "_autoload.php" + ], + "psr-4": { + "OpenTelemetry\\SDK\\": "." + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "opentelemetry-php contributors", + "homepage": "https://github.com/open-telemetry/opentelemetry-php/graphs/contributors" + } + ], + "description": "SDK for OpenTelemetry PHP.", + "keywords": [ + "Metrics", + "apm", + "logging", + "opentelemetry", + "otel", + "sdk", + "tracing" + ], + "support": { + "chat": "https://app.slack.com/client/T08PSQ7BQ/C01NFPCV44V", + "docs": "https://opentelemetry.io/docs/php", + "issues": "https://github.com/open-telemetry/opentelemetry-php/issues", + "source": "https://github.com/open-telemetry/opentelemetry-php" + }, + "time": "2023-11-27T04:26:07+00:00" + }, + { + "name": "open-telemetry/sem-conv", + "version": "1.23.1", + "source": { + "type": "git", + "url": "https://github.com/opentelemetry-php/sem-conv.git", + "reference": "6921f9450510bf8e87c737f731ff818de05bf9c4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/opentelemetry-php/sem-conv/zipball/6921f9450510bf8e87c737f731ff818de05bf9c4", + "reference": "6921f9450510bf8e87c737f731ff818de05bf9c4", + "shasum": "" + }, + "require": { + "php": "^7.4 || ^8.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "OpenTelemetry\\SemConv\\": "." + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "opentelemetry-php contributors", + "homepage": "https://github.com/open-telemetry/opentelemetry-php/graphs/contributors" + } + ], + "description": "Semantic conventions for OpenTelemetry PHP.", + "keywords": [ + "Metrics", + "apm", + "logging", + "opentelemetry", + "otel", + "semantic conventions", + "semconv", + "tracing" + ], + "support": { + "chat": "https://app.slack.com/client/T08PSQ7BQ/C01NFPCV44V", + "docs": "https://opentelemetry.io/docs/php", + "issues": "https://github.com/open-telemetry/opentelemetry-php/issues", + "source": "https://github.com/open-telemetry/opentelemetry-php" + }, + "time": "2023-11-21T22:12:22+00:00" + }, + { + "name": "pdepend/pdepend", + "version": "2.16.1", + "source": { + "type": "git", + "url": "https://github.com/pdepend/pdepend.git", + "reference": "66ceb05eaa8bf358574143c974b04463911bc700" + }, + "dist": { + "type": "zip", + "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|^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", @@ -19112,16 +19805,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.28", + "version": "9.6.15", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "954ca3113a03bf780d22f07bf055d883ee04b65e" + "reference": "05017b80304e0eb3f31d90194a563fd53a6021f1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/954ca3113a03bf780d22f07bf055d883ee04b65e", - "reference": "954ca3113a03bf780d22f07bf055d883ee04b65e", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/05017b80304e0eb3f31d90194a563fd53a6021f1", + "reference": "05017b80304e0eb3f31d90194a563fd53a6021f1", "shasum": "" }, "require": { @@ -19136,7 +19829,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", @@ -19154,8 +19847,8 @@ "sebastian/version": "^3.0.2" }, "suggest": { - "ext-soap": "*", - "ext-xdebug": "*" + "ext-soap": "To be able to generate mocks based on WSDL files", + "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" }, "bin": [ "phpunit" @@ -19163,7 +19856,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "9.5-dev" + "dev-master": "9.6-dev" } }, "autoload": { @@ -19194,7 +19887,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.28" + "security": "https://github.com/sebastianbergmann/phpunit/security/policy", + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.15" }, "funding": [ { @@ -19210,7 +19904,7 @@ "type": "tidelift" } ], - "time": "2023-01-14T12:32:24+00:00" + "time": "2023-12-01T16:55:19+00:00" }, { "name": "sebastian/cli-parser", @@ -20735,6 +21429,85 @@ ], "time": "2023-12-01T09:25:07+00:00" }, + { + "name": "symfony/polyfill-php82", + "version": "v1.28.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php82.git", + "reference": "7716bea9c86776fb3362d6b52fe1fc9471056a49" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php82/zipball/7716bea9c86776fb3362d6b52fe1fc9471056a49", + "reference": "7716bea9c86776fb3362d6b52fe1fc9471056a49", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.28-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php82\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "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 8.2+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php82/tree/v1.28.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": "2023-08-25T17:27:25+00:00" + }, { "name": "theseer/tokenizer", "version": "1.2.2", @@ -20914,5 +21687,5 @@ "prefer-lowest": false, "platform": [], "platform-dev": [], - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.3.0" } diff --git a/modules/acquia_cms_common/acquia_cms_common.info.yml b/modules/acquia_cms_common/acquia_cms_common.info.yml index 2276ab1e0..e9ac1b5e5 100644 --- a/modules/acquia_cms_common/acquia_cms_common.info.yml +++ b/modules/acquia_cms_common/acquia_cms_common.info.yml @@ -2,7 +2,7 @@ name: "Acquia CMS Common" package: "Acquia CMS" description: "Handles shared functionality for Acquia CMS." type: module -core_version_requirement: ~10.2.0 +core_version_requirement: ^10.2 dependencies: - acquia_purge:acquia_purge - config_ignore:config_ignore diff --git a/tests/src/ExistingSiteJavascript/SearchTest.php b/tests/src/ExistingSiteJavascript/SearchTest.php index 299de3d7d..cd2f6807b 100644 --- a/tests/src/ExistingSiteJavascript/SearchTest.php +++ b/tests/src/ExistingSiteJavascript/SearchTest.php @@ -32,37 +32,37 @@ class SearchTest extends ExistingSiteSelenium2DriverTestBase { protected function setUp(): void { parent::setUp(); $this->getDriverInstance()->resizeWindow(1920, 800); - $node_types = NodeType::loadMultiple(); + $nodeTypes = NodeType::loadMultiple(); // Create some published and unpublished nodes to assert that the search // respects the published status of content. - foreach ($node_types as $type) { - $node_type_id = $type->id(); - $node_type_label = $type->label(); + foreach ($nodeTypes as $type) { + $nodeTypeId = $type->id(); + $nodeTypeLabel = $type->label(); - /** @var \Drupal\taxonomy\VocabularyInterface $term_vocab */ - $term_vocab = Vocabulary::load($node_type_id . '_type'); - if ($term_vocab) { + /** @var \Drupal\taxonomy\VocabularyInterface $termVocab */ + $termVocab = Vocabulary::load($nodeTypeId . '_type'); + if ($termVocab) { // Creating couple of terms from each vocab type for published and // unpublished nodes. - $music = $this->createTerm($term_vocab, ['name' => $node_type_label . ' Music']); - $rock = $this->createTerm($term_vocab, ['name' => $node_type_label . ' Rocks']); + $music = $this->createTerm($termVocab, ['name' => $nodeTypeLabel . ' Music']); + $rock = $this->createTerm($termVocab, ['name' => $nodeTypeLabel . ' Rocks']); - $published_node_values['field_' . $node_type_id . '_type'] = $music->id(); - $unpublished_node_values['field_' . $node_type_id . '_type'] = $rock->id(); + $publishedNodeValues['field_' . $nodeTypeId . '_type'] = $music->id(); + $unpublishedNodeValues['field_' . $nodeTypeId . '_type'] = $rock->id(); } - $published_node = $this->createNode($published_node_values + [ - 'type' => $node_type_id, - 'title' => 'Test published ' . $node_type_label, + $publishedNode = $this->createNode($publishedNodeValues + [ + 'type' => $nodeTypeId, + 'title' => 'Test published ' . $nodeTypeLabel, 'moderation_state' => 'published', ]); - $this->assertTrue($published_node->isPublished()); - $unpublished_node = $this->createNode($unpublished_node_values + [ - 'type' => $node_type_id, - 'title' => 'Test unpublished ' . $node_type_label, + $this->assertTrue($publishedNode->isPublished()); + $unpublishedNode = $this->createNode($unpublishedNodeValues + [ + 'type' => $nodeTypeId, + 'title' => 'Test unpublished ' . $nodeTypeLabel, 'moderation_state' => 'draft', ]); - $this->assertFalse($unpublished_node->isPublished()); + $this->assertFalse($unpublishedNode->isPublished()); } } @@ -78,53 +78,54 @@ public function testSearch(): void { $account->addRole('content_administrator'); $account->save(); $this->drupalLogin($account); - $node_types = NodeType::loadMultiple(); + $nodeTypes = NodeType::loadMultiple(); $this->drupalGet('/search'); - /** @var \Drupal\FunctionalJavascriptTests\JSWebAssert $assert_session */ - $assert_session = $this->assertSession(); - $assert_session->elementExists('css', '.views-element-container .coh-style-search-block')->fillField('keywords', 'Test'); - $assert_session->elementExists('css', '.views-element-container input.button')->keyPress('enter'); + /** @var \Drupal\FunctionalJavascriptTests\JSWebAssert $assertSession */ + $assertSession = $this->assertSession(); + $assertSession->elementExists('css', '.views-element-container .coh-style-search-block')->fillField('keywords', 'Test'); + $assertSession->elementExists('css', '.views-element-container input.button')->keyPress('enter'); - $assert_session->waitForElementVisible('css', '.coh-style-facet-accordion'); - $facets = $assert_session->elementExists('css', '.coh-style-facet-accordion'); + $assertSession->waitForElementVisible('css', '.coh-style-facet-accordion'); + $facets = $assertSession->elementExists('css', '.coh-style-facet-accordion'); // Get the container which holds the facets, and assert that, initially, // the content type facet is visible but none of the dependent facets are. $this->assertFacetLinkExists($facets, TRUE); - foreach ($node_types as $node_type_id => $type) { + foreach ($nodeTypes as $nodeTypeId => $type) { // Clear all selected facets. $this->drupalGet('/search'); - $node_type_label = $type->label(); - $assert_session->elementExists('css', '.views-element-container .coh-style-search-block')->fillField('keywords', 'Test'); - $assert_session->elementExists('css', '.views-element-container input.button')->keyPress('enter'); + $nodeTypeLabel = $type->label(); + $assertSession->elementExists('css', '.views-element-container .coh-style-search-block')->fillField('keywords', 'Test'); + $assertSession->elementExists('css', '.views-element-container input.button')->keyPress('enter'); // Assert that the search by title shows the proper result. - $this->assertLinkExists('Test published ' . $node_type_label); - $this->assertLinkNotExists('Test unpublished ' . $node_type_label); + $this->assertLinkExists('Test published ' . $nodeTypeLabel); + $unpublishedTitle = 'Test unpublished ' . $nodeTypeLabel; + $assertSession->elementNotExists('named', ['link', $unpublishedTitle]); // Activate the facet for this content type. /** @var \Behat\Mink\Element\NodeElement $linkElement */ - $linkElement = $this->assertLinkExists($node_type_label . ' (1)', $facets); + $linkElement = $this->assertLinkExists($nodeTypeLabel . ' (1)', $facets); $linkElement->click(); - $this->assertLinkExists('Test published ' . $node_type_label); - $this->assertLinkNotExists('Test unpublished ' . $node_type_label); + $this->assertLinkExists('Test published ' . $nodeTypeLabel); + $assertSession->elementNotExists('named', ['link', $unpublishedTitle]); // Pages have no facets. - if ($node_type_id !== 'page') { + if ($nodeTypeId !== 'page') { // Open the accordion item for the "type" taxonomy of this content type. // @todo This is commented out because, at the moment, the facets are // expanded by default. If we change them to be collapsed by default, we // can uncomment this line. - // $this->assertLinkExists("$node_type_label Type", $facets)->click(); + // $this->assertLinkExists("$nodeTypeLabel Type", $facets)->click(); // Check if term facet is working properly. - $assert_session->elementExists('css', '.coh-style-facet-accordion')->clickLink($node_type_label . ' Music (1)'); + $assertSession->elementExists('css', '.coh-style-facet-accordion')->clickLink($nodeTypeLabel . ' Music (1)'); // Assert that the clear filter is present. - $assert_session->linkExists('Clear filter(s)'); + $assertSession->linkExists('Clear filter(s)'); // Check if node of the selected term is shown. - $this->assertLinkExists('Test published ' . $node_type_label); - $this->assertLinkNotExists('Test unpublished ' . $node_type_label); - $assert_session->linkNotExists($node_type_label . ' Rocks (1)'); + $this->assertLinkExists('Test published ' . $nodeTypeLabel); + $assertSession->elementNotExists('named', ['link', $unpublishedTitle]); + $assertSession->linkNotExists($nodeTypeLabel . ' Rocks (1)'); } } } @@ -200,18 +201,6 @@ private function assertElementWithTitleExists(string $title, ElementInterface $c return $this->assertSession()->elementExists('named', ['content', $title], $container); } - /** - * Asserts that a link does not exist. - * - * @param string $title - * The title, text, or rel of the link. - * - * @throws \Behat\Mink\Exception\ExpectationException - */ - private function assertLinkNotExists(string $title): void { - $this->assertSession()->elementNotExists('named', ['link', $title]); - } - /** * Tests that the listing page displays a fallback view if needed. * @@ -243,7 +232,7 @@ public function testFallback(): void { * * @throws \Behat\Mink\Exception\ElementNotFoundException */ - private function assertFacetLinkExists(ElementInterface $facets = NULL, bool $title = FALSE) { + private function assertFacetLinkExists(ElementInterface $facets = NULL, bool $title = FALSE): void { // Get the container which holds the facets, and assert that, initially, the // Test that none of the dependent facets are visible for fallback. /** @var \Behat\Mink\Element\NodeElement $titleElement */