Issue #2386585 by hussainweb: Upgrade to Symfony 2.6.1
catch
parent
bab6233d5b
commit
d93ba8d265
|
|
@ -1643,17 +1643,17 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/class-loader",
|
||||
"version": "v2.6.0",
|
||||
"version": "v2.6.1",
|
||||
"target-dir": "Symfony/Component/ClassLoader",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/ClassLoader.git",
|
||||
"reference": "b403af3d4fa3a2c3c926121c05042107e3a5b916"
|
||||
"reference": "ba3300e6d79eb51ca9edf77791bbd0497f6030dc"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/ClassLoader/zipball/b403af3d4fa3a2c3c926121c05042107e3a5b916",
|
||||
"reference": "b403af3d4fa3a2c3c926121c05042107e3a5b916",
|
||||
"url": "https://api.github.com/repos/symfony/ClassLoader/zipball/ba3300e6d79eb51ca9edf77791bbd0497f6030dc",
|
||||
"reference": "ba3300e6d79eb51ca9edf77791bbd0497f6030dc",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -1689,21 +1689,21 @@
|
|||
],
|
||||
"description": "Symfony ClassLoader Component",
|
||||
"homepage": "http://symfony.com",
|
||||
"time": "2014-11-20 13:24:23"
|
||||
"time": "2014-12-02 20:19:20"
|
||||
},
|
||||
{
|
||||
"name": "symfony/css-selector",
|
||||
"version": "v2.6.0",
|
||||
"version": "v2.6.1",
|
||||
"target-dir": "Symfony/Component/CssSelector",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/CssSelector.git",
|
||||
"reference": "41953ad30ffc5cd710d106cf01eff79f6effa117"
|
||||
"reference": "93eb315b545b60a908271762fb4bfa1f9954b851"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/CssSelector/zipball/41953ad30ffc5cd710d106cf01eff79f6effa117",
|
||||
"reference": "41953ad30ffc5cd710d106cf01eff79f6effa117",
|
||||
"url": "https://api.github.com/repos/symfony/CssSelector/zipball/93eb315b545b60a908271762fb4bfa1f9954b851",
|
||||
"reference": "93eb315b545b60a908271762fb4bfa1f9954b851",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -1740,21 +1740,21 @@
|
|||
],
|
||||
"description": "Symfony CssSelector Component",
|
||||
"homepage": "http://symfony.com",
|
||||
"time": "2014-10-26 07:46:28"
|
||||
"time": "2014-12-02 20:19:20"
|
||||
},
|
||||
{
|
||||
"name": "symfony/debug",
|
||||
"version": "v2.6.0",
|
||||
"version": "v2.6.1",
|
||||
"target-dir": "Symfony/Component/Debug",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/Debug.git",
|
||||
"reference": "e1e27710efabc3f67a2d1f6710641b3bdca289d3"
|
||||
"reference": "08b529b4c0aa3e746d187fe2a63f08cb955a3566"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/Debug/zipball/e1e27710efabc3f67a2d1f6710641b3bdca289d3",
|
||||
"reference": "e1e27710efabc3f67a2d1f6710641b3bdca289d3",
|
||||
"url": "https://api.github.com/repos/symfony/Debug/zipball/08b529b4c0aa3e746d187fe2a63f08cb955a3566",
|
||||
"reference": "08b529b4c0aa3e746d187fe2a63f08cb955a3566",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -1796,21 +1796,21 @@
|
|||
],
|
||||
"description": "Symfony Debug Component",
|
||||
"homepage": "http://symfony.com",
|
||||
"time": "2014-11-28 10:00:40"
|
||||
"time": "2014-12-02 20:19:20"
|
||||
},
|
||||
{
|
||||
"name": "symfony/dependency-injection",
|
||||
"version": "v2.6.0",
|
||||
"version": "v2.6.1",
|
||||
"target-dir": "Symfony/Component/DependencyInjection",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/DependencyInjection.git",
|
||||
"reference": "20bc8737876e4a2222101749b5547fd5acc24e30"
|
||||
"reference": "e2693382ef9456a7c7e382f34f813e4b4332941d"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/20bc8737876e4a2222101749b5547fd5acc24e30",
|
||||
"reference": "20bc8737876e4a2222101749b5547fd5acc24e30",
|
||||
"url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/e2693382ef9456a7c7e382f34f813e4b4332941d",
|
||||
"reference": "e2693382ef9456a7c7e382f34f813e4b4332941d",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -1853,21 +1853,21 @@
|
|||
],
|
||||
"description": "Symfony DependencyInjection Component",
|
||||
"homepage": "http://symfony.com",
|
||||
"time": "2014-11-28 10:00:40"
|
||||
"time": "2014-12-03 09:22:11"
|
||||
},
|
||||
{
|
||||
"name": "symfony/event-dispatcher",
|
||||
"version": "v2.6.0",
|
||||
"version": "v2.6.1",
|
||||
"target-dir": "Symfony/Component/EventDispatcher",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/EventDispatcher.git",
|
||||
"reference": "697331d4ac78668cf6d21a2bb009b3faae92814f"
|
||||
"reference": "720fe9bca893df7ad1b4546649473b5afddf0216"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/697331d4ac78668cf6d21a2bb009b3faae92814f",
|
||||
"reference": "697331d4ac78668cf6d21a2bb009b3faae92814f",
|
||||
"url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/720fe9bca893df7ad1b4546649473b5afddf0216",
|
||||
"reference": "720fe9bca893df7ad1b4546649473b5afddf0216",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -1911,21 +1911,21 @@
|
|||
],
|
||||
"description": "Symfony EventDispatcher Component",
|
||||
"homepage": "http://symfony.com",
|
||||
"time": "2014-11-28 10:00:40"
|
||||
"time": "2014-12-02 20:19:20"
|
||||
},
|
||||
{
|
||||
"name": "symfony/http-foundation",
|
||||
"version": "v2.6.0",
|
||||
"version": "v2.6.1",
|
||||
"target-dir": "Symfony/Component/HttpFoundation",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/HttpFoundation.git",
|
||||
"reference": "bb46e43145184ce8c3069a8ea2c299fb53d432f9"
|
||||
"reference": "0109221f3cf012bf027768ad3e4236dae1af5332"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/bb46e43145184ce8c3069a8ea2c299fb53d432f9",
|
||||
"reference": "bb46e43145184ce8c3069a8ea2c299fb53d432f9",
|
||||
"url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/0109221f3cf012bf027768ad3e4236dae1af5332",
|
||||
"reference": "0109221f3cf012bf027768ad3e4236dae1af5332",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -1964,21 +1964,21 @@
|
|||
],
|
||||
"description": "Symfony HttpFoundation Component",
|
||||
"homepage": "http://symfony.com",
|
||||
"time": "2014-11-28 10:00:40"
|
||||
"time": "2014-12-02 20:19:20"
|
||||
},
|
||||
{
|
||||
"name": "symfony/http-kernel",
|
||||
"version": "v2.6.0",
|
||||
"version": "v2.6.1",
|
||||
"target-dir": "Symfony/Component/HttpKernel",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/HttpKernel.git",
|
||||
"reference": "0e3cad4d574e84b01d2a0df706bb31f024a93bdc"
|
||||
"reference": "6e911d8a9e1a11c4584ad7b03858afa94e627203"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/HttpKernel/zipball/0e3cad4d574e84b01d2a0df706bb31f024a93bdc",
|
||||
"reference": "0e3cad4d574e84b01d2a0df706bb31f024a93bdc",
|
||||
"url": "https://api.github.com/repos/symfony/HttpKernel/zipball/6e911d8a9e1a11c4584ad7b03858afa94e627203",
|
||||
"reference": "6e911d8a9e1a11c4584ad7b03858afa94e627203",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -2039,21 +2039,21 @@
|
|||
],
|
||||
"description": "Symfony HttpKernel Component",
|
||||
"homepage": "http://symfony.com",
|
||||
"time": "2014-11-28 15:59:01"
|
||||
"time": "2014-12-03 16:40:43"
|
||||
},
|
||||
{
|
||||
"name": "symfony/routing",
|
||||
"version": "v2.6.0",
|
||||
"version": "v2.6.1",
|
||||
"target-dir": "Symfony/Component/Routing",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/Routing.git",
|
||||
"reference": "5e2c6aba6cbb00a6b7e3760db99f72c85c52b6e5"
|
||||
"reference": "b50c10839e1639fb3a89710f9510b63cc8be54c5"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/Routing/zipball/5e2c6aba6cbb00a6b7e3760db99f72c85c52b6e5",
|
||||
"reference": "5e2c6aba6cbb00a6b7e3760db99f72c85c52b6e5",
|
||||
"url": "https://api.github.com/repos/symfony/Routing/zipball/b50c10839e1639fb3a89710f9510b63cc8be54c5",
|
||||
"reference": "b50c10839e1639fb3a89710f9510b63cc8be54c5",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -2106,21 +2106,21 @@
|
|||
"uri",
|
||||
"url"
|
||||
],
|
||||
"time": "2014-11-16 17:28:09"
|
||||
"time": "2014-12-02 20:19:20"
|
||||
},
|
||||
{
|
||||
"name": "symfony/serializer",
|
||||
"version": "v2.6.0",
|
||||
"version": "v2.6.1",
|
||||
"target-dir": "Symfony/Component/Serializer",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/Serializer.git",
|
||||
"reference": "16e548902fab42d26ceb1de5ca06ab676d1a81a7"
|
||||
"reference": "b527ccecd455fc70a805fb25b81e08eb37f3fc5d"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/Serializer/zipball/16e548902fab42d26ceb1de5ca06ab676d1a81a7",
|
||||
"reference": "16e548902fab42d26ceb1de5ca06ab676d1a81a7",
|
||||
"url": "https://api.github.com/repos/symfony/Serializer/zipball/b527ccecd455fc70a805fb25b81e08eb37f3fc5d",
|
||||
"reference": "b527ccecd455fc70a805fb25b81e08eb37f3fc5d",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -2153,21 +2153,21 @@
|
|||
],
|
||||
"description": "Symfony Serializer Component",
|
||||
"homepage": "http://symfony.com",
|
||||
"time": "2014-11-20 13:24:23"
|
||||
"time": "2014-12-02 20:19:20"
|
||||
},
|
||||
{
|
||||
"name": "symfony/translation",
|
||||
"version": "v2.6.0",
|
||||
"version": "v2.6.1",
|
||||
"target-dir": "Symfony/Component/Translation",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/Translation.git",
|
||||
"reference": "0a3711860976f15ee46642b4dd354e9ef9fc9a15"
|
||||
"reference": "5b8bf84a43317021849813f556f26dc35968156b"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/Translation/zipball/0a3711860976f15ee46642b4dd354e9ef9fc9a15",
|
||||
"reference": "0a3711860976f15ee46642b4dd354e9ef9fc9a15",
|
||||
"url": "https://api.github.com/repos/symfony/Translation/zipball/5b8bf84a43317021849813f556f26dc35968156b",
|
||||
"reference": "5b8bf84a43317021849813f556f26dc35968156b",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -2211,21 +2211,21 @@
|
|||
],
|
||||
"description": "Symfony Translation Component",
|
||||
"homepage": "http://symfony.com",
|
||||
"time": "2014-11-28 10:00:40"
|
||||
"time": "2014-12-02 20:19:20"
|
||||
},
|
||||
{
|
||||
"name": "symfony/validator",
|
||||
"version": "v2.6.0",
|
||||
"version": "v2.6.1",
|
||||
"target-dir": "Symfony/Component/Validator",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/Validator.git",
|
||||
"reference": "cbf6575c4c9c83621df01483e215599f5377fc0b"
|
||||
"reference": "4583e0321f1bcdad14d93e265eaca1001035b5c4"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/Validator/zipball/cbf6575c4c9c83621df01483e215599f5377fc0b",
|
||||
"reference": "cbf6575c4c9c83621df01483e215599f5377fc0b",
|
||||
"url": "https://api.github.com/repos/symfony/Validator/zipball/4583e0321f1bcdad14d93e265eaca1001035b5c4",
|
||||
"reference": "4583e0321f1bcdad14d93e265eaca1001035b5c4",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -2281,21 +2281,21 @@
|
|||
],
|
||||
"description": "Symfony Validator Component",
|
||||
"homepage": "http://symfony.com",
|
||||
"time": "2014-11-28 10:00:40"
|
||||
"time": "2014-12-02 20:19:20"
|
||||
},
|
||||
{
|
||||
"name": "symfony/yaml",
|
||||
"version": "v2.6.0",
|
||||
"version": "v2.6.1",
|
||||
"target-dir": "Symfony/Component/Yaml",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/Yaml.git",
|
||||
"reference": "51c845cf3e4bfc182d1d5c05ed1c7338361d86f8"
|
||||
"reference": "3346fc090a3eb6b53d408db2903b241af51dcb20"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/Yaml/zipball/51c845cf3e4bfc182d1d5c05ed1c7338361d86f8",
|
||||
"reference": "51c845cf3e4bfc182d1d5c05ed1c7338361d86f8",
|
||||
"url": "https://api.github.com/repos/symfony/Yaml/zipball/3346fc090a3eb6b53d408db2903b241af51dcb20",
|
||||
"reference": "3346fc090a3eb6b53d408db2903b241af51dcb20",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -2328,7 +2328,7 @@
|
|||
],
|
||||
"description": "Symfony Yaml Component",
|
||||
"homepage": "http://symfony.com",
|
||||
"time": "2014-11-20 13:24:23"
|
||||
"time": "2014-12-02 20:19:20"
|
||||
},
|
||||
{
|
||||
"name": "twig/twig",
|
||||
|
|
|
|||
|
|
@ -1893,18 +1893,18 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/class-loader",
|
||||
"version": "v2.6.0",
|
||||
"version_normalized": "2.6.0.0",
|
||||
"version": "v2.6.1",
|
||||
"version_normalized": "2.6.1.0",
|
||||
"target-dir": "Symfony/Component/ClassLoader",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/ClassLoader.git",
|
||||
"reference": "b403af3d4fa3a2c3c926121c05042107e3a5b916"
|
||||
"reference": "ba3300e6d79eb51ca9edf77791bbd0497f6030dc"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/ClassLoader/zipball/b403af3d4fa3a2c3c926121c05042107e3a5b916",
|
||||
"reference": "b403af3d4fa3a2c3c926121c05042107e3a5b916",
|
||||
"url": "https://api.github.com/repos/symfony/ClassLoader/zipball/ba3300e6d79eb51ca9edf77791bbd0497f6030dc",
|
||||
"reference": "ba3300e6d79eb51ca9edf77791bbd0497f6030dc",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -1913,7 +1913,7 @@
|
|||
"require-dev": {
|
||||
"symfony/finder": "~2.0"
|
||||
},
|
||||
"time": "2014-11-20 13:24:23",
|
||||
"time": "2014-12-02 20:19:20",
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
|
|
@ -1945,24 +1945,24 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/css-selector",
|
||||
"version": "v2.6.0",
|
||||
"version_normalized": "2.6.0.0",
|
||||
"version": "v2.6.1",
|
||||
"version_normalized": "2.6.1.0",
|
||||
"target-dir": "Symfony/Component/CssSelector",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/CssSelector.git",
|
||||
"reference": "41953ad30ffc5cd710d106cf01eff79f6effa117"
|
||||
"reference": "93eb315b545b60a908271762fb4bfa1f9954b851"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/CssSelector/zipball/41953ad30ffc5cd710d106cf01eff79f6effa117",
|
||||
"reference": "41953ad30ffc5cd710d106cf01eff79f6effa117",
|
||||
"url": "https://api.github.com/repos/symfony/CssSelector/zipball/93eb315b545b60a908271762fb4bfa1f9954b851",
|
||||
"reference": "93eb315b545b60a908271762fb4bfa1f9954b851",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.3.3"
|
||||
},
|
||||
"time": "2014-10-26 07:46:28",
|
||||
"time": "2014-12-02 20:19:20",
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
|
|
@ -1998,18 +1998,18 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/dependency-injection",
|
||||
"version": "v2.6.0",
|
||||
"version_normalized": "2.6.0.0",
|
||||
"version": "v2.6.1",
|
||||
"version_normalized": "2.6.1.0",
|
||||
"target-dir": "Symfony/Component/DependencyInjection",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/DependencyInjection.git",
|
||||
"reference": "20bc8737876e4a2222101749b5547fd5acc24e30"
|
||||
"reference": "e2693382ef9456a7c7e382f34f813e4b4332941d"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/20bc8737876e4a2222101749b5547fd5acc24e30",
|
||||
"reference": "20bc8737876e4a2222101749b5547fd5acc24e30",
|
||||
"url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/e2693382ef9456a7c7e382f34f813e4b4332941d",
|
||||
"reference": "e2693382ef9456a7c7e382f34f813e4b4332941d",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -2025,7 +2025,7 @@
|
|||
"symfony/proxy-manager-bridge": "Generate service proxies to lazy load them",
|
||||
"symfony/yaml": ""
|
||||
},
|
||||
"time": "2014-11-28 10:00:40",
|
||||
"time": "2014-12-03 09:22:11",
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
|
|
@ -2057,18 +2057,18 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/debug",
|
||||
"version": "v2.6.0",
|
||||
"version_normalized": "2.6.0.0",
|
||||
"version": "v2.6.1",
|
||||
"version_normalized": "2.6.1.0",
|
||||
"target-dir": "Symfony/Component/Debug",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/Debug.git",
|
||||
"reference": "e1e27710efabc3f67a2d1f6710641b3bdca289d3"
|
||||
"reference": "08b529b4c0aa3e746d187fe2a63f08cb955a3566"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/Debug/zipball/e1e27710efabc3f67a2d1f6710641b3bdca289d3",
|
||||
"reference": "e1e27710efabc3f67a2d1f6710641b3bdca289d3",
|
||||
"url": "https://api.github.com/repos/symfony/Debug/zipball/08b529b4c0aa3e746d187fe2a63f08cb955a3566",
|
||||
"reference": "08b529b4c0aa3e746d187fe2a63f08cb955a3566",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -2083,7 +2083,7 @@
|
|||
"symfony/http-foundation": "",
|
||||
"symfony/http-kernel": ""
|
||||
},
|
||||
"time": "2014-11-28 10:00:40",
|
||||
"time": "2014-12-02 20:19:20",
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
|
|
@ -2115,18 +2115,18 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/http-foundation",
|
||||
"version": "v2.6.0",
|
||||
"version_normalized": "2.6.0.0",
|
||||
"version": "v2.6.1",
|
||||
"version_normalized": "2.6.1.0",
|
||||
"target-dir": "Symfony/Component/HttpFoundation",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/HttpFoundation.git",
|
||||
"reference": "bb46e43145184ce8c3069a8ea2c299fb53d432f9"
|
||||
"reference": "0109221f3cf012bf027768ad3e4236dae1af5332"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/bb46e43145184ce8c3069a8ea2c299fb53d432f9",
|
||||
"reference": "bb46e43145184ce8c3069a8ea2c299fb53d432f9",
|
||||
"url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/0109221f3cf012bf027768ad3e4236dae1af5332",
|
||||
"reference": "0109221f3cf012bf027768ad3e4236dae1af5332",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -2135,7 +2135,7 @@
|
|||
"require-dev": {
|
||||
"symfony/expression-language": "~2.4"
|
||||
},
|
||||
"time": "2014-11-28 10:00:40",
|
||||
"time": "2014-12-02 20:19:20",
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
|
|
@ -2170,18 +2170,18 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/event-dispatcher",
|
||||
"version": "v2.6.0",
|
||||
"version_normalized": "2.6.0.0",
|
||||
"version": "v2.6.1",
|
||||
"version_normalized": "2.6.1.0",
|
||||
"target-dir": "Symfony/Component/EventDispatcher",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/EventDispatcher.git",
|
||||
"reference": "697331d4ac78668cf6d21a2bb009b3faae92814f"
|
||||
"reference": "720fe9bca893df7ad1b4546649473b5afddf0216"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/697331d4ac78668cf6d21a2bb009b3faae92814f",
|
||||
"reference": "697331d4ac78668cf6d21a2bb009b3faae92814f",
|
||||
"url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/720fe9bca893df7ad1b4546649473b5afddf0216",
|
||||
"reference": "720fe9bca893df7ad1b4546649473b5afddf0216",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -2198,7 +2198,7 @@
|
|||
"symfony/dependency-injection": "",
|
||||
"symfony/http-kernel": ""
|
||||
},
|
||||
"time": "2014-11-28 10:00:40",
|
||||
"time": "2014-12-02 20:19:20",
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
|
|
@ -2230,18 +2230,18 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/http-kernel",
|
||||
"version": "v2.6.0",
|
||||
"version_normalized": "2.6.0.0",
|
||||
"version": "v2.6.1",
|
||||
"version_normalized": "2.6.1.0",
|
||||
"target-dir": "Symfony/Component/HttpKernel",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/HttpKernel.git",
|
||||
"reference": "0e3cad4d574e84b01d2a0df706bb31f024a93bdc"
|
||||
"reference": "6e911d8a9e1a11c4584ad7b03858afa94e627203"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/HttpKernel/zipball/0e3cad4d574e84b01d2a0df706bb31f024a93bdc",
|
||||
"reference": "0e3cad4d574e84b01d2a0df706bb31f024a93bdc",
|
||||
"url": "https://api.github.com/repos/symfony/HttpKernel/zipball/6e911d8a9e1a11c4584ad7b03858afa94e627203",
|
||||
"reference": "6e911d8a9e1a11c4584ad7b03858afa94e627203",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -2275,7 +2275,7 @@
|
|||
"symfony/finder": "",
|
||||
"symfony/var-dumper": ""
|
||||
},
|
||||
"time": "2014-11-28 15:59:01",
|
||||
"time": "2014-12-03 16:40:43",
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
|
|
@ -2307,18 +2307,18 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/routing",
|
||||
"version": "v2.6.0",
|
||||
"version_normalized": "2.6.0.0",
|
||||
"version": "v2.6.1",
|
||||
"version_normalized": "2.6.1.0",
|
||||
"target-dir": "Symfony/Component/Routing",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/Routing.git",
|
||||
"reference": "5e2c6aba6cbb00a6b7e3760db99f72c85c52b6e5"
|
||||
"reference": "b50c10839e1639fb3a89710f9510b63cc8be54c5"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/Routing/zipball/5e2c6aba6cbb00a6b7e3760db99f72c85c52b6e5",
|
||||
"reference": "5e2c6aba6cbb00a6b7e3760db99f72c85c52b6e5",
|
||||
"url": "https://api.github.com/repos/symfony/Routing/zipball/b50c10839e1639fb3a89710f9510b63cc8be54c5",
|
||||
"reference": "b50c10839e1639fb3a89710f9510b63cc8be54c5",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -2338,7 +2338,7 @@
|
|||
"symfony/expression-language": "For using expression matching",
|
||||
"symfony/yaml": "For using the YAML loader"
|
||||
},
|
||||
"time": "2014-11-16 17:28:09",
|
||||
"time": "2014-12-02 20:19:20",
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
|
|
@ -2376,24 +2376,24 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/serializer",
|
||||
"version": "v2.6.0",
|
||||
"version_normalized": "2.6.0.0",
|
||||
"version": "v2.6.1",
|
||||
"version_normalized": "2.6.1.0",
|
||||
"target-dir": "Symfony/Component/Serializer",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/Serializer.git",
|
||||
"reference": "16e548902fab42d26ceb1de5ca06ab676d1a81a7"
|
||||
"reference": "b527ccecd455fc70a805fb25b81e08eb37f3fc5d"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/Serializer/zipball/16e548902fab42d26ceb1de5ca06ab676d1a81a7",
|
||||
"reference": "16e548902fab42d26ceb1de5ca06ab676d1a81a7",
|
||||
"url": "https://api.github.com/repos/symfony/Serializer/zipball/b527ccecd455fc70a805fb25b81e08eb37f3fc5d",
|
||||
"reference": "b527ccecd455fc70a805fb25b81e08eb37f3fc5d",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.3.3"
|
||||
},
|
||||
"time": "2014-11-20 13:24:23",
|
||||
"time": "2014-12-02 20:19:20",
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
|
|
@ -2425,18 +2425,18 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/translation",
|
||||
"version": "v2.6.0",
|
||||
"version_normalized": "2.6.0.0",
|
||||
"version": "v2.6.1",
|
||||
"version_normalized": "2.6.1.0",
|
||||
"target-dir": "Symfony/Component/Translation",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/Translation.git",
|
||||
"reference": "0a3711860976f15ee46642b4dd354e9ef9fc9a15"
|
||||
"reference": "5b8bf84a43317021849813f556f26dc35968156b"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/Translation/zipball/0a3711860976f15ee46642b4dd354e9ef9fc9a15",
|
||||
"reference": "0a3711860976f15ee46642b4dd354e9ef9fc9a15",
|
||||
"url": "https://api.github.com/repos/symfony/Translation/zipball/5b8bf84a43317021849813f556f26dc35968156b",
|
||||
"reference": "5b8bf84a43317021849813f556f26dc35968156b",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -2453,7 +2453,7 @@
|
|||
"symfony/config": "",
|
||||
"symfony/yaml": ""
|
||||
},
|
||||
"time": "2014-11-28 10:00:40",
|
||||
"time": "2014-12-02 20:19:20",
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
|
|
@ -2485,18 +2485,18 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/validator",
|
||||
"version": "v2.6.0",
|
||||
"version_normalized": "2.6.0.0",
|
||||
"version": "v2.6.1",
|
||||
"version_normalized": "2.6.1.0",
|
||||
"target-dir": "Symfony/Component/Validator",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/Validator.git",
|
||||
"reference": "cbf6575c4c9c83621df01483e215599f5377fc0b"
|
||||
"reference": "4583e0321f1bcdad14d93e265eaca1001035b5c4"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/Validator/zipball/cbf6575c4c9c83621df01483e215599f5377fc0b",
|
||||
"reference": "cbf6575c4c9c83621df01483e215599f5377fc0b",
|
||||
"url": "https://api.github.com/repos/symfony/Validator/zipball/4583e0321f1bcdad14d93e265eaca1001035b5c4",
|
||||
"reference": "4583e0321f1bcdad14d93e265eaca1001035b5c4",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -2525,7 +2525,7 @@
|
|||
"symfony/property-access": "For using the 2.4 Validator API",
|
||||
"symfony/yaml": ""
|
||||
},
|
||||
"time": "2014-11-28 10:00:40",
|
||||
"time": "2014-12-02 20:19:20",
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
|
|
@ -2557,24 +2557,24 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/yaml",
|
||||
"version": "v2.6.0",
|
||||
"version_normalized": "2.6.0.0",
|
||||
"version": "v2.6.1",
|
||||
"version_normalized": "2.6.1.0",
|
||||
"target-dir": "Symfony/Component/Yaml",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/Yaml.git",
|
||||
"reference": "51c845cf3e4bfc182d1d5c05ed1c7338361d86f8"
|
||||
"reference": "3346fc090a3eb6b53d408db2903b241af51dcb20"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/Yaml/zipball/51c845cf3e4bfc182d1d5c05ed1c7338361d86f8",
|
||||
"reference": "51c845cf3e4bfc182d1d5c05ed1c7338361d86f8",
|
||||
"url": "https://api.github.com/repos/symfony/Yaml/zipball/3346fc090a3eb6b53d408db2903b241af51dcb20",
|
||||
"reference": "3346fc090a3eb6b53d408db2903b241af51dcb20",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.3.3"
|
||||
},
|
||||
"time": "2014-11-20 13:24:23",
|
||||
"time": "2014-12-02 20:19:20",
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
|
|
|
|||
|
|
@ -54,8 +54,8 @@ class ApcClassLoader
|
|||
/**
|
||||
* Constructor.
|
||||
*
|
||||
* @param string $prefix The APC namespace prefix to use.
|
||||
* @param object $decorated A class loader object that implements the findFile() method.
|
||||
* @param string $prefix The APC namespace prefix to use.
|
||||
* @param object $decorated A class loader object that implements the findFile() method.
|
||||
*
|
||||
* @throws \RuntimeException
|
||||
* @throws \InvalidArgumentException
|
||||
|
|
@ -79,7 +79,7 @@ class ApcClassLoader
|
|||
/**
|
||||
* Registers this instance as an autoloader.
|
||||
*
|
||||
* @param bool $prepend Whether to prepend the autoloader or not
|
||||
* @param bool $prepend Whether to prepend the autoloader or not
|
||||
*/
|
||||
public function register($prepend = false)
|
||||
{
|
||||
|
|
@ -99,7 +99,7 @@ class ApcClassLoader
|
|||
*
|
||||
* @param string $class The name of the class
|
||||
*
|
||||
* @return bool|null True, if loaded
|
||||
* @return bool|null True, if loaded
|
||||
*/
|
||||
public function loadClass($class)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -25,12 +25,12 @@ class ClassCollectionLoader
|
|||
/**
|
||||
* Loads a list of classes and caches them in one big file.
|
||||
*
|
||||
* @param array $classes An array of classes to load
|
||||
* @param string $cacheDir A cache directory
|
||||
* @param string $name The cache name prefix
|
||||
* @param bool $autoReload Whether to flush the cache when the cache is stale or not
|
||||
* @param bool $adaptive Whether to remove already declared classes or not
|
||||
* @param string $extension File extension of the resulting file
|
||||
* @param array $classes An array of classes to load
|
||||
* @param string $cacheDir A cache directory
|
||||
* @param string $name The cache name prefix
|
||||
* @param bool $autoReload Whether to flush the cache when the cache is stale or not
|
||||
* @param bool $adaptive Whether to remove already declared classes or not
|
||||
* @param string $extension File extension of the resulting file
|
||||
*
|
||||
* @throws \InvalidArgumentException When class can't be loaded
|
||||
*/
|
||||
|
|
@ -335,10 +335,10 @@ class ClassCollectionLoader
|
|||
* This function does not check for circular dependencies as it should never
|
||||
* occur with PHP traits.
|
||||
*
|
||||
* @param array $tree The dependency tree
|
||||
* @param \ReflectionClass $node The node
|
||||
* @param \ArrayObject $resolved An array of already resolved dependencies
|
||||
* @param \ArrayObject $unresolved An array of dependencies to be resolved
|
||||
* @param array $tree The dependency tree
|
||||
* @param \ReflectionClass $node The node
|
||||
* @param \ArrayObject $resolved An array of already resolved dependencies
|
||||
* @param \ArrayObject $unresolved An array of dependencies to be resolved
|
||||
*
|
||||
* @return \ArrayObject The dependencies for the given node
|
||||
*
|
||||
|
|
|
|||
|
|
@ -103,7 +103,7 @@ class ClassLoader
|
|||
/**
|
||||
* Turns on searching the include for class files.
|
||||
*
|
||||
* @param bool $useIncludePath
|
||||
* @param bool $useIncludePath
|
||||
*/
|
||||
public function setUseIncludePath($useIncludePath)
|
||||
{
|
||||
|
|
@ -124,7 +124,7 @@ class ClassLoader
|
|||
/**
|
||||
* Registers this instance as an autoloader.
|
||||
*
|
||||
* @param bool $prepend Whether to prepend the autoloader or not
|
||||
* @param bool $prepend Whether to prepend the autoloader or not
|
||||
*/
|
||||
public function register($prepend = false)
|
||||
{
|
||||
|
|
@ -144,7 +144,7 @@ class ClassLoader
|
|||
*
|
||||
* @param string $class The name of the class
|
||||
*
|
||||
* @return bool|null True, if loaded
|
||||
* @return bool|null True, if loaded
|
||||
*/
|
||||
public function loadClass($class)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -11,10 +11,12 @@
|
|||
|
||||
namespace Symfony\Component\ClassLoader;
|
||||
|
||||
if (PHP_VERSION_ID >= 50400) {
|
||||
define('SYMFONY_TRAIT', T_TRAIT);
|
||||
} else {
|
||||
define('SYMFONY_TRAIT', 0);
|
||||
if (!defined('SYMFONY_TRAIT')) {
|
||||
if (PHP_VERSION_ID >= 50400) {
|
||||
define('SYMFONY_TRAIT', T_TRAIT);
|
||||
} else {
|
||||
define('SYMFONY_TRAIT', 0);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ class DebugClassLoader
|
|||
*
|
||||
* @param string $class The name of the class
|
||||
*
|
||||
* @return bool|null True, if loaded
|
||||
* @return bool|null True, if loaded
|
||||
*
|
||||
* @throws \RuntimeException
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ class MapClassLoader
|
|||
/**
|
||||
* Registers this instance as an autoloader.
|
||||
*
|
||||
* @param bool $prepend Whether to prepend the autoloader or not
|
||||
* @param bool $prepend Whether to prepend the autoloader or not
|
||||
*/
|
||||
public function register($prepend = false)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -227,7 +227,7 @@ class WithComments
|
|||
{
|
||||
public static \$loaded = true;
|
||||
}
|
||||
\$string ='string shoult not be modified {\$string}';
|
||||
\$string ='string should not be modified {\$string}';
|
||||
\$heredoc = (<<<HD
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ class WithComments
|
|||
public static $loaded = true;
|
||||
}
|
||||
|
||||
$string = 'string shoult not be modified {$string}';
|
||||
$string = 'string should not be modified {$string}';
|
||||
|
||||
$heredoc = (<<<HD
|
||||
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ class UniversalClassLoader
|
|||
* Turns on searching the include for class files. Allows easy loading
|
||||
* of installed PEAR packages
|
||||
*
|
||||
* @param bool $useIncludePath
|
||||
* @param bool $useIncludePath
|
||||
*/
|
||||
public function useIncludePath($useIncludePath)
|
||||
{
|
||||
|
|
@ -229,7 +229,7 @@ class UniversalClassLoader
|
|||
/**
|
||||
* Registers this instance as an autoloader.
|
||||
*
|
||||
* @param bool $prepend Whether to prepend the autoloader or not
|
||||
* @param bool $prepend Whether to prepend the autoloader or not
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
|
|
@ -243,7 +243,7 @@ class UniversalClassLoader
|
|||
*
|
||||
* @param string $class The name of the class
|
||||
*
|
||||
* @return bool|null True, if loaded
|
||||
* @return bool|null True, if loaded
|
||||
*/
|
||||
public function loadClass($class)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -53,8 +53,8 @@ class WinCacheClassLoader
|
|||
/**
|
||||
* Constructor.
|
||||
*
|
||||
* @param string $prefix The WinCache namespace prefix to use.
|
||||
* @param object $decorated A class loader object that implements the findFile() method.
|
||||
* @param string $prefix The WinCache namespace prefix to use.
|
||||
* @param object $decorated A class loader object that implements the findFile() method.
|
||||
*
|
||||
* @throws \RuntimeException
|
||||
* @throws \InvalidArgumentException
|
||||
|
|
@ -76,7 +76,7 @@ class WinCacheClassLoader
|
|||
/**
|
||||
* Registers this instance as an autoloader.
|
||||
*
|
||||
* @param bool $prepend Whether to prepend the autoloader or not
|
||||
* @param bool $prepend Whether to prepend the autoloader or not
|
||||
*/
|
||||
public function register($prepend = false)
|
||||
{
|
||||
|
|
@ -96,7 +96,7 @@ class WinCacheClassLoader
|
|||
*
|
||||
* @param string $class The name of the class
|
||||
*
|
||||
* @return bool|null True, if loaded
|
||||
* @return bool|null True, if loaded
|
||||
*/
|
||||
public function loadClass($class)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -52,8 +52,8 @@ class XcacheClassLoader
|
|||
/**
|
||||
* Constructor.
|
||||
*
|
||||
* @param string $prefix The XCache namespace prefix to use.
|
||||
* @param object $decorated A class loader object that implements the findFile() method.
|
||||
* @param string $prefix The XCache namespace prefix to use.
|
||||
* @param object $decorated A class loader object that implements the findFile() method.
|
||||
*
|
||||
* @throws \RuntimeException
|
||||
* @throws \InvalidArgumentException
|
||||
|
|
@ -77,7 +77,7 @@ class XcacheClassLoader
|
|||
/**
|
||||
* Registers this instance as an autoloader.
|
||||
*
|
||||
* @param bool $prepend Whether to prepend the autoloader or not
|
||||
* @param bool $prepend Whether to prepend the autoloader or not
|
||||
*/
|
||||
public function register($prepend = false)
|
||||
{
|
||||
|
|
@ -97,7 +97,7 @@ class XcacheClassLoader
|
|||
*
|
||||
* @param string $class The name of the class
|
||||
*
|
||||
* @return bool|null True, if loaded
|
||||
* @return bool|null True, if loaded
|
||||
*/
|
||||
public function loadClass($class)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -40,8 +40,8 @@ class CssSelector
|
|||
* Optionally, a prefix can be added to the resulting XPath
|
||||
* expression with the $prefix parameter.
|
||||
*
|
||||
* @param mixed $cssExpr The CSS expression.
|
||||
* @param string $prefix An optional prefix for the XPath expression.
|
||||
* @param mixed $cssExpr The CSS expression.
|
||||
* @param string $prefix An optional prefix for the XPath expression.
|
||||
*
|
||||
* @return string
|
||||
*
|
||||
|
|
|
|||
|
|
@ -45,8 +45,8 @@ class NodeExtension extends AbstractExtension
|
|||
}
|
||||
|
||||
/**
|
||||
* @param int $flag
|
||||
* @param bool $on
|
||||
* @param int $flag
|
||||
* @param bool $on
|
||||
*
|
||||
* @return NodeExtension
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -227,7 +227,7 @@ class Translator implements TranslatorInterface
|
|||
}
|
||||
|
||||
/**
|
||||
* @param XPathExpr $xpath
|
||||
* @param XPathExpr $xpath
|
||||
* @param FunctionNode $function
|
||||
*
|
||||
* @return XPathExpr
|
||||
|
|
|
|||
|
|
@ -37,10 +37,10 @@ class XPathExpr
|
|||
private $condition;
|
||||
|
||||
/**
|
||||
* @param string $path
|
||||
* @param string $element
|
||||
* @param string $condition
|
||||
* @param bool $starPrefix
|
||||
* @param string $path
|
||||
* @param string $element
|
||||
* @param string $condition
|
||||
* @param bool $starPrefix
|
||||
*/
|
||||
public function __construct($path = '', $element = '*', $condition = '', $starPrefix = false)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -28,8 +28,8 @@ class Debug
|
|||
* If the Symfony ClassLoader component is available, a special
|
||||
* class loader is also registered.
|
||||
*
|
||||
* @param int $errorReportingLevel The level of error reporting you want
|
||||
* @param bool $displayErrors Whether to display errors (for development) or just log them (for production)
|
||||
* @param int $errorReportingLevel The level of error reporting you want
|
||||
* @param bool $displayErrors Whether to display errors (for development) or just log them (for production)
|
||||
*/
|
||||
public static function enable($errorReportingLevel = null, $displayErrors = true)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -126,9 +126,9 @@ class FlattenExceptionTest extends \PHPUnit_Framework_TestCase
|
|||
|
||||
$flattened->setPrevious($flattened2);
|
||||
|
||||
$this->assertSame($flattened2,$flattened->getPrevious());
|
||||
$this->assertSame($flattened2, $flattened->getPrevious());
|
||||
|
||||
$this->assertSame(array($flattened2),$flattened->getAllPrevious());
|
||||
$this->assertSame(array($flattened2), $flattened->getAllPrevious());
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -162,7 +162,7 @@ class FlattenExceptionTest extends \PHPUnit_Framework_TestCase
|
|||
'message' => 'test',
|
||||
'class' => 'Exception',
|
||||
'trace' => array(array(
|
||||
'namespace' => '', 'short_class' => '', 'class' => '','type' => '','function' => '', 'file' => 'foo.php', 'line' => 123,
|
||||
'namespace' => '', 'short_class' => '', 'class' => '', 'type' => '', 'function' => '', 'file' => 'foo.php', 'line' => 123,
|
||||
'args' => array(),
|
||||
)),
|
||||
),
|
||||
|
|
@ -214,12 +214,12 @@ class FlattenExceptionTest extends \PHPUnit_Framework_TestCase
|
|||
'class' => 'Exception',
|
||||
'trace' => array(
|
||||
array(
|
||||
'namespace' => '', 'short_class' => '', 'class' => '','type' => '','function' => '',
|
||||
'namespace' => '', 'short_class' => '', 'class' => '', 'type' => '', 'function' => '',
|
||||
'file' => 'foo.php', 'line' => 123,
|
||||
'args' => array(),
|
||||
),
|
||||
array(
|
||||
'namespace' => '', 'short_class' => '', 'class' => '','type' => '','function' => 'test',
|
||||
'namespace' => '', 'short_class' => '', 'class' => '', 'type' => '', 'function' => 'test',
|
||||
'file' => __FILE__, 'line' => 123,
|
||||
'args' => array(
|
||||
array(
|
||||
|
|
|
|||
|
|
@ -22,8 +22,8 @@ class Alias
|
|||
/**
|
||||
* Constructor.
|
||||
*
|
||||
* @param string $id Alias identifier
|
||||
* @param bool $public If this alias is public
|
||||
* @param string $id Alias identifier
|
||||
* @param bool $public If this alias is public
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
|
|
@ -48,7 +48,7 @@ class Alias
|
|||
/**
|
||||
* Sets if this Alias is public.
|
||||
*
|
||||
* @param bool $boolean If this Alias should be public
|
||||
* @param bool $boolean If this Alias should be public
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ class AnalyzeServiceReferencesPass implements RepeatablePassInterface
|
|||
/**
|
||||
* Constructor.
|
||||
*
|
||||
* @param bool $onlyConstructorArguments Sets this Service Reference pass to ignore method calls
|
||||
* @param bool $onlyConstructorArguments Sets this Service Reference pass to ignore method calls
|
||||
*/
|
||||
public function __construct($onlyConstructorArguments = false)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ class InlineServiceDefinitionsPass implements RepeatablePassInterface
|
|||
* @param string $id
|
||||
* @param Definition $definition
|
||||
*
|
||||
* @return bool If the definition is inlineable
|
||||
* @return bool If the definition is inlineable
|
||||
*/
|
||||
private function isInlineableDefinition(ContainerBuilder $container, $id, Definition $definition)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -69,8 +69,8 @@ class ResolveInvalidReferencesPass implements CompilerPassInterface
|
|||
/**
|
||||
* Processes arguments to determine invalid references.
|
||||
*
|
||||
* @param array $arguments An array of Reference objects
|
||||
* @param bool $inMethodCall
|
||||
* @param array $arguments An array of Reference objects
|
||||
* @param bool $inMethodCall
|
||||
*
|
||||
* @return array
|
||||
*
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ class ServiceReferenceGraphNode
|
|||
/**
|
||||
* Checks if the value of this node is an Alias.
|
||||
*
|
||||
* @return bool True if the value is an Alias instance
|
||||
* @return bool True if the value is an Alias instance
|
||||
*/
|
||||
public function isAlias()
|
||||
{
|
||||
|
|
@ -73,7 +73,7 @@ class ServiceReferenceGraphNode
|
|||
/**
|
||||
* Checks if the value of this node is a Definition.
|
||||
*
|
||||
* @return bool True if the value is a Definition instance
|
||||
* @return bool True if the value is a Definition instance
|
||||
*/
|
||||
public function isDefinition()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ class Container implements IntrospectableContainerInterface
|
|||
/**
|
||||
* Returns true if the container parameter bag are frozen.
|
||||
*
|
||||
* @return bool true if the container parameter bag are frozen, false otherwise
|
||||
* @return bool true if the container parameter bag are frozen, false otherwise
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
|
|
@ -136,7 +136,7 @@ class Container implements IntrospectableContainerInterface
|
|||
*
|
||||
* @param string $name The parameter name
|
||||
*
|
||||
* @return mixed The parameter value
|
||||
* @return mixed The parameter value
|
||||
*
|
||||
* @throws InvalidArgumentException if the parameter is not defined
|
||||
*
|
||||
|
|
@ -152,7 +152,7 @@ class Container implements IntrospectableContainerInterface
|
|||
*
|
||||
* @param string $name The parameter name
|
||||
*
|
||||
* @return bool The presence of parameter in container
|
||||
* @return bool The presence of parameter in container
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
|
|
@ -184,7 +184,7 @@ class Container implements IntrospectableContainerInterface
|
|||
* @param object $service The service instance
|
||||
* @param string $scope The scope of the service
|
||||
*
|
||||
* @throws RuntimeException When trying to set a service in an inactive scope
|
||||
* @throws RuntimeException When trying to set a service in an inactive scope
|
||||
* @throws InvalidArgumentException When trying to set a service in the prototype scope
|
||||
*
|
||||
* @api
|
||||
|
|
@ -231,7 +231,7 @@ class Container implements IntrospectableContainerInterface
|
|||
*
|
||||
* @param string $id The service identifier
|
||||
*
|
||||
* @return bool true if the service is defined, false otherwise
|
||||
* @return bool true if the service is defined, false otherwise
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
|
|
@ -256,8 +256,8 @@ class Container implements IntrospectableContainerInterface
|
|||
* If a service is defined both through a set() method and
|
||||
* with a get{$id}Service() method, the former has always precedence.
|
||||
*
|
||||
* @param string $id The service identifier
|
||||
* @param int $invalidBehavior The behavior when the service does not exist
|
||||
* @param string $id The service identifier
|
||||
* @param int $invalidBehavior The behavior when the service does not exist
|
||||
*
|
||||
* @return object The associated service
|
||||
*
|
||||
|
|
@ -348,7 +348,7 @@ class Container implements IntrospectableContainerInterface
|
|||
*
|
||||
* @param string $id The service identifier
|
||||
*
|
||||
* @return bool true if service has already been initialized, false otherwise
|
||||
* @return bool true if service has already been initialized, false otherwise
|
||||
*/
|
||||
public function initialized($id)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
* If you are not using the loaders and therefore don't want
|
||||
* to depend on the Config component, set this flag to false.
|
||||
*
|
||||
* @param bool $track true if you want to track resources, false otherwise
|
||||
* @param bool $track true if you want to track resources, false otherwise
|
||||
*/
|
||||
public function setResourceTracking($track)
|
||||
{
|
||||
|
|
@ -106,7 +106,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
/**
|
||||
* Checks if resources are tracked.
|
||||
*
|
||||
* @return bool true if resources are tracked, false otherwise
|
||||
* @return bool true if resources are tracked, false otherwise
|
||||
*/
|
||||
public function isTrackingResources()
|
||||
{
|
||||
|
|
@ -180,7 +180,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
*
|
||||
* @param string $name The name of the extension
|
||||
*
|
||||
* @return bool If the extension exists
|
||||
* @return bool If the extension exists
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
|
|
@ -285,7 +285,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
* @param string $extension The extension alias or namespace
|
||||
* @param array $values An array of values that customizes the extension
|
||||
*
|
||||
* @return ContainerBuilder The current instance
|
||||
* @return ContainerBuilder The current instance
|
||||
* @throws BadMethodCallException When this ContainerBuilder is frozen
|
||||
*
|
||||
* @throws \LogicException if the container is frozen
|
||||
|
|
@ -434,7 +434,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
*
|
||||
* @param string $id The service identifier
|
||||
*
|
||||
* @return bool true if the service is defined, false otherwise
|
||||
* @return bool true if the service is defined, false otherwise
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
|
|
@ -448,8 +448,8 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
/**
|
||||
* Gets a service.
|
||||
*
|
||||
* @param string $id The service identifier
|
||||
* @param int $invalidBehavior The behavior when the service does not exist
|
||||
* @param string $id The service identifier
|
||||
* @param int $invalidBehavior The behavior when the service does not exist
|
||||
*
|
||||
* @return object The associated service
|
||||
*
|
||||
|
|
@ -574,8 +574,8 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
/**
|
||||
* Prepends a config array to the configs of the given extension.
|
||||
*
|
||||
* @param string $name The name of the extension
|
||||
* @param array $config The config to set
|
||||
* @param string $name The name of the extension
|
||||
* @param array $config The config to set
|
||||
*/
|
||||
public function prependExtensionConfig($name, array $config)
|
||||
{
|
||||
|
|
@ -667,8 +667,8 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
/**
|
||||
* Sets an alias for an existing service.
|
||||
*
|
||||
* @param string $alias The alias to create
|
||||
* @param string|Alias $id The service to alias
|
||||
* @param string $alias The alias to create
|
||||
* @param string|Alias $id The service to alias
|
||||
*
|
||||
* @throws InvalidArgumentException if the id is not a string or an Alias
|
||||
* @throws InvalidArgumentException if the alias is for itself
|
||||
|
|
@ -711,7 +711,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
*
|
||||
* @param string $id The service identifier
|
||||
*
|
||||
* @return bool true if the alias exists, false otherwise
|
||||
* @return bool true if the alias exists, false otherwise
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
|
|
@ -841,7 +841,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
*
|
||||
* @param string $id The service identifier
|
||||
*
|
||||
* @return bool true if the service definition exists, false otherwise
|
||||
* @return bool true if the service definition exists, false otherwise
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
|
|
@ -903,9 +903,9 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
*
|
||||
* @return object The service described by the service definition
|
||||
*
|
||||
* @throws RuntimeException When the scope is inactive
|
||||
* @throws RuntimeException When the factory definition is incomplete
|
||||
* @throws RuntimeException When the service is a synthetic service
|
||||
* @throws RuntimeException When the scope is inactive
|
||||
* @throws RuntimeException When the factory definition is incomplete
|
||||
* @throws RuntimeException When the service is a synthetic service
|
||||
* @throws InvalidArgumentException When configure callable is not callable
|
||||
*
|
||||
* @internal this method is public because of PHP 5.3 limitations, do not use it explicitly in your code
|
||||
|
|
|
|||
|
|
@ -50,9 +50,9 @@ interface ContainerInterface
|
|||
*
|
||||
* @return object The associated service
|
||||
*
|
||||
* @throws InvalidArgumentException if the service is not defined
|
||||
* @throws InvalidArgumentException if the service is not defined
|
||||
* @throws ServiceCircularReferenceException When a circular reference is detected
|
||||
* @throws ServiceNotFoundException When the service is not defined
|
||||
* @throws ServiceNotFoundException When the service is not defined
|
||||
*
|
||||
* @see Reference
|
||||
*
|
||||
|
|
@ -65,7 +65,7 @@ interface ContainerInterface
|
|||
*
|
||||
* @param string $id The service identifier
|
||||
*
|
||||
* @return bool true if the service is defined, false otherwise
|
||||
* @return bool true if the service is defined, false otherwise
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
|
|
@ -76,7 +76,7 @@ interface ContainerInterface
|
|||
*
|
||||
* @param string $name The parameter name
|
||||
*
|
||||
* @return mixed The parameter value
|
||||
* @return mixed The parameter value
|
||||
*
|
||||
* @throws InvalidArgumentException if the parameter is not defined
|
||||
*
|
||||
|
|
@ -89,7 +89,7 @@ interface ContainerInterface
|
|||
*
|
||||
* @param string $name The parameter name
|
||||
*
|
||||
* @return bool The presence of parameter in container
|
||||
* @return bool The presence of parameter in container
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -302,8 +302,8 @@ class Definition
|
|||
/**
|
||||
* Sets a specific argument
|
||||
*
|
||||
* @param int $index
|
||||
* @param mixed $argument
|
||||
* @param int $index
|
||||
* @param mixed $argument
|
||||
*
|
||||
* @return Definition The current instance
|
||||
*
|
||||
|
|
@ -337,7 +337,7 @@ class Definition
|
|||
/**
|
||||
* Gets an argument to pass to the service constructor/factory method.
|
||||
*
|
||||
* @param int $index
|
||||
* @param int $index
|
||||
*
|
||||
* @return mixed The argument value
|
||||
*
|
||||
|
|
@ -610,7 +610,7 @@ class Definition
|
|||
/**
|
||||
* Sets the visibility of this service.
|
||||
*
|
||||
* @param bool $boolean
|
||||
* @param bool $boolean
|
||||
*
|
||||
* @return Definition The current instance
|
||||
*
|
||||
|
|
@ -638,7 +638,7 @@ class Definition
|
|||
/**
|
||||
* Sets the synchronized flag of this service.
|
||||
*
|
||||
* @param bool $boolean
|
||||
* @param bool $boolean
|
||||
*
|
||||
* @return Definition The current instance
|
||||
*
|
||||
|
|
@ -666,7 +666,7 @@ class Definition
|
|||
/**
|
||||
* Sets the lazy flag of this service.
|
||||
*
|
||||
* @param bool $lazy
|
||||
* @param bool $lazy
|
||||
*
|
||||
* @return Definition The current instance
|
||||
*/
|
||||
|
|
@ -691,7 +691,7 @@ class Definition
|
|||
* Sets whether this definition is synthetic, that is not constructed by the
|
||||
* container, but dynamically injected.
|
||||
*
|
||||
* @param bool $boolean
|
||||
* @param bool $boolean
|
||||
*
|
||||
* @return Definition the current instance
|
||||
*
|
||||
|
|
@ -721,7 +721,7 @@ class Definition
|
|||
* Whether this definition is abstract, that means it merely serves as a
|
||||
* template for other definitions.
|
||||
*
|
||||
* @param bool $boolean
|
||||
* @param bool $boolean
|
||||
*
|
||||
* @return Definition the current instance
|
||||
*
|
||||
|
|
|
|||
|
|
@ -176,7 +176,7 @@ class DefinitionDecorator extends Definition
|
|||
* If replaceArgument() has been used to replace an argument, this method
|
||||
* will return the replacement value.
|
||||
*
|
||||
* @param int $index
|
||||
* @param int $index
|
||||
*
|
||||
* @return mixed The argument value
|
||||
*
|
||||
|
|
@ -207,10 +207,10 @@ class DefinitionDecorator extends Definition
|
|||
* certain conventions when you want to overwrite the arguments of the
|
||||
* parent definition, otherwise your arguments will only be appended.
|
||||
*
|
||||
* @param int $index
|
||||
* @param mixed $value
|
||||
* @param int $index
|
||||
* @param mixed $value
|
||||
*
|
||||
* @return DefinitionDecorator the current instance
|
||||
* @return DefinitionDecorator the current instance
|
||||
* @throws InvalidArgumentException when $index isn't an integer
|
||||
*
|
||||
* @api
|
||||
|
|
|
|||
|
|
@ -123,10 +123,10 @@ class GraphvizDumper extends Dumper
|
|||
/**
|
||||
* Finds all edges belonging to a specific service id.
|
||||
*
|
||||
* @param string $id The service id used to find edges
|
||||
* @param array $arguments An array of arguments
|
||||
* @param bool $required
|
||||
* @param string $name
|
||||
* @param string $id The service id used to find edges
|
||||
* @param array $arguments An array of arguments
|
||||
* @param bool $required
|
||||
* @param string $name
|
||||
*
|
||||
* @return array An array of edges
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -55,6 +55,8 @@ class PhpDumper extends Dumper
|
|||
private $variableCount;
|
||||
private $reservedVariables = array('instance', 'class');
|
||||
private $expressionLanguage;
|
||||
private $targetDirRegex;
|
||||
private $targetDirMaxMatches;
|
||||
|
||||
/**
|
||||
* @var ExpressionFunctionProviderInterface[]
|
||||
|
|
@ -105,12 +107,36 @@ class PhpDumper extends Dumper
|
|||
*/
|
||||
public function dump(array $options = array())
|
||||
{
|
||||
$this->targetDirRegex = null;
|
||||
$options = array_merge(array(
|
||||
'class' => 'ProjectServiceContainer',
|
||||
'base_class' => 'Container',
|
||||
'namespace' => '',
|
||||
), $options);
|
||||
|
||||
if (!empty($options['file']) && is_dir($dir = dirname($options['file']))) {
|
||||
// Build a regexp where the first two root dirs are mandatory,
|
||||
// but every other sub-dir is optional up to the full path in $dir
|
||||
|
||||
$dir = explode(DIRECTORY_SEPARATOR, realpath($dir));
|
||||
$i = count($dir);
|
||||
|
||||
if (3 <= $i) {
|
||||
$regex = '';
|
||||
$this->targetDirMaxMatches = $i - 3;
|
||||
|
||||
while (2 < --$i) {
|
||||
$regex = sprintf('(%s%s)?', preg_quote(DIRECTORY_SEPARATOR.$dir[$i], '#'), $regex);
|
||||
}
|
||||
|
||||
do {
|
||||
$regex = preg_quote(DIRECTORY_SEPARATOR.$dir[$i], '#').$regex;
|
||||
} while (0 < --$i);
|
||||
|
||||
$this->targetDirRegex = '#'.preg_quote($dir[0], '#').$regex.'#';
|
||||
}
|
||||
}
|
||||
|
||||
$code = $this->startClass($options['class'], $options['base_class'], $options['namespace']);
|
||||
|
||||
if ($this->container->isFrozen()) {
|
||||
|
|
@ -126,6 +152,7 @@ class PhpDumper extends Dumper
|
|||
$this->endClass().
|
||||
$this->addProxyClasses()
|
||||
;
|
||||
$this->targetDirRegex = null;
|
||||
|
||||
return $code;
|
||||
}
|
||||
|
|
@ -254,7 +281,7 @@ class PhpDumper extends Dumper
|
|||
*
|
||||
* @return string
|
||||
*
|
||||
* @throws RuntimeException When the factory definition is incomplete
|
||||
* @throws RuntimeException When the factory definition is incomplete
|
||||
* @throws ServiceCircularReferenceException When a circular reference is detected
|
||||
*/
|
||||
private function addServiceInlinedDefinitions($id, $definition)
|
||||
|
|
@ -796,6 +823,8 @@ $bagClass
|
|||
*/
|
||||
class $class extends $baseClass
|
||||
{
|
||||
private \$parameters;
|
||||
|
||||
EOF;
|
||||
}
|
||||
|
||||
|
|
@ -810,14 +839,14 @@ EOF;
|
|||
|
||||
$code = <<<EOF
|
||||
|
||||
private static \$parameters = $parameters;
|
||||
|
||||
/**
|
||||
* Constructor.
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
parent::__construct(new ParameterBag(self::\$parameters));
|
||||
\$this->parameters = $parameters;
|
||||
|
||||
parent::__construct(new ParameterBag(\$this->parameters));
|
||||
|
||||
EOF;
|
||||
|
||||
|
|
@ -849,8 +878,6 @@ EOF;
|
|||
|
||||
$code = <<<EOF
|
||||
|
||||
private static \$parameters = $parameters;
|
||||
|
||||
/**
|
||||
* Constructor.
|
||||
*/
|
||||
|
|
@ -859,6 +886,7 @@ EOF;
|
|||
\$this->services =
|
||||
\$this->scopedServices =
|
||||
\$this->scopeStacks = array();
|
||||
\$this->parameters = $parameters;
|
||||
|
||||
\$this->set('service_container', \$this);
|
||||
|
||||
|
|
@ -974,11 +1002,11 @@ EOF;
|
|||
{
|
||||
\$name = strtolower(\$name);
|
||||
|
||||
if (!(isset(self::\$parameters[\$name]) || array_key_exists(\$name, self::\$parameters))) {
|
||||
if (!(isset(\$this->parameters[\$name]) || array_key_exists(\$name, \$this->parameters))) {
|
||||
throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', \$name));
|
||||
}
|
||||
|
||||
return self::\$parameters[\$name];
|
||||
return \$this->parameters[\$name];
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -988,7 +1016,7 @@ EOF;
|
|||
{
|
||||
\$name = strtolower(\$name);
|
||||
|
||||
return isset(self::\$parameters[\$name]) || array_key_exists(\$name, self::\$parameters);
|
||||
return isset(\$this->parameters[\$name]) || array_key_exists(\$name, \$this->parameters);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -1005,7 +1033,7 @@ EOF;
|
|||
public function getParameterBag()
|
||||
{
|
||||
if (null === \$this->parameterBag) {
|
||||
\$this->parameterBag = new FrozenParameterBag(self::\$parameters);
|
||||
\$this->parameterBag = new FrozenParameterBag(\$this->parameters);
|
||||
}
|
||||
|
||||
return \$this->parameterBag;
|
||||
|
|
@ -1020,9 +1048,9 @@ EOF;
|
|||
/**
|
||||
* Exports parameters.
|
||||
*
|
||||
* @param array $parameters
|
||||
* @param string $path
|
||||
* @param int $indent
|
||||
* @param array $parameters
|
||||
* @param string $path
|
||||
* @param int $indent
|
||||
*
|
||||
* @return string
|
||||
*
|
||||
|
|
@ -1043,7 +1071,7 @@ EOF;
|
|||
} elseif ($value instanceof Expression) {
|
||||
throw new InvalidArgumentException(sprintf('You cannot dump a container with parameters that contain expressions. Expression "%s" found in "%s".', $value, $path.'/'.$key));
|
||||
} else {
|
||||
$value = var_export($value, true);
|
||||
$value = $this->export($value);
|
||||
}
|
||||
|
||||
$php[] = sprintf('%s%s => %s,', str_repeat(' ', $indent), var_export($key, true), $value);
|
||||
|
|
@ -1093,9 +1121,9 @@ EOF;
|
|||
/**
|
||||
* Builds service calls from arguments.
|
||||
*
|
||||
* @param array $arguments
|
||||
* @param array &$calls By reference
|
||||
* @param array &$behavior By reference
|
||||
* @param array $arguments
|
||||
* @param array &$calls By reference
|
||||
* @param array &$behavior By reference
|
||||
*/
|
||||
private function getServiceCallsFromArguments(array $arguments, array &$calls, array &$behavior)
|
||||
{
|
||||
|
|
@ -1173,10 +1201,10 @@ EOF;
|
|||
/**
|
||||
* Checks if a service id has a reference.
|
||||
*
|
||||
* @param string $id
|
||||
* @param array $arguments
|
||||
* @param bool $deep
|
||||
* @param array $visited
|
||||
* @param string $id
|
||||
* @param array $arguments
|
||||
* @param bool $deep
|
||||
* @param array $visited
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
|
|
@ -1212,8 +1240,8 @@ EOF;
|
|||
/**
|
||||
* Dumps values.
|
||||
*
|
||||
* @param mixed $value
|
||||
* @param bool $interpolate
|
||||
* @param mixed $value
|
||||
* @param bool $interpolate
|
||||
*
|
||||
* @return string
|
||||
*
|
||||
|
|
@ -1307,14 +1335,14 @@ EOF;
|
|||
return "'.".$that->dumpParameter(strtolower($match[2])).".'";
|
||||
};
|
||||
|
||||
$code = str_replace('%%', '%', preg_replace_callback('/(?<!%)(%)([^%]+)\1/', $replaceParameters, var_export($value, true)));
|
||||
$code = str_replace('%%', '%', preg_replace_callback('/(?<!%)(%)([^%]+)\1/', $replaceParameters, $this->export($value)));
|
||||
|
||||
return $code;
|
||||
}
|
||||
} elseif (is_object($value) || is_resource($value)) {
|
||||
throw new RuntimeException('Unable to dump a service container if a parameter is an object or a resource.');
|
||||
} else {
|
||||
return var_export($value, true);
|
||||
return $this->export($value);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1445,4 +1473,26 @@ EOF;
|
|||
|
||||
return $this->expressionLanguage;
|
||||
}
|
||||
|
||||
private function export($value)
|
||||
{
|
||||
if (null !== $this->targetDirRegex && is_string($value) && preg_match($this->targetDirRegex, $value, $matches, PREG_OFFSET_CAPTURE)) {
|
||||
$prefix = $matches[0][1] ? var_export(substr($value, 0, $matches[0][1]), true).'.' : '';
|
||||
$suffix = $matches[0][1] + strlen($matches[0][0]);
|
||||
$suffix = isset($value[$suffix]) ? '.'.var_export(substr($value, $suffix), true) : '';
|
||||
$dirname = '__DIR__';
|
||||
|
||||
for ($i = $this->targetDirMaxMatches - count($matches); 0 <= $i; --$i) {
|
||||
$dirname = sprintf('dirname(%s)', $dirname);
|
||||
}
|
||||
|
||||
if ($prefix || $suffix) {
|
||||
return sprintf('(%s%s%s)', $prefix, $dirname, $suffix);
|
||||
}
|
||||
|
||||
return $dirname;
|
||||
}
|
||||
|
||||
return var_export($value, true);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -306,8 +306,8 @@ class YamlDumper extends Dumper
|
|||
/**
|
||||
* Prepares parameters.
|
||||
*
|
||||
* @param array $parameters
|
||||
* @param bool $escape
|
||||
* @param array $parameters
|
||||
* @param bool $escape
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@ abstract class Extension implements ExtensionInterface, ConfigurationExtensionIn
|
|||
* @param ContainerBuilder $container
|
||||
* @param array $config
|
||||
*
|
||||
* @return bool Whether the configuration is enabled
|
||||
* @return bool Whether the configuration is enabled
|
||||
*
|
||||
* @throws InvalidArgumentException When the config is not enableable
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ interface IntrospectableContainerInterface extends ContainerInterface
|
|||
*
|
||||
* @param string $id
|
||||
*
|
||||
* @return bool true if the service has been initialized, false otherwise
|
||||
* @return bool true if the service has been initialized, false otherwise
|
||||
*
|
||||
*/
|
||||
public function initialized($id);
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ class ParameterBag implements ParameterBagInterface
|
|||
*
|
||||
* @param string $name The parameter name
|
||||
*
|
||||
* @return mixed The parameter value
|
||||
* @return mixed The parameter value
|
||||
*
|
||||
* @throws ParameterNotFoundException if the parameter is not defined
|
||||
*
|
||||
|
|
@ -127,7 +127,7 @@ class ParameterBag implements ParameterBagInterface
|
|||
*
|
||||
* @param string $name The parameter name
|
||||
*
|
||||
* @return bool true if the parameter name is defined, false otherwise
|
||||
* @return bool true if the parameter name is defined, false otherwise
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
|
|
@ -181,9 +181,9 @@ class ParameterBag implements ParameterBagInterface
|
|||
*
|
||||
* @return mixed The resolved value
|
||||
*
|
||||
* @throws ParameterNotFoundException if a placeholder references a parameter that does not exist
|
||||
* @throws ParameterNotFoundException if a placeholder references a parameter that does not exist
|
||||
* @throws ParameterCircularReferenceException if a circular reference if detected
|
||||
* @throws RuntimeException when a given parameter has a type problem.
|
||||
* @throws RuntimeException when a given parameter has a type problem.
|
||||
*/
|
||||
public function resolveValue($value, array $resolving = array())
|
||||
{
|
||||
|
|
@ -211,9 +211,9 @@ class ParameterBag implements ParameterBagInterface
|
|||
*
|
||||
* @return string The resolved string
|
||||
*
|
||||
* @throws ParameterNotFoundException if a placeholder references a parameter that does not exist
|
||||
* @throws ParameterNotFoundException if a placeholder references a parameter that does not exist
|
||||
* @throws ParameterCircularReferenceException if a circular reference if detected
|
||||
* @throws RuntimeException when a given parameter has a type problem.
|
||||
* @throws RuntimeException when a given parameter has a type problem.
|
||||
*/
|
||||
public function resolveString($value, array $resolving = array())
|
||||
{
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ interface ParameterBagInterface
|
|||
*
|
||||
* @param string $name The parameter name
|
||||
*
|
||||
* @return mixed The parameter value
|
||||
* @return mixed The parameter value
|
||||
*
|
||||
* @throws ParameterNotFoundException if the parameter is not defined
|
||||
*
|
||||
|
|
@ -75,7 +75,7 @@ interface ParameterBagInterface
|
|||
*
|
||||
* @param string $name The parameter name
|
||||
*
|
||||
* @return bool true if the parameter name is defined, false otherwise
|
||||
* @return bool true if the parameter name is defined, false otherwise
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -27,9 +27,9 @@ class Reference
|
|||
/**
|
||||
* Constructor.
|
||||
*
|
||||
* @param string $id The service identifier
|
||||
* @param int $invalidBehavior The behavior when the service does not exist
|
||||
* @param bool $strict Sets how this reference is validated
|
||||
* @param string $id The service identifier
|
||||
* @param int $invalidBehavior The behavior when the service does not exist
|
||||
* @param bool $strict Sets how this reference is validated
|
||||
*
|
||||
* @see Container
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -38,8 +38,8 @@ class SimpleXMLElement extends \SimpleXMLElement
|
|||
/**
|
||||
* Returns arguments as valid PHP types.
|
||||
*
|
||||
* @param string $name
|
||||
* @param bool $lowercase
|
||||
* @param string $name
|
||||
* @param bool $lowercase
|
||||
*
|
||||
* @return mixed
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -147,9 +147,9 @@ class ResolveDefinitionTemplatesPassTest extends \PHPUnit_Framework_TestCase
|
|||
{
|
||||
$container = new ContainerBuilder();
|
||||
|
||||
$container->register('parent','stdClass');
|
||||
$container->register('parent', 'stdClass');
|
||||
|
||||
$container->setDefinition('child1',new DefinitionDecorator('parent'))
|
||||
$container->setDefinition('child1', new DefinitionDecorator('parent'))
|
||||
->setLazy(true)
|
||||
;
|
||||
|
||||
|
|
@ -162,11 +162,11 @@ class ResolveDefinitionTemplatesPassTest extends \PHPUnit_Framework_TestCase
|
|||
{
|
||||
$container = new ContainerBuilder();
|
||||
|
||||
$container->register('parent','stdClass')
|
||||
$container->register('parent', 'stdClass')
|
||||
->setLazy(true)
|
||||
;
|
||||
|
||||
$container->setDefinition('child1',new DefinitionDecorator('parent'));
|
||||
$container->setDefinition('child1', new DefinitionDecorator('parent'));
|
||||
|
||||
$this->process($container);
|
||||
|
||||
|
|
|
|||
|
|
@ -37,21 +37,6 @@ class PhpDumperTest extends \PHPUnit_Framework_TestCase
|
|||
new PhpDumper($container);
|
||||
}
|
||||
|
||||
public function testDumpFrozenContainerWithNoParameter()
|
||||
{
|
||||
$container = new ContainerBuilder();
|
||||
$container->setResourceTracking(false);
|
||||
$container->register('foo', 'stdClass');
|
||||
|
||||
$container->compile();
|
||||
|
||||
$dumper = new PhpDumper($container);
|
||||
|
||||
$dumpedString = $dumper->dump();
|
||||
$this->assertStringEqualsFile(self::$fixturesPath.'/php/services11.php', $dumpedString, '->dump() does not add getDefaultParameters() method call if container have no parameters.');
|
||||
$this->assertNotRegexp("/function getDefaultParameters\(/", $dumpedString, '->dump() does not add getDefaultParameters() method definition.');
|
||||
}
|
||||
|
||||
public function testDumpOptimizationString()
|
||||
{
|
||||
$definition = new Definition();
|
||||
|
|
@ -80,6 +65,24 @@ class PhpDumperTest extends \PHPUnit_Framework_TestCase
|
|||
$this->assertStringEqualsFile(self::$fixturesPath.'/php/services10.php', $dumper->dump(), '->dump() dumps an empty container as an empty PHP class');
|
||||
}
|
||||
|
||||
public function testDumpRelativeDir()
|
||||
{
|
||||
$definition = new Definition();
|
||||
$definition->setClass('stdClass');
|
||||
$definition->addArgument('%foo%');
|
||||
$definition->addArgument(array('%foo%' => '%foo%'));
|
||||
|
||||
$container = new ContainerBuilder();
|
||||
$container->setDefinition('test', $definition);
|
||||
$container->setParameter('foo', 'wiz'.dirname(dirname(__FILE__)));
|
||||
$container->setParameter('bar', dirname(__FILE__));
|
||||
$container->setParameter('baz', '%bar%/PhpDumperTest.php');
|
||||
$container->compile();
|
||||
|
||||
$dumper = new PhpDumper($container);
|
||||
$this->assertStringEqualsFile(self::$fixturesPath.'/php/services12.php', $dumper->dump(array('file' => __FILE__)), '->dump() dumps __DIR__ relative strings');
|
||||
}
|
||||
|
||||
/**
|
||||
* @expectedException \InvalidArgumentException
|
||||
*/
|
||||
|
|
@ -101,13 +104,13 @@ class PhpDumperTest extends \PHPUnit_Framework_TestCase
|
|||
// without compilation
|
||||
$container = include self::$fixturesPath.'/containers/container9.php';
|
||||
$dumper = new PhpDumper($container);
|
||||
$this->assertEquals(str_replace('%path%', str_replace('\\','\\\\',self::$fixturesPath.DIRECTORY_SEPARATOR.'includes'.DIRECTORY_SEPARATOR), file_get_contents(self::$fixturesPath.'/php/services9.php')), $dumper->dump(), '->dump() dumps services');
|
||||
$this->assertEquals(str_replace('%path%', str_replace('\\', '\\\\', self::$fixturesPath.DIRECTORY_SEPARATOR.'includes'.DIRECTORY_SEPARATOR), file_get_contents(self::$fixturesPath.'/php/services9.php')), $dumper->dump(), '->dump() dumps services');
|
||||
|
||||
// with compilation
|
||||
$container = include self::$fixturesPath.'/containers/container9.php';
|
||||
$container->compile();
|
||||
$dumper = new PhpDumper($container);
|
||||
$this->assertEquals(str_replace('%path%', str_replace('\\','\\\\',self::$fixturesPath.DIRECTORY_SEPARATOR.'includes'.DIRECTORY_SEPARATOR), file_get_contents(self::$fixturesPath.'/php/services9_compiled.php')), $dumper->dump(), '->dump() dumps services');
|
||||
$this->assertEquals(str_replace('%path%', str_replace('\\', '\\\\', self::$fixturesPath.DIRECTORY_SEPARATOR.'includes'.DIRECTORY_SEPARATOR), file_get_contents(self::$fixturesPath.'/php/services9_compiled.php')), $dumper->dump(), '->dump() dumps services');
|
||||
|
||||
$dumper = new PhpDumper($container = new ContainerBuilder());
|
||||
$container->register('foo', 'FooClass')->addArgument(new \stdClass());
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ if (is_file($file)) {
|
|||
}
|
||||
|
||||
$phar = new Phar($file, 0, 'ProjectWithXsdExtensionInPhar.phar');
|
||||
$phar->addFromString('ProjectWithXsdExtensionInPhar.php',<<<EOT
|
||||
$phar->addFromString('ProjectWithXsdExtensionInPhar.php', <<<EOT
|
||||
<?php
|
||||
|
||||
class ProjectWithXsdExtensionInPhar extends ProjectExtension
|
||||
|
|
|
|||
|
|
@ -16,15 +16,17 @@ use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
|
|||
*/
|
||||
class ProjectServiceContainer extends Container
|
||||
{
|
||||
private static $parameters = array(
|
||||
|
||||
);
|
||||
private $parameters;
|
||||
|
||||
/**
|
||||
* Constructor.
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
parent::__construct(new ParameterBag(self::$parameters));
|
||||
$this->parameters = array(
|
||||
|
||||
);
|
||||
|
||||
parent::__construct(new ParameterBag($this->parameters));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,10 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
|
|||
*/
|
||||
class ProjectServiceContainer extends Container
|
||||
{
|
||||
private static $parameters = array(
|
||||
'empty_value' => '',
|
||||
'some_string' => '-',
|
||||
);
|
||||
private $parameters;
|
||||
|
||||
/**
|
||||
* Constructor.
|
||||
|
|
@ -29,6 +26,10 @@ class ProjectServiceContainer extends Container
|
|||
$this->services =
|
||||
$this->scopedServices =
|
||||
$this->scopeStacks = array();
|
||||
$this->parameters = array(
|
||||
'empty_value' => '',
|
||||
'some_string' => '-',
|
||||
);
|
||||
|
||||
$this->set('service_container', $this);
|
||||
|
||||
|
|
@ -69,11 +70,11 @@ class ProjectServiceContainer extends Container
|
|||
{
|
||||
$name = strtolower($name);
|
||||
|
||||
if (!(isset(self::$parameters[$name]) || array_key_exists($name, self::$parameters))) {
|
||||
if (!(isset($this->parameters[$name]) || array_key_exists($name, $this->parameters))) {
|
||||
throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
|
||||
}
|
||||
|
||||
return self::$parameters[$name];
|
||||
return $this->parameters[$name];
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -83,7 +84,7 @@ class ProjectServiceContainer extends Container
|
|||
{
|
||||
$name = strtolower($name);
|
||||
|
||||
return isset(self::$parameters[$name]) || array_key_exists($name, self::$parameters);
|
||||
return isset($this->parameters[$name]) || array_key_exists($name, $this->parameters);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -100,7 +101,7 @@ class ProjectServiceContainer extends Container
|
|||
public function getParameterBag()
|
||||
{
|
||||
if (null === $this->parameterBag) {
|
||||
$this->parameterBag = new FrozenParameterBag(self::$parameters);
|
||||
$this->parameterBag = new FrozenParameterBag($this->parameters);
|
||||
}
|
||||
|
||||
return $this->parameterBag;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,110 @@
|
|||
<?php
|
||||
|
||||
use Symfony\Component\DependencyInjection\ContainerInterface;
|
||||
use Symfony\Component\DependencyInjection\Container;
|
||||
use Symfony\Component\DependencyInjection\Exception\InactiveScopeException;
|
||||
use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
|
||||
use Symfony\Component\DependencyInjection\Exception\LogicException;
|
||||
use Symfony\Component\DependencyInjection\Exception\RuntimeException;
|
||||
use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
|
||||
|
||||
/**
|
||||
* ProjectServiceContainer
|
||||
*
|
||||
* This class has been auto-generated
|
||||
* by the Symfony Dependency Injection Component.
|
||||
*/
|
||||
class ProjectServiceContainer extends Container
|
||||
{
|
||||
private $parameters;
|
||||
|
||||
/**
|
||||
* Constructor.
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
$this->services =
|
||||
$this->scopedServices =
|
||||
$this->scopeStacks = array();
|
||||
$this->parameters = array(
|
||||
'foo' => ('wiz'.dirname(__DIR__)),
|
||||
'bar' => __DIR__,
|
||||
'baz' => (__DIR__.'/PhpDumperTest.php'),
|
||||
);
|
||||
|
||||
$this->set('service_container', $this);
|
||||
|
||||
$this->scopes = array();
|
||||
$this->scopeChildren = array();
|
||||
$this->methodMap = array(
|
||||
'test' => 'getTestService',
|
||||
);
|
||||
|
||||
$this->aliases = array();
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function compile()
|
||||
{
|
||||
throw new LogicException('You cannot compile a dumped frozen container.');
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the 'test' service.
|
||||
*
|
||||
* This service is shared.
|
||||
* This method always returns the same instance of the service.
|
||||
*
|
||||
* @return \stdClass A stdClass instance.
|
||||
*/
|
||||
protected function getTestService()
|
||||
{
|
||||
return $this->services['test'] = new \stdClass(('wiz'.dirname(__DIR__)), array(('wiz'.dirname(__DIR__)) => ('wiz'.dirname(__DIR__))));
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function getParameter($name)
|
||||
{
|
||||
$name = strtolower($name);
|
||||
|
||||
if (!(isset($this->parameters[$name]) || array_key_exists($name, $this->parameters))) {
|
||||
throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
|
||||
}
|
||||
|
||||
return $this->parameters[$name];
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function hasParameter($name)
|
||||
{
|
||||
$name = strtolower($name);
|
||||
|
||||
return isset($this->parameters[$name]) || array_key_exists($name, $this->parameters);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function setParameter($name, $value)
|
||||
{
|
||||
throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function getParameterBag()
|
||||
{
|
||||
if (null === $this->parameterBag) {
|
||||
$this->parameterBag = new FrozenParameterBag($this->parameters);
|
||||
}
|
||||
|
||||
return $this->parameterBag;
|
||||
}
|
||||
}
|
||||
|
|
@ -16,16 +16,18 @@ use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
|
|||
*/
|
||||
class ProjectServiceContainer extends Container
|
||||
{
|
||||
private static $parameters = array(
|
||||
|
||||
);
|
||||
private $parameters;
|
||||
|
||||
/**
|
||||
* Constructor.
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
parent::__construct(new ParameterBag(self::$parameters));
|
||||
$this->parameters = array(
|
||||
|
||||
);
|
||||
|
||||
parent::__construct(new ParameterBag($this->parameters));
|
||||
$this->methodMap = array(
|
||||
'service_from_anonymous_factory' => 'getServiceFromAnonymousFactoryService',
|
||||
'service_with_method_call_and_factory' => 'getServiceWithMethodCallAndFactoryService',
|
||||
|
|
|
|||
|
|
@ -16,7 +16,14 @@ use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
|
|||
*/
|
||||
class ProjectServiceContainer extends Container
|
||||
{
|
||||
private static $parameters = array(
|
||||
private $parameters;
|
||||
|
||||
/**
|
||||
* Constructor.
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
$this->parameters = array(
|
||||
'foo' => '%baz%',
|
||||
'baz' => 'bar',
|
||||
'bar' => 'foo is %%foo bar',
|
||||
|
|
@ -33,11 +40,6 @@ class ProjectServiceContainer extends Container
|
|||
),
|
||||
);
|
||||
|
||||
/**
|
||||
* Constructor.
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
parent::__construct(new ParameterBag(self::$parameters));
|
||||
parent::__construct(new ParameterBag($this->parameters));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,18 +16,20 @@ use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
|
|||
*/
|
||||
class ProjectServiceContainer extends Container
|
||||
{
|
||||
private static $parameters = array(
|
||||
'baz_class' => 'BazClass',
|
||||
'foo_class' => 'Bar\\FooClass',
|
||||
'foo' => 'bar',
|
||||
);
|
||||
private $parameters;
|
||||
|
||||
/**
|
||||
* Constructor.
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
parent::__construct(new ParameterBag(self::$parameters));
|
||||
$this->parameters = array(
|
||||
'baz_class' => 'BazClass',
|
||||
'foo_class' => 'Bar\\FooClass',
|
||||
'foo' => 'bar',
|
||||
);
|
||||
|
||||
parent::__construct(new ParameterBag($this->parameters));
|
||||
$this->methodMap = array(
|
||||
'bar' => 'getBarService',
|
||||
'baz' => 'getBazService',
|
||||
|
|
|
|||
|
|
@ -16,11 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
|
|||
*/
|
||||
class ProjectServiceContainer extends Container
|
||||
{
|
||||
private static $parameters = array(
|
||||
'baz_class' => 'BazClass',
|
||||
'foo_class' => 'Bar\\FooClass',
|
||||
'foo' => 'bar',
|
||||
);
|
||||
private $parameters;
|
||||
|
||||
/**
|
||||
* Constructor.
|
||||
|
|
@ -30,6 +26,11 @@ class ProjectServiceContainer extends Container
|
|||
$this->services =
|
||||
$this->scopedServices =
|
||||
$this->scopeStacks = array();
|
||||
$this->parameters = array(
|
||||
'baz_class' => 'BazClass',
|
||||
'foo_class' => 'Bar\\FooClass',
|
||||
'foo' => 'bar',
|
||||
);
|
||||
|
||||
$this->set('service_container', $this);
|
||||
|
||||
|
|
@ -336,11 +337,11 @@ class ProjectServiceContainer extends Container
|
|||
{
|
||||
$name = strtolower($name);
|
||||
|
||||
if (!(isset(self::$parameters[$name]) || array_key_exists($name, self::$parameters))) {
|
||||
if (!(isset($this->parameters[$name]) || array_key_exists($name, $this->parameters))) {
|
||||
throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
|
||||
}
|
||||
|
||||
return self::$parameters[$name];
|
||||
return $this->parameters[$name];
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -350,7 +351,7 @@ class ProjectServiceContainer extends Container
|
|||
{
|
||||
$name = strtolower($name);
|
||||
|
||||
return isset(self::$parameters[$name]) || array_key_exists($name, self::$parameters);
|
||||
return isset($this->parameters[$name]) || array_key_exists($name, $this->parameters);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -367,7 +368,7 @@ class ProjectServiceContainer extends Container
|
|||
public function getParameterBag()
|
||||
{
|
||||
if (null === $this->parameterBag) {
|
||||
$this->parameterBag = new FrozenParameterBag(self::$parameters);
|
||||
$this->parameterBag = new FrozenParameterBag($this->parameters);
|
||||
}
|
||||
|
||||
return $this->parameterBag;
|
||||
|
|
|
|||
|
|
@ -56,10 +56,10 @@ class ContainerAwareEventDispatcher extends EventDispatcher
|
|||
*
|
||||
* @param string $eventName Event for which the listener is added
|
||||
* @param array $callback The service ID of the listener service & the method
|
||||
* name that has to be called
|
||||
* @param int $priority The higher this value, the earlier an event listener
|
||||
* will be triggered in the chain.
|
||||
* Defaults to 0.
|
||||
* name that has to be called
|
||||
* @param int $priority The higher this value, the earlier an event listener
|
||||
* will be triggered in the chain.
|
||||
* Defaults to 0.
|
||||
*
|
||||
* @throws \InvalidArgumentException
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ class Event
|
|||
* Returns whether further event listeners should be triggered.
|
||||
*
|
||||
* @see Event::stopPropagation
|
||||
* @return bool Whether propagation was already stopped for this event.
|
||||
* @return bool Whether propagation was already stopped for this event.
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ interface EventDispatcherInterface
|
|||
* @param string $eventName The name of the event to dispatch. The name of
|
||||
* the event is the name of the method that is
|
||||
* invoked on listeners.
|
||||
* @param Event $event The event to pass to the event handlers/listeners.
|
||||
* @param Event $event The event to pass to the event handlers/listeners.
|
||||
* If not supplied, an empty Event instance is created.
|
||||
*
|
||||
* @return Event
|
||||
|
|
@ -90,7 +90,7 @@ interface EventDispatcherInterface
|
|||
*
|
||||
* @param string $eventName The name of the event
|
||||
*
|
||||
* @return bool true if the specified event has any listeners, false otherwise
|
||||
* @return bool true if the specified event has any listeners, false otherwise
|
||||
*/
|
||||
public function hasListeners($eventName = null);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ class BinaryFileResponse extends Response
|
|||
/**
|
||||
* Sets the file to stream.
|
||||
*
|
||||
* @param \SplFileInfo|string $file The file to stream
|
||||
* @param \SplFileInfo|string $file The file to stream
|
||||
* @param string $contentDisposition
|
||||
* @param bool $autoEtag
|
||||
* @param bool $autoLastModified
|
||||
|
|
|
|||
|
|
@ -31,13 +31,13 @@ class Cookie
|
|||
/**
|
||||
* Constructor.
|
||||
*
|
||||
* @param string $name The name of the cookie
|
||||
* @param string $value The value of the cookie
|
||||
* @param int|string|\DateTime $expire The time the cookie expires
|
||||
* @param string $path The path on the server in which the cookie will be available on
|
||||
* @param string $domain The domain that the cookie is available to
|
||||
* @param bool $secure Whether the cookie should only be transmitted over a secure HTTPS connection from the client
|
||||
* @param bool $httpOnly Whether the cookie will be made accessible only through the HTTP protocol
|
||||
* @param string $name The name of the cookie
|
||||
* @param string $value The value of the cookie
|
||||
* @param int|string|\DateTime $expire The time the cookie expires
|
||||
* @param string $path The path on the server in which the cookie will be available on
|
||||
* @param string $domain The domain that the cookie is available to
|
||||
* @param bool $secure Whether the cookie should only be transmitted over a secure HTTPS connection from the client
|
||||
* @param bool $httpOnly Whether the cookie will be made accessible only through the HTTP protocol
|
||||
*
|
||||
* @throws \InvalidArgumentException
|
||||
*
|
||||
|
|
|
|||
|
|
@ -28,8 +28,8 @@ class File extends \SplFileInfo
|
|||
/**
|
||||
* Constructs a new file from the given path.
|
||||
*
|
||||
* @param string $path The path to the file
|
||||
* @param bool $checkPath Whether to check the path or not
|
||||
* @param string $path The path to the file
|
||||
* @param bool $checkPath Whether to check the path or not
|
||||
*
|
||||
* @throws FileNotFoundException If the given path is not a file
|
||||
*
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ class ExtensionGuesser implements ExtensionGuesserInterface
|
|||
*
|
||||
* @param string $mimeType The mime type
|
||||
*
|
||||
* @return string The guessed extension or NULL, if none could be guessed
|
||||
* @return string The guessed extension or NULL, if none could be guessed
|
||||
*/
|
||||
public function guess($mimeType)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -17,10 +17,11 @@ namespace Symfony\Component\HttpFoundation\File\MimeType;
|
|||
interface ExtensionGuesserInterface
|
||||
{
|
||||
/**
|
||||
* Makes a best guess for a file extension, given a mime type
|
||||
* Makes a best guess for a file extension, given a mime type.
|
||||
*
|
||||
* @param string $mimeType The mime type
|
||||
* @return string The guessed extension or NULL, if none could be guessed
|
||||
*
|
||||
* @return string The guessed extension or NULL, if none could be guessed
|
||||
*/
|
||||
public function guess($mimeType);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -103,7 +103,7 @@ class MimeTypeGuesser implements MimeTypeGuesserInterface
|
|||
*
|
||||
* @param string $path The path to the file
|
||||
*
|
||||
* @return string The mime type or NULL, if none could be guessed
|
||||
* @return string The mime type or NULL, if none could be guessed
|
||||
*
|
||||
* @throws \LogicException
|
||||
* @throws FileNotFoundException
|
||||
|
|
|
|||
|
|
@ -26,10 +26,10 @@ interface MimeTypeGuesserInterface
|
|||
*
|
||||
* @param string $path The path to the file
|
||||
*
|
||||
* @return string The mime type or NULL, if none could be guessed
|
||||
* @return string The mime type or NULL, if none could be guessed
|
||||
*
|
||||
* @throws FileNotFoundException If the file does not exist
|
||||
* @throws AccessDeniedException If the file could not be read
|
||||
* @throws FileNotFoundException If the file does not exist
|
||||
* @throws AccessDeniedException If the file could not be read
|
||||
*/
|
||||
public function guess($path);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -77,12 +77,12 @@ class UploadedFile extends File
|
|||
*
|
||||
* Calling any other method on an non-valid instance will cause an unpredictable result.
|
||||
*
|
||||
* @param string $path The full temporary path to the file
|
||||
* @param string $originalName The original file name
|
||||
* @param string $mimeType The type of the file as provided by PHP
|
||||
* @param int $size The file size
|
||||
* @param int $error The error constant of the upload (one of PHP's UPLOAD_ERR_XXX constants)
|
||||
* @param bool $test Whether the test mode is active
|
||||
* @param string $path The full temporary path to the file
|
||||
* @param string $originalName The original file name
|
||||
* @param string $mimeType The type of the file as provided by PHP
|
||||
* @param int $size The file size
|
||||
* @param int $error The error constant of the upload (one of PHP's UPLOAD_ERR_XXX constants)
|
||||
* @param bool $test Whether the test mode is active
|
||||
*
|
||||
* @throws FileException If file_uploads is disabled
|
||||
* @throws FileNotFoundException If the file does not exist
|
||||
|
|
@ -179,7 +179,7 @@ class UploadedFile extends File
|
|||
* It is extracted from the request from which the file has been uploaded.
|
||||
* Then it should not be considered as a safe value.
|
||||
*
|
||||
* @return int|null The file size
|
||||
* @return int|null The file size
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
|
|
@ -194,7 +194,7 @@ class UploadedFile extends File
|
|||
* If the upload was successful, the constant UPLOAD_ERR_OK is returned.
|
||||
* Otherwise one of the other UPLOAD_ERR_XXX constants is returned.
|
||||
*
|
||||
* @return int The upload error
|
||||
* @return int The upload error
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
|
|
@ -206,7 +206,7 @@ class UploadedFile extends File
|
|||
/**
|
||||
* Returns whether the file was uploaded successfully.
|
||||
*
|
||||
* @return bool True if the file has been uploaded with HTTP and no error occurred.
|
||||
* @return bool True if the file has been uploaded with HTTP and no error occurred.
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -115,9 +115,9 @@ class HeaderBag implements \IteratorAggregate, \Countable
|
|||
/**
|
||||
* Returns a header value by name.
|
||||
*
|
||||
* @param string $key The header name
|
||||
* @param mixed $default The default value
|
||||
* @param bool $first Whether to return the first value or all header values
|
||||
* @param string $key The header name
|
||||
* @param mixed $default The default value
|
||||
* @param bool $first Whether to return the first value or all header values
|
||||
*
|
||||
* @return string|array The first header value if $first is true, an array of values otherwise
|
||||
*
|
||||
|
|
@ -173,7 +173,7 @@ class HeaderBag implements \IteratorAggregate, \Countable
|
|||
*
|
||||
* @param string $key The HTTP header
|
||||
*
|
||||
* @return bool true if the parameter exists, false otherwise
|
||||
* @return bool true if the parameter exists, false otherwise
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
|
|
@ -188,7 +188,7 @@ class HeaderBag implements \IteratorAggregate, \Countable
|
|||
* @param string $key The HTTP header name
|
||||
* @param string $value The HTTP value
|
||||
*
|
||||
* @return bool true if the value is contained in the header, false otherwise
|
||||
* @return bool true if the value is contained in the header, false otherwise
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -28,10 +28,10 @@ class IpUtils
|
|||
/**
|
||||
* Checks if an IPv4 or IPv6 address is contained in the list of given IPs or subnets
|
||||
*
|
||||
* @param string $requestIp IP to check
|
||||
* @param string|array $ips List of IPs or subnets (can be a string if only a single one)
|
||||
* @param string $requestIp IP to check
|
||||
* @param string|array $ips List of IPs or subnets (can be a string if only a single one)
|
||||
*
|
||||
* @return bool Whether the IP is valid
|
||||
* @return bool Whether the IP is valid
|
||||
*/
|
||||
public static function checkIp($requestIp, $ips)
|
||||
{
|
||||
|
|
@ -57,7 +57,7 @@ class IpUtils
|
|||
* @param string $requestIp IPv4 address to check
|
||||
* @param string $ip IPv4 address or subnet in CIDR notation
|
||||
*
|
||||
* @return bool Whether the IP is valid
|
||||
* @return bool Whether the IP is valid
|
||||
*/
|
||||
public static function checkIp4($requestIp, $ip)
|
||||
{
|
||||
|
|
@ -85,7 +85,7 @@ class IpUtils
|
|||
* @param string $requestIp IPv6 address to check
|
||||
* @param string $ip IPv6 address or subnet in CIDR notation
|
||||
*
|
||||
* @return bool Whether the IP is valid
|
||||
* @return bool Whether the IP is valid
|
||||
*
|
||||
* @throws \RuntimeException When IPV6 support is not enabled
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -31,9 +31,9 @@ class JsonResponse extends Response
|
|||
/**
|
||||
* Constructor.
|
||||
*
|
||||
* @param mixed $data The response data
|
||||
* @param int $status The response status code
|
||||
* @param array $headers An array of response headers
|
||||
* @param mixed $data The response data
|
||||
* @param int $status The response status code
|
||||
* @param array $headers An array of response headers
|
||||
*/
|
||||
public function __construct($data = null, $status = 200, $headers = array())
|
||||
{
|
||||
|
|
|
|||
|
|
@ -90,9 +90,9 @@ class ParameterBag implements \IteratorAggregate, \Countable
|
|||
/**
|
||||
* Returns a parameter by name.
|
||||
*
|
||||
* @param string $path The key
|
||||
* @param mixed $default The default value if the parameter key does not exist
|
||||
* @param bool $deep If true, a path like foo[bar] will find deeper items
|
||||
* @param string $path The key
|
||||
* @param mixed $default The default value if the parameter key does not exist
|
||||
* @param bool $deep If true, a path like foo[bar] will find deeper items
|
||||
*
|
||||
* @return mixed
|
||||
*
|
||||
|
|
@ -167,7 +167,7 @@ class ParameterBag implements \IteratorAggregate, \Countable
|
|||
*
|
||||
* @param string $key The key
|
||||
*
|
||||
* @return bool true if the parameter exists, false otherwise
|
||||
* @return bool true if the parameter exists, false otherwise
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
|
|
@ -191,9 +191,9 @@ class ParameterBag implements \IteratorAggregate, \Countable
|
|||
/**
|
||||
* Returns the alphabetic characters of the parameter value.
|
||||
*
|
||||
* @param string $key The parameter key
|
||||
* @param mixed $default The default value if the parameter key does not exist
|
||||
* @param bool $deep If true, a path like foo[bar] will find deeper items
|
||||
* @param string $key The parameter key
|
||||
* @param mixed $default The default value if the parameter key does not exist
|
||||
* @param bool $deep If true, a path like foo[bar] will find deeper items
|
||||
*
|
||||
* @return string The filtered value
|
||||
*
|
||||
|
|
@ -207,9 +207,9 @@ class ParameterBag implements \IteratorAggregate, \Countable
|
|||
/**
|
||||
* Returns the alphabetic characters and digits of the parameter value.
|
||||
*
|
||||
* @param string $key The parameter key
|
||||
* @param mixed $default The default value if the parameter key does not exist
|
||||
* @param bool $deep If true, a path like foo[bar] will find deeper items
|
||||
* @param string $key The parameter key
|
||||
* @param mixed $default The default value if the parameter key does not exist
|
||||
* @param bool $deep If true, a path like foo[bar] will find deeper items
|
||||
*
|
||||
* @return string The filtered value
|
||||
*
|
||||
|
|
@ -223,9 +223,9 @@ class ParameterBag implements \IteratorAggregate, \Countable
|
|||
/**
|
||||
* Returns the digits of the parameter value.
|
||||
*
|
||||
* @param string $key The parameter key
|
||||
* @param mixed $default The default value if the parameter key does not exist
|
||||
* @param bool $deep If true, a path like foo[bar] will find deeper items
|
||||
* @param string $key The parameter key
|
||||
* @param mixed $default The default value if the parameter key does not exist
|
||||
* @param bool $deep If true, a path like foo[bar] will find deeper items
|
||||
*
|
||||
* @return string The filtered value
|
||||
*
|
||||
|
|
@ -240,11 +240,11 @@ class ParameterBag implements \IteratorAggregate, \Countable
|
|||
/**
|
||||
* Returns the parameter value converted to integer.
|
||||
*
|
||||
* @param string $key The parameter key
|
||||
* @param mixed $default The default value if the parameter key does not exist
|
||||
* @param bool $deep If true, a path like foo[bar] will find deeper items
|
||||
* @param string $key The parameter key
|
||||
* @param mixed $default The default value if the parameter key does not exist
|
||||
* @param bool $deep If true, a path like foo[bar] will find deeper items
|
||||
*
|
||||
* @return int The filtered value
|
||||
* @return int The filtered value
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
|
|
@ -270,11 +270,11 @@ class ParameterBag implements \IteratorAggregate, \Countable
|
|||
/**
|
||||
* Filter key.
|
||||
*
|
||||
* @param string $key Key.
|
||||
* @param mixed $default Default = null.
|
||||
* @param bool $deep Default = false.
|
||||
* @param int $filter FILTER_* constant.
|
||||
* @param mixed $options Filter options.
|
||||
* @param string $key Key.
|
||||
* @param mixed $default Default = null.
|
||||
* @param bool $deep Default = false.
|
||||
* @param int $filter FILTER_* constant.
|
||||
* @param mixed $options Filter options.
|
||||
*
|
||||
* @see http://php.net/manual/en/function.filter-var.php
|
||||
*
|
||||
|
|
|
|||
|
|
@ -25,9 +25,9 @@ class RedirectResponse extends Response
|
|||
/**
|
||||
* Creates a redirect response so that it conforms to the rules defined for a redirect status code.
|
||||
*
|
||||
* @param string $url The URL to redirect to
|
||||
* @param int $status The status code (302 by default)
|
||||
* @param array $headers The headers (Location is always set to the given URL)
|
||||
* @param string $url The URL to redirect to
|
||||
* @param int $status The status code (302 by default)
|
||||
* @param array $headers The headers (Location is always set to the given URL)
|
||||
*
|
||||
* @throws \InvalidArgumentException
|
||||
*
|
||||
|
|
@ -71,7 +71,7 @@ class RedirectResponse extends Response
|
|||
/**
|
||||
* Sets the redirect target of this response.
|
||||
*
|
||||
* @param string $url The URL to redirect to
|
||||
* @param string $url The URL to redirect to
|
||||
*
|
||||
* @return RedirectResponse The current response.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -696,7 +696,7 @@ class Request
|
|||
/**
|
||||
* Checks whether support for the _method request parameter is enabled.
|
||||
*
|
||||
* @return bool True when the _method request parameter is enabled, false otherwise
|
||||
* @return bool True when the _method request parameter is enabled, false otherwise
|
||||
*/
|
||||
public static function getHttpMethodParameterOverride()
|
||||
{
|
||||
|
|
@ -718,9 +718,9 @@ class Request
|
|||
* It is better to explicitly get request parameters from the appropriate
|
||||
* public property instead (query, attributes, request).
|
||||
*
|
||||
* @param string $key the key
|
||||
* @param mixed $default the default value
|
||||
* @param bool $deep is parameter deep in multidimensional array
|
||||
* @param string $key the key
|
||||
* @param mixed $default the default value
|
||||
* @param bool $deep is parameter deep in multidimensional array
|
||||
*
|
||||
* @return mixed
|
||||
*/
|
||||
|
|
@ -774,7 +774,7 @@ class Request
|
|||
* like whether the session is started or not. It is just a way to check if this Request
|
||||
* is associated with a Session instance.
|
||||
*
|
||||
* @return bool true when the Request contains a Session object, false otherwise
|
||||
* @return bool true when the Request contains a Session object, false otherwise
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
|
|
@ -1467,7 +1467,7 @@ class Request
|
|||
/**
|
||||
* Returns the request body content.
|
||||
*
|
||||
* @param bool $asResource If true, a resource will be returned
|
||||
* @param bool $asResource If true, a resource will be returned
|
||||
*
|
||||
* @return string|resource The request body content or a resource to read the body stream.
|
||||
*
|
||||
|
|
@ -1642,7 +1642,7 @@ class Request
|
|||
* It is known to work with common JavaScript frameworks:
|
||||
* @link http://en.wikipedia.org/wiki/List_of_Ajax_frameworks#JavaScript
|
||||
*
|
||||
* @return bool true if the request is an XMLHttpRequest, false otherwise
|
||||
* @return bool true if the request is an XMLHttpRequest, false otherwise
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ interface RequestMatcherInterface
|
|||
*
|
||||
* @param Request $request The request to check for a match
|
||||
*
|
||||
* @return bool true if the request matches, false otherwise
|
||||
* @return bool true if the request matches, false otherwise
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -188,9 +188,9 @@ class Response
|
|||
/**
|
||||
* Constructor.
|
||||
*
|
||||
* @param mixed $content The response content, see setContent()
|
||||
* @param int $status The response status code
|
||||
* @param array $headers An array of response headers
|
||||
* @param mixed $content The response content, see setContent()
|
||||
* @param int $status The response status code
|
||||
* @param array $headers An array of response headers
|
||||
*
|
||||
* @throws \InvalidArgumentException When the HTTP status code is not valid
|
||||
*
|
||||
|
|
@ -215,9 +215,9 @@ class Response
|
|||
* return Response::create($body, 200)
|
||||
* ->setSharedMaxAge(300);
|
||||
*
|
||||
* @param mixed $content The response content, see setContent()
|
||||
* @param int $status The response status code
|
||||
* @param array $headers An array of response headers
|
||||
* @param mixed $content The response content, see setContent()
|
||||
* @param int $status The response status code
|
||||
* @param array $headers An array of response headers
|
||||
*
|
||||
* @return Response
|
||||
*/
|
||||
|
|
@ -451,8 +451,8 @@ class Response
|
|||
/**
|
||||
* Sets the response status code.
|
||||
*
|
||||
* @param int $code HTTP status code
|
||||
* @param mixed $text HTTP status text
|
||||
* @param int $code HTTP status code
|
||||
* @param mixed $text HTTP status text
|
||||
*
|
||||
* If the status text is null it will be automatically populated for the known
|
||||
* status codes and left empty otherwise.
|
||||
|
|
@ -490,7 +490,7 @@ class Response
|
|||
/**
|
||||
* Retrieves the status code for the current web response.
|
||||
*
|
||||
* @return int Status code
|
||||
* @return int Status code
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
|
|
@ -536,7 +536,7 @@ class Response
|
|||
* Responses with neither a freshness lifetime (Expires, max-age) nor cache
|
||||
* validator (Last-Modified, ETag) are considered uncacheable.
|
||||
*
|
||||
* @return bool true if the response is worth caching, false otherwise
|
||||
* @return bool true if the response is worth caching, false otherwise
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
|
|
@ -560,7 +560,7 @@ class Response
|
|||
* origin. A response is considered fresh when it includes a Cache-Control/max-age
|
||||
* indicator or Expires header and the calculated age is less than the freshness lifetime.
|
||||
*
|
||||
* @return bool true if the response is fresh, false otherwise
|
||||
* @return bool true if the response is fresh, false otherwise
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
|
|
@ -573,7 +573,7 @@ class Response
|
|||
* Returns true if the response includes headers that can be used to validate
|
||||
* the response with the origin server using a conditional GET request.
|
||||
*
|
||||
* @return bool true if the response is validateable, false otherwise
|
||||
* @return bool true if the response is validateable, false otherwise
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
|
|
@ -624,7 +624,7 @@ class Response
|
|||
* When present, the TTL of the response should not be overridden to be
|
||||
* greater than the value provided by the origin.
|
||||
*
|
||||
* @return bool true if the response must be revalidated by a cache, false otherwise
|
||||
* @return bool true if the response must be revalidated by a cache, false otherwise
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
|
|
@ -667,7 +667,7 @@ class Response
|
|||
/**
|
||||
* Returns the age of the response.
|
||||
*
|
||||
* @return int The age of the response in seconds
|
||||
* @return int The age of the response in seconds
|
||||
*/
|
||||
public function getAge()
|
||||
{
|
||||
|
|
@ -742,7 +742,7 @@ class Response
|
|||
* First, it checks for a s-maxage directive, then a max-age directive, and then it falls
|
||||
* back on an expires header. It returns null when no maximum age can be established.
|
||||
*
|
||||
* @return int|null Number of seconds
|
||||
* @return int|null Number of seconds
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
|
|
@ -766,7 +766,7 @@ class Response
|
|||
*
|
||||
* This methods sets the Cache-Control max-age directive.
|
||||
*
|
||||
* @param int $value Number of seconds
|
||||
* @param int $value Number of seconds
|
||||
*
|
||||
* @return Response
|
||||
*
|
||||
|
|
@ -784,7 +784,7 @@ class Response
|
|||
*
|
||||
* This methods sets the Cache-Control s-maxage directive.
|
||||
*
|
||||
* @param int $value Number of seconds
|
||||
* @param int $value Number of seconds
|
||||
*
|
||||
* @return Response
|
||||
*
|
||||
|
|
@ -806,7 +806,7 @@ class Response
|
|||
* When the responses TTL is <= 0, the response may not be served from cache without first
|
||||
* revalidating with the origin.
|
||||
*
|
||||
* @return int|null The TTL in seconds
|
||||
* @return int|null The TTL in seconds
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
|
|
@ -822,7 +822,7 @@ class Response
|
|||
*
|
||||
* This method adjusts the Cache-Control/s-maxage directive.
|
||||
*
|
||||
* @param int $seconds Number of seconds
|
||||
* @param int $seconds Number of seconds
|
||||
*
|
||||
* @return Response
|
||||
*
|
||||
|
|
@ -840,7 +840,7 @@ class Response
|
|||
*
|
||||
* This method adjusts the Cache-Control/max-age directive.
|
||||
*
|
||||
* @param int $seconds Number of seconds
|
||||
* @param int $seconds Number of seconds
|
||||
*
|
||||
* @return Response
|
||||
*
|
||||
|
|
@ -1010,7 +1010,7 @@ class Response
|
|||
/**
|
||||
* Returns true if the response includes a Vary header.
|
||||
*
|
||||
* @return bool true if the response includes a Vary header, false otherwise
|
||||
* @return bool true if the response includes a Vary header, false otherwise
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
|
|
@ -1066,7 +1066,7 @@ class Response
|
|||
*
|
||||
* @param Request $request A Request instance
|
||||
*
|
||||
* @return bool true if the Response validators match the Request, false otherwise
|
||||
* @return bool true if the Response validators match the Request, false otherwise
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ interface AttributeBagInterface extends SessionBagInterface
|
|||
*
|
||||
* @param string $name The attribute name
|
||||
*
|
||||
* @return bool true if the attribute is defined, false otherwise
|
||||
* @return bool true if the attribute is defined, false otherwise
|
||||
*/
|
||||
public function has($name);
|
||||
|
||||
|
|
|
|||
|
|
@ -99,8 +99,8 @@ class NamespacedAttributeBag extends AttributeBag
|
|||
*
|
||||
* This method allows structured namespacing of session attributes.
|
||||
*
|
||||
* @param string $name Key name
|
||||
* @param bool $writeContext Write context, default false
|
||||
* @param string $name Key name
|
||||
* @param bool $writeContext Write context, default false
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ interface SessionInterface
|
|||
/**
|
||||
* Starts the session storage.
|
||||
*
|
||||
* @return bool True if session started.
|
||||
* @return bool True if session started.
|
||||
*
|
||||
* @throws \RuntimeException If session fails to start.
|
||||
*
|
||||
|
|
@ -73,12 +73,12 @@ interface SessionInterface
|
|||
* Clears all session attributes and flashes and regenerates the
|
||||
* session and deletes the old session from persistence.
|
||||
*
|
||||
* @param int $lifetime Sets the cookie lifetime for the session cookie. A null value
|
||||
* will leave the system settings unchanged, 0 sets the cookie
|
||||
* to expire with browser session. Time is in seconds, and is
|
||||
* not a Unix timestamp.
|
||||
* @param int $lifetime Sets the cookie lifetime for the session cookie. A null value
|
||||
* will leave the system settings unchanged, 0 sets the cookie
|
||||
* to expire with browser session. Time is in seconds, and is
|
||||
* not a Unix timestamp.
|
||||
*
|
||||
* @return bool True if session invalidated, false if error.
|
||||
* @return bool True if session invalidated, false if error.
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
|
|
@ -88,13 +88,13 @@ interface SessionInterface
|
|||
* Migrates the current session to a new session id while maintaining all
|
||||
* session attributes.
|
||||
*
|
||||
* @param bool $destroy Whether to delete the old session or leave it to garbage collection.
|
||||
* @param int $lifetime Sets the cookie lifetime for the session cookie. A null value
|
||||
* will leave the system settings unchanged, 0 sets the cookie
|
||||
* to expire with browser session. Time is in seconds, and is
|
||||
* not a Unix timestamp.
|
||||
* @param bool $destroy Whether to delete the old session or leave it to garbage collection.
|
||||
* @param int $lifetime Sets the cookie lifetime for the session cookie. A null value
|
||||
* will leave the system settings unchanged, 0 sets the cookie
|
||||
* to expire with browser session. Time is in seconds, and is
|
||||
* not a Unix timestamp.
|
||||
*
|
||||
* @return bool True if session migrated, false if error.
|
||||
* @return bool True if session migrated, false if error.
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
|
|
@ -114,7 +114,7 @@ interface SessionInterface
|
|||
*
|
||||
* @param string $name The attribute name
|
||||
*
|
||||
* @return bool true if the attribute is defined, false otherwise
|
||||
* @return bool true if the attribute is defined, false otherwise
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -97,10 +97,10 @@ class MetadataBag implements SessionBagInterface
|
|||
/**
|
||||
* Stamps a new session's metadata.
|
||||
*
|
||||
* @param int $lifetime Sets the cookie lifetime for the session cookie. A null value
|
||||
* will leave the system settings unchanged, 0 sets the cookie
|
||||
* to expire with browser session. Time is in seconds, and is
|
||||
* not a Unix timestamp.
|
||||
* @param int $lifetime Sets the cookie lifetime for the session cookie. A null value
|
||||
* will leave the system settings unchanged, 0 sets the cookie
|
||||
* to expire with browser session. Time is in seconds, and is
|
||||
* not a Unix timestamp.
|
||||
*/
|
||||
public function stampNew($lifetime = null)
|
||||
{
|
||||
|
|
@ -118,7 +118,7 @@ class MetadataBag implements SessionBagInterface
|
|||
/**
|
||||
* Gets the created timestamp metadata.
|
||||
*
|
||||
* @return int Unix timestamp
|
||||
* @return int Unix timestamp
|
||||
*/
|
||||
public function getCreated()
|
||||
{
|
||||
|
|
@ -128,7 +128,7 @@ class MetadataBag implements SessionBagInterface
|
|||
/**
|
||||
* Gets the last used metadata.
|
||||
*
|
||||
* @return int Unix timestamp
|
||||
* @return int Unix timestamp
|
||||
*/
|
||||
public function getLastUsed()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ abstract class AbstractProxy
|
|||
*
|
||||
* @internal
|
||||
*
|
||||
* @param bool $flag
|
||||
* @param bool $flag
|
||||
*
|
||||
* @throws \LogicException
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ class NativeProxy extends AbstractProxy
|
|||
/**
|
||||
* Returns true if this handler wraps an internal PHP session save handler using \SessionHandler.
|
||||
*
|
||||
* @return bool False.
|
||||
* @return bool False.
|
||||
*/
|
||||
public function isWrapper()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ interface SessionStorageInterface
|
|||
*
|
||||
* @throws \RuntimeException If something goes wrong starting the session.
|
||||
*
|
||||
* @return bool True if started.
|
||||
* @return bool True if started.
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
|
|
@ -37,7 +37,7 @@ interface SessionStorageInterface
|
|||
/**
|
||||
* Checks if the session is started.
|
||||
*
|
||||
* @return bool True if started, false otherwise.
|
||||
* @return bool True if started, false otherwise.
|
||||
*/
|
||||
public function isStarted();
|
||||
|
||||
|
|
@ -96,13 +96,13 @@ interface SessionStorageInterface
|
|||
* Otherwise session data could get lost again for concurrent requests with the
|
||||
* new ID. One result could be that you get logged out after just logging in.
|
||||
*
|
||||
* @param bool $destroy Destroy session when regenerating?
|
||||
* @param int $lifetime Sets the cookie lifetime for the session cookie. A null value
|
||||
* will leave the system settings unchanged, 0 sets the cookie
|
||||
* to expire with browser session. Time is in seconds, and is
|
||||
* not a Unix timestamp.
|
||||
* @param bool $destroy Destroy session when regenerating?
|
||||
* @param int $lifetime Sets the cookie lifetime for the session cookie. A null value
|
||||
* will leave the system settings unchanged, 0 sets the cookie
|
||||
* to expire with browser session. Time is in seconds, and is
|
||||
* not a Unix timestamp.
|
||||
*
|
||||
* @return bool True if session regenerated, false if error
|
||||
* @return bool True if session regenerated, false if error
|
||||
*
|
||||
* @throws \RuntimeException If an error occurs while regenerating this storage
|
||||
*
|
||||
|
|
|
|||
|
|
@ -116,7 +116,7 @@ class FileTest extends \PHPUnit_Framework_TestCase
|
|||
copy(__DIR__.'/Fixtures/test.gif', $path);
|
||||
|
||||
$file = new File($path);
|
||||
$movedFile = $file->move($targetDir,$filename);
|
||||
$movedFile = $file->move($targetDir, $filename);
|
||||
$this->assertInstanceOf('Symfony\Component\HttpFoundation\File\File', $movedFile);
|
||||
|
||||
$this->assertTrue(file_exists($targetPath));
|
||||
|
|
|
|||
|
|
@ -97,18 +97,18 @@ class HeaderBagTest extends \PHPUnit_Framework_TestCase
|
|||
public function testGet()
|
||||
{
|
||||
$bag = new HeaderBag(array('foo' => 'bar', 'fuzz' => 'bizz'));
|
||||
$this->assertEquals( 'bar', $bag->get('foo'), '->get return current value');
|
||||
$this->assertEquals( 'bar', $bag->get('FoO'), '->get key in case insensitive');
|
||||
$this->assertEquals( array('bar'), $bag->get('foo', 'nope', false), '->get return the value as array');
|
||||
$this->assertEquals('bar', $bag->get('foo'), '->get return current value');
|
||||
$this->assertEquals('bar', $bag->get('FoO'), '->get key in case insensitive');
|
||||
$this->assertEquals(array('bar'), $bag->get('foo', 'nope', false), '->get return the value as array');
|
||||
|
||||
// defaults
|
||||
$this->assertNull($bag->get('none'), '->get unknown values returns null');
|
||||
$this->assertEquals( 'default', $bag->get('none', 'default'), '->get unknown values returns default');
|
||||
$this->assertEquals( array('default'), $bag->get('none', 'default', false), '->get unknown values returns default as array');
|
||||
$this->assertEquals('default', $bag->get('none', 'default'), '->get unknown values returns default');
|
||||
$this->assertEquals(array('default'), $bag->get('none', 'default', false), '->get unknown values returns default as array');
|
||||
|
||||
$bag->set('foo', 'bor', false);
|
||||
$this->assertEquals( 'bar', $bag->get('foo'), '->get return first value');
|
||||
$this->assertEquals( array('bar', 'bor'), $bag->get('foo', 'nope', false), '->get return all values as array');
|
||||
$this->assertEquals('bar', $bag->get('foo'), '->get return first value');
|
||||
$this->assertEquals(array('bar', 'bor'), $bag->get('foo', 'nope', false), '->get return all values as array');
|
||||
}
|
||||
|
||||
public function testSetAssociativeArray()
|
||||
|
|
@ -125,16 +125,16 @@ class HeaderBagTest extends \PHPUnit_Framework_TestCase
|
|||
public function testContains()
|
||||
{
|
||||
$bag = new HeaderBag(array('foo' => 'bar', 'fuzz' => 'bizz'));
|
||||
$this->assertTrue( $bag->contains('foo', 'bar'), '->contains first value');
|
||||
$this->assertTrue( $bag->contains('fuzz', 'bizz'), '->contains second value');
|
||||
$this->assertFalse( $bag->contains('nope', 'nope'), '->contains unknown value');
|
||||
$this->assertFalse( $bag->contains('foo', 'nope'), '->contains unknown value');
|
||||
$this->assertTrue($bag->contains('foo', 'bar'), '->contains first value');
|
||||
$this->assertTrue($bag->contains('fuzz', 'bizz'), '->contains second value');
|
||||
$this->assertFalse($bag->contains('nope', 'nope'), '->contains unknown value');
|
||||
$this->assertFalse($bag->contains('foo', 'nope'), '->contains unknown value');
|
||||
|
||||
// Multiple values
|
||||
$bag->set('foo', 'bor', false);
|
||||
$this->assertTrue( $bag->contains('foo', 'bar'), '->contains first value');
|
||||
$this->assertTrue( $bag->contains('foo', 'bor'), '->contains second value');
|
||||
$this->assertFalse( $bag->contains('foo', 'nope'), '->contains unknown value');
|
||||
$this->assertTrue($bag->contains('foo', 'bar'), '->contains first value');
|
||||
$this->assertTrue($bag->contains('foo', 'bor'), '->contains second value');
|
||||
$this->assertFalse($bag->contains('foo', 'nope'), '->contains unknown value');
|
||||
}
|
||||
|
||||
public function testCacheControlDirectiveAccessors()
|
||||
|
|
|
|||
|
|
@ -212,12 +212,12 @@ class ParameterBagTest extends \PHPUnit_Framework_TestCase
|
|||
|
||||
$this->assertFalse($bag->filter('dec', '', false, FILTER_VALIDATE_INT, array(
|
||||
'flags' => FILTER_FLAG_ALLOW_HEX,
|
||||
'options' => array('min_range' => 1, 'max_range' => 0xff),)
|
||||
'options' => array('min_range' => 1, 'max_range' => 0xff))
|
||||
), '->filter() gets a value of parameter as integer between boundaries');
|
||||
|
||||
$this->assertFalse($bag->filter('hex', '', false, FILTER_VALIDATE_INT, array(
|
||||
'flags' => FILTER_FLAG_ALLOW_HEX,
|
||||
'options' => array('min_range' => 1, 'max_range' => 0xff),)
|
||||
'options' => array('min_range' => 1, 'max_range' => 0xff))
|
||||
), '->filter() gets a value of parameter as integer between boundaries');
|
||||
|
||||
$this->assertEquals(array('bang'), $bag->filter('array', '', false), '->filter() gets a value of parameter as an array');
|
||||
|
|
|
|||
|
|
@ -217,7 +217,7 @@ class RequestTest extends \PHPUnit_Framework_TestCase
|
|||
$this->assertEquals(80, $request->getPort());
|
||||
$this->assertEquals('test.com', $request->getHttpHost());
|
||||
$this->assertEquals('username', $request->getUser());
|
||||
$this->assertSame('',$request->getPassword());
|
||||
$this->assertSame('', $request->getPassword());
|
||||
$this->assertFalse($request->isSecure());
|
||||
|
||||
$request = Request::create('http://test.com/?foo');
|
||||
|
|
@ -501,7 +501,7 @@ class RequestTest extends \PHPUnit_Framework_TestCase
|
|||
|
||||
$request = new Request();
|
||||
|
||||
$request->initialize(array(), array(), array(), array(), array(),$server);
|
||||
$request->initialize(array(), array(), array(), array(), array(), $server);
|
||||
|
||||
$this->assertEquals('http://host:8080/index.php/some/path', $request->getUriForPath('/some/path'), '->getUriForPath() with non default port');
|
||||
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ class FlashBagTest extends \PHPUnit_Framework_TestCase
|
|||
$this->bag->set('error', 'Bar');
|
||||
$this->assertEquals(array(
|
||||
'notice' => array('Foo'),
|
||||
'error' => array('Bar'),), $this->bag->all()
|
||||
'error' => array('Bar'), ), $this->bag->all()
|
||||
);
|
||||
|
||||
$this->assertEquals(array(), $this->bag->all());
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ class CacheWarmerAggregate implements CacheWarmerInterface
|
|||
/**
|
||||
* Checks whether this warmer is optional or not.
|
||||
*
|
||||
* @return bool always false
|
||||
* @return bool always false
|
||||
*/
|
||||
public function isOptional()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ interface CacheWarmerInterface extends WarmableInterface
|
|||
* A warmer should return true if the cache can be
|
||||
* generated incrementally and on-demand.
|
||||
*
|
||||
* @return bool true if the warmer is optional, false otherwise
|
||||
* @return bool true if the warmer is optional, false otherwise
|
||||
*/
|
||||
public function isOptional();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -143,7 +143,7 @@ class ConfigDataCollector extends DataCollector
|
|||
/**
|
||||
* Returns true if the debug is enabled.
|
||||
*
|
||||
* @return bool true if debug is enabled, false otherwise
|
||||
* @return bool true if debug is enabled, false otherwise
|
||||
*/
|
||||
public function isDebug()
|
||||
{
|
||||
|
|
@ -153,7 +153,7 @@ class ConfigDataCollector extends DataCollector
|
|||
/**
|
||||
* Returns true if the XDebug is enabled.
|
||||
*
|
||||
* @return bool true if XDebug is enabled, false otherwise
|
||||
* @return bool true if XDebug is enabled, false otherwise
|
||||
*/
|
||||
public function hasXDebug()
|
||||
{
|
||||
|
|
@ -163,7 +163,7 @@ class ConfigDataCollector extends DataCollector
|
|||
/**
|
||||
* Returns true if EAccelerator is enabled.
|
||||
*
|
||||
* @return bool true if EAccelerator is enabled, false otherwise
|
||||
* @return bool true if EAccelerator is enabled, false otherwise
|
||||
*/
|
||||
public function hasEAccelerator()
|
||||
{
|
||||
|
|
@ -173,7 +173,7 @@ class ConfigDataCollector extends DataCollector
|
|||
/**
|
||||
* Returns true if APC is enabled.
|
||||
*
|
||||
* @return bool true if APC is enabled, false otherwise
|
||||
* @return bool true if APC is enabled, false otherwise
|
||||
*/
|
||||
public function hasApc()
|
||||
{
|
||||
|
|
@ -183,7 +183,7 @@ class ConfigDataCollector extends DataCollector
|
|||
/**
|
||||
* Returns true if Zend OPcache is enabled
|
||||
*
|
||||
* @return bool true if Zend OPcache is enabled, false otherwise
|
||||
* @return bool true if Zend OPcache is enabled, false otherwise
|
||||
*/
|
||||
public function hasZendOpcache()
|
||||
{
|
||||
|
|
@ -193,7 +193,7 @@ class ConfigDataCollector extends DataCollector
|
|||
/**
|
||||
* Returns true if XCache is enabled.
|
||||
*
|
||||
* @return bool true if XCache is enabled, false otherwise
|
||||
* @return bool true if XCache is enabled, false otherwise
|
||||
*/
|
||||
public function hasXCache()
|
||||
{
|
||||
|
|
@ -203,7 +203,7 @@ class ConfigDataCollector extends DataCollector
|
|||
/**
|
||||
* Returns true if WinCache is enabled.
|
||||
*
|
||||
* @return bool true if WinCache is enabled, false otherwise
|
||||
* @return bool true if WinCache is enabled, false otherwise
|
||||
*/
|
||||
public function hasWinCache()
|
||||
{
|
||||
|
|
@ -213,7 +213,7 @@ class ConfigDataCollector extends DataCollector
|
|||
/**
|
||||
* Returns true if any accelerator is enabled.
|
||||
*
|
||||
* @return bool true if any accelerator is enabled, false otherwise
|
||||
* @return bool true if any accelerator is enabled, false otherwise
|
||||
*/
|
||||
public function hasAccelerator()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ class ExceptionDataCollector extends DataCollector
|
|||
/**
|
||||
* Checks if the exception is not null.
|
||||
*
|
||||
* @return bool true if the exception is not null, false otherwise
|
||||
* @return bool true if the exception is not null, false otherwise
|
||||
*/
|
||||
public function hasException()
|
||||
{
|
||||
|
|
@ -67,7 +67,7 @@ class ExceptionDataCollector extends DataCollector
|
|||
/**
|
||||
* Gets the exception code.
|
||||
*
|
||||
* @return int The exception code
|
||||
* @return int The exception code
|
||||
*/
|
||||
public function getCode()
|
||||
{
|
||||
|
|
@ -77,7 +77,7 @@ class ExceptionDataCollector extends DataCollector
|
|||
/**
|
||||
* Gets the status code.
|
||||
*
|
||||
* @return int The status code
|
||||
* @return int The status code
|
||||
*/
|
||||
public function getStatusCode()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ class MemoryDataCollector extends DataCollector implements LateDataCollectorInte
|
|||
/**
|
||||
* Gets the memory.
|
||||
*
|
||||
* @return int The memory
|
||||
* @return int The memory
|
||||
*/
|
||||
public function getMemory()
|
||||
{
|
||||
|
|
@ -58,7 +58,7 @@ class MemoryDataCollector extends DataCollector implements LateDataCollectorInte
|
|||
/**
|
||||
* Gets the PHP memory limit.
|
||||
*
|
||||
* @return int The memory limit
|
||||
* @return int The memory limit
|
||||
*/
|
||||
public function getMemoryLimit()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ class RouterDataCollector extends DataCollector
|
|||
}
|
||||
|
||||
/**
|
||||
* @return bool Whether this request will result in a redirect
|
||||
* @return bool Whether this request will result in a redirect
|
||||
*/
|
||||
public function getRedirect()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@ class TimeDataCollector extends DataCollector implements LateDataCollectorInterf
|
|||
/**
|
||||
* Gets the request time.
|
||||
*
|
||||
* @return int The time
|
||||
* @return int The time
|
||||
*/
|
||||
public function getStartTime()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ class GetResponseEvent extends KernelEvent
|
|||
/**
|
||||
* Returns whether a response was set
|
||||
*
|
||||
* @return bool Whether a response was set
|
||||
* @return bool Whether a response was set
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ class GetResponseForExceptionEvent extends GetResponseEvent
|
|||
/**
|
||||
* Returns the thrown exception
|
||||
*
|
||||
* @return \Exception The thrown exception
|
||||
* @return \Exception The thrown exception
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -77,8 +77,8 @@ class KernelEvent extends Event
|
|||
/**
|
||||
* Returns the request type the kernel is currently processing
|
||||
*
|
||||
* @return int One of HttpKernelInterface::MASTER_REQUEST and
|
||||
* HttpKernelInterface::SUB_REQUEST
|
||||
* @return int One of HttpKernelInterface::MASTER_REQUEST and
|
||||
* HttpKernelInterface::SUB_REQUEST
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -21,9 +21,9 @@ class BadRequestHttpException extends HttpException
|
|||
/**
|
||||
* Constructor.
|
||||
*
|
||||
* @param string $message The internal exception message
|
||||
* @param \Exception $previous The previous exception
|
||||
* @param int $code The internal exception code
|
||||
* @param string $message The internal exception message
|
||||
* @param \Exception $previous The previous exception
|
||||
* @param int $code The internal exception code
|
||||
*/
|
||||
public function __construct($message = null, \Exception $previous = null, $code = 0)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -21,9 +21,9 @@ class ConflictHttpException extends HttpException
|
|||
/**
|
||||
* Constructor.
|
||||
*
|
||||
* @param string $message The internal exception message
|
||||
* @param \Exception $previous The previous exception
|
||||
* @param int $code The internal exception code
|
||||
* @param string $message The internal exception message
|
||||
* @param \Exception $previous The previous exception
|
||||
* @param int $code The internal exception code
|
||||
*/
|
||||
public function __construct($message = null, \Exception $previous = null, $code = 0)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -21,9 +21,9 @@ class GoneHttpException extends HttpException
|
|||
/**
|
||||
* Constructor.
|
||||
*
|
||||
* @param string $message The internal exception message
|
||||
* @param \Exception $previous The previous exception
|
||||
* @param int $code The internal exception code
|
||||
* @param string $message The internal exception message
|
||||
* @param \Exception $previous The previous exception
|
||||
* @param int $code The internal exception code
|
||||
*/
|
||||
public function __construct($message = null, \Exception $previous = null, $code = 0)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ interface HttpExceptionInterface
|
|||
/**
|
||||
* Returns the status code.
|
||||
*
|
||||
* @return int An HTTP response status code
|
||||
* @return int An HTTP response status code
|
||||
*/
|
||||
public function getStatusCode();
|
||||
|
||||
|
|
|
|||
|
|
@ -21,9 +21,9 @@ class LengthRequiredHttpException extends HttpException
|
|||
/**
|
||||
* Constructor.
|
||||
*
|
||||
* @param string $message The internal exception message
|
||||
* @param \Exception $previous The previous exception
|
||||
* @param int $code The internal exception code
|
||||
* @param string $message The internal exception message
|
||||
* @param \Exception $previous The previous exception
|
||||
* @param int $code The internal exception code
|
||||
*/
|
||||
public function __construct($message = null, \Exception $previous = null, $code = 0)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -21,9 +21,9 @@ class NotAcceptableHttpException extends HttpException
|
|||
/**
|
||||
* Constructor.
|
||||
*
|
||||
* @param string $message The internal exception message
|
||||
* @param \Exception $previous The previous exception
|
||||
* @param int $code The internal exception code
|
||||
* @param string $message The internal exception message
|
||||
* @param \Exception $previous The previous exception
|
||||
* @param int $code The internal exception code
|
||||
*/
|
||||
public function __construct($message = null, \Exception $previous = null, $code = 0)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -21,9 +21,9 @@ class PreconditionFailedHttpException extends HttpException
|
|||
/**
|
||||
* Constructor.
|
||||
*
|
||||
* @param string $message The internal exception message
|
||||
* @param \Exception $previous The previous exception
|
||||
* @param int $code The internal exception code
|
||||
* @param string $message The internal exception message
|
||||
* @param \Exception $previous The previous exception
|
||||
* @param int $code The internal exception code
|
||||
*/
|
||||
public function __construct($message = null, \Exception $previous = null, $code = 0)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -22,9 +22,9 @@ class PreconditionRequiredHttpException extends HttpException
|
|||
/**
|
||||
* Constructor.
|
||||
*
|
||||
* @param string $message The internal exception message
|
||||
* @param \Exception $previous The previous exception
|
||||
* @param int $code The internal exception code
|
||||
* @param string $message The internal exception message
|
||||
* @param \Exception $previous The previous exception
|
||||
* @param int $code The internal exception code
|
||||
*/
|
||||
public function __construct($message = null, \Exception $previous = null, $code = 0)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -21,10 +21,10 @@ class ServiceUnavailableHttpException extends HttpException
|
|||
/**
|
||||
* Constructor.
|
||||
*
|
||||
* @param int|string $retryAfter The number of seconds or HTTP-date after which the request may be retried
|
||||
* @param string $message The internal exception message
|
||||
* @param \Exception $previous The previous exception
|
||||
* @param int $code The internal exception code
|
||||
* @param int|string $retryAfter The number of seconds or HTTP-date after which the request may be retried
|
||||
* @param string $message The internal exception message
|
||||
* @param \Exception $previous The previous exception
|
||||
* @param int $code The internal exception code
|
||||
*/
|
||||
public function __construct($retryAfter = null, $message = null, \Exception $previous = null, $code = 0)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -22,10 +22,10 @@ class TooManyRequestsHttpException extends HttpException
|
|||
/**
|
||||
* Constructor.
|
||||
*
|
||||
* @param int|string $retryAfter The number of seconds or HTTP-date after which the request may be retried
|
||||
* @param string $message The internal exception message
|
||||
* @param \Exception $previous The previous exception
|
||||
* @param int $code The internal exception code
|
||||
* @param int|string $retryAfter The number of seconds or HTTP-date after which the request may be retried
|
||||
* @param string $message The internal exception message
|
||||
* @param \Exception $previous The previous exception
|
||||
* @param int $code The internal exception code
|
||||
*/
|
||||
public function __construct($retryAfter = null, $message = null, \Exception $previous = null, $code = 0)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -21,9 +21,9 @@ class UnsupportedMediaTypeHttpException extends HttpException
|
|||
/**
|
||||
* Constructor.
|
||||
*
|
||||
* @param string $message The internal exception message
|
||||
* @param \Exception $previous The previous exception
|
||||
* @param int $code The internal exception code
|
||||
* @param string $message The internal exception message
|
||||
* @param \Exception $previous The previous exception
|
||||
* @param int $code The internal exception code
|
||||
*/
|
||||
public function __construct($message = null, \Exception $previous = null, $code = 0)
|
||||
{
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue