Skip to content
Snippets Groups Projects
Commit d894465f authored by catch's avatar catch
Browse files

Issue #3198340 by alexpott, xjm, Mile23, cilefen, mmjvb, catch, Mixologic,... 

Issue #3198340 by alexpott, xjm, Mile23, cilefen, mmjvb, catch, Mixologic, effulgentsia, mfb, longwave, larowlan, greg.1.anderson, Warped, quietone: Strict constraints in drupal/core-recommended make it harder for Composer-managed sites to apply their own security updates when a core update is not available
parent a2ca087f
No related branches found
No related tags found
40 merge requests!85673265330-fix-missing-hyphens: Create patch to MR and fix remaining words,!8394[warning] array_flip(): Can only flip STRING and INTEGER values, when saving a non-revisionable custom content entity,!7780issue 3443822: fix for 'No route found for the specified format html. Supported formats: json, xml.',!7416Simplify the HTML of field.html.twig,!7150Revert "Issue #3137119 by munish.kumar, johnwebdev, Jaypan, jungle, xjm,...,!6445Issue #3034692: Renamed the getHandler function which return the configuration of a handler instance on given display,!5013Issue #3071143: Table Render Array Example Is Incorrect,!4848Issue #1566662: Update module should send notifications on Thursdays,!4792Issue #2230689: Remove redundant "Italic" style,!4782Issue #2662898: "Links" field not displaying on custom view modes,!4220Issue #3368223: Link field > Access to internal links is not checked on display.,!4173Issue #2123543: Add string context and location filters to the translate interface,!3884Issue #3356842,!3870Issue #3087868,!3812Draft: Issue #3339373 by alexpott, andypost, mondrake:...,!3736Issue #3294005: Refactor Claro's form--password-confirm stylesheet,!3686Issue #3219967 against 9.5.x,!3683Issue #2939397: Clearing AliasManager cache with root path raises warning,!3543Issue #3344259: Allow ajax dialog to have focus configurable,!3356Issue #3209129: Scrolling problems when adding a block via layout builder,!2982Issue #3301562: Translate the default settings for this plugin (TimestampAgoFormatter),!2921Issue #1383696: Allow a custom HTML element to be selected for a grouping field,!2920Issue #3260175: Saving media entity without an owner crashes,!2857Issue #3314541: Remove unnecessary fill from SVG icon for the "Media Library" CKEditor 5 button — enabling dark mode support in contrib,!2841Resolve #3296811 "Resourceresponsetrait needs a",!2803Issue #3041402: Add option absolute url in formatter URL to image,!2733Issue #3293855: Update the outdated user_help text for user.admin_permissions and the description of the select box on the role settings page,!2527Issue #3298714: Undefined #options and Count Warning in Radios.php,!2447Issue #3293135: shouldUpdateThumbnail does not update thumbnail is source field changed,!2428Issue #3032078: Multiple webheads can cause infinite growth of Twig cache,!2280Issue #3280415: Metapackage Generator Breaks Under Composer --no-dev,!2205Quote all names in the regions section.,!2050Issue #3272969: Remove UnqiueField constraint.,!1956Issue #3268872: hook_views_invalidate_cache not called when a view is deleted,!1893Issue #3217260: Add a way to make media captions not editable in CKEditor,!1690fixing include_source documentation at SubProcess.php,!1459Issue #3087632: menu_name max length is too long,!878Issue #3221534: throw an exception when IDs passed to loadMultiple() are badly formed,!866Issue #2845319: The highlighting of the 'Home' menu-link does not respect query strings and fragment identifiers,!204Issue #3040556: It is not possible to react to an entity being duplicated
Hide whitespace changes
Inline Side-by-side
composer/Generator/Builder/DrupalCoreRecommendedBuilder.php
+ 2
− 2
View file @ d894465f
......@@ -41,7 +41,7 @@ public function getPackage() {
// If there is no 'source' record, then this is a path repository
// or something else that we do not want to include.
if (isset($package['source']) && !in_array($package['name'], $remove_list)) {
$composer['require'][$package['name']] = $package['version'];
$composer['require'][$package['name']] = '~' . $package['version'];
}
}
return $composer;
......@@ -56,7 +56,7 @@ protected function initialPackageMetadata() {
return [
"name" => "drupal/core-recommended",
"type" => "metapackage",
"description" => "Locked core dependencies; require this project INSTEAD OF drupal/core.",
"description" => "Core and its dependencies with known-compatible minor versions. Require this project INSTEAD OF drupal/core.",
"license" => "GPL-2.0-or-later",
"conflict" => [
"webflo/drupal-core-strict" => "*",
......
composer/Metapackage/CoreRecommended/composer.json
+ 56
− 56
View file @ d894465f
{
"name": "drupal/core-recommended",
"type": "metapackage",
"description": "Locked core dependencies; require this project INSTEAD OF drupal/core.",
"description": "Core and its dependencies with known-compatible minor versions. Require this project INSTEAD OF drupal/core.",
"license": "GPL-2.0-or-later",
"conflict": {
"webflo/drupal-core-strict": "*"
},
"require": {
"drupal/core": "9.5.x-dev",
"asm89/stack-cors": "1.3.0",
"composer/semver": "3.3.2",
"doctrine/annotations": "1.13.2",
"doctrine/lexer": "1.2.3",
"doctrine/reflection": "1.2.2",
"egulias/email-validator": "3.2",
"guzzlehttp/guzzle": "6.5.7",
"guzzlehttp/promises": "1.5.1",
"guzzlehttp/psr7": "1.8.5",
"laminas/laminas-diactoros": "2.11.0",
"laminas/laminas-escaper": "2.9.0",
"laminas/laminas-feed": "2.17.0",
"laminas/laminas-stdlib": "3.7.1",
"masterminds/html5": "2.7.5",
"pear/archive_tar": "1.4.14",
"pear/console_getopt": "v1.4.3",
"pear/pear-core-minimal": "v1.10.11",
"pear/pear_exception": "v1.0.2",
"psr/cache": "1.0.1",
"psr/container": "1.1.1",
"psr/http-factory": "1.0.1",
"psr/http-message": "1.0.1",
"psr/log": "1.1.4",
"ralouphie/getallheaders": "3.0.3",
"stack/builder": "v1.0.6",
"symfony-cmf/routing": "2.3.4",
"symfony/console": "v4.4.42",
"symfony/debug": "v4.4.41",
"symfony/dependency-injection": "v4.4.42",
"symfony/deprecation-contracts": "v2.5.1",
"symfony/error-handler": "v4.4.41",
"symfony/event-dispatcher": "v4.4.42",
"symfony/event-dispatcher-contracts": "v1.1.12",
"symfony/http-client-contracts": "v2.5.1",
"symfony/http-foundation": "v4.4.42",
"symfony/http-kernel": "v4.4.42",
"symfony/mime": "v5.4.9",
"symfony/polyfill-ctype": "v1.25.0",
"symfony/polyfill-iconv": "v1.25.0",
"symfony/polyfill-intl-idn": "v1.25.0",
"symfony/polyfill-intl-normalizer": "v1.25.0",
"symfony/polyfill-mbstring": "v1.25.0",
"symfony/polyfill-php80": "v1.25.0",
"symfony/process": "v4.4.41",
"symfony/psr-http-message-bridge": "v2.1.2",
"symfony/routing": "v4.4.41",
"symfony/serializer": "v4.4.42",
"symfony/service-contracts": "v2.5.1",
"symfony/translation": "v4.4.41",
"symfony/translation-contracts": "v2.5.1",
"symfony/validator": "v4.4.41",
"symfony/var-dumper": "v5.4.9",
"symfony/yaml": "v4.4.37",
"twig/twig": "v2.15.1",
"typo3/phar-stream-wrapper": "v3.1.7"
"asm89/stack-cors": "~1.3.0",
"composer/semver": "~3.3.2",
"doctrine/annotations": "~1.13.2",
"doctrine/lexer": "~1.2.3",
"doctrine/reflection": "~1.2.2",
"egulias/email-validator": "~3.2",
"guzzlehttp/guzzle": "~6.5.7",
"guzzlehttp/promises": "~1.5.1",
"guzzlehttp/psr7": "~1.8.5",
"laminas/laminas-diactoros": "~2.11.0",
"laminas/laminas-escaper": "~2.9.0",
"laminas/laminas-feed": "~2.17.0",
"laminas/laminas-stdlib": "~3.7.1",
"masterminds/html5": "~2.7.5",
"pear/archive_tar": "~1.4.14",
"pear/console_getopt": "~v1.4.3",
"pear/pear-core-minimal": "~v1.10.11",
"pear/pear_exception": "~v1.0.2",
"psr/cache": "~1.0.1",
"psr/container": "~1.1.1",
"psr/http-factory": "~1.0.1",
"psr/http-message": "~1.0.1",
"psr/log": "~1.1.4",
"ralouphie/getallheaders": "~3.0.3",
"stack/builder": "~v1.0.6",
"symfony-cmf/routing": "~2.3.4",
"symfony/console": "~v4.4.42",
"symfony/debug": "~v4.4.41",
"symfony/dependency-injection": "~v4.4.42",
"symfony/deprecation-contracts": "~v2.5.1",
"symfony/error-handler": "~v4.4.41",
"symfony/event-dispatcher": "~v4.4.42",
"symfony/event-dispatcher-contracts": "~v1.1.12",
"symfony/http-client-contracts": "~v2.5.1",
"symfony/http-foundation": "~v4.4.42",
"symfony/http-kernel": "~v4.4.42",
"symfony/mime": "~v5.4.9",
"symfony/polyfill-ctype": "~v1.25.0",
"symfony/polyfill-iconv": "~v1.25.0",
"symfony/polyfill-intl-idn": "~v1.25.0",
"symfony/polyfill-intl-normalizer": "~v1.25.0",
"symfony/polyfill-mbstring": "~v1.25.0",
"symfony/polyfill-php80": "~v1.25.0",
"symfony/process": "~v4.4.41",
"symfony/psr-http-message-bridge": "~v2.1.2",
"symfony/routing": "~v4.4.41",
"symfony/serializer": "~v4.4.42",
"symfony/service-contracts": "~v2.5.1",
"symfony/translation": "~v4.4.41",
"symfony/translation-contracts": "~v2.5.1",
"symfony/validator": "~v4.4.41",
"symfony/var-dumper": "~v5.4.9",
"symfony/yaml": "~v4.4.37",
"twig/twig": "~v2.15.1",
"typo3/phar-stream-wrapper": "~v3.1.7"
}
}
core/tests/Drupal/Tests/Composer/Generator/BuilderTest.php
+ 3
− 3
View file @ d894465f
......@@ -25,13 +25,13 @@ public function builderTestData() {
[
'name' => 'drupal/core-recommended',
'type' => 'metapackage',
'description' => 'Locked core dependencies; require this project INSTEAD OF drupal/core.',
'description' => 'Core and its dependencies with known-compatible minor versions. Require this project INSTEAD OF drupal/core.',
'license' => 'GPL-2.0-or-later',
'require' =>
[
'drupal/core' => Composer::drupalVersionBranch(),
'symfony/polyfill-ctype' => 'v1.12.0',
'symfony/yaml' => 'v3.4.32',
'symfony/polyfill-ctype' => '~v1.12.0',
'symfony/yaml' => '~v3.4.32',
],
'conflict' =>
[
......
core/tests/Drupal/Tests/ComposerIntegrationTest.php
+ 4
− 1
View file @ d894465f
......@@ -53,6 +53,9 @@ public function testComposerLockHash() {
* @dataProvider providerTestComposerJson
*/
public function testComposerTilde($path) {
if (preg_match('#composer/Metapackage/CoreRecommended/composer.json$#', $path)) {
$this->markTestSkipped("$path has tilde");
}
$content = json_decode(file_get_contents($path), TRUE);
$composer_keys = array_intersect(['require', 'require-dev'], array_keys($content));
if (empty($composer_keys)) {
......@@ -79,7 +82,7 @@ public function providerTestComposerJson() {
$data = [];
$composer_json_finder = $this->getComposerJsonFinder(realpath(__DIR__ . '/../../../../'));
foreach ($composer_json_finder->getIterator() as $composer_json) {
$data[] = [$composer_json->getPathname()];
$data[$composer_json->getPathname()] = [$composer_json->getPathname()];
}
return $data;
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment