Skip to content
Snippets Groups Projects
Commit 1003720c authored by Alex Pott's avatar Alex Pott
Browse files

Issue #2414235 by hussainweb, dawehner: Upgrade to Symfony 2.6.4

parent 0baa9b26
No related branches found
No related tags found
2 merge requests!7452Issue #1797438. HTML5 validation is preventing form submit and not fully...,!789Issue #3210310: Adjust Database API to remove deprecated Drupal 9 code in Drupal 10
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 821 additions and 728 deletions
core/composer.lock
+ 99
− 88
View file @ 1003720c
...@@ -1695,24 +1695,24 @@ ...@@ -1695,24 +1695,24 @@
}, },
{ {
"name": "symfony/class-loader", "name": "symfony/class-loader",
"version": "v2.6.1", "version": "v2.6.4",
"target-dir": "Symfony/Component/ClassLoader", "target-dir": "Symfony/Component/ClassLoader",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/ClassLoader.git", "url": "https://github.com/symfony/ClassLoader.git",
"reference": "ba3300e6d79eb51ca9edf77791bbd0497f6030dc" "reference": "deac802f76910708ab50d039806cfd1866895b52"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/ClassLoader/zipball/ba3300e6d79eb51ca9edf77791bbd0497f6030dc", "url": "https://api.github.com/repos/symfony/ClassLoader/zipball/deac802f76910708ab50d039806cfd1866895b52",
"reference": "ba3300e6d79eb51ca9edf77791bbd0497f6030dc", "reference": "deac802f76910708ab50d039806cfd1866895b52",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.3" "php": ">=5.3.3"
}, },
"require-dev": { "require-dev": {
"symfony/finder": "~2.0" "symfony/finder": "~2.0,>=2.0.5"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
...@@ -1741,21 +1741,21 @@ ...@@ -1741,21 +1741,21 @@
], ],
"description": "Symfony ClassLoader Component", "description": "Symfony ClassLoader Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2014-12-02 20:19:20" "time": "2015-01-05 14:28:40"
}, },
{ {
"name": "symfony/css-selector", "name": "symfony/css-selector",
"version": "v2.6.1", "version": "v2.6.4",
"target-dir": "Symfony/Component/CssSelector", "target-dir": "Symfony/Component/CssSelector",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/CssSelector.git", "url": "https://github.com/symfony/CssSelector.git",
"reference": "93eb315b545b60a908271762fb4bfa1f9954b851" "reference": "3f80ecc614fec68d5b4a84a0703db3fdf5ce8584"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/CssSelector/zipball/93eb315b545b60a908271762fb4bfa1f9954b851", "url": "https://api.github.com/repos/symfony/CssSelector/zipball/3f80ecc614fec68d5b4a84a0703db3fdf5ce8584",
"reference": "93eb315b545b60a908271762fb4bfa1f9954b851", "reference": "3f80ecc614fec68d5b4a84a0703db3fdf5ce8584",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1792,30 +1792,34 @@ ...@@ -1792,30 +1792,34 @@
], ],
"description": "Symfony CssSelector Component", "description": "Symfony CssSelector Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2014-12-02 20:19:20" "time": "2015-01-03 08:01:59"
}, },
{ {
"name": "symfony/debug", "name": "symfony/debug",
"version": "v2.6.1", "version": "v2.6.4",
"target-dir": "Symfony/Component/Debug", "target-dir": "Symfony/Component/Debug",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/Debug.git", "url": "https://github.com/symfony/Debug.git",
"reference": "08b529b4c0aa3e746d187fe2a63f08cb955a3566" "reference": "150c80059c3ccf68f96a4fceb513eb6b41f23300"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/Debug/zipball/08b529b4c0aa3e746d187fe2a63f08cb955a3566", "url": "https://api.github.com/repos/symfony/Debug/zipball/150c80059c3ccf68f96a4fceb513eb6b41f23300",
"reference": "08b529b4c0aa3e746d187fe2a63f08cb955a3566", "reference": "150c80059c3ccf68f96a4fceb513eb6b41f23300",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.3", "php": ">=5.3.3",
"psr/log": "~1.0" "psr/log": "~1.0"
}, },
"conflict": {
"symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
},
"require-dev": { "require-dev": {
"symfony/class-loader": "~2.2",
"symfony/http-foundation": "~2.1", "symfony/http-foundation": "~2.1",
"symfony/http-kernel": "~2.1" "symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2"
}, },
"suggest": { "suggest": {
"symfony/http-foundation": "", "symfony/http-foundation": "",
...@@ -1848,30 +1852,33 @@ ...@@ -1848,30 +1852,33 @@
], ],
"description": "Symfony Debug Component", "description": "Symfony Debug Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2014-12-02 20:19:20" "time": "2015-01-21 20:57:55"
}, },
{ {
"name": "symfony/dependency-injection", "name": "symfony/dependency-injection",
"version": "v2.6.1", "version": "v2.6.4",
"target-dir": "Symfony/Component/DependencyInjection", "target-dir": "Symfony/Component/DependencyInjection",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/DependencyInjection.git", "url": "https://github.com/symfony/DependencyInjection.git",
"reference": "e2693382ef9456a7c7e382f34f813e4b4332941d" "reference": "42bbb43fab66292a1865dc9616c299904c3d4d14"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/e2693382ef9456a7c7e382f34f813e4b4332941d", "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/42bbb43fab66292a1865dc9616c299904c3d4d14",
"reference": "e2693382ef9456a7c7e382f34f813e4b4332941d", "reference": "42bbb43fab66292a1865dc9616c299904c3d4d14",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.3" "php": ">=5.3.3"
}, },
"conflict": {
"symfony/expression-language": "<2.6"
},
"require-dev": { "require-dev": {
"symfony/config": "~2.2", "symfony/config": "~2.2",
"symfony/expression-language": "~2.4", "symfony/expression-language": "~2.6",
"symfony/yaml": "~2.0" "symfony/yaml": "~2.1"
}, },
"suggest": { "suggest": {
"symfony/config": "", "symfony/config": "",
...@@ -1905,21 +1912,21 @@ ...@@ -1905,21 +1912,21 @@
], ],
"description": "Symfony DependencyInjection Component", "description": "Symfony DependencyInjection Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2014-12-03 09:22:11" "time": "2015-01-25 04:39:26"
}, },
{ {
"name": "symfony/event-dispatcher", "name": "symfony/event-dispatcher",
"version": "v2.6.1", "version": "v2.6.4",
"target-dir": "Symfony/Component/EventDispatcher", "target-dir": "Symfony/Component/EventDispatcher",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/EventDispatcher.git", "url": "https://github.com/symfony/EventDispatcher.git",
"reference": "720fe9bca893df7ad1b4546649473b5afddf0216" "reference": "f75989f3ab2743a82fe0b03ded2598a2b1546813"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/720fe9bca893df7ad1b4546649473b5afddf0216", "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/f75989f3ab2743a82fe0b03ded2598a2b1546813",
"reference": "720fe9bca893df7ad1b4546649473b5afddf0216", "reference": "f75989f3ab2743a82fe0b03ded2598a2b1546813",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1927,10 +1934,10 @@ ...@@ -1927,10 +1934,10 @@
}, },
"require-dev": { "require-dev": {
"psr/log": "~1.0", "psr/log": "~1.0",
"symfony/config": "~2.0", "symfony/config": "~2.0,>=2.0.5",
"symfony/dependency-injection": "~2.6", "symfony/dependency-injection": "~2.6",
"symfony/expression-language": "~2.6", "symfony/expression-language": "~2.6",
"symfony/stopwatch": "~2.2" "symfony/stopwatch": "~2.3"
}, },
"suggest": { "suggest": {
"symfony/dependency-injection": "", "symfony/dependency-injection": "",
...@@ -1963,21 +1970,21 @@ ...@@ -1963,21 +1970,21 @@
], ],
"description": "Symfony EventDispatcher Component", "description": "Symfony EventDispatcher Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2014-12-02 20:19:20" "time": "2015-02-01 16:10:57"
}, },
{ {
"name": "symfony/http-foundation", "name": "symfony/http-foundation",
"version": "v2.6.1", "version": "v2.6.4",
"target-dir": "Symfony/Component/HttpFoundation", "target-dir": "Symfony/Component/HttpFoundation",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/HttpFoundation.git", "url": "https://github.com/symfony/HttpFoundation.git",
"reference": "0109221f3cf012bf027768ad3e4236dae1af5332" "reference": "8fa63d614d56ccfe033e30411d90913cfc483ff6"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/0109221f3cf012bf027768ad3e4236dae1af5332", "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/8fa63d614d56ccfe033e30411d90913cfc483ff6",
"reference": "0109221f3cf012bf027768ad3e4236dae1af5332", "reference": "8fa63d614d56ccfe033e30411d90913cfc483ff6",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2016,43 +2023,45 @@ ...@@ -2016,43 +2023,45 @@
], ],
"description": "Symfony HttpFoundation Component", "description": "Symfony HttpFoundation Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2014-12-02 20:19:20" "time": "2015-02-01 16:10:57"
}, },
{ {
"name": "symfony/http-kernel", "name": "symfony/http-kernel",
"version": "v2.6.1", "version": "v2.6.4",
"target-dir": "Symfony/Component/HttpKernel", "target-dir": "Symfony/Component/HttpKernel",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/HttpKernel.git", "url": "https://github.com/symfony/HttpKernel.git",
"reference": "6e911d8a9e1a11c4584ad7b03858afa94e627203" "reference": "27abf3106d8bd08562070dd4e2438c279792c434"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/HttpKernel/zipball/6e911d8a9e1a11c4584ad7b03858afa94e627203", "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/27abf3106d8bd08562070dd4e2438c279792c434",
"reference": "6e911d8a9e1a11c4584ad7b03858afa94e627203", "reference": "27abf3106d8bd08562070dd4e2438c279792c434",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.3", "php": ">=5.3.3",
"psr/log": "~1.0", "psr/log": "~1.0",
"symfony/debug": "~2.6", "symfony/debug": "~2.6,>=2.6.2",
"symfony/event-dispatcher": "~2.5", "symfony/event-dispatcher": "~2.5.9|~2.6,>=2.6.2",
"symfony/http-foundation": "~2.5" "symfony/http-foundation": "~2.5,>=2.5.4"
}, },
"require-dev": { "require-dev": {
"symfony/browser-kit": "~2.2", "symfony/browser-kit": "~2.3",
"symfony/class-loader": "~2.1", "symfony/class-loader": "~2.1",
"symfony/config": "~2.0", "symfony/config": "~2.0,>=2.0.5",
"symfony/console": "~2.2", "symfony/console": "~2.3",
"symfony/dependency-injection": "~2.0", "symfony/css-selector": "~2.0,>=2.0.5",
"symfony/dependency-injection": "~2.2",
"symfony/dom-crawler": "~2.0,>=2.0.5",
"symfony/expression-language": "~2.4", "symfony/expression-language": "~2.4",
"symfony/finder": "~2.0", "symfony/finder": "~2.0,>=2.0.5",
"symfony/process": "~2.0", "symfony/process": "~2.0,>=2.0.5",
"symfony/routing": "~2.2", "symfony/routing": "~2.2",
"symfony/stopwatch": "~2.2", "symfony/stopwatch": "~2.3",
"symfony/templating": "~2.2", "symfony/templating": "~2.2",
"symfony/translation": "~2.0", "symfony/translation": "~2.0,>=2.0.5",
"symfony/var-dumper": "~2.6" "symfony/var-dumper": "~2.6"
}, },
"suggest": { "suggest": {
...@@ -2091,21 +2100,21 @@ ...@@ -2091,21 +2100,21 @@
], ],
"description": "Symfony HttpKernel Component", "description": "Symfony HttpKernel Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2014-12-03 16:40:43" "time": "2015-02-02 18:02:30"
}, },
{ {
"name": "symfony/process", "name": "symfony/process",
"version": "v2.6.1", "version": "v2.6.4",
"target-dir": "Symfony/Component/Process", "target-dir": "Symfony/Component/Process",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/Process.git", "url": "https://github.com/symfony/Process.git",
"reference": "bf0c9bd625f13b0b0bbe39919225cf145dfb935a" "reference": "ecfc23e89d9967999fa5f60a1e9af7384396e9ae"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/Process/zipball/bf0c9bd625f13b0b0bbe39919225cf145dfb935a", "url": "https://api.github.com/repos/symfony/Process/zipball/ecfc23e89d9967999fa5f60a1e9af7384396e9ae",
"reference": "bf0c9bd625f13b0b0bbe39919225cf145dfb935a", "reference": "ecfc23e89d9967999fa5f60a1e9af7384396e9ae",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2138,21 +2147,21 @@ ...@@ -2138,21 +2147,21 @@
], ],
"description": "Symfony Process Component", "description": "Symfony Process Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2014-12-02 20:19:20" "time": "2015-01-25 04:39:26"
}, },
{ {
"name": "symfony/routing", "name": "symfony/routing",
"version": "v2.6.1", "version": "v2.6.4",
"target-dir": "Symfony/Component/Routing", "target-dir": "Symfony/Component/Routing",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/Routing.git", "url": "https://github.com/symfony/Routing.git",
"reference": "b50c10839e1639fb3a89710f9510b63cc8be54c5" "reference": "bda1c3c67f2a33bbeabb1d321feaf626a0ca5698"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/Routing/zipball/b50c10839e1639fb3a89710f9510b63cc8be54c5", "url": "https://api.github.com/repos/symfony/Routing/zipball/bda1c3c67f2a33bbeabb1d321feaf626a0ca5698",
"reference": "b50c10839e1639fb3a89710f9510b63cc8be54c5", "reference": "bda1c3c67f2a33bbeabb1d321feaf626a0ca5698",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2160,11 +2169,12 @@ ...@@ -2160,11 +2169,12 @@
}, },
"require-dev": { "require-dev": {
"doctrine/annotations": "~1.0", "doctrine/annotations": "~1.0",
"doctrine/common": "~2.2",
"psr/log": "~1.0", "psr/log": "~1.0",
"symfony/config": "~2.2", "symfony/config": "~2.2",
"symfony/expression-language": "~2.4", "symfony/expression-language": "~2.4",
"symfony/http-foundation": "~2.3", "symfony/http-foundation": "~2.3",
"symfony/yaml": "~2.0" "symfony/yaml": "~2.0,>=2.0.5"
}, },
"suggest": { "suggest": {
"doctrine/annotations": "For using the annotation loader", "doctrine/annotations": "For using the annotation loader",
...@@ -2205,21 +2215,21 @@ ...@@ -2205,21 +2215,21 @@
"uri", "uri",
"url" "url"
], ],
"time": "2014-12-02 20:19:20" "time": "2015-01-15 12:15:12"
}, },
{ {
"name": "symfony/serializer", "name": "symfony/serializer",
"version": "v2.6.1", "version": "v2.6.4",
"target-dir": "Symfony/Component/Serializer", "target-dir": "Symfony/Component/Serializer",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/Serializer.git", "url": "https://github.com/symfony/Serializer.git",
"reference": "b527ccecd455fc70a805fb25b81e08eb37f3fc5d" "reference": "43fbb762fbdb2bcfce86205ffef2094a3995c801"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/Serializer/zipball/b527ccecd455fc70a805fb25b81e08eb37f3fc5d", "url": "https://api.github.com/repos/symfony/Serializer/zipball/43fbb762fbdb2bcfce86205ffef2094a3995c801",
"reference": "b527ccecd455fc70a805fb25b81e08eb37f3fc5d", "reference": "43fbb762fbdb2bcfce86205ffef2094a3995c801",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2252,21 +2262,21 @@ ...@@ -2252,21 +2262,21 @@
], ],
"description": "Symfony Serializer Component", "description": "Symfony Serializer Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2014-12-02 20:19:20" "time": "2015-02-01 16:10:57"
}, },
{ {
"name": "symfony/translation", "name": "symfony/translation",
"version": "v2.6.1", "version": "v2.6.4",
"target-dir": "Symfony/Component/Translation", "target-dir": "Symfony/Component/Translation",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/Translation.git", "url": "https://github.com/symfony/Translation.git",
"reference": "5b8bf84a43317021849813f556f26dc35968156b" "reference": "f289cdf8179d32058c1e1cbac723106a5ff6fa39"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/Translation/zipball/5b8bf84a43317021849813f556f26dc35968156b", "url": "https://api.github.com/repos/symfony/Translation/zipball/f289cdf8179d32058c1e1cbac723106a5ff6fa39",
"reference": "5b8bf84a43317021849813f556f26dc35968156b", "reference": "f289cdf8179d32058c1e1cbac723106a5ff6fa39",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2274,7 +2284,7 @@ ...@@ -2274,7 +2284,7 @@
}, },
"require-dev": { "require-dev": {
"psr/log": "~1.0", "psr/log": "~1.0",
"symfony/config": "~2.0", "symfony/config": "~2.3,>=2.3.12",
"symfony/intl": "~2.3", "symfony/intl": "~2.3",
"symfony/yaml": "~2.2" "symfony/yaml": "~2.2"
}, },
...@@ -2310,37 +2320,38 @@ ...@@ -2310,37 +2320,38 @@
], ],
"description": "Symfony Translation Component", "description": "Symfony Translation Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2014-12-02 20:19:20" "time": "2015-01-03 15:33:07"
}, },
{ {
"name": "symfony/validator", "name": "symfony/validator",
"version": "v2.6.1", "version": "v2.6.4",
"target-dir": "Symfony/Component/Validator", "target-dir": "Symfony/Component/Validator",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/Validator.git", "url": "https://github.com/symfony/Validator.git",
"reference": "4583e0321f1bcdad14d93e265eaca1001035b5c4" "reference": "1906eb78a5049b41a80094c20faf66dfbaaf2049"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/Validator/zipball/4583e0321f1bcdad14d93e265eaca1001035b5c4", "url": "https://api.github.com/repos/symfony/Validator/zipball/1906eb78a5049b41a80094c20faf66dfbaaf2049",
"reference": "4583e0321f1bcdad14d93e265eaca1001035b5c4", "reference": "1906eb78a5049b41a80094c20faf66dfbaaf2049",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.3", "php": ">=5.3.3",
"symfony/translation": "~2.0" "symfony/translation": "~2.0,>=2.0.5"
}, },
"require-dev": { "require-dev": {
"doctrine/annotations": "~1.0", "doctrine/annotations": "~1.0",
"doctrine/cache": "~1.0", "doctrine/cache": "~1.0",
"egulias/email-validator": "~1.0", "doctrine/common": "~2.3",
"egulias/email-validator": "~1.2,>=1.2.1",
"symfony/config": "~2.2", "symfony/config": "~2.2",
"symfony/expression-language": "~2.4", "symfony/expression-language": "~2.4",
"symfony/http-foundation": "~2.1", "symfony/http-foundation": "~2.1",
"symfony/intl": "~2.3", "symfony/intl": "~2.3",
"symfony/property-access": "~2.2", "symfony/property-access": "~2.3",
"symfony/yaml": "~2.0" "symfony/yaml": "~2.0,>=2.0.5"
}, },
"suggest": { "suggest": {
"doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.", "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
...@@ -2380,21 +2391,21 @@ ...@@ -2380,21 +2391,21 @@
], ],
"description": "Symfony Validator Component", "description": "Symfony Validator Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2014-12-02 20:19:20" "time": "2015-02-01 16:10:57"
}, },
{ {
"name": "symfony/yaml", "name": "symfony/yaml",
"version": "v2.6.1", "version": "v2.6.4",
"target-dir": "Symfony/Component/Yaml", "target-dir": "Symfony/Component/Yaml",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/Yaml.git", "url": "https://github.com/symfony/Yaml.git",
"reference": "3346fc090a3eb6b53d408db2903b241af51dcb20" "reference": "60ed7751671113cf1ee7d7778e691642c2e9acd8"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/Yaml/zipball/3346fc090a3eb6b53d408db2903b241af51dcb20", "url": "https://api.github.com/repos/symfony/Yaml/zipball/60ed7751671113cf1ee7d7778e691642c2e9acd8",
"reference": "3346fc090a3eb6b53d408db2903b241af51dcb20", "reference": "60ed7751671113cf1ee7d7778e691642c2e9acd8",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2427,7 +2438,7 @@ ...@@ -2427,7 +2438,7 @@
], ],
"description": "Symfony Yaml Component", "description": "Symfony Yaml Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2014-12-02 20:19:20" "time": "2015-01-25 04:39:26"
}, },
{ {
"name": "twig/twig", "name": "twig/twig",
......
core/modules/system/src/Tests/RouteProcessor/RouteProcessorCurrentIntegrationTest.php
+ 1
− 1
View file @ 1003720c
...@@ -47,7 +47,7 @@ public function testProcessOutbound() { ...@@ -47,7 +47,7 @@ public function testProcessOutbound() {
'SCRIPT_FILENAME' => \Drupal::root() . '/index.php', 'SCRIPT_FILENAME' => \Drupal::root() . '/index.php',
'SERVER_NAME' => 'http://www.example.com', 'SERVER_NAME' => 'http://www.example.com',
]; ];
$request = Request::create('/subdir', 'GET', [], [], [], $server); $request = Request::create('/subdir/', 'GET', [], [], [], $server);
$request->attributes->set(RouteObjectInterface::ROUTE_NAME, '<front>'); $request->attributes->set(RouteObjectInterface::ROUTE_NAME, '<front>');
$request->attributes->set(RouteObjectInterface::ROUTE_OBJECT, new Route('/')); $request->attributes->set(RouteObjectInterface::ROUTE_OBJECT, new Route('/'));
......
core/tests/Drupal/Tests/Core/Utility/UnroutedUrlAssemblerTest.php
+ 1
− 1
View file @ 1003720c
...@@ -159,7 +159,7 @@ protected function setupRequestStack($subdir) { ...@@ -159,7 +159,7 @@ protected function setupRequestStack($subdir) {
'SCRIPT_FILENAME' => $this->root . '/index.php', 'SCRIPT_FILENAME' => $this->root . '/index.php',
'SERVER_NAME' => 'http://www.example.com', 'SERVER_NAME' => 'http://www.example.com',
]; ];
$request = Request::create('/subdir'); $request = Request::create('/subdir/');
} }
else { else {
$request = Request::create('/'); $request = Request::create('/');
......
core/vendor/composer/installed.json
+ 610
− 599
View file @ 1003720c
This diff is collapsed.
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ApcClassLoader.php
+ 11
− 4
View file @ 1003720c
...@@ -17,11 +17,19 @@ ...@@ -17,11 +17,19 @@
* It expects an object implementing a findFile method to find the file. This * It expects an object implementing a findFile method to find the file. This
* allows using it as a wrapper around the other loaders of the component (the * allows using it as a wrapper around the other loaders of the component (the
* ClassLoader and the UniversalClassLoader for instance) but also around any * ClassLoader and the UniversalClassLoader for instance) but also around any
* other autoloader following this convention (the Composer one for instance) * other autoloaders following this convention (the Composer one for instance).
*
* // with a Symfony autoloader
* use Symfony\Component\ClassLoader\ClassLoader;
* *
* $loader = new ClassLoader(); * $loader = new ClassLoader();
* $loader->addPrefix('Symfony\Component', __DIR__.'/component');
* $loader->addPrefix('Symfony', __DIR__.'/framework');
*
* // or with a Composer autoloader
* use Composer\Autoload\ClassLoader;
* *
* // register classes with namespaces * $loader = new ClassLoader();
* $loader->add('Symfony\Component', __DIR__.'/component'); * $loader->add('Symfony\Component', __DIR__.'/component');
* $loader->add('Symfony', __DIR__.'/framework'); * $loader->add('Symfony', __DIR__.'/framework');
* *
...@@ -44,10 +52,9 @@ class ApcClassLoader ...@@ -44,10 +52,9 @@ class ApcClassLoader
private $prefix; private $prefix;
/** /**
* The class loader object being decorated. * A class loader object that implements the findFile() method.
* *
* @var object * @var object
* A class loader object that implements the findFile() method.
*/ */
protected $decorated; protected $decorated;
......
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php
+ 2
− 0
View file @ 1003720c
...@@ -59,6 +59,8 @@ ...@@ -59,6 +59,8 @@
* @author Kris Wallsmith <kris@symfony.com> * @author Kris Wallsmith <kris@symfony.com>
* *
* @api * @api
*
* @deprecated Deprecated since version 2.4, to be removed in 3.0. Use the ApcClassLoader class instead.
*/ */
class ApcUniversalClassLoader extends UniversalClassLoader class ApcUniversalClassLoader extends UniversalClassLoader
{ {
......
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/CHANGELOG.md
+ 3
− 0
View file @ 1003720c
...@@ -4,6 +4,9 @@ CHANGELOG ...@@ -4,6 +4,9 @@ CHANGELOG
2.4.0 2.4.0
----- -----
* deprecated the UniversalClassLoader in favor of the ClassLoader class instead
* deprecated the ApcUniversalClassLoader in favor of the ApcClassLoader class instead
* deprecated the DebugUniversalClassLoader in favor of the DebugClassLoader class from the Debug component
* deprecated the DebugClassLoader as it has been moved to the Debug component instead * deprecated the DebugClassLoader as it has been moved to the Debug component instead
2.3.0 2.3.0
......
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ClassCollectionLoader.php
+ 9
− 6
View file @ 1003720c
...@@ -353,14 +353,17 @@ private static function resolveDependencies(array $tree, $node, \ArrayObject $re ...@@ -353,14 +353,17 @@ private static function resolveDependencies(array $tree, $node, \ArrayObject $re
$unresolved = new \ArrayObject(); $unresolved = new \ArrayObject();
} }
$nodeName = $node->getName(); $nodeName = $node->getName();
$unresolved[$nodeName] = $node;
foreach ($tree[$nodeName] as $dependency) { if (isset($tree[$nodeName])) {
if (!$resolved->offsetExists($dependency->getName())) { $unresolved[$nodeName] = $node;
self::resolveDependencies($tree, $dependency, $resolved, $unresolved); foreach ($tree[$nodeName] as $dependency) {
if (!$resolved->offsetExists($dependency->getName())) {
self::resolveDependencies($tree, $dependency, $resolved, $unresolved);
}
} }
$resolved[$nodeName] = $node;
unset($unresolved[$nodeName]);
} }
$resolved[$nodeName] = $node;
unset($unresolved[$nodeName]);
return $resolved; return $resolved;
} }
......
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ClassLoader.php
+ 2
− 2
View file @ 1003720c
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
namespace Symfony\Component\ClassLoader; namespace Symfony\Component\ClassLoader;
/** /**
* ClassLoader implements an PSR-0 class loader * ClassLoader implements an PSR-0 class loader.
* *
* See https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md * See https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md
* *
...@@ -76,7 +76,7 @@ public function addPrefixes(array $prefixes) ...@@ -76,7 +76,7 @@ public function addPrefixes(array $prefixes)
} }
/** /**
* Registers a set of classes * Registers a set of classes.
* *
* @param string $prefix The classes prefix * @param string $prefix The classes prefix
* @param array|string $paths The location(s) of the classes * @param array|string $paths The location(s) of the classes
......
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ClassMapGenerator.php
+ 4
− 4
View file @ 1003720c
...@@ -20,14 +20,14 @@ ...@@ -20,14 +20,14 @@
} }
/** /**
* ClassMapGenerator * ClassMapGenerator.
* *
* @author Gyula Sallai <salla016@gmail.com> * @author Gyula Sallai <salla016@gmail.com>
*/ */
class ClassMapGenerator class ClassMapGenerator
{ {
/** /**
* Generate a class map file * Generate a class map file.
* *
* @param array|string $dirs Directories or a single path to search in * @param array|string $dirs Directories or a single path to search in
* @param string $file The name of the class map file * @param string $file The name of the class map file
...@@ -45,7 +45,7 @@ public static function dump($dirs, $file) ...@@ -45,7 +45,7 @@ public static function dump($dirs, $file)
} }
/** /**
* Iterate over all files in the given directory searching for classes * Iterate over all files in the given directory searching for classes.
* *
* @param \Iterator|string $dir The directory to search in or an iterator * @param \Iterator|string $dir The directory to search in or an iterator
* *
...@@ -81,7 +81,7 @@ public static function createMap($dir) ...@@ -81,7 +81,7 @@ public static function createMap($dir)
} }
/** /**
* Extract the classes in the given file * Extract the classes in the given file.
* *
* @param string $path The file to check * @param string $path The file to check
* *
......
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/DebugClassLoader.php
+ 1
− 1
View file @ 1003720c
...@@ -82,7 +82,7 @@ public function unregister() ...@@ -82,7 +82,7 @@ public function unregister()
} }
/** /**
* Finds a file by class name * Finds a file by class name.
* *
* @param string $class A class name to resolve to file * @param string $class A class name to resolve to file
* *
......
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/DebugUniversalClassLoader.php
+ 2
− 0
View file @ 1003720c
...@@ -15,6 +15,8 @@ ...@@ -15,6 +15,8 @@
* Checks that the class is actually declared in the included file. * Checks that the class is actually declared in the included file.
* *
* @author Fabien Potencier <fabien@symfony.com> * @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.
*/ */
class DebugUniversalClassLoader extends UniversalClassLoader class DebugUniversalClassLoader extends UniversalClassLoader
{ {
......
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/LICENSE
+ 1
− 1
View file @ 1003720c
Copyright (c) 2004-2014 Fabien Potencier Copyright (c) 2004-2015 Fabien Potencier
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal
......
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Psr4ClassLoader.php
+ 1
− 1
View file @ 1003720c
...@@ -77,7 +77,7 @@ public function loadClass($class) ...@@ -77,7 +77,7 @@ public function loadClass($class)
/** /**
* Registers this instance as an autoloader. * Registers this instance as an autoloader.
* *
* @param bool $prepend * @param bool $prepend
*/ */
public function register($prepend = false) public function register($prepend = false)
{ {
......
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/README.md
+ 22
− 18
View file @ 1003720c
...@@ -4,34 +4,34 @@ ClassLoader Component ...@@ -4,34 +4,34 @@ ClassLoader Component
ClassLoader loads your project classes automatically if they follow some ClassLoader loads your project classes automatically if they follow some
standard PHP conventions. standard PHP conventions.
The Universal ClassLoader is able to autoload classes that implement the PSR-0 The ClassLoader object is able to autoload classes that implement the PSR-0
standard or the PEAR naming convention. standard or the PEAR naming convention.
First, register the autoloader: First, register the autoloader:
```php ```php
require_once __DIR__.'/src/Symfony/Component/ClassLoader/UniversalClassLoader.php'; require_once __DIR__.'/src/Symfony/Component/ClassLoader/ClassLoader.php';
use Symfony\Component\ClassLoader\UniversalClassLoader; use Symfony\Component\ClassLoader\ClassLoader;
$loader = new UniversalClassLoader(); $loader = new ClassLoader();
$loader->register(); $loader->register();
``` ```
Then, register some namespaces with the `registerNamespace()` method: Then, register some namespaces with the `addPrefix()` method:
```php ```php
$loader->registerNamespace('Symfony', __DIR__.'/src'); $loader->addPrefix('Symfony', __DIR__.'/src');
$loader->registerNamespace('Monolog', __DIR__.'/vendor/monolog/src'); $loader->addPrefix('Monolog', __DIR__.'/vendor/monolog/src');
``` ```
The `registerNamespace()` method takes a namespace prefix and a path where to The `addPrefix()` method takes a namespace prefix and a path where to
look for the classes as arguments. look for the classes as arguments.
You can also register a sub-namespaces: You can also register a sub-namespaces:
```php ```php
$loader->registerNamespace('Doctrine\\Common', __DIR__.'/vendor/doctrine-common/lib'); $loader->addPrefix('Doctrine\\Common', __DIR__.'/vendor/doctrine-common/lib');
``` ```
The order of registration is significant and the first registered namespace The order of registration is significant and the first registered namespace
...@@ -40,14 +40,14 @@ takes precedence over later registered one. ...@@ -40,14 +40,14 @@ takes precedence over later registered one.
You can also register more than one path for a given namespace: You can also register more than one path for a given namespace:
```php ```php
$loader->registerNamespace('Symfony', array(__DIR__.'/src', __DIR__.'/symfony/src')); $loader->addPrefix('Symfony', array(__DIR__.'/src', __DIR__.'/symfony/src'));
``` ```
Alternatively, you can use the `registerNamespaces()` method to register more Alternatively, you can use the `addPrefixes()` method to register more
than one namespace at once: than one namespace at once:
```php ```php
$loader->registerNamespaces(array( $loader->addPrefixes(array(
'Symfony' => array(__DIR__.'/src', __DIR__.'/symfony/src'), 'Symfony' => array(__DIR__.'/src', __DIR__.'/symfony/src'),
'Doctrine\\Common' => __DIR__.'/vendor/doctrine-common/lib', 'Doctrine\\Common' => __DIR__.'/vendor/doctrine-common/lib',
'Doctrine' => __DIR__.'/vendor/doctrine/lib', 'Doctrine' => __DIR__.'/vendor/doctrine/lib',
...@@ -55,16 +55,20 @@ $loader->registerNamespaces(array( ...@@ -55,16 +55,20 @@ $loader->registerNamespaces(array(
)); ));
``` ```
For better performance, you can use the APC based version of the universal For better performance, you can use the APC class loader:
class loader:
```php ```php
require_once __DIR__.'/src/Symfony/Component/ClassLoader/UniversalClassLoader.php'; require_once __DIR__.'/src/Symfony/Component/ClassLoader/ClassLoader.php';
require_once __DIR__.'/src/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php'; require_once __DIR__.'/src/Symfony/Component/ClassLoader/ApcClassLoader.php';
use Symfony\Component\ClassLoader\ApcUniversalClassLoader; use Symfony\Component\ClassLoader\ClassLoader;
use Symfony\Component\ClassLoader\ApcClassLoader;
$loader = new ApcUniversalClassLoader('apc.prefix.'); $loader = new ClassLoader();
$loader->addPrefix('Symfony', __DIR__.'/src');
$loader = new ApcClassLoader('apc.prefix.', $loader);
$loader->register();
``` ```
Furthermore, the component provides tools to aggregate classes into a single Furthermore, the component provides tools to aggregate classes into a single
......
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/ClassCollectionLoaderTest.php
+ 32
− 0
View file @ 1003720c
...@@ -146,6 +146,38 @@ public function getDifferentOrdersForTraits() ...@@ -146,6 +146,38 @@ public function getDifferentOrdersForTraits()
); );
} }
public function testFixClassWithTraitsOrdering()
{
if (PHP_VERSION_ID < 50400) {
$this->markTestSkipped('Requires PHP > 5.4');
return;
}
require_once __DIR__.'/Fixtures/ClassesWithParents/CTrait.php';
require_once __DIR__.'/Fixtures/ClassesWithParents/F.php';
require_once __DIR__.'/Fixtures/ClassesWithParents/G.php';
$classes = array(
'ClassesWithParents\\F',
'ClassesWithParents\\G',
);
$expected = array(
'ClassesWithParents\\CTrait',
'ClassesWithParents\\F',
'ClassesWithParents\\G',
);
$r = new \ReflectionClass('Symfony\Component\ClassLoader\ClassCollectionLoader');
$m = $r->getMethod('getOrderedClasses');
$m->setAccessible(true);
$ordered = $m->invoke('Symfony\Component\ClassLoader\ClassCollectionLoader', $classes);
$this->assertEquals($expected, array_map(function ($class) { return $class->getName(); }, $ordered));
}
/** /**
* @dataProvider getFixNamespaceDeclarationsData * @dataProvider getFixNamespaceDeclarationsData
*/ */
......
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/ClassMapGeneratorTest.php
+ 1
− 1
View file @ 1003720c
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
class ClassMapGeneratorTest extends \PHPUnit_Framework_TestCase class ClassMapGeneratorTest extends \PHPUnit_Framework_TestCase
{ {
/** /**
* @var string $workspace * @var string|null
*/ */
private $workspace = null; private $workspace = null;
......
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/ClassesWithParents/F.php 0 → 100644
+ 8
− 0
View file @ 1003720c
<?php
namespace ClassesWithParents;
class F
{
use CTrait;
}
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/ClassesWithParents/G.php 0 → 100644
+ 8
− 0
View file @ 1003720c
<?php
namespace ClassesWithParents;
class G
{
use CTrait;
}
core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/ApcUniversalClassLoaderTest.php → core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/LegacyApcUniversalClassLoaderTest.php
+ 3
− 1
View file @ 1003720c
...@@ -13,10 +13,12 @@ ...@@ -13,10 +13,12 @@
use Symfony\Component\ClassLoader\ApcUniversalClassLoader; use Symfony\Component\ClassLoader\ApcUniversalClassLoader;
class ApcUniversalClassLoaderTest extends \PHPUnit_Framework_TestCase class LegacyApcUniversalClassLoaderTest extends \PHPUnit_Framework_TestCase
{ {
protected function setUp() protected function setUp()
{ {
$this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
if (!extension_loaded('apc')) { if (!extension_loaded('apc')) {
$this->markTestSkipped('The apc extension is not available.'); $this->markTestSkipped('The apc extension is not available.');
} }
......
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