Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2470693 by dawehner, Berdir, jibran, hussainweb, pwolanin, znerol: Upgrade to Symfony 2.7.0

8.0.x
Alex Pott 2015-06-01 11:47:08 +01:00
parent 7786d91cf0
commit 73b5652a74
1942 changed files with 38395 additions and 8655 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
core/composer.json
View File

@ -6,18 +6,19 @@
"require": {
"php": ">=5.4.5",
"sdboyer/gliph": "0.1.*",
"symfony/class-loader": "2.6.*",
"symfony/console": "2.6.*",
"symfony/css-selector": "2.6.*",
"symfony/dependency-injection": "2.6.*",
"symfony/event-dispatcher": "2.6.*",
"symfony/http-foundation": "2.6.*",
"symfony/http-kernel": "2.6.*",
"symfony/routing": "2.6.*",
"symfony/serializer": "2.6.*",
"symfony/validator": "2.6.*@dev",
"symfony/process": "2.6.*",
"symfony/yaml": "2.6.*",
"symfony/class-loader": "2.7.*",
"symfony/console": "2.7.*",
"symfony/css-selector": "2.7.*",
"symfony/dependency-injection": "2.7.*",
"symfony/event-dispatcher": "2.7.*",
"symfony/http-foundation": "2.7.*",
"symfony/http-kernel": "2.7.*",
"symfony/routing": "2.7.*",
"symfony/serializer": "2.7.*",
"symfony/translation": "2.7.*",
"symfony/validator": "2.7.*",
"symfony/process": "2.7.*",
"symfony/yaml": "2.7.*",
"twig/twig": "1.18.*",
"doctrine/common": "~2.4.2",
"doctrine/annotations": "1.2.*",
@ -34,6 +35,8 @@
"fabpot/goutte": "^2.0.3",
"masterminds/html5": "~2.1"
},
"minimum-stability": "dev",
"prefer-stable": true,
"autoload": {
"psr-4": {
"Drupal\\Core\\": "lib/Drupal/Core",

437
core/composer.lock generated
View File

@ -1,10 +1,10 @@
{
"_readme": [
"This file locks the dependencies of your project to a known state",
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "8815752eccc78eaca65ea89fa297746f",
"hash": "61a2b6dec8252d78e904d37fbf1637d7",
"packages": [
{
"name": "behat/mink",
@ -2143,17 +2143,17 @@
},
{
"name": "symfony/browser-kit",
"version": "v2.6.6",
"version": "v2.6.9",
"target-dir": "Symfony/Component/BrowserKit",
"source": {
"type": "git",
"url": "https://github.com/symfony/BrowserKit.git",
"reference": "f21189b0eccbe56528515858ca1d5089a741692f"
"reference": "cf950c42947ea2f29c36a1f443202b6134f5c303"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/BrowserKit/zipball/f21189b0eccbe56528515858ca1d5089a741692f",
"reference": "f21189b0eccbe56528515858ca1d5089a741692f",
"url": "https://api.github.com/repos/symfony/BrowserKit/zipball/cf950c42947ea2f29c36a1f443202b6134f5c303",
"reference": "cf950c42947ea2f29c36a1f443202b6134f5c303",
"shasum": ""
},
"require": {
@ -2184,36 +2184,35 @@
"MIT"
],
"authors": [
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
},
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony BrowserKit Component",
"homepage": "http://symfony.com",
"time": "2015-03-30 15:54:10"
"homepage": "https://symfony.com",
"time": "2015-05-02 15:18:45"
},
{
"name": "symfony/class-loader",
"version": "v2.6.6",
"target-dir": "Symfony/Component/ClassLoader",
"version": "v2.7.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/ClassLoader.git",
"reference": "861765b3e5f32979de5bd19ad2577cbb830a29d5"
"reference": "fa19598cb708b92d983b34aae313f57c217f9386"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/ClassLoader/zipball/861765b3e5f32979de5bd19ad2577cbb830a29d5",
"reference": "861765b3e5f32979de5bd19ad2577cbb830a29d5",
"url": "https://api.github.com/repos/symfony/ClassLoader/zipball/fa19598cb708b92d983b34aae313f57c217f9386",
"reference": "fa19598cb708b92d983b34aae313f57c217f9386",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
"php": ">=5.3.9"
},
"require-dev": {
"symfony/finder": "~2.0,>=2.0.5",
@ -2222,11 +2221,11 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.6-dev"
"dev-master": "2.7-dev"
}
},
"autoload": {
"psr-0": {
"psr-4": {
"Symfony\\Component\\ClassLoader\\": ""
}
},
@ -2235,36 +2234,35 @@
"MIT"
],
"authors": [
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
},
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony ClassLoader Component",
"homepage": "http://symfony.com",
"time": "2015-03-27 10:19:51"
"homepage": "https://symfony.com",
"time": "2015-05-15 13:33:16"
},
{
"name": "symfony/console",
"version": "v2.6.7",
"target-dir": "Symfony/Component/Console",
"version": "v2.7.0-BETA2",
"source": {
"type": "git",
"url": "https://github.com/symfony/Console.git",
"reference": "ebc5679854aa24ed7d65062e9e3ab0b18a917272"
"reference": "555ba7fc54a538e1b83988e2299db09b6b6dca64"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/Console/zipball/ebc5679854aa24ed7d65062e9e3ab0b18a917272",
"reference": "ebc5679854aa24ed7d65062e9e3ab0b18a917272",
"url": "https://api.github.com/repos/symfony/Console/zipball/555ba7fc54a538e1b83988e2299db09b6b6dca64",
"reference": "555ba7fc54a538e1b83988e2299db09b6b6dca64",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
"php": ">=5.3.9"
},
"require-dev": {
"psr/log": "~1.0",
@ -2280,11 +2278,11 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.6-dev"
"dev-master": "2.7-dev"
}
},
"autoload": {
"psr-0": {
"psr-4": {
"Symfony\\Component\\Console\\": ""
}
},
@ -2304,25 +2302,24 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
"time": "2015-05-02 15:18:45"
"time": "2015-05-02 15:21:08"
},
{
"name": "symfony/css-selector",
"version": "v2.6.6",
"target-dir": "Symfony/Component/CssSelector",
"version": "v2.7.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/CssSelector.git",
"reference": "db2c48df9658423a8c168d89f7b971b73d3d74a4"
"reference": "0b5c07b516226b7dd32afbbc82fe547a469c5092"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/CssSelector/zipball/db2c48df9658423a8c168d89f7b971b73d3d74a4",
"reference": "db2c48df9658423a8c168d89f7b971b73d3d74a4",
"url": "https://api.github.com/repos/symfony/CssSelector/zipball/0b5c07b516226b7dd32afbbc82fe547a469c5092",
"reference": "0b5c07b516226b7dd32afbbc82fe547a469c5092",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
"php": ">=5.3.9"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7"
@ -2330,11 +2327,11 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.6-dev"
"dev-master": "2.7-dev"
}
},
"autoload": {
"psr-0": {
"psr-4": {
"Symfony\\Component\\CssSelector\\": ""
}
},
@ -2343,10 +2340,6 @@
"MIT"
],
"authors": [
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
},
{
"name": "Jean-François Simon",
"email": "jeanfrancois.simon@sensiolabs.com"
@ -2354,25 +2347,29 @@
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony CssSelector Component",
"homepage": "http://symfony.com",
"time": "2015-03-22 16:55:57"
"homepage": "https://symfony.com",
"time": "2015-05-15 13:33:16"
},
{
"name": "symfony/debug",
"version": "v2.6.6",
"version": "v2.6.9",
"target-dir": "Symfony/Component/Debug",
"source": {
"type": "git",
"url": "https://github.com/symfony/Debug.git",
"reference": "d49a46a20a8f0544aedac54466750ad787d3d3e3"
"reference": "4851a041c48e76b91a221db84ab5850daa6a7b33"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/Debug/zipball/d49a46a20a8f0544aedac54466750ad787d3d3e3",
"reference": "d49a46a20a8f0544aedac54466750ad787d3d3e3",
"url": "https://api.github.com/repos/symfony/Debug/zipball/4851a041c48e76b91a221db84ab5850daa6a7b33",
"reference": "4851a041c48e76b91a221db84ab5850daa6a7b33",
"shasum": ""
},
"require": {
@ -2408,36 +2405,35 @@
"MIT"
],
"authors": [
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
},
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony Debug Component",
"homepage": "http://symfony.com",
"time": "2015-03-22 16:55:57"
"homepage": "https://symfony.com",
"time": "2015-05-20 13:09:45"
},
{
"name": "symfony/dependency-injection",
"version": "v2.6.6",
"target-dir": "Symfony/Component/DependencyInjection",
"version": "v2.7.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/DependencyInjection.git",
"reference": "8e9007012226b4bd41f8afed855c452cf5edc3a6"
"reference": "137bf489c5151c7eb1e4b7dd34a123f9a74b966d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/8e9007012226b4bd41f8afed855c452cf5edc3a6",
"reference": "8e9007012226b4bd41f8afed855c452cf5edc3a6",
"url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/137bf489c5151c7eb1e4b7dd34a123f9a74b966d",
"reference": "137bf489c5151c7eb1e4b7dd34a123f9a74b966d",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
"php": ">=5.3.9"
},
"conflict": {
"symfony/expression-language": "<2.6"
@ -2456,11 +2452,11 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.6-dev"
"dev-master": "2.7-dev"
}
},
"autoload": {
"psr-0": {
"psr-4": {
"Symfony\\Component\\DependencyInjection\\": ""
}
},
@ -2469,32 +2465,32 @@
"MIT"
],
"authors": [
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
},
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony DependencyInjection Component",
"homepage": "http://symfony.com",
"time": "2015-03-30 15:54:10"
"homepage": "https://symfony.com",
"time": "2015-05-29 14:44:44"
},
{
"name": "symfony/dom-crawler",
"version": "v2.6.6",
"version": "v2.6.9",
"target-dir": "Symfony/Component/DomCrawler",
"source": {
"type": "git",
"url": "https://github.com/symfony/DomCrawler.git",
"reference": "8897ebf39c7dfb752a5494fa301845a3fbb9e53d"
"reference": "c74fe625d8c65fee512de2b40cceabba1b09503b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/DomCrawler/zipball/8897ebf39c7dfb752a5494fa301845a3fbb9e53d",
"reference": "8897ebf39c7dfb752a5494fa301845a3fbb9e53d",
"url": "https://api.github.com/repos/symfony/DomCrawler/zipball/c74fe625d8c65fee512de2b40cceabba1b09503b",
"reference": "c74fe625d8c65fee512de2b40cceabba1b09503b",
"shasum": ""
},
"require": {
@ -2523,36 +2519,35 @@
"MIT"
],
"authors": [
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
},
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony DomCrawler Component",
"homepage": "http://symfony.com",
"time": "2015-03-30 15:54:10"
"homepage": "https://symfony.com",
"time": "2015-05-22 14:53:08"
},
{
"name": "symfony/event-dispatcher",
"version": "v2.6.6",
"target-dir": "Symfony/Component/EventDispatcher",
"version": "v2.7.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/EventDispatcher.git",
"reference": "70f7c8478739ad21e3deef0d977b38c77f1fb284"
"reference": "687039686d0e923429ba6e958d0baa920cd5d458"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/70f7c8478739ad21e3deef0d977b38c77f1fb284",
"reference": "70f7c8478739ad21e3deef0d977b38c77f1fb284",
"url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/687039686d0e923429ba6e958d0baa920cd5d458",
"reference": "687039686d0e923429ba6e958d0baa920cd5d458",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
"php": ">=5.3.9"
},
"require-dev": {
"psr/log": "~1.0",
@ -2569,11 +2564,11 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.6-dev"
"dev-master": "2.7-dev"
}
},
"autoload": {
"psr-0": {
"psr-4": {
"Symfony\\Component\\EventDispatcher\\": ""
}
},
@ -2582,36 +2577,35 @@
"MIT"
],
"authors": [
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
},
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony EventDispatcher Component",
"homepage": "http://symfony.com",
"time": "2015-03-13 17:37:22"
"homepage": "https://symfony.com",
"time": "2015-05-02 15:21:08"
},
{
"name": "symfony/http-foundation",
"version": "v2.6.6",
"target-dir": "Symfony/Component/HttpFoundation",
"version": "v2.7.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/HttpFoundation.git",
"reference": "8a6337233f08f7520de97f4ffd6f00e947d892f9"
"reference": "729de183da037c125c5f6366bd4f0631ba1a1abb"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/8a6337233f08f7520de97f4ffd6f00e947d892f9",
"reference": "8a6337233f08f7520de97f4ffd6f00e947d892f9",
"url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/729de183da037c125c5f6366bd4f0631ba1a1abb",
"reference": "729de183da037c125c5f6366bd4f0631ba1a1abb",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
"php": ">=5.3.9"
},
"require-dev": {
"symfony/expression-language": "~2.4",
@ -2620,15 +2614,15 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.6-dev"
"dev-master": "2.7-dev"
}
},
"autoload": {
"psr-0": {
"psr-4": {
"Symfony\\Component\\HttpFoundation\\": ""
},
"classmap": [
"Symfony/Component/HttpFoundation/Resources/stubs"
"Resources/stubs"
]
},
"notification-url": "https://packagist.org/downloads/",
@ -2636,45 +2630,47 @@
"MIT"
],
"authors": [
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
},
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony HttpFoundation Component",
"homepage": "http://symfony.com",
"time": "2015-04-01 16:50:12"
"homepage": "https://symfony.com",
"time": "2015-05-22 14:54:25"
},
{
"name": "symfony/http-kernel",
"version": "v2.6.6",
"target-dir": "Symfony/Component/HttpKernel",
"version": "v2.7.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/HttpKernel.git",
"reference": "3829cacfe21eaf3f73604a62d79183d1f6e792c4"
"reference": "74acbb7ef9c4aae0620d3250b9b990d2fff28d16"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/HttpKernel/zipball/3829cacfe21eaf3f73604a62d79183d1f6e792c4",
"reference": "3829cacfe21eaf3f73604a62d79183d1f6e792c4",
"url": "https://api.github.com/repos/symfony/HttpKernel/zipball/74acbb7ef9c4aae0620d3250b9b990d2fff28d16",
"reference": "74acbb7ef9c4aae0620d3250b9b990d2fff28d16",
"shasum": ""
},
"require": {
"php": ">=5.3.3",
"php": ">=5.3.9",
"psr/log": "~1.0",
"symfony/debug": "~2.6,>=2.6.2",
"symfony/event-dispatcher": "~2.5.9|~2.6,>=2.6.2",
"symfony/http-foundation": "~2.5,>=2.5.4"
},
"conflict": {
"symfony/config": "<2.7"
},
"require-dev": {
"symfony/browser-kit": "~2.3",
"symfony/class-loader": "~2.1",
"symfony/config": "~2.0,>=2.0.5",
"symfony/config": "~2.7",
"symfony/console": "~2.3",
"symfony/css-selector": "~2.0,>=2.0.5",
"symfony/dependency-injection": "~2.2",
@ -2701,11 +2697,11 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.6-dev"
"dev-master": "2.7-dev"
}
},
"autoload": {
"psr-0": {
"psr-4": {
"Symfony\\Component\\HttpKernel\\": ""
}
},
@ -2714,36 +2710,35 @@
"MIT"
],
"authors": [
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
},
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony HttpKernel Component",
"homepage": "http://symfony.com",
"time": "2015-04-01 16:55:26"
"homepage": "https://symfony.com",
"time": "2015-05-30 16:52:28"
},
{
"name": "symfony/process",
"version": "v2.6.6",
"target-dir": "Symfony/Component/Process",
"version": "v2.7.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/Process.git",
"reference": "a8bebaec1a9dc6cde53e0250e32917579b0be552"
"reference": "e0a82b58e36afc60f8e79b8bc85a22bb064077c1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/Process/zipball/a8bebaec1a9dc6cde53e0250e32917579b0be552",
"reference": "a8bebaec1a9dc6cde53e0250e32917579b0be552",
"url": "https://api.github.com/repos/symfony/Process/zipball/e0a82b58e36afc60f8e79b8bc85a22bb064077c1",
"reference": "e0a82b58e36afc60f8e79b8bc85a22bb064077c1",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
"php": ">=5.3.9"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7"
@ -2751,11 +2746,11 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.6-dev"
"dev-master": "2.7-dev"
}
},
"autoload": {
"psr-0": {
"psr-4": {
"Symfony\\Component\\Process\\": ""
}
},
@ -2764,42 +2759,44 @@
"MIT"
],
"authors": [
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
},
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony Process Component",
"homepage": "http://symfony.com",
"time": "2015-03-30 15:54:10"
"homepage": "https://symfony.com",
"time": "2015-05-15 13:33:16"
},
{
"name": "symfony/routing",
"version": "v2.6.6",
"target-dir": "Symfony/Component/Routing",
"version": "v2.7.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/Routing.git",
"reference": "4e173a645b63ff60a124f3741b4f15feebd908fa"
"reference": "6f0333fb8b89cf6f8fd9d6740c5e83b73d9c95b9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/Routing/zipball/4e173a645b63ff60a124f3741b4f15feebd908fa",
"reference": "4e173a645b63ff60a124f3741b4f15feebd908fa",
"url": "https://api.github.com/repos/symfony/Routing/zipball/6f0333fb8b89cf6f8fd9d6740c5e83b73d9c95b9",
"reference": "6f0333fb8b89cf6f8fd9d6740c5e83b73d9c95b9",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
"php": ">=5.3.9"
},
"conflict": {
"symfony/config": "<2.7"
},
"require-dev": {
"doctrine/annotations": "~1.0",
"doctrine/common": "~2.2",
"psr/log": "~1.0",
"symfony/config": "~2.2",
"symfony/config": "~2.7",
"symfony/expression-language": "~2.4",
"symfony/http-foundation": "~2.3",
"symfony/phpunit-bridge": "~2.7",
@ -2814,11 +2811,11 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.6-dev"
"dev-master": "2.7-dev"
}
},
"autoload": {
"psr-0": {
"psr-4": {
"Symfony\\Component\\Routing\\": ""
}
},
@ -2827,54 +2824,65 @@
"MIT"
],
"authors": [
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
},
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony Routing Component",
"homepage": "http://symfony.com",
"homepage": "https://symfony.com",
"keywords": [
"router",
"routing",
"uri",
"url"
],
"time": "2015-03-30 15:54:10"
"time": "2015-05-19 06:58:17"
},
{
"name": "symfony/serializer",
"version": "v2.6.6",
"target-dir": "Symfony/Component/Serializer",
"version": "v2.7.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/Serializer.git",
"reference": "bf30b882e15945fe8700edcd966eb3f5503820f3"
"reference": "634d3adf119396320fba4c14caa01390700e7f3b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/Serializer/zipball/bf30b882e15945fe8700edcd966eb3f5503820f3",
"reference": "bf30b882e15945fe8700edcd966eb3f5503820f3",
"url": "https://api.github.com/repos/symfony/Serializer/zipball/634d3adf119396320fba4c14caa01390700e7f3b",
"reference": "634d3adf119396320fba4c14caa01390700e7f3b",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
"php": ">=5.3.9"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7"
"doctrine/annotations": "~1.0",
"doctrine/cache": "~1.0",
"symfony/config": "~2.2",
"symfony/phpunit-bridge": "~2.7",
"symfony/property-access": "~2.3",
"symfony/yaml": "~2.0"
},
"suggest": {
"doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
"doctrine/cache": "For using the default cached annotation reader and metadata cache.",
"symfony/config": "For using the XML mapping loader.",
"symfony/property-access": "For using the ObjectNormalizer.",
"symfony/yaml": "For using the default YAML mapping loader."
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.6-dev"
"dev-master": "2.7-dev"
}
},
"autoload": {
"psr-0": {
"psr-4": {
"Symfony\\Component\\Serializer\\": ""
}
},
@ -2883,40 +2891,42 @@
"MIT"
],
"authors": [
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
},
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony Serializer Component",
"homepage": "http://symfony.com",
"time": "2015-03-22 16:55:57"
"homepage": "https://symfony.com",
"time": "2015-05-29 14:44:44"
},
{
"name": "symfony/translation",
"version": "v2.6.6",
"target-dir": "Symfony/Component/Translation",
"version": "v2.7.0-BETA2",
"source": {
"type": "git",
"url": "https://github.com/symfony/Translation.git",
"reference": "bd939f05cdaca128f4ddbae1b447d6f0203b60af"
"reference": "1be5bbed3938247acd7c5f4e4f29dd32db636b1f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/Translation/zipball/bd939f05cdaca128f4ddbae1b447d6f0203b60af",
"reference": "bd939f05cdaca128f4ddbae1b447d6f0203b60af",
"url": "https://api.github.com/repos/symfony/Translation/zipball/1be5bbed3938247acd7c5f4e4f29dd32db636b1f",
"reference": "1be5bbed3938247acd7c5f4e4f29dd32db636b1f",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
"php": ">=5.3.9"
},
"conflict": {
"symfony/config": "<2.7"
},
"require-dev": {
"psr/log": "~1.0",
"symfony/config": "~2.3,>=2.3.12",
"symfony/config": "~2.7",
"symfony/intl": "~2.3",
"symfony/phpunit-bridge": "~2.7",
"symfony/yaml": "~2.2"
@ -2929,11 +2939,11 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.6-dev"
"dev-master": "2.7-dev"
}
},
"autoload": {
"psr-0": {
"psr-4": {
"Symfony\\Component\\Translation\\": ""
}
},
@ -2942,42 +2952,40 @@
"MIT"
],
"authors": [
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
},
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony Translation Component",
"homepage": "http://symfony.com",
"time": "2015-03-30 15:54:10"
"homepage": "https://symfony.com",
"time": "2015-05-11 02:35:29"
},
{
"name": "symfony/validator",
"version": "2.6.x-dev",
"target-dir": "Symfony/Component/Validator",
"version": "v2.7.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/Validator.git",
"reference": "6bb1b474d25cb80617d8da6cb14c955ba914e495"
"reference": "3a5461a388ff8962790fd5a39e6e2da84ba1e824"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/Validator/zipball/d667b6a563e233b24ae1599a9fde7a53ddd1c055",
"reference": "6bb1b474d25cb80617d8da6cb14c955ba914e495",
"url": "https://api.github.com/repos/symfony/Validator/zipball/3a5461a388ff8962790fd5a39e6e2da84ba1e824",
"reference": "3a5461a388ff8962790fd5a39e6e2da84ba1e824",
"shasum": ""
},
"require": {
"php": ">=5.3.3",
"symfony/translation": "~2.0,>=2.0.5"
"php": ">=5.3.9",
"symfony/translation": "~2.4"
},
"require-dev": {
"doctrine/annotations": "~1.0",
"doctrine/cache": "~1.0",
"doctrine/common": "~2.3",
"egulias/email-validator": "~1.2,>=1.2.1",
"symfony/config": "~2.2",
"symfony/expression-language": "~2.4",
@ -3001,11 +3009,11 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.6-dev"
"dev-master": "2.7-dev"
}
},
"autoload": {
"psr-0": {
"psr-4": {
"Symfony\\Component\\Validator\\": ""
}
},
@ -3025,25 +3033,24 @@
],
"description": "Symfony Validator Component",
"homepage": "https://symfony.com",
"time": "2015-05-05 01:29:27"
"time": "2015-05-29 14:44:44"
},
{
"name": "symfony/yaml",
"version": "v2.6.6",
"target-dir": "Symfony/Component/Yaml",
"version": "v2.7.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/Yaml.git",
"reference": "174f009ed36379a801109955fc5a71a49fe62dd4"
"reference": "4a29a5248aed4fb45f626a7bbbd330291492f5c3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/Yaml/zipball/174f009ed36379a801109955fc5a71a49fe62dd4",
"reference": "174f009ed36379a801109955fc5a71a49fe62dd4",
"url": "https://api.github.com/repos/symfony/Yaml/zipball/4a29a5248aed4fb45f626a7bbbd330291492f5c3",
"reference": "4a29a5248aed4fb45f626a7bbbd330291492f5c3",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
"php": ">=5.3.9"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7"
@ -3051,11 +3058,11 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.6-dev"
"dev-master": "2.7-dev"
}
},
"autoload": {
"psr-0": {
"psr-4": {
"Symfony\\Component\\Yaml\\": ""
}
},
@ -3064,18 +3071,18 @@
"MIT"
],
"authors": [
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
},
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony Yaml Component",
"homepage": "http://symfony.com",
"time": "2015-03-30 15:54:10"
"homepage": "https://symfony.com",
"time": "2015-05-02 15:21:08"
},
{
"name": "twig/twig",
@ -3286,11 +3293,9 @@
],
"packages-dev": [],
"aliases": [],
"minimum-stability": "stable",
"stability-flags": {
"symfony/validator": 20
},
"prefer-stable": false,
"minimum-stability": "dev",
"stability-flags": [],
"prefer-stable": true,
"prefer-lowest": false,
"platform": {
"php": ">=5.4.5"

48
core/core.services.yml
View File

@ -144,57 +144,49 @@ services:
class: Drupal\Core\Cache\CacheBackendInterface
tags:
- { name: cache.bin, default_backend: cache.backend.chainedfast }
factory_method: get
factory_service: cache_factory
factory: cache_factory:get
arguments: [bootstrap]
cache.config:
class: Drupal\Core\Cache\CacheBackendInterface
tags:
- { name: cache.bin, default_backend: cache.backend.chainedfast }
factory_method: get
factory_service: cache_factory
factory: cache_factory:get
arguments: [config]
cache.default:
class: Drupal\Core\Cache\CacheBackendInterface
tags:
- { name: cache.bin }
factory_method: get
factory_service: cache_factory
factory: cache_factory:get
arguments: [default]
cache.entity:
class: Drupal\Core\Cache\CacheBackendInterface
tags:
- { name: cache.bin }
factory_method: get
factory_service: cache_factory
factory: cache_factory:get
arguments: [entity]
cache.menu:
class: Drupal\Core\Cache\CacheBackendInterface
tags:
- { name: cache.bin }
factory_method: get
factory_service: cache_factory
factory: cache_factory:get
arguments: [menu]
cache.render:
class: Drupal\Core\Cache\CacheBackendInterface
tags:
- { name: cache.bin }
factory_method: get
factory_service: cache_factory
factory: cache_factory:get
arguments: [render]
cache.data:
class: Drupal\Core\Cache\CacheBackendInterface
tags:
- { name: cache.bin }
factory_method: get
factory_service: cache_factory
factory: cache_factory:get
arguments: [data]
cache.discovery:
class: Drupal\Core\Cache\CacheBackendInterface
tags:
- { name: cache.bin, default_backend: cache.backend.chainedfast }
factory_method: get
factory_service: cache_factory
factory: cache_factory:get
arguments: [discovery]
cache_router_rebuild_subscriber:
class: Drupal\Core\EventSubscriber\CacheRouterRebuildSubscriber
@ -253,13 +245,11 @@ services:
- { name: backend_overridable }
config.storage.file:
class: Drupal\Core\Config\FileStorage
factory_class: Drupal\Core\Config\FileStorageFactory
factory_method: getActive
factory: Drupal\Core\Config\FileStorageFactory::getActive
public: false
config.storage.staging:
class: Drupal\Core\Config\FileStorage
factory_class: Drupal\Core\Config\FileStorageFactory
factory_method: getStaging
factory: Drupal\Core\Config\FileStorageFactory::getStaging
config.storage.snapshot:
class: Drupal\Core\Config\DatabaseStorage
arguments: ['@database', config_snapshot]
@ -285,8 +275,7 @@ services:
arguments: ['@config.factory']
database:
class: Drupal\Core\Database\Connection
factory_class: Drupal\Core\Database\Database
factory_method: getConnection
factory: Drupal\Core\Database\Database::getConnection
arguments: [default]
file_system:
class: Drupal\Core\File\FileSystem
@ -324,8 +313,7 @@ services:
logger.channel_base:
abstract: true
class: Drupal\Core\Logger\LoggerChannel
factory_method: get
factory_service: logger.factory
factory: logger.factory:get
logger.channel.default:
parent: logger.channel_base
arguments: ['system']
@ -340,8 +328,7 @@ services:
arguments: ['cron']
logger.channel.file:
class: Drupal\Core\Logger\LoggerChannel
factory_method: get
factory_service: logger.factory
factory: logger.factory:get
arguments: ['file']
logger.channel.form:
parent: logger.channel_base
@ -358,8 +345,7 @@ services:
settings:
class: Drupal\Core\Site\Settings
factory_class: Drupal\Core\Site\Settings
factory_method: getInstance
factory: Drupal\Core\Site\Settings::getInstance
state:
class: Drupal\Core\State\State
arguments: ['@keyvalue']
@ -546,8 +532,7 @@ services:
arguments: ['@service_container']
app.root:
class: SplString
factory_service: 'app.root.factory'
factory_method: 'get'
factory: app.root.factory:get
tags:
- { name: parameter_service }
app.root.factory:
@ -617,8 +602,7 @@ services:
- { name: service_collector, tag: string_translator, call: addTranslator }
database.replica:
class: Drupal\Core\Database\Connection
factory_class: Drupal\Core\Database\Database
factory_method: getConnection
factory: Drupal\Core\Database\Database::getConnection
arguments: [replica]
typed_data_manager:
class: Drupal\Core\TypedData\TypedDataManager

16
core/lib/Drupal/Core/Composer/Composer.php
View File

@ -24,14 +24,14 @@ class Composer {
$package = $composer->getPackage();
$autoload = $package->getAutoload();
$autoload['classmap'] = array_merge($autoload['classmap'], array(
'vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Request.php',
'vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/ParameterBag.php',
'vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/FileBag.php',
'vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/ServerBag.php',
'vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/HeaderBag.php',
'vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpKernel.php',
'vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpKernelInterface.php',
'vendor/symfony/http-kernel/Symfony/Component/HttpKernel/TerminableInterface.php'
'vendor/symfony/http-foundation/Request.php',
'vendor/symfony/http-foundation/ParameterBag.php',
'vendor/symfony/http-foundation/FileBag.php',
'vendor/symfony/http-foundation/ServerBag.php',
'vendor/symfony/http-foundation/HeaderBag.php',
'vendor/symfony/http-kernel/HttpKernel.php',
'vendor/symfony/http-kernel/HttpKernelInterface.php',
'vendor/symfony/http-kernel/TerminableInterface.php',
));
$package->setAutoload($autoload);
}

4
core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php
View File

@ -43,10 +43,6 @@ class ContainerBuilder extends SymfonyContainerBuilder {
public function set($id, $service, $scope = self::SCOPE_CONTAINER) {
SymfonyContainer::set($id, $service, $scope);
if ($this->hasDefinition($id) && ($definition = $this->getDefinition($id)) && $definition->isSynchronized()) {
$this->synchronize($id);
}
// Ensure that the _serviceId property is set on synthetic services as well.
if (isset($this->services[$id]) && is_object($this->services[$id]) && !isset($this->services[$id]->_serviceId)) {
$this->services[$id]->_serviceId = $id;

69
core/lib/Drupal/Core/DependencyInjection/YamlFileLoader.php
View File

@ -83,6 +83,10 @@ class YamlFileLoader
// parameters
if (isset($content['parameters'])) {
if (!is_array($content['parameters'])) {
throw new InvalidArgumentException(sprintf('The "parameters" key should contain an array in %s. Check your YAML syntax.', $file));
}
foreach ($content['parameters'] as $key => $value) {
$this->container->setParameter($key, $this->resolveServices($value));
}
@ -108,6 +112,10 @@ class YamlFileLoader
return;
}
if (!is_array($content['services'])) {
throw new InvalidArgumentException(sprintf('The "services" key should contain an array in %s. Check your YAML syntax.', $file));
}
foreach ($content['services'] as $id => $service) {
$this->parseDefinition($id, $service, $file);
}
@ -128,8 +136,14 @@ class YamlFileLoader
$this->container->setAlias($id, substr($service, 1));
return;
} elseif (isset($service['alias'])) {
$public = !array_key_exists('public', $service) || (Boolean) $service['public'];
}
if (!is_array($service)) {
throw new InvalidArgumentException(sprintf('A service definition must be an array or a string starting with "@" but %s found for service "%s" in %s. Check your YAML syntax.', gettype($service), $id, $file));
}
if (isset($service['alias'])) {
$public = !array_key_exists('public', $service) || (bool) $service['public'];
$this->container->setAlias($id, new Alias($service['alias'], $public));
return;
@ -154,7 +168,7 @@ class YamlFileLoader
}
if (isset($service['synchronized'])) {
$definition->setSynchronized($service['synchronized']);
$definition->setSynchronized($service['synchronized'], 'request' !== $id);
}
if (isset($service['lazy'])) {
@ -169,6 +183,19 @@ class YamlFileLoader
$definition->setAbstract($service['abstract']);
}
if (isset($service['factory'])) {
if (is_string($service['factory'])) {
if (strpos($service['factory'], ':') !== false && strpos($service['factory'], '::') === false) {
$parts = explode(':', $service['factory']);
$definition->setFactory(array($this->resolveServices('@'.$parts[0]), $parts[1]));
} else {
$definition->setFactory($service['factory']);
}
} else {
$definition->setFactory(array($this->resolveServices($service['factory'][0]), $service['factory'][1]));
}
}
if (isset($service['factory_class'])) {
$definition->setFactoryClass($service['factory_class']);
}
@ -202,18 +229,33 @@ class YamlFileLoader
}
if (isset($service['calls'])) {
if (!is_array($service['calls'])) {
throw new InvalidArgumentException(sprintf('Parameter "calls" must be an array for service "%s" in %s. Check your YAML syntax.', $id, $file));
}
foreach ($service['calls'] as $call) {
$args = isset($call[1]) ? $this->resolveServices($call[1]) : array();
$definition->addMethodCall($call[0], $args);
if (isset($call['method'])) {
$method = $call['method'];
$args = isset($call['arguments']) ? $this->resolveServices($call['arguments']) : array();
} else {
$method = $call[0];
$args = isset($call[1]) ? $this->resolveServices($call[1]) : array();
}
$definition->addMethodCall($method, $args);
}
}
if (isset($service['tags'])) {
if (!is_array($service['tags'])) {
throw new InvalidArgumentException(sprintf('Parameter "tags" must be an array for service "%s" in %s.', $id, $file));
throw new InvalidArgumentException(sprintf('Parameter "tags" must be an array for service "%s" in %s. Check your YAML syntax.', $id, $file));
}
foreach ($service['tags'] as $tag) {
if (!is_array($tag)) {
throw new InvalidArgumentException(sprintf('A "tags" entry must be an array for service "%s" in %s. Check your YAML syntax.', $id, $file));
}
if (!isset($tag['name'])) {
throw new InvalidArgumentException(sprintf('A "tags" entry is missing a "name" key for service "%s" in %s.', $id, $file));
}
@ -223,7 +265,7 @@ class YamlFileLoader
foreach ($tag as $attribute => $value) {
if (!is_scalar($value) && null !== $value) {
throw new InvalidArgumentException(sprintf('A "tags" attribute must be of a scalar-type for service "%s", tag "%s", attribute "%s" in %s.', $id, $name, $attribute, $file));
throw new InvalidArgumentException(sprintf('A "tags" attribute must be of a scalar-type for service "%s", tag "%s", attribute "%s" in %s. Check your YAML syntax.', $id, $name, $attribute, $file));
}
}
@ -231,6 +273,11 @@ class YamlFileLoader
}
}
if (isset($service['decorates'])) {
$renameId = isset($service['decoration_inner_name']) ? $service['decoration_inner_name'] : null;
$definition->setDecoratedService($service['decorates'], $renameId);
}
$this->container->setDefinition($id, $definition);
}
@ -240,6 +287,8 @@ class YamlFileLoader
* @param string $file
*
* @return array The file content
*
* @throws InvalidArgumentException when the given file is not a local file or when it does not exist
*/
protected function loadFile($file)
{
@ -271,7 +320,7 @@ class YamlFileLoader
}
if (!is_array($content)) {
throw new InvalidArgumentException(sprintf('The service file "%s" is not valid: it is not an array.', $file));
throw new InvalidArgumentException(sprintf('The service file "%s" is not valid. It should contain an array. Check your YAML syntax.', $file));
}
if ($invalid_keys = array_diff_key($content, array('parameters' => 1, 'services' => 1))) {
@ -284,9 +333,9 @@ class YamlFileLoader
/**
* Resolves services.
*
* @param string $value
* @param string|array $value
*
* @return Reference
* @return array|string|Reference
*/
private function resolveServices($value)
{

10
core/lib/Drupal/Core/RouteProcessor/RouteProcessorCurrent.php
View File

@ -39,8 +39,16 @@ class RouteProcessorCurrent implements OutboundRouteProcessorInterface {
public function processOutbound($route_name, Route $route, array &$parameters, CacheableMetadata $cacheable_metadata = NULL) {
if ($route_name === '<current>') {
if ($current_route = $this->routeMatch->getRouteObject()) {
$requirements = $current_route->getRequirements();
// Setting _method and _schema is deprecated since 2.7. Using
// setMethods() and setSchemes() are now the recommended ways.
unset($requirements['_method']);
unset($requirements['_schema']);
$route->setRequirements($requirements);
$route->setPath($current_route->getPath());
$route->setRequirements($current_route->getRequirements());
$route->setSchemes($current_route->getSchemes());
$route->setMethods($current_route->getMethods());
$route->setOptions($current_route->getOptions());
$route->setDefaults($current_route->getDefaults());
$parameters = array_merge($parameters, $this->routeMatch->getRawParameters()->all());

6
core/lib/Drupal/Core/Routing/RouteBuilder.php
View File

@ -168,9 +168,13 @@ class RouteBuilder implements RouteBuilderInterface, DestructableInterface {
'defaults' => array(),
'requirements' => array(),
'options' => array(),
'host' => NULL,
'schemes' => array(),
'methods' => array(),
'condition' => '',
);
$route = new Route($route_info['path'], $route_info['defaults'], $route_info['requirements'], $route_info['options']);
$route = new Route($route_info['path'], $route_info['defaults'], $route_info['requirements'], $route_info['options'], $route_info['host'], $route_info['schemes'], $route_info['methods'], $route_info['condition']);
$collection->add($name, $route);
}
}

4
core/lib/Drupal/Core/Routing/UrlGenerator.php
View File

@ -345,8 +345,8 @@ class UrlGenerator implements UrlGeneratorInterface {
else {
$scheme = $this->context->getScheme();
}
$scheme_req = $route->getRequirement('_scheme');
if (isset($scheme_req) && ($req = strtolower($scheme_req)) && $scheme !== $req) {
$scheme_req = $route->getSchemes();
if ($scheme_req && ($req = $scheme_req[0]) && $scheme !== $req) {
$scheme = $req;
}
$port = '';

6
core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/NullConstraint.php → core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/IsNullConstraint.php
View File

@ -2,12 +2,12 @@
/**
* @file
* Contains \Drupal\Core\Validation\Plugin\Validation\Constraint\NullConstraint.
* Contains \Drupal\Core\Validation\Plugin\Validation\Constraint\IsNullConstraint.
*/
namespace Drupal\Core\Validation\Plugin\Validation\Constraint;
use Symfony\Component\Validator\Constraints\Null;
use Symfony\Component\Validator\Constraints\IsNull;
/**
* Null constraint.
@ -20,4 +20,4 @@ use Symfony\Component\Validator\Constraints\Null;
* type = false
* )
*/
class NullConstraint extends Null { }
class IsNullConstraint extends IsNull { }

6
core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/NullConstraintValidator.php → core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/IsNullConstraintValidator.php
View File

@ -2,7 +2,7 @@
/**
* @file
* Contains \Drupal\Core\Validation\Plugin\Validation\Constraint\NullConstraintValidator.
* Contains \Drupal\Core\Validation\Plugin\Validation\Constraint\IsNullConstraintValidator.
*/
namespace Drupal\Core\Validation\Plugin\Validation\Constraint;
@ -11,14 +11,14 @@ use Drupal\Core\TypedData\ComplexDataInterface;
use Drupal\Core\TypedData\ListInterface;
use Drupal\Core\TypedData\Validation\TypedDataAwareValidatorTrait;
use Symfony\Component\Validator\Constraint;
use Symfony\Component\Validator\Constraints\NullValidator;
use Symfony\Component\Validator\Constraints\IsNullValidator;
/**
* Null constraint validator.
*
* Overrides the symfony validator to handle empty Typed Data structures.
*/
class NullConstraintValidator extends NullValidator {
class IsNullConstraintValidator extends IsNullValidator {
use TypedDataAwareValidatorTrait;

6
core/modules/config/tests/config_events_test/src/EventSubscriber.php
View File

@ -37,11 +37,13 @@ class EventSubscriber implements EventSubscriberInterface {
*
* @param \Drupal\Core\Config\ConfigCrudEvent $event
* The configuration event.
* @param string $name
* The event name.
*/
public function configEventRecorder(ConfigCrudEvent $event) {
public function configEventRecorder(ConfigCrudEvent $event, $name) {
$config = $event->getConfig();
$this->state->set('config_events_test.event', array(
'event_name' => $event->getName(),
'event_name' => $name,
'current_config_data' => $config->get(),
'original_config_data' => $config->getOriginal(),
'raw_config_data' => $config->getRawData()

3
core/modules/contact/contact.services.yml
View File

@ -9,6 +9,5 @@ services:
arguments: ['@plugin.manager.mail', '@language_manager', '@logger.channel.contact', '@string_translation', '@entity.manager']
logger.channel.contact:
class: Drupal\Core\Logger\LoggerChannel
factory_method: get
factory_service: logger.factory
factory: logger.factory:get
arguments: ['contact']

4
core/modules/link/src/Plugin/Field/FieldWidget/LinkWidget.php
View File

@ -351,7 +351,7 @@ class LinkWidget extends WidgetBase {
public function flagErrors(FieldItemListInterface $items, ConstraintViolationListInterface $violations, array $form, FormStateInterface $form_state) {
/** @var \Symfony\Component\Validator\ConstraintViolationInterface $violation */
foreach ($violations as $offset => $violation) {
$parameters = $violation->getMessageParameters();
$parameters = $violation->getParameters();
if (isset($parameters['@uri'])) {
$parameters['@uri'] = static::getUriAsDisplayableString($parameters['@uri']);
$violations->set($offset, new ConstraintViolation(
@ -361,7 +361,7 @@ class LinkWidget extends WidgetBase {
$violation->getRoot(),
$violation->getPropertyPath(),
$violation->getInvalidValue(),
$violation->getMessagePluralization(),
$violation->getPlural(),
$violation->getCode()
));
}

3
core/modules/migrate/migrate.services.yml
View File

@ -3,8 +3,7 @@ services:
class: Drupal\Core\Cache\CacheBackendInterface
tags:
- { name: cache.bin }
factory_method: get
factory_service: cache_factory
factory: cache_factory:get
arguments: [migrate]
plugin.manager.migrate.source:
class: Drupal\migrate\Plugin\MigratePluginManager

3
core/modules/rest/rest.services.yml
View File

@ -6,8 +6,7 @@ services:
class: Drupal\Core\Cache\CacheBackendInterface
tags:
- { name: cache.bin }
factory_method: get
factory_service: cache_factory
factory: cache_factory:get
arguments: [rest]
access_check.rest.csrf:
class: Drupal\rest\Access\CSRFAccessCheck

12
core/modules/rest/src/Plugin/ResourceBase.php
View File

@ -111,7 +111,7 @@ abstract class ResourceBase extends PluginBase implements ContainerFactoryPlugin
switch ($method) {
case 'POST':
$route->setPattern($create_path);
$route->setPath($create_path);
// Restrict the incoming HTTP Content-type header to the known
// serialization formats.
$route->addRequirements(array('_content_type_format' => implode('|', $this->serializerFormats)));
@ -203,10 +203,14 @@ abstract class ResourceBase extends PluginBase implements ContainerFactoryPlugin
// Pass the resource plugin ID along as default property.
'_plugin' => $this->pluginId,
), array(
// The HTTP method is a requirement for this route.
'_method' => $method,
'_permission' => "restful $lower_method $this->pluginId",
));
),
array(),
'',
array(),
// The HTTP method is a requirement for this route.
array($method)
);
return $route;
}

2
core/modules/rest/src/Plugin/views/display/RestExport.php
View File

@ -263,7 +263,7 @@ class RestExport extends PathPluginBase {
if ($route = $collection->get("view.$view_id.$display_id")) {
$style_plugin = $this->getPlugin('style');
// REST exports should only respond to get methods.
$requirements = array('_method' => 'GET');
$route->setMethods(['GET']);
// Format as a string using pipes as a delimiter.
$requirements['_format'] = implode('|', $style_plugin->getFormats());

5
core/modules/rest/src/Routing/ResourceRoutes.php
View File

@ -74,9 +74,10 @@ class ResourceRoutes extends RouteSubscriberBase {
$plugin = $this->manager->getInstance(array('id' => $id));
foreach ($plugin->routes() as $name => $route) {
$method = $route->getRequirement('_method');
// @todo: Are multiple methods possible here?
$methods = $route->getMethods();
// Only expose routes where the method is enabled in the configuration.
if ($method && isset($enabled_methods[$method])) {
if ($methods && ($method = $methods[0]) && $method && isset($enabled_methods[$method])) {
$route->setRequirement('_access_rest_csrf', 'TRUE');
// Check that authentication providers are defined.

3
core/modules/simpletest/src/WebTestBase.php
View File

@ -708,7 +708,8 @@ abstract class WebTestBase extends TestBase {
if ($this->strictConfigSchema) {
// Add a listener to validate configuration schema on save.
$yaml = new \Symfony\Component\Yaml\Yaml();
$services = $yaml->parse($directory . '/services.yml');
$content = file_get_contents($directory . '/services.yml');
$services = $yaml->parse($content);
$services['services']['simpletest.config_schema_checker'] = [
'class' => 'Drupal\Core\Config\Testing\ConfigSchemaChecker',
'arguments' => ['@config.typed'],

6
core/modules/system/core.api.php
View File

@ -438,8 +438,7 @@
* class: Drupal\Core\Cache\CacheBackendInterface
* tags:
* - { name: cache.bin }
* factory_method: get
* factory_service: cache_factory
* factory: cache_factory:get
* arguments: [nameofbin]
* @endcode
* See the @link container Services topic @endlink for more on defining
@ -683,8 +682,7 @@
* class: Drupal\Core\Cache\CacheBackendInterface
* tags:
* - { name: cache.bin }
* factory_method: get
* factory_service: cache_factory
* factory: cache_factory:get
* arguments: [entity]
* @endcode
*

4
core/modules/system/src/Tests/Routing/RouteProviderTest.php
View File

@ -385,10 +385,10 @@ class RouteProviderTest extends KernelTestBase {
$route = $provider->getRouteByName('route_a');
$this->assertEqual($route->getPath(), '/path/one', 'The right route pattern was found.');
$this->assertEqual($route->getRequirement('_method'), 'GET', 'The right route method was found.');
$this->assertEqual($route->getMethods(), ['GET'], 'The right route method was found.');
$route = $provider->getRouteByName('route_b');
$this->assertEqual($route->getPath(), '/path/one', 'The right route pattern was found.');
$this->assertEqual($route->getRequirement('_method'), 'PUT', 'The right route method was found.');
$this->assertEqual($route->getMethods(), ['PUT'], 'The right route method was found.');
$exception_thrown = FALSE;
try {

3
core/modules/toolbar/toolbar.services.yml
View File

@ -3,8 +3,7 @@ services:
class: Drupal\Core\Cache\CacheBackendInterface
tags:
- { name: cache.bin }
factory_method: get
factory_service: cache_factory
factory: cache_factory:get
arguments: [toolbar]
toolbar.page_cache_request_policy.allow_toolbar_path:
class: Drupal\toolbar\PageCache\AllowToolbarPath

24
core/tests/Drupal/Tests/Core/DependencyInjection/ContainerBuilderTest.php
View File

@ -9,9 +9,7 @@ namespace Drupal\Tests\Core\DependencyInjection;
use Drupal\Core\DependencyInjection\ContainerBuilder;
use Drupal\Tests\UnitTestCase;
use Drupal\Tests\Core\DependencyInjection\Fixture\BazClass;
use Drupal\Tests\Core\DependencyInjection\Fixture\BarClass;
use Symfony\Component\DependencyInjection\Reference;
/**
* @coversDefaultClass \Drupal\Core\DependencyInjection\ContainerBuilder
@ -19,28 +17,6 @@ use Symfony\Component\DependencyInjection\Reference;
*/
class ContainerBuilderTest extends UnitTestCase {
/**
* Tests set with a synchronized service.
*
* @covers ::set
*/
public function testSetOnSynchronizedService() {
$container = new ContainerBuilder();
$container->register('baz', '\Drupal\Tests\Core\DependencyInjection\Fixture\BazClass')
->setSynchronized(TRUE);
$container->register('bar', '\Drupal\Tests\Core\DependencyInjection\Fixture\BarClass')
->addMethodCall('setBaz', array(new Reference('baz')));
// Ensure that we can set services on a compiled container.
$container->compile();
$container->set('baz', $baz = new BazClass());
$this->assertSame($baz, $container->get('bar')->getBaz());
$container->set('baz', $baz = new BazClass());
$this->assertSame($baz, $container->get('bar')->getBaz());
}
/**
* @covers ::get
*/

32
core/tests/Drupal/Tests/Core/Routing/RoutingFixtures.php
View File

@ -50,20 +50,16 @@ class RoutingFixtures {
$routes = array();
$routes['route_a'] = array(
'path' => '/path/one',
'requirements' => array(
'_method' => 'GET',
),
'methods' => array('GET'),
);
$routes['route_b'] = array(
'path' => '/path/one',
'requirements' => array(
'_method' => 'PUT',
),
'methods' => array('PUT'),
);
$routes['route_c'] = array(
'path' => '/path/two',
'methods' => array('GET'),
'requirements' => array(
'_method' => 'GET',
'_format' => 'json'
),
);
@ -72,8 +68,8 @@ class RoutingFixtures {
);
$routes['route_e'] = array(
'path' => '/path/two',
'methods' => array('GET', 'HEAD'),
'requirements' => array(
'_method' => 'GET|HEAD',
'_format' => 'html'
),
);
@ -90,15 +86,15 @@ class RoutingFixtures {
$collection = new RouteCollection();
$route = new Route('path/one');
$route->setRequirement('_method', 'GET');
$route->setMethods(['GET']);
$collection->add('route_a', $route);
$route = new Route('path/one');
$route->setRequirement('_method', 'PUT');
$route->setMethods(['PUT']);
$collection->add('route_b', $route);
$route = new Route('path/two');
$route->setRequirement('_method', 'GET');
$route->setMethods(['GET']);
$route->setRequirement('_format', 'json');
$collection->add('route_c', $route);
@ -106,7 +102,7 @@ class RoutingFixtures {
$collection->add('route_d', $route);
$route = new Route('path/two');
$route->setRequirement('_method', 'GET|HEAD');
$route->setMethods(['GET', 'HEAD']);
$route->setRequirement('_format', 'html');
$collection->add('route_e', $route);
@ -122,22 +118,22 @@ class RoutingFixtures {
$collection = new RouteCollection();
$route = new Route('/path/{thing}/one');
$route->setRequirement('_method', 'GET');
$route->setMethods(['GET']);
$collection->add('route_a', $route);
$route = new Route('/path/{thing}/one');
$route->setRequirement('_method', 'PUT');
$route->setMethods(['PUT']);
$collection->add('route_b', $route);
$route = new Route('/somewhere/{item}/over/the/rainbow');
$route->setRequirement('_method', 'GET');
$route->setMethods(['GET']);
$collection->add('route_c', $route);
$route = new Route('/another/{thing}/about/{item}');
$collection->add('route_d', $route);
$route = new Route('/path/add/one');
$route->setRequirement('_method', 'GET|HEAD');
$route->setMethods(['GET', 'HEAD']);
$collection->add('route_e', $route);
return $collection;
@ -152,12 +148,12 @@ class RoutingFixtures {
$collection = new RouteCollection();
$route = new Route('path/three');
$route->setRequirement('_method', 'POST');
$route->setMethods(['POST']);
$route->setRequirement('_content_type_format', 'json');
$collection->add('route_f', $route);
$route = new Route('path/three');
$route->setRequirement('_method', 'PATCH');
$route->setMethods(['PATCH']);
$route->setRequirement('_content_type_format', 'xml');
$collection->add('route_g', $route);
return $collection;

2
core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php
View File

@ -70,7 +70,7 @@ class UrlGeneratorTest extends UnitTestCase {
$first_route = new Route('/test/one');
$second_route = new Route('/test/two/{narf}');
$third_route = new Route('/test/two/');
$fourth_route = new Route('/test/four', array(), array('_scheme' => 'https'));
$fourth_route = new Route('/test/four', array(), array(), array(), '', ['https']);
$routes->add('test_1', $first_route);
$routes->add('test_2', $second_route);
$routes->add('test_3', $third_route);

3
core/tests/Drupal/Tests/Core/TypedData/RecursiveContextualValidatorTest.php
View File

@ -16,6 +16,7 @@ use Drupal\Core\TypedData\Validation\ExecutionContextFactory;
use Drupal\Core\TypedData\Validation\RecursiveValidator;
use Drupal\Core\Validation\ConstraintManager;
use Drupal\Tests\UnitTestCase;
use Symfony\Component\Translation\IdentityTranslator;
use Symfony\Component\Validator\ConstraintValidatorFactory;
use Symfony\Component\Validator\Context\ExecutionContextInterface;
use Symfony\Component\Validator\DefaultTranslator;
@ -81,7 +82,7 @@ class RecursiveContextualValidatorTest extends UnitTestCase {
$container->set('typed_data_manager', $this->typedDataManager);
\Drupal::setContainer($container);
$translator = new DefaultTranslator();
$translator = new IdentityTranslator();
$this->contextFactory = new ExecutionContextFactory($translator);
$this->validatorFactory = new ConstraintValidatorFactory();
$this->recursiveValidator = new RecursiveValidator($this->contextFactory, $this->validatorFactory, $this->typedDataManager);

18
core/vendor/composer/autoload_classmap.php vendored
View File

@ -425,14 +425,14 @@ return array(
'SebastianBergmann\\RecursionContext\\Exception' => $vendorDir . '/sebastian/recursion-context/src/Exception.php',
'SebastianBergmann\\RecursionContext\\InvalidArgumentException' => $vendorDir . '/sebastian/recursion-context/src/InvalidArgumentException.php',
'SebastianBergmann\\Version' => $vendorDir . '/sebastian/version/src/Version.php',
'SessionHandlerInterface' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Resources/stubs/SessionHandlerInterface.php',
'Symfony\\Component\\HttpFoundation\\FileBag' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/FileBag.php',
'Symfony\\Component\\HttpFoundation\\HeaderBag' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/HeaderBag.php',
'Symfony\\Component\\HttpFoundation\\ParameterBag' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/ParameterBag.php',
'Symfony\\Component\\HttpFoundation\\Request' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Request.php',
'Symfony\\Component\\HttpFoundation\\ServerBag' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/ServerBag.php',
'Symfony\\Component\\HttpKernel\\HttpKernel' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/HttpKernel.php',
'Symfony\\Component\\HttpKernel\\HttpKernelInterface' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/HttpKernelInterface.php',
'Symfony\\Component\\HttpKernel\\TerminableInterface' => $vendorDir . '/symfony/http-kernel/Symfony/Component/HttpKernel/TerminableInterface.php',
'SessionHandlerInterface' => $vendorDir . '/symfony/http-foundation/Resources/stubs/SessionHandlerInterface.php',
'Symfony\\Component\\HttpFoundation\\FileBag' => $vendorDir . '/symfony/http-foundation/FileBag.php',
'Symfony\\Component\\HttpFoundation\\HeaderBag' => $vendorDir . '/symfony/http-foundation/HeaderBag.php',
'Symfony\\Component\\HttpFoundation\\ParameterBag' => $vendorDir . '/symfony/http-foundation/ParameterBag.php',
'Symfony\\Component\\HttpFoundation\\Request' => $vendorDir . '/symfony/http-foundation/Request.php',
'Symfony\\Component\\HttpFoundation\\ServerBag' => $vendorDir . '/symfony/http-foundation/ServerBag.php',
'Symfony\\Component\\HttpKernel\\HttpKernel' => $vendorDir . '/symfony/http-kernel/HttpKernel.php',
'Symfony\\Component\\HttpKernel\\HttpKernelInterface' => $vendorDir . '/symfony/http-kernel/HttpKernelInterface.php',
'Symfony\\Component\\HttpKernel\\TerminableInterface' => $vendorDir . '/symfony/http-kernel/TerminableInterface.php',
'Text_Template' => $vendorDir . '/phpunit/php-text-template/Text/Template.php',
);

13
core/vendor/composer/autoload_namespaces.php vendored
View File

@ -9,21 +9,8 @@ return array(
'phpDocumentor' => array($vendorDir . '/phpdocumentor/reflection-docblock/src'),
'org\\bovigo\\vfs\\' => array($vendorDir . '/mikey179/vfsStream/src/main/php'),
'Twig_' => array($vendorDir . '/twig/twig/lib'),
'Symfony\\Component\\Yaml\\' => array($vendorDir . '/symfony/yaml'),
'Symfony\\Component\\Validator\\' => array($vendorDir . '/symfony/validator'),
'Symfony\\Component\\Translation\\' => array($vendorDir . '/symfony/translation'),
'Symfony\\Component\\Serializer\\' => array($vendorDir . '/symfony/serializer'),
'Symfony\\Component\\Routing\\' => array($vendorDir . '/symfony/routing'),
'Symfony\\Component\\Process\\' => array($vendorDir . '/symfony/process'),
'Symfony\\Component\\HttpKernel\\' => array($vendorDir . '/symfony/http-kernel'),
'Symfony\\Component\\HttpFoundation\\' => array($vendorDir . '/symfony/http-foundation'),
'Symfony\\Component\\EventDispatcher\\' => array($vendorDir . '/symfony/event-dispatcher'),
'Symfony\\Component\\DomCrawler\\' => array($vendorDir . '/symfony/dom-crawler'),
'Symfony\\Component\\DependencyInjection\\' => array($vendorDir . '/symfony/dependency-injection'),
'Symfony\\Component\\Debug\\' => array($vendorDir . '/symfony/debug'),
'Symfony\\Component\\CssSelector\\' => array($vendorDir . '/symfony/css-selector'),
'Symfony\\Component\\Console\\' => array($vendorDir . '/symfony/console'),
'Symfony\\Component\\ClassLoader\\' => array($vendorDir . '/symfony/class-loader'),
'Symfony\\Component\\BrowserKit\\' => array($vendorDir . '/symfony/browser-kit'),
'Stack' => array($vendorDir . '/stack/builder/src'),
'Psr\\Log\\' => array($vendorDir . '/psr/log'),

13
core/vendor/composer/autoload_psr4.php vendored
View File

@ -9,6 +9,19 @@ return array(
'Zend\\Stdlib\\' => array($vendorDir . '/zendframework/zend-stdlib'),
'Zend\\Feed\\' => array($vendorDir . '/zendframework/zend-feed'),
'Zend\\Escaper\\' => array($vendorDir . '/zendframework/zend-escaper'),
'Symfony\\Component\\Yaml\\' => array($vendorDir . '/symfony/yaml'),
'Symfony\\Component\\Validator\\' => array($vendorDir . '/symfony/validator'),
'Symfony\\Component\\Translation\\' => array($vendorDir . '/symfony/translation'),
'Symfony\\Component\\Serializer\\' => array($vendorDir . '/symfony/serializer'),
'Symfony\\Component\\Routing\\' => array($vendorDir . '/symfony/routing'),
'Symfony\\Component\\Process\\' => array($vendorDir . '/symfony/process'),
'Symfony\\Component\\HttpKernel\\' => array($vendorDir . '/symfony/http-kernel'),
'Symfony\\Component\\HttpFoundation\\' => array($vendorDir . '/symfony/http-foundation'),
'Symfony\\Component\\EventDispatcher\\' => array($vendorDir . '/symfony/event-dispatcher'),
'Symfony\\Component\\DependencyInjection\\' => array($vendorDir . '/symfony/dependency-injection'),
'Symfony\\Component\\CssSelector\\' => array($vendorDir . '/symfony/css-selector'),
'Symfony\\Component\\Console\\' => array($vendorDir . '/symfony/console'),
'Symfony\\Component\\ClassLoader\\' => array($vendorDir . '/symfony/class-loader'),
'Symfony\\Cmf\\Component\\Routing\\' => array($vendorDir . '/symfony-cmf/routing'),
'React\\Promise\\' => array($vendorDir . '/react/promise/src'),
'Masterminds\\' => array($vendorDir . '/masterminds/html5/src'),

1847
core/vendor/composer/installed.json vendored
View File

File diff suppressed because it is too large Load Diff

1
core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Cookie.php vendored
View File

@ -93,6 +93,7 @@ class Cookie
$dateTime = \DateTime::createFromFormat('U', $this->expires, new \DateTimeZone('GMT'));
if ($dateTime === false) {
// this throw will provoke PHP fatal
throw new \UnexpectedValueException(sprintf('The cookie expiration time "%s" is not valid.'), $this->expires);
}

4
core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/composer.json vendored
View File

@ -3,7 +3,7 @@
"type": "library",
"description": "Symfony BrowserKit Component",
"keywords": [],
"homepage": "http://symfony.com",
"homepage": "https://symfony.com",
"license": "MIT",
"authors": [
{
@ -12,7 +12,7 @@
},
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
"homepage": "https://symfony.com/contributors"
}
],
"require": {

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ApcClassLoader.php → core/vendor/symfony/class-loader/ApcClassLoader.php vendored
View File

5
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php → core/vendor/symfony/class-loader/ApcUniversalClassLoader.php vendored
View File

@ -11,6 +11,8 @@
namespace Symfony\Component\ClassLoader;
trigger_error('The '.__NAMESPACE__.'\ApcUniversalClassLoader class is deprecated since version 2.7 and will be removed in 3.0. Use the Symfony\Component\ClassLoader\ApcClassLoader class instead.', E_USER_DEPRECATED);
/**
* ApcUniversalClassLoader implements a "universal" autoloader cached in APC for PHP 5.3.
*
@ -60,7 +62,8 @@ namespace Symfony\Component\ClassLoader;
*
* @api
*
* @deprecated Deprecated since version 2.4, to be removed in 3.0. Use the ApcClassLoader class instead.
* @deprecated since version 2.4, to be removed in 3.0.
* Use the {@link ClassLoader} class instead.
*/
class ApcUniversalClassLoader extends UniversalClassLoader
{

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/CHANGELOG.md → core/vendor/symfony/class-loader/CHANGELOG.md vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ClassCollectionLoader.php → core/vendor/symfony/class-loader/ClassCollectionLoader.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ClassLoader.php → core/vendor/symfony/class-loader/ClassLoader.php vendored
View File

2
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ClassMapGenerator.php → core/vendor/symfony/class-loader/ClassMapGenerator.php vendored
View File

@ -95,7 +95,7 @@ class ClassMapGenerator
$classes = array();
$namespace = '';
for ($i = 0, $max = count($tokens); $i < $max; $i++) {
for ($i = 0, $max = count($tokens); $i < $max; ++$i) {
$token = $tokens[$i];
if (is_string($token)) {

5
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/DebugClassLoader.php → core/vendor/symfony/class-loader/DebugClassLoader.php vendored
View File

@ -11,6 +11,8 @@
namespace Symfony\Component\ClassLoader;
trigger_error('The '.__NAMESPACE__.'\DebugClassLoader class is deprecated since version 2.4 and will be removed in 3.0. Use the Symfony\Component\Debug\DebugClassLoader class instead.', E_USER_DEPRECATED);
/**
* Autoloader checking if the class is really defined in the file found.
*
@ -23,7 +25,8 @@ namespace Symfony\Component\ClassLoader;
*
* @api
*
* @deprecated Deprecated since version 2.4, to be removed in 3.0. Use the DebugClassLoader provided by the Debug component instead.
* @deprecated since version 2.4, to be removed in 3.0.
* Use {@link \Symfony\Component\Debug\DebugClassLoader} instead.
*/
class DebugClassLoader
{

5
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/DebugUniversalClassLoader.php → core/vendor/symfony/class-loader/DebugUniversalClassLoader.php vendored
View File

@ -11,12 +11,15 @@
namespace Symfony\Component\ClassLoader;
trigger_error('The '.__NAMESPACE__.'\DebugUniversalClassLoader class is deprecated since version 2.4 and will be removed in 3.0. Use the Symfony\Component\Debug\DebugClassLoader class instead.', E_USER_DEPRECATED);
/**
* Checks that the class is actually declared in the included file.
*
* @author Fabien Potencier <fabien@symfony.com>
*
* @deprecated Deprecated since version 2.4, to be removed in 3.0. Use the DebugClassLoader provided by the Debug component instead.
* @deprecated since version 2.4, to be removed in 3.0.
* Use the {@link \Symfony\Component\Debug\DebugClassLoader} class instead.
*/
class DebugUniversalClassLoader extends UniversalClassLoader
{

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/LICENSE → core/vendor/symfony/class-loader/LICENSE vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/MapClassLoader.php → core/vendor/symfony/class-loader/MapClassLoader.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Psr4ClassLoader.php → core/vendor/symfony/class-loader/Psr4ClassLoader.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/README.md → core/vendor/symfony/class-loader/README.md vendored
View File

3
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/.gitignore vendored
View File

@ -1,3 +0,0 @@
vendor/
composer.lock
phpunit.xml

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/ClassCollectionLoaderTest.php → core/vendor/symfony/class-loader/Tests/ClassCollectionLoaderTest.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/ClassLoaderTest.php → core/vendor/symfony/class-loader/Tests/ClassLoaderTest.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/ClassMapGeneratorTest.php → core/vendor/symfony/class-loader/Tests/ClassMapGeneratorTest.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/Namespaced/Bar.php → core/vendor/symfony/class-loader/Tests/Fixtures/Apc/Namespaced/Bar.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/Namespaced/Baz.php → core/vendor/symfony/class-loader/Tests/Fixtures/Apc/Namespaced/Baz.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/Namespaced/Foo.php → core/vendor/symfony/class-loader/Tests/Fixtures/Apc/Namespaced/Foo.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/Namespaced/FooBar.php → core/vendor/symfony/class-loader/Tests/Fixtures/Apc/Namespaced/FooBar.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/Pearlike/Bar.php → core/vendor/symfony/class-loader/Tests/Fixtures/Apc/Pearlike/Bar.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/Pearlike/Baz.php → core/vendor/symfony/class-loader/Tests/Fixtures/Apc/Pearlike/Baz.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/Pearlike/Foo.php → core/vendor/symfony/class-loader/Tests/Fixtures/Apc/Pearlike/Foo.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/alpha/Apc/ApcPrefixCollision/A/Bar.php → core/vendor/symfony/class-loader/Tests/Fixtures/Apc/alpha/Apc/ApcPrefixCollision/A/Bar.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/alpha/Apc/ApcPrefixCollision/A/Foo.php → core/vendor/symfony/class-loader/Tests/Fixtures/Apc/alpha/Apc/ApcPrefixCollision/A/Foo.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/alpha/Apc/NamespaceCollision/A/Bar.php → core/vendor/symfony/class-loader/Tests/Fixtures/Apc/alpha/Apc/NamespaceCollision/A/Bar.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/alpha/Apc/NamespaceCollision/A/Foo.php → core/vendor/symfony/class-loader/Tests/Fixtures/Apc/alpha/Apc/NamespaceCollision/A/Foo.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/beta/Apc/ApcPrefixCollision/A/B/Bar.php → core/vendor/symfony/class-loader/Tests/Fixtures/Apc/beta/Apc/ApcPrefixCollision/A/B/Bar.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/beta/Apc/ApcPrefixCollision/A/B/Foo.php → core/vendor/symfony/class-loader/Tests/Fixtures/Apc/beta/Apc/ApcPrefixCollision/A/B/Foo.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/beta/Apc/NamespaceCollision/A/B/Bar.php → core/vendor/symfony/class-loader/Tests/Fixtures/Apc/beta/Apc/NamespaceCollision/A/B/Bar.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/beta/Apc/NamespaceCollision/A/B/Foo.php → core/vendor/symfony/class-loader/Tests/Fixtures/Apc/beta/Apc/NamespaceCollision/A/B/Foo.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/fallback/Apc/Pearlike/FooBar.php → core/vendor/symfony/class-loader/Tests/Fixtures/Apc/fallback/Apc/Pearlike/FooBar.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/fallback/Namespaced/FooBar.php → core/vendor/symfony/class-loader/Tests/Fixtures/Apc/fallback/Namespaced/FooBar.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/ClassesWithParents/A.php → core/vendor/symfony/class-loader/Tests/Fixtures/ClassesWithParents/A.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/ClassesWithParents/ATrait.php → core/vendor/symfony/class-loader/Tests/Fixtures/ClassesWithParents/ATrait.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/ClassesWithParents/B.php → core/vendor/symfony/class-loader/Tests/Fixtures/ClassesWithParents/B.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/ClassesWithParents/BTrait.php → core/vendor/symfony/class-loader/Tests/Fixtures/ClassesWithParents/BTrait.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/ClassesWithParents/CInterface.php → core/vendor/symfony/class-loader/Tests/Fixtures/ClassesWithParents/CInterface.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/ClassesWithParents/CTrait.php → core/vendor/symfony/class-loader/Tests/Fixtures/ClassesWithParents/CTrait.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/ClassesWithParents/D.php → core/vendor/symfony/class-loader/Tests/Fixtures/ClassesWithParents/D.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/ClassesWithParents/E.php → core/vendor/symfony/class-loader/Tests/Fixtures/ClassesWithParents/E.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/ClassesWithParents/F.php → core/vendor/symfony/class-loader/Tests/Fixtures/ClassesWithParents/F.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/ClassesWithParents/G.php → core/vendor/symfony/class-loader/Tests/Fixtures/ClassesWithParents/G.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/ClassesWithParents/GInterface.php → core/vendor/symfony/class-loader/Tests/Fixtures/ClassesWithParents/GInterface.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/Namespaced/Bar.php → core/vendor/symfony/class-loader/Tests/Fixtures/Namespaced/Bar.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/Namespaced/Baz.php → core/vendor/symfony/class-loader/Tests/Fixtures/Namespaced/Baz.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/Namespaced/Foo.php → core/vendor/symfony/class-loader/Tests/Fixtures/Namespaced/Foo.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/Namespaced/WithComments.php → core/vendor/symfony/class-loader/Tests/Fixtures/Namespaced/WithComments.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/Namespaced2/Bar.php → core/vendor/symfony/class-loader/Tests/Fixtures/Namespaced2/Bar.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/Namespaced2/Baz.php → core/vendor/symfony/class-loader/Tests/Fixtures/Namespaced2/Baz.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/Namespaced2/Foo.php → core/vendor/symfony/class-loader/Tests/Fixtures/Namespaced2/Foo.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/Pearlike/Bar.php → core/vendor/symfony/class-loader/Tests/Fixtures/Pearlike/Bar.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/Pearlike/Baz.php → core/vendor/symfony/class-loader/Tests/Fixtures/Pearlike/Baz.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/Pearlike/Foo.php → core/vendor/symfony/class-loader/Tests/Fixtures/Pearlike/Foo.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/Pearlike/WithComments.php → core/vendor/symfony/class-loader/Tests/Fixtures/Pearlike/WithComments.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/Pearlike2/Bar.php → core/vendor/symfony/class-loader/Tests/Fixtures/Pearlike2/Bar.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/Pearlike2/Baz.php → core/vendor/symfony/class-loader/Tests/Fixtures/Pearlike2/Baz.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/Pearlike2/Foo.php → core/vendor/symfony/class-loader/Tests/Fixtures/Pearlike2/Foo.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/alpha/NamespaceCollision/A/Bar.php → core/vendor/symfony/class-loader/Tests/Fixtures/alpha/NamespaceCollision/A/Bar.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/alpha/NamespaceCollision/A/Foo.php → core/vendor/symfony/class-loader/Tests/Fixtures/alpha/NamespaceCollision/A/Foo.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/alpha/NamespaceCollision/C/Bar.php → core/vendor/symfony/class-loader/Tests/Fixtures/alpha/NamespaceCollision/C/Bar.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/alpha/NamespaceCollision/C/Foo.php → core/vendor/symfony/class-loader/Tests/Fixtures/alpha/NamespaceCollision/C/Foo.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/alpha/PrefixCollision/A/Bar.php → core/vendor/symfony/class-loader/Tests/Fixtures/alpha/PrefixCollision/A/Bar.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/alpha/PrefixCollision/A/Foo.php → core/vendor/symfony/class-loader/Tests/Fixtures/alpha/PrefixCollision/A/Foo.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/alpha/PrefixCollision/C/Bar.php → core/vendor/symfony/class-loader/Tests/Fixtures/alpha/PrefixCollision/C/Bar.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/alpha/PrefixCollision/C/Foo.php → core/vendor/symfony/class-loader/Tests/Fixtures/alpha/PrefixCollision/C/Foo.php vendored
View File

0
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/beta/NamespaceCollision/A/B/Bar.php → core/vendor/symfony/class-loader/Tests/Fixtures/beta/NamespaceCollision/A/B/Bar.php vendored
View File

Some files were not shown because too many files have changed in this diff Show More