X-Git-Url: https://yaffs.net/gitweb/?a=blobdiff_plain;f=web%2Fcore%2Fcomposer.json;h=62c26c4ac5904e86888907fc5f569618e5e83bec;hb=74df008bdbb3a11eeea356744f39b802369bda3c;hp=fe99c280b116fb6d06dad78db4cdbf0c420ba0c8;hpb=9917807b03b64faf00f6a1f29dcb6eafc454efa5;p=yaffs-website

diff --git a/web/core/composer.json b/web/core/composer.json
index fe99c280b..62c26c4ac 100644
--- a/web/core/composer.json
+++ b/web/core/composer.json
@@ -2,23 +2,36 @@
     "name": "drupal/core",
     "description": "Drupal is an open source content management platform powering millions of websites and applications.",
     "type": "drupal-core",
-    "license": "GPL-2.0+",
+    "license": "GPL-2.0-or-later",
     "require": {
-        "php": ">=5.5.9",
-        "symfony/class-loader": "~3.2.8",
-        "symfony/console": "~3.2.8",
-        "symfony/dependency-injection": "~3.2.8",
-        "symfony/event-dispatcher": "~3.2.8",
-        "symfony/http-foundation": "~3.2.8",
-        "symfony/http-kernel": "~3.2.8",
-        "symfony/routing": "~3.2.8",
-        "symfony/serializer": "~3.2.8",
-        "symfony/translation": "~3.2.8",
-        "symfony/validator": "~3.2.8",
-        "symfony/process": "~3.2.8",
+        "ext-date": "*",
+        "ext-dom": "*",
+        "ext-filter": "*",
+        "ext-gd": "*",
+        "ext-hash": "*",
+        "ext-json": "*",
+        "ext-pcre": "*",
+        "ext-PDO": "*",
+        "ext-session": "*",
+        "ext-SimpleXML": "*",
+        "ext-SPL": "*",
+        "ext-tokenizer": "*",
+        "ext-xml": "*",
+        "php": "^5.5.9|>=7.0.8",
+        "symfony/class-loader": "~3.4.0",
+        "symfony/console": "~3.4.0",
+        "symfony/dependency-injection": "~3.4.0",
+        "symfony/event-dispatcher": "~3.4.0",
+        "symfony/http-foundation": "~3.4.0",
+        "symfony/http-kernel": "~3.4.0",
+        "symfony/routing": "~3.4.0",
+        "symfony/serializer": "~3.4.0",
+        "symfony/translation": "~3.4.0",
+        "symfony/validator": "~3.4.0",
+        "symfony/process": "~3.4.0",
         "symfony/polyfill-iconv": "^1.0",
-        "symfony/yaml": "~3.2.8",
-        "twig/twig": "^1.23.1",
+        "symfony/yaml": "~3.4.5",
+        "twig/twig": "^1.35.0",
         "doctrine/common": "^2.5",
         "doctrine/annotations": "^1.2",
         "guzzlehttp/guzzle": "^6.2.1",
@@ -40,14 +53,16 @@
     "require-dev": {
         "behat/mink": "1.7.x-dev",
         "behat/mink-goutte-driver": "^1.2",
+        "behat/mink-selenium2-driver": "1.3.x-dev",
         "drupal/coder": "^8.2.12",
         "jcalderonzumba/gastonjs": "^1.0.2",
         "jcalderonzumba/mink-phantomjs-driver": "^0.3.1",
         "mikey179/vfsStream": "^1.2",
-        "phpunit/phpunit": ">=4.8.35 <5",
+        "phpunit/phpunit": "^4.8.35 || ^6.1",
         "phpspec/prophecy": "^1.4",
-        "symfony/css-selector": "~3.2.8",
-        "symfony/phpunit-bridge": "~3.2.8"
+        "symfony/css-selector": "^3.4.0",
+        "symfony/phpunit-bridge": "^3.4.3",
+        "symfony/debug": "^3.4.0"
     },
     "replace": {
         "drupal/action": "self.version",
@@ -112,6 +127,7 @@
         "drupal/image": "self.version",
         "drupal/inline_form_errors": "self.version",
         "drupal/language": "self.version",
+        "drupal/layout_builder": "self.version",
         "drupal/layout_discovery": "self.version",
         "drupal/link": "self.version",
         "drupal/locale": "self.version",
@@ -153,6 +169,37 @@
         "drupal/views_ui": "self.version",
         "drupal/workflows": "self.version"
     },
+    "extra": {
+        "merge-plugin": {
+            "require": [
+                "core/lib/Drupal/Component/Annotation/composer.json",
+                "core/lib/Drupal/Component/Assertion/composer.json",
+                "core/lib/Drupal/Component/Bridge/composer.json",
+                "core/lib/Drupal/Component/ClassFinder/composer.json",
+                "core/lib/Drupal/Component/Datetime/composer.json",
+                "core/lib/Drupal/Component/DependencyInjection/composer.json",
+                "core/lib/Drupal/Component/Diff/composer.json",
+                "core/lib/Drupal/Component/Discovery/composer.json",
+                "core/lib/Drupal/Component/EventDispatcher/composer.json",
+                "core/lib/Drupal/Component/FileCache/composer.json",
+                "core/lib/Drupal/Component/FileSystem/composer.json",
+                "core/lib/Drupal/Component/Gettext/composer.json",
+                "core/lib/Drupal/Component/Graph/composer.json",
+                "core/lib/Drupal/Component/HttpFoundation/composer.json",
+                "core/lib/Drupal/Component/PhpStorage/composer.json",
+                "core/lib/Drupal/Component/Plugin/composer.json",
+                "core/lib/Drupal/Component/ProxyBuilder/composer.json",
+                "core/lib/Drupal/Component/Render/composer.json",
+                "core/lib/Drupal/Component/Serialization/composer.json",
+                "core/lib/Drupal/Component/Transliteration/composer.json",
+                "core/lib/Drupal/Component/Utility/composer.json",
+                "core/lib/Drupal/Component/Uuid/composer.json"
+            ],
+            "recurse": false,
+            "replace": false,
+            "merge-extra": false
+        }
+    },
     "minimum-stability": "dev",
     "prefer-stable": true,
     "autoload": {