Verified Commit e257fc7d authored by Dave Long's avatar Dave Long
Browse files

build: #3600889 Remove some minor constraints from core-recommended 

By: catch
By: gábor hojtsy
By: moshe weitzman
By: deviantintegral
By: longwave
By: joelpittet
By: godotislate
By: borisson_
By: ressa
By: xjm
By: prudloff
By: solideogloria
By: cmlara
By: phenaproxima
By: steven jones
By: jurgenhaas
By: nicxvan
By: lambert
By: benjifisher
By: quietone
(cherry picked from commit 8db15f23)
parent b11b664b

composer/Generator/Builder/DrupalCoreRecommendedBuilder.php

+20 −2
Original line number Diff line number Diff line
@@ -31,9 +31,12 @@ public function getPackage() { 


    // Make a list of packages we do not want to put in the 'require' section.

    $remove_list = [

      'drupal/core',

      'wikimedia/composer-merge-plugin',

      'composer/installers',

      'drupal/core',

      // Guzzle regularly releases security fixes in only minor releases.

      'guzzlehttp/guzzle',

      'guzzlehttp/promises',

      'guzzlehttp/psr7',

      // This package contains no code other than interfaces, so allow sites

      // to use any compatible version without needing to switch off of

      // drupal/core-recommended.
@@ -42,6 +45,21 @@ public function getPackage() { 
      // cycle. In order to allow supporting multiple PHPUnit major versions,

      // we cannot let it be pinned.

      'sebastian/diff',

      // Symfony polyfills are transitive dependency that almost exclusively

      // release security releases as minor releases.

      'symfony/polyfill-ctype',

      'symfony/polyfill-iconv',

      'symfony/polyfill-intl-grapheme',

      'symfony/polyfill-intl-idn',

      'symfony/polyfill-intl-normalizer',

      'symfony/polyfill-mbstring',

      'symfony/polyfill-php84',

      'symfony/polyfill-php85',

      'symfony/polyfill-php86',

      // Twig regularly releases security fixes in only minor releases.

      'twig/html-extra',

      'twig/twig',

      'wikimedia/composer-merge-plugin',

    ];



    // Copy the 'packages' section from the Composer lock into our 'require'

composer/Metapackage/CoreRecommended/composer.json

+1 −15
Original line number Diff line number Diff line
@@ -12,9 +12,6 @@ 
        "composer/semver": "~3.4.4",

        "doctrine/lexer": "~3.0.1",

        "egulias/email-validator": "~4.0.4",

        "guzzlehttp/guzzle": "~7.12.1",

        "guzzlehttp/promises": "~2.5.0",

        "guzzlehttp/psr7": "~2.12.1",

        "justinrainbow/json-schema": "~6.8.2",

        "marc-mabe/php-enum": "~v4.7.2",

        "masterminds/html5": "~2.10.0",
@@ -43,15 +40,6 @@ 
        "symfony/http-kernel": "~v7.4.13",

        "symfony/mailer": "~v7.4.12",

        "symfony/mime": "~v7.4.13",

        "symfony/polyfill-ctype": "~v1.37.0",

        "symfony/polyfill-iconv": "~v1.37.0",

        "symfony/polyfill-intl-grapheme": "~v1.38.1",

        "symfony/polyfill-intl-idn": "~v1.38.1",

        "symfony/polyfill-intl-normalizer": "~v1.38.0",

        "symfony/polyfill-mbstring": "~v1.38.1",

        "symfony/polyfill-php84": "~v1.38.1",

        "symfony/polyfill-php85": "~v1.38.1",

        "symfony/polyfill-php86": "~v1.38.0",

        "symfony/process": "~v7.4.13",

        "symfony/psr-http-message-bridge": "~v7.4.8",

        "symfony/routing": "~v7.4.13",
@@ -63,9 +51,7 @@ 
        "symfony/validator": "~v7.4.10",

        "symfony/var-dumper": "~v7.4.8",

        "symfony/var-exporter": "~v7.4.9",

        "symfony/yaml": "~v7.4.13",

        "twig/html-extra": "~v3.24.0",

        "twig/twig": "~v3.27.1"

        "symfony/yaml": "~v7.4.13"

    },

    "extra": {

        "branch-alias": {

core/tests/Drupal/Tests/Composer/Generator/BuilderTest.php

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ public static function builderTestData(): array { 
          'require' =>

          [

            'drupal/core' => Composer::drupalVersionBranch(),

            'symfony/polyfill-ctype' => '~v1.12.0',

            'symfony/yaml' => '~v3.4.32',

          ],

          'conflict' =>