diff --git a/composer.lock b/composer.lock index 7b8706b..eb1c2c4 100644 --- a/composer.lock +++ b/composer.lock @@ -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", diff --git a/core/vendor/composer/installed.json b/core/vendor/composer/installed.json index aff2261..7128da0 100644 --- a/core/vendor/composer/installed.json +++ b/core/vendor/composer/installed.json @@ -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": { diff --git a/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ApcClassLoader.php b/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ApcClassLoader.php index 513362a..fccb68e 100644 --- a/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ApcClassLoader.php +++ b/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ApcClassLoader.php @@ -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 @@ public function __construct($prefix, $decorated) /** * 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 @@ public function unregister() * * @param string $class The name of the class * - * @return bool|null True, if loaded + * @return bool|null True, if loaded */ public function loadClass($class) { diff --git a/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ClassCollectionLoader.php b/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ClassCollectionLoader.php index 0ee9322..7e3d275 100644 --- a/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ClassCollectionLoader.php +++ b/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ClassCollectionLoader.php @@ -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 @@ private static function computeTraitDeps(\ReflectionClass $class) * 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 * diff --git a/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ClassLoader.php b/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ClassLoader.php index b00f7da..e4ba1a5 100644 --- a/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ClassLoader.php +++ b/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ClassLoader.php @@ -103,7 +103,7 @@ public function addPrefix($prefix, $paths) /** * Turns on searching the include for class files. * - * @param bool $useIncludePath + * @param bool $useIncludePath */ public function setUseIncludePath($useIncludePath) { @@ -124,7 +124,7 @@ public function getUseIncludePath() /** * 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 @@ public function unregister() * * @param string $class The name of the class * - * @return bool|null True, if loaded + * @return bool|null True, if loaded */ public function loadClass($class) { diff --git a/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ClassMapGenerator.php b/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ClassMapGenerator.php index 5b8ca59..e9a93e1 100644 --- a/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ClassMapGenerator.php +++ b/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ClassMapGenerator.php @@ -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); + } } /** diff --git a/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/DebugClassLoader.php b/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/DebugClassLoader.php index 9294bda..7c6141f 100644 --- a/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/DebugClassLoader.php +++ b/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/DebugClassLoader.php @@ -98,7 +98,7 @@ public function findFile($class) * * @param string $class The name of the class * - * @return bool|null True, if loaded + * @return bool|null True, if loaded * * @throws \RuntimeException */ diff --git a/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/MapClassLoader.php b/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/MapClassLoader.php index 7557b0d..1d8bcc2 100644 --- a/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/MapClassLoader.php +++ b/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/MapClassLoader.php @@ -33,7 +33,7 @@ public function __construct(array $map) /** * 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) { diff --git a/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/ClassCollectionLoaderTest.php b/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/ClassCollectionLoaderTest.php index 587f369..696943e 100644 --- a/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/ClassCollectionLoaderTest.php +++ b/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/ClassCollectionLoaderTest.php @@ -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 = (<<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 @@ public function testToArray(\Exception $exception, $statusCode) '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 @@ public function testSetTraceIncompleteClass() '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( diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Alias.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Alias.php index 021b0c6..025a2d6 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Alias.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Alias.php @@ -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 @@ public function isPublic() /** * 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 */ diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php index 66d2707..40c6b23 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php @@ -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) { diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php index da95278..102e933 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php @@ -115,7 +115,7 @@ private function inlineArguments(ContainerBuilder $container, array $arguments) * @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) { diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/ResolveInvalidReferencesPass.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/ResolveInvalidReferencesPass.php index 83aef9b..000bf08 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/ResolveInvalidReferencesPass.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/ResolveInvalidReferencesPass.php @@ -69,8 +69,8 @@ public function process(ContainerBuilder $container) /** * 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 * diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphNode.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphNode.php index cc7288e..5664413 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphNode.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphNode.php @@ -63,7 +63,7 @@ public function addOutEdge(ServiceReferenceGraphEdge $edge) /** * 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 @@ public function isAlias() /** * 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() { diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Container.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Container.php index 17117ff..8f11798 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Container.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Container.php @@ -110,7 +110,7 @@ public function compile() /** * 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 @@ public function getParameterBag() * * @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 @@ public function getParameter($name) * * @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 @@ public function setParameter($name, $value) * @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 @@ public function set($id, $service, $scope = self::SCOPE_CONTAINER) * * @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 @@ public function has($id) * 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 @@ public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE * * @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) { diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ContainerBuilder.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ContainerBuilder.php index 1d091a0..7f5a114 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ContainerBuilder.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ContainerBuilder.php @@ -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 @@ public function setResourceTracking($track) /** * 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 @@ public function getExtensions() * * @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 @@ public function addClassResource(\ReflectionClass $class) * @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 @@ public function removeDefinition($id) * * @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 @@ public function has($id) /** * 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 @@ public function getExtensionConfig($name) /** * 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 @@ public function setAliases(array $aliases) /** * 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 @@ public function removeAlias($alias) * * @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 @@ public function setDefinition($id, Definition $definition) * * @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 @@ public function findDefinition($id) * * @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 diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ContainerInterface.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ContainerInterface.php index a70f13c2..906a9f2 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ContainerInterface.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ContainerInterface.php @@ -50,9 +50,9 @@ public function set($id, $service, $scope = self::SCOPE_CONTAINER); * * @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 @@ public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE * * @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 @@ public function has($id); * * @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 @@ public function getParameter($name); * * @param string $name The parameter name * - * @return bool The presence of parameter in container + * @return bool The presence of parameter in container * * @api */ diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Definition.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Definition.php index b77a137..ee657fd 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Definition.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Definition.php @@ -302,8 +302,8 @@ public function addArgument($argument) /** * 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 @@ public function getArguments() /** * 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 @@ public function getScope() /** * Sets the visibility of this service. * - * @param bool $boolean + * @param bool $boolean * * @return Definition The current instance * @@ -638,7 +638,7 @@ public function isPublic() /** * Sets the synchronized flag of this service. * - * @param bool $boolean + * @param bool $boolean * * @return Definition The current instance * @@ -666,7 +666,7 @@ public function isSynchronized() /** * Sets the lazy flag of this service. * - * @param bool $lazy + * @param bool $lazy * * @return Definition The current instance */ @@ -691,7 +691,7 @@ public function isLazy() * 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 @@ public function isSynthetic() * 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 * diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/DefinitionDecorator.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/DefinitionDecorator.php index 390147e..c079c47 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/DefinitionDecorator.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/DefinitionDecorator.php @@ -176,7 +176,7 @@ public function setLazy($boolean) * 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 @@ public function getArgument($index) * 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 diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php index 9ba2670..33bfe0c 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php @@ -123,10 +123,10 @@ private function addEdges() /** * 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 */ diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php index 2b5277f..11cae7a 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php @@ -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 @@ public function setProxyDumper(ProxyDumper $proxyDumper) */ 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 @@ public function dump(array $options = array()) $this->endClass(). $this->addProxyClasses() ; + $this->targetDirRegex = null; return $code; } @@ -254,7 +281,7 @@ private function addServiceInclude($id, $definition) * * @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 @@ private function startClass($class, $baseClass, $namespace) */ class $class extends $baseClass { + private \$parameters; + EOF; } @@ -810,14 +839,14 @@ private function addConstructor() $code = <<parameters = $parameters; + + parent::__construct(new ParameterBag(\$this->parameters)); EOF; @@ -849,8 +878,6 @@ private function addFrozenConstructor() $code = <<services = \$this->scopedServices = \$this->scopeStacks = array(); + \$this->parameters = $parameters; \$this->set('service_container', \$this); @@ -974,11 +1002,11 @@ public function getParameter(\$name) { \$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 @@ public function hasParameter(\$name) { \$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 @@ public function setParameter(\$name, \$value) 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 @@ public function getParameterBag() /** * 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 @@ private function exportParameters($parameters, $path = '', $indent = 12) } 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 @@ private function wrapServiceConditionals($value, $code) /** * 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 @@ private function getDefinitionsFromArguments(array $arguments) /** * 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 @@ private function hasReference($id, array $arguments, $deep = false, array $visit /** * Dumps values. * - * @param mixed $value - * @param bool $interpolate + * @param mixed $value + * @param bool $interpolate * * @return string * @@ -1307,14 +1335,14 @@ private function dumpValue($value, $interpolate = true) return "'.".$that->dumpParameter(strtolower($match[2])).".'"; }; - $code = str_replace('%%', '%', preg_replace_callback('/(?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 @@ private function getExpressionLanguage() 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); + } } diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php index f96416e..e5e124d 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php @@ -306,8 +306,8 @@ private function getExpressionCall($expression) /** * Prepares parameters. * - * @param array $parameters - * @param bool $escape + * @param array $parameters + * @param bool $escape * * @return array */ diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Extension/Extension.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Extension/Extension.php index 0ebe4e4..f8e058b 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Extension/Extension.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Extension/Extension.php @@ -109,7 +109,7 @@ public function getConfiguration(array $config, ContainerBuilder $container) * @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 */ diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/IntrospectableContainerInterface.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/IntrospectableContainerInterface.php index f0853fe..df6f7f9 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/IntrospectableContainerInterface.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/IntrospectableContainerInterface.php @@ -25,7 +25,7 @@ * * @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); diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php index 1a339e5..12cc481 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php @@ -80,7 +80,7 @@ public function all() * * @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 @@ public function set($name, $value) * * @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 @@ public function resolve() * * @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 @@ public function resolveValue($value, array $resolving = array()) * * @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()) { diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ParameterBag/ParameterBagInterface.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ParameterBag/ParameterBagInterface.php index 990f33a..8f17ff9 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ParameterBag/ParameterBagInterface.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ParameterBag/ParameterBagInterface.php @@ -52,7 +52,7 @@ public function all(); * * @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 @@ public function set($name, $value); * * @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 */ diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Reference.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Reference.php index d9de9f3..56d5070 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Reference.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Reference.php @@ -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 */ diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/SimpleXMLElement.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/SimpleXMLElement.php index 15f3544..2e20b6c 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/SimpleXMLElement.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/SimpleXMLElement.php @@ -38,8 +38,8 @@ public function getAttributeAsPhp($name) /** * Returns arguments as valid PHP types. * - * @param string $name - * @param bool $lowercase + * @param string $name + * @param bool $lowercase * * @return mixed */ diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php index 98e0c87..fb2bb5f 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php @@ -147,9 +147,9 @@ public function testSetLazyOnServiceHasParent() { $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 @@ public function testSetLazyOnServiceIsParent() { $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); diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php index 6cb0444..4223a19 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php @@ -37,21 +37,6 @@ public function testDump() 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 @@ public function testDumpOptimizationString() $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 @@ public function testAddService() // 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()); diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/createphar.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/createphar.php index 1640020..cfe9425 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/createphar.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/createphar.php @@ -6,7 +6,7 @@ } $phar = new Phar($file, 0, 'ProjectWithXsdExtensionInPhar.phar'); -$phar->addFromString('ProjectWithXsdExtensionInPhar.php',<<addFromString('ProjectWithXsdExtensionInPhar.php', <<parameters = array( + + ); + + parent::__construct(new ParameterBag($this->parameters)); } } diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php index 2fb04b6..3b504c9 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php @@ -16,10 +16,7 @@ */ class ProjectServiceContainer extends Container { - private static $parameters = array( - 'empty_value' => '', - 'some_string' => '-', - ); + private $parameters; /** * Constructor. @@ -29,6 +26,10 @@ public function __construct() $this->services = $this->scopedServices = $this->scopeStacks = array(); + $this->parameters = array( + 'empty_value' => '', + 'some_string' => '-', + ); $this->set('service_container', $this); @@ -69,11 +70,11 @@ public function getParameter($name) { $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 @@ public function hasParameter($name) { $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 @@ public function setParameter($name, $value) public function getParameterBag() { if (null === $this->parameterBag) { - $this->parameterBag = new FrozenParameterBag(self::$parameters); + $this->parameterBag = new FrozenParameterBag($this->parameters); } return $this->parameterBag; diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php new file mode 100644 index 0000000..1d7ac85 --- /dev/null +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php @@ -0,0 +1,110 @@ +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; + } +} diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php index 746b3fa..fdafa6e 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php @@ -16,16 +16,18 @@ */ 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', diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php index 7c50647..a6de38e 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php @@ -16,7 +16,14 @@ */ 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)); } } diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php index 3cc3aac..6011057 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php @@ -16,18 +16,20 @@ */ 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', diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php index 5e8103b..7d03bd5 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php @@ -16,11 +16,7 @@ */ class ProjectServiceContainer extends Container { - private static $parameters = array( - 'baz_class' => 'BazClass', - 'foo_class' => 'Bar\\FooClass', - 'foo' => 'bar', - ); + private $parameters; /** * Constructor. @@ -30,6 +26,11 @@ public function __construct() $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 @@ public function getParameter($name) { $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 @@ public function hasParameter($name) { $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 @@ public function setParameter($name, $value) public function getParameterBag() { if (null === $this->parameterBag) { - $this->parameterBag = new FrozenParameterBag(self::$parameters); + $this->parameterBag = new FrozenParameterBag($this->parameters); } return $this->parameterBag; diff --git a/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php b/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php index f19dc5d..97a03d6 100644 --- a/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php +++ b/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php @@ -56,10 +56,10 @@ public function __construct(ContainerInterface $container) * * @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 */ diff --git a/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/Event.php b/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/Event.php index bf792a2..34d9e81 100644 --- a/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/Event.php +++ b/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/Event.php @@ -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 */ diff --git a/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/EventDispatcherInterface.php b/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/EventDispatcherInterface.php index c85ebda..efb7c5b 100644 --- a/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/EventDispatcherInterface.php +++ b/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/EventDispatcherInterface.php @@ -28,7 +28,7 @@ * @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 @@ public function getListeners($eventName = null); * * @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); } diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/BinaryFileResponse.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/BinaryFileResponse.php index bf8ef84..8a930a1 100644 --- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/BinaryFileResponse.php +++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/BinaryFileResponse.php @@ -73,7 +73,7 @@ public static function create($file = null, $status = 200, $headers = array(), $ /** * 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 diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Cookie.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Cookie.php index d112123..d5fc979 100644 --- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Cookie.php +++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Cookie.php @@ -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 * diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/File/File.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/File/File.php index 0fdf7b0..0b637d1 100644 --- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/File/File.php +++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/File/File.php @@ -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 * diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/File/MimeType/ExtensionGuesser.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/File/MimeType/ExtensionGuesser.php index fe66543..4f2f672 100644 --- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/File/MimeType/ExtensionGuesser.php +++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/File/MimeType/ExtensionGuesser.php @@ -83,7 +83,7 @@ public function register(ExtensionGuesserInterface $guesser) * * @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) { diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/File/MimeType/ExtensionGuesserInterface.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/File/MimeType/ExtensionGuesserInterface.php index 8373696..88a3967 100644 --- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/File/MimeType/ExtensionGuesserInterface.php +++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/File/MimeType/ExtensionGuesserInterface.php @@ -17,10 +17,11 @@ 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); } diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php index f6bf2cd..a057e66 100644 --- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php +++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php @@ -103,7 +103,7 @@ public function register(MimeTypeGuesserInterface $guesser) * * @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 diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesserInterface.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesserInterface.php index 87ea20f..0f9b970 100644 --- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesserInterface.php +++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesserInterface.php @@ -26,10 +26,10 @@ * * @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); } diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/File/UploadedFile.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/File/UploadedFile.php index 955dec3..86d7bfd 100644 --- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/File/UploadedFile.php +++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/File/UploadedFile.php @@ -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 @@ public function guessClientExtension() * 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 @@ public function getClientSize() * 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 @@ public function getError() /** * 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 */ diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/HeaderBag.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/HeaderBag.php index 4584915..d3adffa 100644 --- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/HeaderBag.php +++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/HeaderBag.php @@ -115,9 +115,9 @@ public function add(array $headers) /** * 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 @@ public function set($key, $values, $replace = true) * * @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 @@ public function has($key) * @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 */ diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/IpUtils.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/IpUtils.php index 892503e..287bae2 100644 --- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/IpUtils.php +++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/IpUtils.php @@ -28,10 +28,10 @@ private function __construct() /** * 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 @@ public static function checkIp($requestIp, $ips) * @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 @@ public static function checkIp4($requestIp, $ip) * @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 */ diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/JsonResponse.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/JsonResponse.php index accd57c..05137dd 100644 --- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/JsonResponse.php +++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/JsonResponse.php @@ -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()) { diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/ParameterBag.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/ParameterBag.php index 18ca3ea..6f7f126 100644 --- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/ParameterBag.php +++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/ParameterBag.php @@ -90,9 +90,9 @@ public function add(array $parameters = array()) /** * 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 @@ public function set($key, $value) * * @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 @@ public function remove($key) /** * 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 @@ public function getAlpha($key, $default = '', $deep = false) /** * 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 @@ public function getAlnum($key, $default = '', $deep = false) /** * 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 @@ public function getDigits($key, $default = '', $deep = false) /** * 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 @@ public function getBoolean($key, $default = false, $deep = false) /** * 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 * diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/RedirectResponse.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/RedirectResponse.php index ccd50f7..5dc0b9e 100644 --- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/RedirectResponse.php +++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/RedirectResponse.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 @@ public function getTargetUrl() /** * 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. * diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Request.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Request.php index 0bc7e68..5dfaf51 100644 --- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Request.php +++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Request.php @@ -696,7 +696,7 @@ public static function enableHttpMethodParameterOverride() /** * 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 @@ public static function getHttpMethodParameterOverride() * 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 @@ public function hasPreviousSession() * 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 @@ public function isMethodSafe() /** * 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 @@ public function getAcceptableContentTypes() * 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 */ diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/RequestMatcherInterface.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/RequestMatcherInterface.php index 20e14e3..b45f80c 100644 --- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/RequestMatcherInterface.php +++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/RequestMatcherInterface.php @@ -25,7 +25,7 @@ * * @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 */ diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Response.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Response.php index 9299f92..a586723 100644 --- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Response.php +++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Response.php @@ -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 @@ public function __construct($content = '', $status = 200, $headers = array()) * 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 @@ public function getProtocolVersion() /** * 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 @@ public function setStatusCode($code, $text = null) /** * Retrieves the status code for the current web response. * - * @return int Status code + * @return int Status code * * @api */ @@ -536,7 +536,7 @@ public function getCharset() * 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 @@ public function isCacheable() * 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 @@ public function isFresh() * 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 @@ public function setPublic() * 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 @@ public function setDate(\DateTime $date) /** * 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 @@ public function setExpires(\DateTime $date = null) * 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 @@ public function getMaxAge() * * 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 @@ public function setMaxAge($value) * * 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 @@ public function setSharedMaxAge($value) * 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 @@ public function getTtl() * * 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 @@ public function setTtl($seconds) * * 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 @@ public function setNotModified() /** * 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 @@ public function setVary($headers, $replace = true) * * @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 */ diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBagInterface.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBagInterface.php index 4bf3c65..0d8d179 100644 --- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBagInterface.php +++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBagInterface.php @@ -25,7 +25,7 @@ * * @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); diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Attribute/NamespacedAttributeBag.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Attribute/NamespacedAttributeBag.php index 10bceed..a8730e8 100644 --- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Attribute/NamespacedAttributeBag.php +++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Attribute/NamespacedAttributeBag.php @@ -99,8 +99,8 @@ public function remove($name) * * 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 */ diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/SessionInterface.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/SessionInterface.php index f98c0a4..4669c74 100644 --- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/SessionInterface.php +++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/SessionInterface.php @@ -23,7 +23,7 @@ /** * 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 @@ public function setName($name); * 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 @@ public function invalidate($lifetime = null); * 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 @@ public function save(); * * @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 */ diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/MetadataBag.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/MetadataBag.php index f996900..d373442 100644 --- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/MetadataBag.php +++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/MetadataBag.php @@ -97,10 +97,10 @@ public function getLifetime() /** * 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 @@ public function getStorageKey() /** * Gets the created timestamp metadata. * - * @return int Unix timestamp + * @return int Unix timestamp */ public function getCreated() { @@ -128,7 +128,7 @@ public function getCreated() /** * Gets the last used metadata. * - * @return int Unix timestamp + * @return int Unix timestamp */ public function getLastUsed() { diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/Proxy/AbstractProxy.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/Proxy/AbstractProxy.php index a46355a..1036818 100644 --- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/Proxy/AbstractProxy.php +++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/Proxy/AbstractProxy.php @@ -87,7 +87,7 @@ public function isActive() * * @internal * - * @param bool $flag + * @param bool $flag * * @throws \LogicException */ diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/Proxy/NativeProxy.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/Proxy/NativeProxy.php index d2362b2..5bb2c71 100644 --- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/Proxy/NativeProxy.php +++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/Proxy/NativeProxy.php @@ -32,7 +32,7 @@ public function __construct() /** * Returns true if this handler wraps an internal PHP session save handler using \SessionHandler. * - * @return bool False. + * @return bool False. */ public function isWrapper() { diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php index 9c93be0..236fca5 100644 --- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php +++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php @@ -28,7 +28,7 @@ * * @throws \RuntimeException If something goes wrong starting the session. * - * @return bool True if started. + * @return bool True if started. * * @api */ @@ -37,7 +37,7 @@ public function start(); /** * 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 @@ public function setName($name); * 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 * diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/File/FileTest.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/File/FileTest.php index b64d5f5..1f89c39 100644 --- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/File/FileTest.php +++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/File/FileTest.php @@ -116,7 +116,7 @@ public function testMoveWithNonLatinName($filename, $sanitizedFilename) 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)); diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/HeaderBagTest.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/HeaderBagTest.php index f1a0ef2..3ea9a57 100644 --- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/HeaderBagTest.php +++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/HeaderBagTest.php @@ -97,18 +97,18 @@ public function testReplace() 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 @@ public function testSetAssociativeArray() 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() diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/ParameterBagTest.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/ParameterBagTest.php index 8ef34ce..d431ee8 100644 --- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/ParameterBagTest.php +++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/ParameterBagTest.php @@ -212,12 +212,12 @@ public function testFilter() $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'); diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/RequestTest.php index 263fd9b..08f7cd4 100644 --- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/RequestTest.php +++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/RequestTest.php @@ -217,7 +217,7 @@ public function testCreate() $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 @@ public function testGetUriForPath() $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'); diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Flash/FlashBagTest.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Flash/FlashBagTest.php index d6e27bb..5b9d32a 100644 --- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Flash/FlashBagTest.php +++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Flash/FlashBagTest.php @@ -91,7 +91,7 @@ public function testAll() $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()); diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerAggregate.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerAggregate.php index 3cc0e40..e5f4e4f 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerAggregate.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerAggregate.php @@ -52,7 +52,7 @@ public function warmUp($cacheDir) /** * Checks whether this warmer is optional or not. * - * @return bool always false + * @return bool always false */ public function isOptional() { diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerInterface.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerInterface.php index 902d8d6..8fece5e 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerInterface.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerInterface.php @@ -26,7 +26,7 @@ * 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(); } diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php index ae9f73c..a500fb9 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php @@ -143,7 +143,7 @@ public function getEnv() /** * 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 @@ public function isDebug() /** * 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 @@ public function hasXDebug() /** * 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 @@ public function hasEAccelerator() /** * 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 @@ public function hasApc() /** * 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 @@ public function hasZendOpcache() /** * 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 @@ public function hasXCache() /** * 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 @@ public function hasWinCache() /** * 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() { diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/ExceptionDataCollector.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/ExceptionDataCollector.php index 476bfff..c9cf964 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/ExceptionDataCollector.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/ExceptionDataCollector.php @@ -37,7 +37,7 @@ public function collect(Request $request, Response $response, \Exception $except /** * 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 @@ public function getMessage() /** * Gets the exception code. * - * @return int The exception code + * @return int The exception code */ public function getCode() { @@ -77,7 +77,7 @@ public function getCode() /** * Gets the status code. * - * @return int The status code + * @return int The status code */ public function getStatusCode() { diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php index 5016005..9b57722 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php @@ -48,7 +48,7 @@ public function lateCollect() /** * Gets the memory. * - * @return int The memory + * @return int The memory */ public function getMemory() { @@ -58,7 +58,7 @@ public function getMemory() /** * Gets the PHP memory limit. * - * @return int The memory limit + * @return int The memory limit */ public function getMemoryLimit() { diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php index 05392a0..76d9623 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php @@ -69,7 +69,7 @@ public function onKernelController(FilterControllerEvent $event) } /** - * @return bool Whether this request will result in a redirect + * @return bool Whether this request will result in a redirect */ public function getRedirect() { diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php index 1ea2556..4ccaafa 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php @@ -119,7 +119,7 @@ public function getInitTime() /** * Gets the request time. * - * @return int The time + * @return int The time */ public function getStartTime() { diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Event/GetResponseEvent.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Event/GetResponseEvent.php index 5565f82..a2b686e 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Event/GetResponseEvent.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Event/GetResponseEvent.php @@ -61,7 +61,7 @@ public function setResponse(Response $response) /** * Returns whether a response was set * - * @return bool Whether a response was set + * @return bool Whether a response was set * * @api */ diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Event/GetResponseForExceptionEvent.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Event/GetResponseForExceptionEvent.php index 3787f62..3eb3557 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Event/GetResponseForExceptionEvent.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Event/GetResponseForExceptionEvent.php @@ -47,7 +47,7 @@ public function __construct(HttpKernelInterface $kernel, Request $request, $requ /** * Returns the thrown exception * - * @return \Exception The thrown exception + * @return \Exception The thrown exception * * @api */ diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Event/KernelEvent.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Event/KernelEvent.php index 93e0237..3efc041 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Event/KernelEvent.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Event/KernelEvent.php @@ -77,8 +77,8 @@ public function getRequest() /** * 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 */ diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/BadRequestHttpException.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/BadRequestHttpException.php index 3f30a43..5f68172 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/BadRequestHttpException.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/BadRequestHttpException.php @@ -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) { diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/ConflictHttpException.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/ConflictHttpException.php index 35f0776..34d738e 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/ConflictHttpException.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/ConflictHttpException.php @@ -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) { diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/GoneHttpException.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/GoneHttpException.php index 219da32..16ea223 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/GoneHttpException.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/GoneHttpException.php @@ -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) { diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/HttpExceptionInterface.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/HttpExceptionInterface.php index 67f0bae..8aa50a9 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/HttpExceptionInterface.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/HttpExceptionInterface.php @@ -21,7 +21,7 @@ /** * Returns the status code. * - * @return int An HTTP response status code + * @return int An HTTP response status code */ public function getStatusCode(); diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/LengthRequiredHttpException.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/LengthRequiredHttpException.php index 878388a..0c4b943 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/LengthRequiredHttpException.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/LengthRequiredHttpException.php @@ -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) { diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/NotAcceptableHttpException.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/NotAcceptableHttpException.php index 0985d4a..cc6be4b 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/NotAcceptableHttpException.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/NotAcceptableHttpException.php @@ -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) { diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/PreconditionFailedHttpException.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/PreconditionFailedHttpException.php index 0dc2174..9df0e7b 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/PreconditionFailedHttpException.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/PreconditionFailedHttpException.php @@ -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) { diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/PreconditionRequiredHttpException.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/PreconditionRequiredHttpException.php index fb1494d..ef7eb4d 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/PreconditionRequiredHttpException.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/PreconditionRequiredHttpException.php @@ -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) { diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/ServiceUnavailableHttpException.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/ServiceUnavailableHttpException.php index dcf4d74..32b9e2d 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/ServiceUnavailableHttpException.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/ServiceUnavailableHttpException.php @@ -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) { diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/TooManyRequestsHttpException.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/TooManyRequestsHttpException.php index 22f6dd5..3d716bd 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/TooManyRequestsHttpException.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/TooManyRequestsHttpException.php @@ -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) { diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/UnsupportedMediaTypeHttpException.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/UnsupportedMediaTypeHttpException.php index b263470..a9d8fa0 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/UnsupportedMediaTypeHttpException.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/UnsupportedMediaTypeHttpException.php @@ -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) { diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Fragment/HIncludeFragmentRenderer.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Fragment/HIncludeFragmentRenderer.php index e4ee7ce..56c96b3 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Fragment/HIncludeFragmentRenderer.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Fragment/HIncludeFragmentRenderer.php @@ -64,7 +64,7 @@ public function setTemplating($templating) /** * Checks if a templating engine has been set. * - * @return bool true if the templating engine has been set, false otherwise + * @return bool true if the templating engine has been set, false otherwise */ public function hasTemplating() { diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php index cfbf535..d7eeb89 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php @@ -39,10 +39,10 @@ public function setFragmentPath($path) /** * Generates a fragment URI for a given controller. * - * @param ControllerReference $reference A ControllerReference instance - * @param Request $request A Request instance - * @param bool $absolute Whether to generate an absolute URL or not - * @param bool $strict Whether to allow non-scalar attributes or not + * @param ControllerReference $reference A ControllerReference instance + * @param Request $request A Request instance + * @param bool $absolute Whether to generate an absolute URL or not + * @param bool $strict Whether to allow non-scalar attributes or not * * @return string A fragment URI */ diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/Esi.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/Esi.php index c3ec0e4..0ae793b 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/Esi.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/Esi.php @@ -34,7 +34,7 @@ class Esi implements SurrogateInterface * Constructor. * * @param array $contentTypes An array of content-type that should be parsed for ESI information. - * (default: text/html, text/xml, application/xhtml+xml, and application/xml) + * (default: text/html, text/xml, application/xhtml+xml, and application/xml) */ public function __construct(array $contentTypes = array('text/html', 'text/xml', 'application/xhtml+xml', 'application/xml')) { @@ -61,7 +61,7 @@ public function createCacheStrategy() * * @param Request $request A Request instance * - * @return bool true if one surrogate has ESI/1.0 capability, false otherwise + * @return bool true if one surrogate has ESI/1.0 capability, false otherwise */ public function hasSurrogateCapability(Request $request) { @@ -130,7 +130,7 @@ public function addSurrogateControl(Response $response) * * @param Response $response A Response instance * - * @return bool true if the Response needs to be parsed, false otherwise + * @return bool true if the Response needs to be parsed, false otherwise */ public function needsParsing(Response $response) { @@ -158,10 +158,10 @@ public function needsEsiParsing(Response $response) /** * Renders an ESI tag. * - * @param string $uri A URI - * @param string $alt An alternate URI - * @param bool $ignoreErrors Whether to ignore errors or not - * @param string $comment A comment to add as an esi:include tag + * @param string $uri A URI + * @param string $alt An alternate URI + * @param bool $ignoreErrors Whether to ignore errors or not + * @param string $comment A comment to add as an esi:include tag * * @return string */ diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/HttpCache.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/HttpCache.php index 6e5e84e..99c4f2c 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/HttpCache.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/HttpCache.php @@ -519,7 +519,7 @@ protected function forward(Request $request, $catch = false, Response $entry = n * @param Request $request A Request instance * @param Response $entry A Response instance * - * @return bool true if the cache entry if fresh enough, false otherwise + * @return bool true if the cache entry if fresh enough, false otherwise */ protected function isFreshEnough(Request $request, Response $entry) { @@ -540,7 +540,7 @@ protected function isFreshEnough(Request $request, Response $entry) * @param Request $request A Request instance * @param Response $entry A Response instance * - * @return bool true if the cache entry can be returned even if it is staled, false otherwise + * @return bool true if the cache entry can be returned even if it is staled, false otherwise */ protected function lock(Request $request, Response $entry) { @@ -672,7 +672,7 @@ protected function processResponseBody(Request $request, Response $response) * * @param Request $request A Request instance * - * @return bool true if the Request is private, false otherwise + * @return bool true if the Request is private, false otherwise */ private function isPrivateRequest(Request $request) { diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/Store.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/Store.php index 8e86a86..75ba3cf 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/Store.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/Store.php @@ -69,7 +69,7 @@ public function cleanup() * * @param Request $request A Request instance * - * @return bool|string true if the lock is acquired, the path to the current lock otherwise + * @return bool|string true if the lock is acquired, the path to the current lock otherwise */ public function lock(Request $request) { @@ -95,7 +95,7 @@ public function lock(Request $request) * * @param Request $request A Request instance * - * @return bool False if the lock file does not exist or cannot be unlocked, true otherwise + * @return bool False if the lock file does not exist or cannot be unlocked, true otherwise */ public function unlock(Request $request) { @@ -257,7 +257,7 @@ public function invalidate(Request $request) * @param array $env1 A Request HTTP header array * @param array $env2 A Request HTTP header array * - * @return bool true if the two environments match, false otherwise + * @return bool true if the two environments match, false otherwise */ private function requestsMatch($vary, $env1, $env2) { @@ -300,7 +300,7 @@ private function getMetadata($key) * * @param string $url A URL * - * @return bool true if the URL exists and has been purged, false otherwise + * @return bool true if the URL exists and has been purged, false otherwise */ public function purge($url) { diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/StoreInterface.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/StoreInterface.php index 2f15877..ddc0c04 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/StoreInterface.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpCache/StoreInterface.php @@ -58,7 +58,7 @@ public function invalidate(Request $request); * * @param Request $request A Request instance * - * @return bool|string true if the lock is acquired, the path to the current lock otherwise + * @return bool|string true if the lock is acquired, the path to the current lock otherwise */ public function lock(Request $request); @@ -67,7 +67,7 @@ public function lock(Request $request); * * @param Request $request A Request instance * - * @return bool False if the lock file does not exist or cannot be unlocked, true otherwise + * @return bool False if the lock file does not exist or cannot be unlocked, true otherwise */ public function unlock(Request $request); @@ -76,7 +76,7 @@ public function unlock(Request $request); * * @param Request $request A Request instance * - * @return bool true if lock exists, false otherwise + * @return bool true if lock exists, false otherwise */ public function isLocked(Request $request); @@ -85,7 +85,7 @@ public function isLocked(Request $request); * * @param string $url A URL * - * @return bool true if the URL exists and has been purged, false otherwise + * @return bool true if the URL exists and has been purged, false otherwise */ public function purge($url); diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpKernel.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpKernel.php index 0806cef..ac25359 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpKernel.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpKernel.php @@ -114,7 +114,7 @@ public function terminateWithException(\Exception $exception) * * @return Response A Response instance * - * @throws \LogicException If one of the listener does not behave as expected + * @throws \LogicException If one of the listener does not behave as expected * @throws NotFoundHttpException When controller cannot be found */ private function handleRaw(Request $request, $type = self::MASTER_REQUEST) diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpKernelInterface.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpKernelInterface.php index 79d44f1..d09da6b 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpKernelInterface.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpKernelInterface.php @@ -34,8 +34,8 @@ * * @param Request $request A Request instance * @param int $type The type of the request - * (one of HttpKernelInterface::MASTER_REQUEST or HttpKernelInterface::SUB_REQUEST) - * @param bool $catch Whether to catch exceptions or not + * (one of HttpKernelInterface::MASTER_REQUEST or HttpKernelInterface::SUB_REQUEST) + * @param bool $catch Whether to catch exceptions or not * * @return Response A Response instance * diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Kernel.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Kernel.php index 765aa83..4fdbf95 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Kernel.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Kernel.php @@ -59,18 +59,18 @@ protected $startTime; protected $loadClassCache; - const VERSION = '2.6.0'; - const VERSION_ID = '20600'; + const VERSION = '2.6.1'; + const VERSION_ID = '20601'; const MAJOR_VERSION = '2'; const MINOR_VERSION = '6'; - const RELEASE_VERSION = '0'; + const RELEASE_VERSION = '1'; const EXTRA_VERSION = ''; /** * Constructor. * - * @param string $environment The environment - * @param bool $debug Whether to enable debugging or not + * @param string $environment The environment + * @param bool $debug Whether to enable debugging or not * * @api */ @@ -260,9 +260,9 @@ public function getBundle($name, $first = true) * * before looking in the bundle resource folder. * - * @param string $name A resource name to locate - * @param string $dir A directory where to look for the resource first - * @param bool $first Whether to return the first path or paths for all matching bundles + * @param string $name A resource name to locate + * @param string $dir A directory where to look for the resource first + * @param bool $first Whether to return the first path or paths for all matching bundles * * @return string|array The absolute path of the resource or an array if $first is false * @@ -710,7 +710,7 @@ protected function dumpContainer(ConfigCache $cache, ContainerBuilder $container $dumper->setProxyDumper(new ProxyDumper()); } - $content = $dumper->dump(array('class' => $class, 'base_class' => $baseClass)); + $content = $dumper->dump(array('class' => $class, 'base_class' => $baseClass, 'file' => (string) $cache)); if (!$this->debug) { $content = static::stripComments($content); } diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/KernelInterface.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/KernelInterface.php index e03c151..04e5bd6 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/KernelInterface.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/KernelInterface.php @@ -74,7 +74,7 @@ public function getBundles(); * * @param string $class A class name * - * @return bool true if the class belongs to an active bundle, false otherwise + * @return bool true if the class belongs to an active bundle, false otherwise * * @api * @@ -85,8 +85,8 @@ public function isClassInActiveBundle($class); /** * Returns a bundle and optionally its descendants by its name. * - * @param string $name Bundle name - * @param bool $first Whether to return the first bundle only or together with its descendants + * @param string $name Bundle name + * @param bool $first Whether to return the first bundle only or together with its descendants * * @return BundleInterface|BundleInterface[] A BundleInterface instance or an array of BundleInterface instances if $first is false * @@ -113,9 +113,9 @@ public function getBundle($name, $first = true); * * $dir/BundleName/path/without/Resources * - * @param string $name A resource name to locate - * @param string $dir A directory where to look for the resource first - * @param bool $first Whether to return the first path or paths for all matching bundles + * @param string $name A resource name to locate + * @param string $dir A directory where to look for the resource first + * @param bool $first Whether to return the first path or paths for all matching bundles * * @return string|array The absolute path of the resource or an array if $first is false * @@ -147,7 +147,7 @@ public function getEnvironment(); /** * Checks if debug mode is enabled. * - * @return bool true if debug mode is enabled, false otherwise + * @return bool true if debug mode is enabled, false otherwise * * @api */ @@ -174,7 +174,7 @@ public function getContainer(); /** * Gets the request start time (not available if debug is disabled). * - * @return int The request start timestamp + * @return int The request start timestamp * * @api */ diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Log/DebugLoggerInterface.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Log/DebugLoggerInterface.php index c015b0d..5635a21 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Log/DebugLoggerInterface.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Log/DebugLoggerInterface.php @@ -32,7 +32,7 @@ public function getLogs(); /** * Returns the number of errors. * - * @return int The number of errors + * @return int The number of errors */ public function countErrors(); } diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/MongoDbProfilerStorage.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/MongoDbProfilerStorage.php index c524280..7db374f 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/MongoDbProfilerStorage.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/MongoDbProfilerStorage.php @@ -20,10 +20,10 @@ class MongoDbProfilerStorage implements ProfilerStorageInterface /** * Constructor. * - * @param string $dsn A data source name - * @param string $username Not used - * @param string $password Not used - * @param int $lifetime The lifetime to use for the purge + * @param string $dsn A data source name + * @param string $username Not used + * @param string $password Not used + * @param int $lifetime The lifetime to use for the purge */ public function __construct($dsn, $username = '', $password = '', $lifetime = 86400) { diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/PdoProfilerStorage.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/PdoProfilerStorage.php index 16b8b2f..29b58e4 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/PdoProfilerStorage.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/PdoProfilerStorage.php @@ -28,10 +28,10 @@ /** * Constructor. * - * @param string $dsn A data source name - * @param string $username The username for the database - * @param string $password The password for the database - * @param int $lifetime The lifetime to use for the purge + * @param string $dsn A data source name + * @param string $username The username for the database + * @param string $password The password for the database + * @param int $lifetime The lifetime to use for the purge */ public function __construct($dsn, $username = '', $password = '', $lifetime = 86400) { diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/ProfilerStorageInterface.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/ProfilerStorageInterface.php index 2e16915..ea72af2 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/ProfilerStorageInterface.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/ProfilerStorageInterface.php @@ -48,7 +48,7 @@ public function read($token); * * @param Profile $profile A Profile instance * - * @return bool Write operation successful + * @return bool Write operation successful */ public function write(Profile $profile); diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/README.md b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/README.md index 0830eb0..d9ad1cb 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/README.md +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/README.md @@ -13,7 +13,7 @@ interface HttpKernelInterface /** * Handles a Request to convert it to a Response. * - * @param Request $request A Request instance + * @param Request $request A Request instance * * @return Response A Response instance */ diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/DataCollector/ConfigDataCollectorTest.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/DataCollector/ConfigDataCollectorTest.php index 0c73961..401f143 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/DataCollector/ConfigDataCollectorTest.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/DataCollector/ConfigDataCollectorTest.php @@ -26,12 +26,12 @@ public function testCollect() $c->setKernel($kernel); $c->collect(new Request(), new Response()); - $this->assertSame('test',$c->getEnv()); + $this->assertSame('test', $c->getEnv()); $this->assertTrue($c->isDebug()); - $this->assertSame('config',$c->getName()); - $this->assertSame('testkernel',$c->getAppName()); - $this->assertSame(PHP_VERSION,$c->getPhpVersion()); - $this->assertSame(Kernel::VERSION,$c->getSymfonyVersion()); + $this->assertSame('config', $c->getName()); + $this->assertSame('testkernel', $c->getAppName()); + $this->assertSame(PHP_VERSION, $c->getPhpVersion()); + $this->assertSame(Kernel::VERSION, $c->getSymfonyVersion()); $this->assertNull($c->getToken()); // if else clause because we don't know it diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/DataCollector/ExceptionDataCollectorTest.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/DataCollector/ExceptionDataCollectorTest.php index 4cc6405..517e326 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/DataCollector/ExceptionDataCollectorTest.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/DataCollector/ExceptionDataCollectorTest.php @@ -20,20 +20,20 @@ class ExceptionDataCollectorTest extends \PHPUnit_Framework_TestCase { public function testCollect() { - $e = new \Exception('foo',500); + $e = new \Exception('foo', 500); $c = new ExceptionDataCollector(); $flattened = FlattenException::create($e); $trace = $flattened->getTrace(); $this->assertFalse($c->hasException()); - $c->collect(new Request(), new Response(),$e); + $c->collect(new Request(), new Response(), $e); $this->assertTrue($c->hasException()); - $this->assertEquals($flattened,$c->getException()); - $this->assertSame('foo',$c->getMessage()); - $this->assertSame(500,$c->getCode()); - $this->assertSame('exception',$c->getName()); - $this->assertSame($trace,$c->getTrace()); + $this->assertEquals($flattened, $c->getException()); + $this->assertSame('foo', $c->getMessage()); + $this->assertSame(500, $c->getCode()); + $this->assertSame('exception', $c->getName()); + $this->assertSame($trace, $c->getTrace()); } } diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php index 6eeb711..842ea91 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php @@ -173,9 +173,9 @@ protected function createResponse() $response = new Response(); $response->setStatusCode(200); $response->headers->set('Content-Type', 'application/json'); - $response->headers->setCookie(new Cookie('foo','bar',1,'/foo','localhost',true,true)); - $response->headers->setCookie(new Cookie('bar','foo',new \DateTime('@946684800'))); - $response->headers->setCookie(new Cookie('bazz','foo','2000-12-12')); + $response->headers->setCookie(new Cookie('foo', 'bar', 1, '/foo', 'localhost', true, true)); + $response->headers->setCookie(new Cookie('bar', 'foo', new \DateTime('@946684800'))); + $response->headers->setCookie(new Cookie('bazz', 'foo', '2000-12-12')); return $response; } diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/HttpCache/StoreTest.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/HttpCache/StoreTest.php index d8cf75f..cf4e4b5 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/HttpCache/StoreTest.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/HttpCache/StoreTest.php @@ -87,7 +87,7 @@ public function testSetsTheXContentDigestResponseHeaderBeforeStoring() { $cacheKey = $this->storeSimpleEntry(); $entries = $this->getStoreMetadata($cacheKey); - list ($req, $res) = $entries[0]; + list($req, $res) = $entries[0]; $this->assertEquals('en9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08', $res['x-content-digest'][0]); } diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/KernelTest.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/KernelTest.php index 03af905..96c9965 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/KernelTest.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/KernelTest.php @@ -424,7 +424,7 @@ public function testLocateResourceReturnsAllMatches() $this->assertEquals(array( __DIR__.'/Fixtures/Bundle2Bundle/foo.txt', - __DIR__.'/Fixtures/Bundle1Bundle/foo.txt',), + __DIR__.'/Fixtures/Bundle1Bundle/foo.txt', ), $kernel->locateResource('@Bundle1Bundle/foo.txt', null, false)); } @@ -487,7 +487,7 @@ public function testLocateResourceReturnsTheDirOneForResourcesAndBundleOnes() $this->assertEquals(array( __DIR__.'/Fixtures/Resources/Bundle1Bundle/foo.txt', - __DIR__.'/Fixtures/Bundle1Bundle/Resources/foo.txt',), + __DIR__.'/Fixtures/Bundle1Bundle/Resources/foo.txt', ), $kernel->locateResource('@Bundle1Bundle/Resources/foo.txt', __DIR__.'/Fixtures/Resources', false) ); } diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Profiler/Mock/MemcacheMock.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Profiler/Mock/MemcacheMock.php index 71f74b9..8309b77 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Profiler/Mock/MemcacheMock.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Profiler/Mock/MemcacheMock.php @@ -24,9 +24,9 @@ class MemcacheMock /** * Open memcached server connection * - * @param string $host - * @param int $port - * @param int $timeout + * @param string $host + * @param int $port + * @param int $timeout * * @return bool */ @@ -44,9 +44,9 @@ public function connect($host, $port = null, $timeout = null) /** * Open memcached server persistent connection * - * @param string $host - * @param int $port - * @param int $timeout + * @param string $host + * @param int $port + * @param int $timeout * * @return bool */ @@ -90,10 +90,10 @@ public function addServer($host, $port = 11211, $persistent = null, $weight = nu /** * Add an item to the server only if such key doesn't exist at the server yet. * - * @param string $key - * @param mixed $var - * @param int $flag - * @param int $expire + * @param string $key + * @param mixed $var + * @param int $flag + * @param int $expire * * @return bool */ @@ -115,10 +115,10 @@ public function add($key, $var, $flag = null, $expire = null) /** * Store data at the server. * - * @param string $key - * @param string $var - * @param int $flag - * @param int $expire + * @param string $key + * @param string $var + * @param int $flag + * @param int $expire * * @return bool */ @@ -136,10 +136,10 @@ public function set($key, $var, $flag = null, $expire = null) /** * Replace value of the existing item. * - * @param string $key - * @param mixed $var - * @param int $flag - * @param int $expire + * @param string $key + * @param mixed $var + * @param int $flag + * @param int $expire * * @return bool */ @@ -161,8 +161,8 @@ public function replace($key, $var, $flag = null, $expire = null) /** * Retrieve item from the server. * - * @param string|array $key - * @param int|array $flags + * @param string|array $key + * @param int|array $flags * * @return mixed */ diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Profiler/Mock/MemcachedMock.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Profiler/Mock/MemcachedMock.php index 09f52dd..7f220a1 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Profiler/Mock/MemcachedMock.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Profiler/Mock/MemcachedMock.php @@ -24,8 +24,8 @@ class MemcachedMock /** * Set a Memcached option * - * @param int $option - * @param mixed $value + * @param int $option + * @param mixed $value * * @return bool */ @@ -37,9 +37,9 @@ public function setOption($option, $value) /** * Add a memcached server to connection pool * - * @param string $host - * @param int $port - * @param int $weight + * @param string $host + * @param int $port + * @param int $weight * * @return bool */ @@ -57,9 +57,9 @@ public function addServer($host, $port = 11211, $weight = 0) /** * Add an item to the server only if such key doesn't exist at the server yet. * - * @param string $key - * @param mixed $value - * @param int $expiration + * @param string $key + * @param mixed $value + * @param int $expiration * * @return bool */ @@ -81,9 +81,9 @@ public function add($key, $value, $expiration = 0) /** * Store data at the server. * - * @param string $key - * @param mixed $value - * @param int $expiration + * @param string $key + * @param mixed $value + * @param int $expiration * * @return bool */ @@ -101,9 +101,9 @@ public function set($key, $value, $expiration = null) /** * Replace value of the existing item. * - * @param string $key - * @param mixed $value - * @param int $expiration + * @param string $key + * @param mixed $value + * @param int $expiration * * @return bool */ diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Profiler/Mock/RedisMock.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Profiler/Mock/RedisMock.php index 5fd3a57..9ac2627 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Profiler/Mock/RedisMock.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Profiler/Mock/RedisMock.php @@ -24,9 +24,9 @@ class RedisMock /** * Add a server to connection pool * - * @param string $host - * @param int $port - * @param float $timeout + * @param string $host + * @param int $port + * @param float $timeout * * @return bool */ @@ -44,8 +44,8 @@ public function connect($host, $port = 6379, $timeout = 0) /** * Set client option. * - * @param int $name - * @param int $value + * @param int $name + * @param int $value * * @return bool */ @@ -77,9 +77,9 @@ public function exists($key) /** * Store data at the server with expiration time. * - * @param string $key - * @param int $ttl - * @param mixed $value + * @param string $key + * @param int $ttl + * @param mixed $value * * @return bool */ @@ -97,8 +97,8 @@ public function setex($key, $ttl, $value) /** * Sets an expiration time on an item. * - * @param string $key - * @param int $ttl + * @param string $key + * @param int $ttl * * @return bool */ @@ -137,7 +137,7 @@ public function get($key) * @param string $key * @param string $value * - * @return int Size of the value after the append. + * @return int Size of the value after the append. */ public function append($key, $value) { diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/UriSigner.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/UriSigner.php index c3c3555..7b7d452 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/UriSigner.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/UriSigner.php @@ -54,7 +54,7 @@ public function sign($uri) * * @param string $uri A signed URI * - * @return bool True if the URI is signed correctly, false otherwise + * @return bool True if the URI is signed correctly, false otherwise */ public function check($uri) { diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/CompiledRoute.php b/core/vendor/symfony/routing/Symfony/Component/Routing/CompiledRoute.php index 7b21fe9..35ae69d 100644 --- a/core/vendor/symfony/routing/Symfony/Component/Routing/CompiledRoute.php +++ b/core/vendor/symfony/routing/Symfony/Component/Routing/CompiledRoute.php @@ -30,14 +30,14 @@ class CompiledRoute implements \Serializable /** * Constructor. * - * @param string $staticPrefix The static prefix of the compiled route - * @param string $regex The regular expression to use to match this route - * @param array $tokens An array of tokens to use to generate URL for this route - * @param array $pathVariables An array of path variables - * @param string|null $hostRegex Host regex - * @param array $hostTokens Host tokens - * @param array $hostVariables An array of host variables - * @param array $variables An array of variables (variables defined in the path and in the host patterns) + * @param string $staticPrefix The static prefix of the compiled route + * @param string $regex The regular expression to use to match this route + * @param array $tokens An array of tokens to use to generate URL for this route + * @param array $pathVariables An array of path variables + * @param string|null $hostRegex Host regex + * @param array $hostTokens Host tokens + * @param array $hostVariables An array of host variables + * @param array $variables An array of variables (variables defined in the path and in the host patterns) */ public function __construct($staticPrefix, $regex, array $tokens, array $pathVariables, $hostRegex = null, array $hostTokens = array(), array $hostVariables = array(), array $variables = array()) { diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/Generator/ConfigurableRequirementsInterface.php b/core/vendor/symfony/routing/Symfony/Component/Routing/Generator/ConfigurableRequirementsInterface.php index 3cf7edf..dc97b7e 100644 --- a/core/vendor/symfony/routing/Symfony/Component/Routing/Generator/ConfigurableRequirementsInterface.php +++ b/core/vendor/symfony/routing/Symfony/Component/Routing/Generator/ConfigurableRequirementsInterface.php @@ -41,7 +41,7 @@ * Enables or disables the exception on incorrect parameters. * Passing null will deactivate the requirements check completely. * - * @param bool|null $enabled + * @param bool|null $enabled */ public function setStrictRequirements($enabled); diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/Generator/UrlGeneratorInterface.php b/core/vendor/symfony/routing/Symfony/Component/Routing/Generator/UrlGeneratorInterface.php index b89966d..944a44b 100644 --- a/core/vendor/symfony/routing/Symfony/Component/Routing/Generator/UrlGeneratorInterface.php +++ b/core/vendor/symfony/routing/Symfony/Component/Routing/Generator/UrlGeneratorInterface.php @@ -70,9 +70,9 @@ * * If there is no route with the given name, the generator must throw the RouteNotFoundException. * - * @param string $name The name of the route - * @param mixed $parameters An array of parameters - * @param bool|string $referenceType The type of reference to be generated (one of the constants) + * @param string $name The name of the route + * @param mixed $parameters An array of parameters + * @param bool|string $referenceType The type of reference to be generated (one of the constants) * * @return string The generated URL * diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php b/core/vendor/symfony/routing/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php index 4ba115b..66090c2 100644 --- a/core/vendor/symfony/routing/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php +++ b/core/vendor/symfony/routing/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php @@ -113,10 +113,10 @@ public function dump(array $options = array()) /** * Dumps a single route * - * @param string $name Route name - * @param Route $route The route - * @param array $options Options - * @param bool $hostRegexUnique Unique identifier for the host regex + * @param string $name Route name + * @param Route $route The route + * @param array $options Options + * @param bool $hostRegexUnique Unique identifier for the host regex * * @return string The compiled route */ @@ -192,7 +192,7 @@ private function dumpRoute($name, $route, array $options, $hostRegexUnique) /** * Returns methods allowed for a route * - * @param Route $route The route + * @param Route $route The route * * @return array The methods */ @@ -213,7 +213,7 @@ private function getRouteMethods(Route $route) /** * Converts a regex to make it suitable for mod_rewrite * - * @param string $regex The regex + * @param string $regex The regex * * @return string The converted regex */ diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/Matcher/Dumper/DumperCollection.php b/core/vendor/symfony/routing/Symfony/Component/Routing/Matcher/Dumper/DumperCollection.php index 25e8e24..04e44be 100644 --- a/core/vendor/symfony/routing/Symfony/Component/Routing/Matcher/Dumper/DumperCollection.php +++ b/core/vendor/symfony/routing/Symfony/Component/Routing/Matcher/Dumper/DumperCollection.php @@ -116,7 +116,7 @@ protected function setParent(DumperCollection $parent) * * @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 hasAttribute($name) { diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php b/core/vendor/symfony/routing/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php index ad3d85c..8fd791b 100644 --- a/core/vendor/symfony/routing/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php +++ b/core/vendor/symfony/routing/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php @@ -92,7 +92,7 @@ public function addExpressionLanguageProvider(ExpressionFunctionProviderInterfac /** * Generates the code for the match method implementing UrlMatcherInterface. * - * @param bool $supportsRedirections Whether redirections are supported by the base class + * @param bool $supportsRedirections Whether redirections are supported by the base class * * @return string Match method as PHP code */ diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/RequestContext.php b/core/vendor/symfony/routing/Symfony/Component/Routing/RequestContext.php index b6c71ff..577d1d0 100644 --- a/core/vendor/symfony/routing/Symfony/Component/Routing/RequestContext.php +++ b/core/vendor/symfony/routing/Symfony/Component/Routing/RequestContext.php @@ -42,14 +42,14 @@ class RequestContext /** * Constructor. * - * @param string $baseUrl The base URL - * @param string $method The HTTP method - * @param string $host The HTTP host name - * @param string $scheme The HTTP scheme - * @param int $httpPort The HTTP port - * @param int $httpsPort The HTTPS port - * @param string $path The path - * @param string $queryString The query string + * @param string $baseUrl The base URL + * @param string $method The HTTP method + * @param string $host The HTTP host name + * @param string $scheme The HTTP scheme + * @param int $httpPort The HTTP port + * @param int $httpsPort The HTTPS port + * @param string $path The path + * @param string $queryString The query string * * @api */ diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/Route.php b/core/vendor/symfony/routing/Symfony/Component/Routing/Route.php index 32b31c9..23890d9 100644 --- a/core/vendor/symfony/routing/Symfony/Component/Routing/Route.php +++ b/core/vendor/symfony/routing/Symfony/Component/Routing/Route.php @@ -403,7 +403,7 @@ public function getOption($name) * * @param string $name An option name * - * @return bool true if the option is set, false otherwise + * @return bool true if the option is set, false otherwise */ public function hasOption($name) { @@ -472,7 +472,7 @@ public function getDefault($name) * * @param string $name A variable name * - * @return bool true if the default value is set, false otherwise + * @return bool true if the default value is set, false otherwise */ public function hasDefault($name) { @@ -559,7 +559,7 @@ public function getRequirement($key) * * @param string $key A variable name * - * @return bool true if a requirement is specified, false otherwise + * @return bool true if a requirement is specified, false otherwise */ public function hasRequirement($key) { diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/RouteCollection.php b/core/vendor/symfony/routing/Symfony/Component/Routing/RouteCollection.php index f028324..46ca137 100644 --- a/core/vendor/symfony/routing/Symfony/Component/Routing/RouteCollection.php +++ b/core/vendor/symfony/routing/Symfony/Component/Routing/RouteCollection.php @@ -121,7 +121,7 @@ public function remove($name) * Adds a route collection at the end of the current set by appending all * routes of the added collection. * - * @param RouteCollection $collection A RouteCollection instance + * @param RouteCollection $collection A RouteCollection instance * * @api */ diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/RouteCompiler.php b/core/vendor/symfony/routing/Symfony/Component/Routing/RouteCompiler.php index 095145f..4ffce0a 100644 --- a/core/vendor/symfony/routing/Symfony/Component/Routing/RouteCompiler.php +++ b/core/vendor/symfony/routing/Symfony/Component/Routing/RouteCompiler.php @@ -191,9 +191,9 @@ private static function findNextSeparator($pattern) /** * Computes the regexp used to match a specific token. It can be static text or a subpattern. * - * @param array $tokens The route tokens - * @param int $index The index of the current token - * @param int $firstOptional The index of the first optional token + * @param array $tokens The route tokens + * @param int $index The index of the current token + * @param int $firstOptional The index of the first optional token * * @return string The regexp pattern for a single token */ diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/Fixtures/validpattern.php b/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/Fixtures/validpattern.php index 9c6b556..f0a0cd6 100644 --- a/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/Fixtures/validpattern.php +++ b/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/Fixtures/validpattern.php @@ -10,7 +10,7 @@ array('compiler_class' => 'RouteCompiler'), '{locale}.example.com', array('https'), - array('GET','POST','put','OpTiOnS'), + array('GET', 'POST', 'put', 'OpTiOnS'), 'context.getMethod() == "GET"' )); $collection->add('blog_show_legacy', new Route( diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php b/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php index 624394b..03ba152 100644 --- a/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php +++ b/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php @@ -119,7 +119,7 @@ public function testLoad($className, $routeDatas = array(), $methodArgs = array( $route = $routeCollection->get($routeDatas['name']); $this->assertSame($routeDatas['path'], $route->getPath(), '->load preserves path annotation'); - $this->assertSame($routeDatas['requirements'],$route->getRequirements(), '->load preserves requirements annotation'); + $this->assertSame($routeDatas['requirements'], $route->getRequirements(), '->load preserves requirements annotation'); $this->assertCount(0, array_intersect($route->getOptions(), $routeDatas['options']), '->load preserves options annotation'); $this->assertSame(array_replace($methodArgs, $routeDatas['defaults']), $route->getDefaults(), '->load preserves defaults annotation'); $this->assertEquals($routeDatas['condition'], $route->getCondition(), '->load preserves condition annotation'); diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php b/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php index 8f5f332..7fa699e 100644 --- a/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php +++ b/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php @@ -244,12 +244,12 @@ public function testAdjacentVariables() // 'w' eagerly matches as much as possible and the other variables match the remaining chars. // This also shows that the variables w-z must all exclude the separating char (the dot '.' in this case) by default requirement. // Otherwise they would also consume '.xml' and _format would never match as it's an optional variable. - $this->assertEquals(array('w' => 'wwwww', 'x' => 'x', 'y' => 'Y', 'z' => 'Z','_format' => 'xml', '_route' => 'test'), $matcher->match('/wwwwwxYZ.xml')); + $this->assertEquals(array('w' => 'wwwww', 'x' => 'x', 'y' => 'Y', 'z' => 'Z', '_format' => 'xml', '_route' => 'test'), $matcher->match('/wwwwwxYZ.xml')); // As 'y' has custom requirement and can only be of value 'y|Y', it will leave 'ZZZ' to variable z. // So with carefully chosen requirements adjacent variables, can be useful. - $this->assertEquals(array('w' => 'wwwww', 'x' => 'x', 'y' => 'y', 'z' => 'ZZZ','_format' => 'html', '_route' => 'test'), $matcher->match('/wwwwwxyZZZ')); + $this->assertEquals(array('w' => 'wwwww', 'x' => 'x', 'y' => 'y', 'z' => 'ZZZ', '_format' => 'html', '_route' => 'test'), $matcher->match('/wwwwwxyZZZ')); // z and _format are optional. - $this->assertEquals(array('w' => 'wwwww', 'x' => 'x', 'y' => 'y', 'z' => 'default-z','_format' => 'html', '_route' => 'test'), $matcher->match('/wwwwwxy')); + $this->assertEquals(array('w' => 'wwwww', 'x' => 'x', 'y' => 'y', 'z' => 'default-z', '_format' => 'html', '_route' => 'test'), $matcher->match('/wwwwwxy')); $this->setExpectedException('Symfony\Component\Routing\Exception\ResourceNotFoundException'); $matcher->match('/wxy.html'); diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php index 419d793..86c2702 100644 --- a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php +++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php @@ -28,11 +28,11 @@ * recursively all child objects of the implementor. * * @param DenormalizerInterface $denormalizer The denormalizer is given so that you - * can use it to denormalize objects contained within this object. + * can use it to denormalize objects contained within this object * @param array|scalar $data The data from which to re-create the object. * @param string|null $format The format is optionally given to be able to denormalize differently - * based on different input formats. - * @param array $context options for denormalizing. + * based on different input formats + * @param array $context options for denormalizing */ public function denormalize(DenormalizerInterface $denormalizer, $data, $format = null, array $context = array()); } diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraint.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraint.php index b08ddfb..9985772 100644 --- a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraint.php +++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraint.php @@ -286,7 +286,7 @@ public function validatedBy() * This method should return one or more of the constants * Constraint::CLASS_CONSTRAINT and Constraint::PROPERTY_CONSTRAINT. * - * @return string|array One or more constant values + * @return string|array One or more constant values * * @api */ diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/ConstraintViolationInterface.php b/core/vendor/symfony/validator/Symfony/Component/Validator/ConstraintViolationInterface.php index 32be7c6..01bec9d 100644 --- a/core/vendor/symfony/validator/Symfony/Component/Validator/ConstraintViolationInterface.php +++ b/core/vendor/symfony/validator/Symfony/Component/Validator/ConstraintViolationInterface.php @@ -85,7 +85,7 @@ public function getMessageParameters(); * This method returns the value of the parameter for choosing the right * pluralization form (in this case "choices"). * - * @return int|null The number to use to pluralize of the message. + * @return int|null The number to use to pluralize of the message. */ public function getMessagePluralization(); diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/ConstraintViolationListInterface.php b/core/vendor/symfony/validator/Symfony/Component/Validator/ConstraintViolationListInterface.php index 6923519..088c70c 100644 --- a/core/vendor/symfony/validator/Symfony/Component/Validator/ConstraintViolationListInterface.php +++ b/core/vendor/symfony/validator/Symfony/Component/Validator/ConstraintViolationListInterface.php @@ -41,7 +41,7 @@ public function addAll(ConstraintViolationListInterface $otherList); /** * Returns the violation at a given offset. * - * @param int $offset The offset of the violation. + * @param int $offset The offset of the violation. * * @return ConstraintViolationInterface The violation. * @@ -54,9 +54,9 @@ public function get($offset); /** * Returns whether the given offset exists. * - * @param int $offset The violation offset. + * @param int $offset The violation offset. * - * @return bool Whether the offset exists. + * @return bool Whether the offset exists. * * @api */ @@ -75,7 +75,7 @@ public function set($offset, ConstraintViolationInterface $violation); /** * Removes a violation at a given offset. * - * @param int $offset The offset to remove. + * @param int $offset The offset to remove. * * @api */ diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php index 1aa13c8..413fadb 100644 --- a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php +++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php @@ -65,10 +65,10 @@ public function validate($value, Constraint $constraint) /** * Compares the two given values to find if their relationship is valid * - * @param mixed $value1 The first value to compare - * @param mixed $value2 The second value to compare + * @param mixed $value1 The first value to compare + * @param mixed $value2 The second value to compare * - * @return bool true if the relationship is valid, false otherwise + * @return bool true if the relationship is valid, false otherwise */ abstract protected function compareValues($value1, $value2); } diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/CardSchemeValidator.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/CardSchemeValidator.php index 62492e6..3b73bcf 100644 --- a/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/CardSchemeValidator.php +++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Constraints/CardSchemeValidator.php @@ -101,7 +101,7 @@ class CardSchemeValidator extends ConstraintValidator /** * Validates a creditcard belongs to a specified scheme. * - * @param mixed $value + * @param mixed $value * @param Constraint $constraint */ public function validate($value, Constraint $constraint) diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/DefaultTranslator.php b/core/vendor/symfony/validator/Symfony/Component/Validator/DefaultTranslator.php index 3c1171f..06967de 100644 --- a/core/vendor/symfony/validator/Symfony/Component/Validator/DefaultTranslator.php +++ b/core/vendor/symfony/validator/Symfony/Component/Validator/DefaultTranslator.php @@ -117,11 +117,11 @@ public function trans($id, array $parameters = array(), $domain = null, $locale * * // -> These are 3 donkeys. * - * @param string $id The message id - * @param int $number The number to use to find the index of the message - * @param array $parameters An array of parameters for the message - * @param string $domain Ignored - * @param string $locale Ignored + * @param string $id The message id + * @param int $number The number to use to find the index of the message + * @param array $parameters An array of parameters for the message + * @param string $domain Ignored + * @param string $locale Ignored * * @return string The translated string * diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/ExecutionContextInterface.php b/core/vendor/symfony/validator/Symfony/Component/Validator/ExecutionContextInterface.php index 375d8cf..ebef4bd 100644 --- a/core/vendor/symfony/validator/Symfony/Component/Validator/ExecutionContextInterface.php +++ b/core/vendor/symfony/validator/Symfony/Component/Validator/ExecutionContextInterface.php @@ -109,12 +109,12 @@ public function addViolation($message, array $params = array(), $invalidValue = * Adds a violation at the validation graph node with the given property * path relative to the current property path. * - * @param string $subPath The relative property path for the violation - * @param string $message The error message - * @param array $parameters The parameters substituted in the error message - * @param mixed $invalidValue The invalid, validated value - * @param int|null $plural The number to use to pluralize of the message - * @param int|null $code The violation code + * @param string $subPath The relative property path for the violation + * @param string $message The error message + * @param array $parameters The parameters substituted in the error message + * @param mixed $invalidValue The invalid, validated value + * @param int|null $plural The number to use to pluralize of the message + * @param int|null $code The violation code * * @api * diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Mapping/ClassMetadata.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Mapping/ClassMetadata.php index 862e197..6a7e8d0 100644 --- a/core/vendor/symfony/validator/Symfony/Component/Validator/Mapping/ClassMetadata.php +++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Mapping/ClassMetadata.php @@ -207,7 +207,7 @@ public function getClassName() * will validate the group sequence. The constraints assigned to "Default" * can still be validated by validating the class in "". * - * @return string The name of the default group + * @return string The name of the default group */ public function getDefaultGroup() { @@ -499,7 +499,7 @@ public function getReflectionClass() /** * Sets whether a group sequence provider should be used. * - * @param bool $active + * @param bool $active * * @throws GroupDefinitionException */ diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Mapping/Loader/AbstractLoader.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Mapping/Loader/AbstractLoader.php index 24591d6..08f7381 100644 --- a/core/vendor/symfony/validator/Symfony/Component/Validator/Mapping/Loader/AbstractLoader.php +++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Mapping/Loader/AbstractLoader.php @@ -36,10 +36,10 @@ protected function addNamespaceAlias($alias, $namespace) /** * Creates a new constraint instance for the given constraint name. * - * @param string $name The constraint name. Either a constraint relative - * to the default constraint namespace, or a fully - * qualified class name - * @param mixed $options The constraint options + * @param string $name The constraint name. Either a constraint relative + * to the default constraint namespace, or a fully + * qualified class name + * @param mixed $options The constraint options * * @return Constraint * diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php index 3503fcf..e362704 100644 --- a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php +++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php @@ -163,7 +163,8 @@ public function provideAllInvalidComparisons() abstract public function provideInvalidComparisons(); /** - * @param array $options Options for the constraint + * @param array $options Options for the constraint + * * @return Constraint */ abstract protected function createConstraint(array $options); diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/AbstractConstraintValidatorTest.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/AbstractConstraintValidatorTest.php index 762dac5..9cca4c6 100644 --- a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/AbstractConstraintValidatorTest.php +++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/AbstractConstraintValidatorTest.php @@ -160,7 +160,7 @@ protected function createContext() } /** - * @param $message + * @param mixed $message * @param array $parameters * @param string $propertyPath * @param string $invalidValue @@ -350,7 +350,7 @@ protected function assertNoViolation() } /** - * @param $message + * @param mixed $message * @param array $parameters * @param string $propertyPath * @param string $invalidValue diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/ChoiceValidatorTest.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/ChoiceValidatorTest.php index aa5b894..e06c173 100644 --- a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/ChoiceValidatorTest.php +++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Constraints/ChoiceValidatorTest.php @@ -95,7 +95,7 @@ public function testValidChoiceCallbackClosure() { $constraint = new Choice(array('callback' => function () { return array('foo', 'bar'); - },)); + }, )); $this->validator->validate('bar', $constraint); diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Mapping/ClassMetadataFactoryTest.php b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Mapping/ClassMetadataFactoryTest.php index aee137a..b559852 100644 --- a/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Mapping/ClassMetadataFactoryTest.php +++ b/core/vendor/symfony/validator/Symfony/Component/Validator/Tests/Mapping/ClassMetadataFactoryTest.php @@ -105,7 +105,7 @@ public function testReadMetadataFromCache() ->method('read') ->will($this->returnValue($metadata)); - $this->assertEquals($metadata,$factory->getMetadataFor(self::PARENTCLASS)); + $this->assertEquals($metadata, $factory->getMetadataFor(self::PARENTCLASS)); } } diff --git a/core/vendor/symfony/validator/Symfony/Component/Validator/ValidationVisitorInterface.php b/core/vendor/symfony/validator/Symfony/Component/Validator/ValidationVisitorInterface.php index 531e6d4..483a1b5 100644 --- a/core/vendor/symfony/validator/Symfony/Component/Validator/ValidationVisitorInterface.php +++ b/core/vendor/symfony/validator/Symfony/Component/Validator/ValidationVisitorInterface.php @@ -56,11 +56,11 @@ * does not find metadata for the given value, it will fail with an * exception. * - * @param mixed $value The value to validate. - * @param string $group The validation group to validate. - * @param string $propertyPath The current property path in the validation graph. - * @param bool $traverse Whether to traverse the value if it is traversable. - * @param bool $deep Whether to traverse nested traversable values recursively. + * @param mixed $value The value to validate. + * @param string $group The validation group to validate. + * @param string $propertyPath The current property path in the validation graph. + * @param bool $traverse Whether to traverse the value if it is traversable. + * @param bool $deep Whether to traverse nested traversable values recursively. * * @throws Exception\NoSuchMetadataException If no metadata can be found for * the given value. diff --git a/core/vendor/symfony/yaml/Symfony/Component/Yaml/Dumper.php b/core/vendor/symfony/yaml/Symfony/Component/Yaml/Dumper.php index 26103c8..39cdcfc 100644 --- a/core/vendor/symfony/yaml/Symfony/Component/Yaml/Dumper.php +++ b/core/vendor/symfony/yaml/Symfony/Component/Yaml/Dumper.php @@ -28,7 +28,7 @@ class Dumper /** * Sets the indentation. * - * @param int $num The amount of spaces to use for indentation of nested nodes. + * @param int $num The amount of spaces to use for indentation of nested nodes. */ public function setIndentation($num) { @@ -38,13 +38,13 @@ public function setIndentation($num) /** * Dumps a PHP value to YAML. * - * @param mixed $input The PHP value - * @param int $inline The level where you switch to inline YAML - * @param int $indent The level of indentation (used internally) - * @param bool $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise - * @param bool $objectSupport true if object support is enabled, false otherwise + * @param mixed $input The PHP value + * @param int $inline The level where you switch to inline YAML + * @param int $indent The level of indentation (used internally) + * @param bool $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise + * @param bool $objectSupport true if object support is enabled, false otherwise * - * @return string The YAML representation of the PHP value + * @return string The YAML representation of the PHP value */ public function dump($input, $inline = 0, $indent = 0, $exceptionOnInvalidType = false, $objectSupport = false) { diff --git a/core/vendor/symfony/yaml/Symfony/Component/Yaml/Escaper.php b/core/vendor/symfony/yaml/Symfony/Component/Yaml/Escaper.php index dc9705f..6f97858 100644 --- a/core/vendor/symfony/yaml/Symfony/Component/Yaml/Escaper.php +++ b/core/vendor/symfony/yaml/Symfony/Component/Yaml/Escaper.php @@ -44,7 +44,7 @@ class Escaper * * @param string $value A PHP value * - * @return bool True if the value would require double quotes. + * @return bool True if the value would require double quotes. */ public static function requiresDoubleQuoting($value) { @@ -68,7 +68,7 @@ public static function escapeWithDoubleQuotes($value) * * @param string $value A PHP value * - * @return bool True if the value would require single quotes. + * @return bool True if the value would require single quotes. */ public static function requiresSingleQuoting($value) { diff --git a/core/vendor/symfony/yaml/Symfony/Component/Yaml/Exception/ParseException.php b/core/vendor/symfony/yaml/Symfony/Component/Yaml/Exception/ParseException.php index f5b5e6b..0447dff 100644 --- a/core/vendor/symfony/yaml/Symfony/Component/Yaml/Exception/ParseException.php +++ b/core/vendor/symfony/yaml/Symfony/Component/Yaml/Exception/ParseException.php @@ -28,10 +28,10 @@ class ParseException extends RuntimeException /** * Constructor. * - * @param string $message The error message - * @param int $parsedLine The line where the error occurred - * @param int $snippet The snippet of code near the problem - * @param string $parsedFile The file name where the error occurred + * @param string $message The error message + * @param int $parsedLine The line where the error occurred + * @param int $snippet The snippet of code near the problem + * @param string $parsedFile The file name where the error occurred * @param \Exception $previous The previous exception */ public function __construct($message, $parsedLine = -1, $snippet = null, $parsedFile = null, \Exception $previous = null) @@ -95,7 +95,7 @@ public function setParsedFile($parsedFile) /** * Gets the line where the error occurred. * - * @return int The file line + * @return int The file line */ public function getParsedLine() { @@ -105,7 +105,7 @@ public function getParsedLine() /** * Sets the line where the error occurred. * - * @param int $parsedLine The file line + * @param int $parsedLine The file line */ public function setParsedLine($parsedLine) { diff --git a/core/vendor/symfony/yaml/Symfony/Component/Yaml/Inline.php b/core/vendor/symfony/yaml/Symfony/Component/Yaml/Inline.php index 40b9c4f..e3fafe1 100644 --- a/core/vendor/symfony/yaml/Symfony/Component/Yaml/Inline.php +++ b/core/vendor/symfony/yaml/Symfony/Component/Yaml/Inline.php @@ -86,9 +86,9 @@ public static function parse($value, $exceptionOnInvalidType = false, $objectSup /** * Dumps a given PHP variable to a YAML string. * - * @param mixed $value The PHP variable to convert - * @param bool $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise - * @param bool $objectSupport true if object support is enabled, false otherwise + * @param mixed $value The PHP variable to convert + * @param bool $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise + * @param bool $objectSupport true if object support is enabled, false otherwise * * @return string The YAML string representing the PHP array * @@ -161,9 +161,9 @@ public static function dump($value, $exceptionOnInvalidType = false, $objectSupp /** * Dumps a PHP array to a YAML string. * - * @param array $value The PHP array to dump - * @param bool $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise - * @param bool $objectSupport true if object support is enabled, false otherwise + * @param array $value The PHP array to dump + * @param bool $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise + * @param bool $objectSupport true if object support is enabled, false otherwise * * @return string The YAML string representing the PHP array */ diff --git a/core/vendor/symfony/yaml/Symfony/Component/Yaml/Parser.php b/core/vendor/symfony/yaml/Symfony/Component/Yaml/Parser.php index a1b6a27..00c613d 100644 --- a/core/vendor/symfony/yaml/Symfony/Component/Yaml/Parser.php +++ b/core/vendor/symfony/yaml/Symfony/Component/Yaml/Parser.php @@ -31,7 +31,7 @@ class Parser /** * Constructor * - * @param int $offset The offset of YAML document (used for line numbers in error messages) + * @param int $offset The offset of YAML document (used for line numbers in error messages) */ public function __construct($offset = 0) { @@ -46,7 +46,7 @@ public function __construct($offset = 0) * @param bool $objectSupport true if object support is enabled, false otherwise * @param bool $objectForMap true if maps should return a stdClass instead of array() * - * @return mixed A PHP value + * @return mixed A PHP value * * @throws ParseException If the YAML is not valid */ @@ -116,7 +116,7 @@ public function parse($value, $exceptionOnInvalidType = false, $objectSupport = $data[] = $this->parseValue($values['value'], $exceptionOnInvalidType, $objectSupport, $objectForMap); } } - } elseif (preg_match('#^(?P'.Inline::REGEX_QUOTED_STRING.'|[^ \'"\[\{].*?) *\:(\s+(?P.+?))?\s*$#u', $this->currentLine, $values) && (false === strpos($values['key'],' #') || in_array($values['key'][0], array('"', "'")))) { + } elseif (preg_match('#^(?P'.Inline::REGEX_QUOTED_STRING.'|[^ \'"\[\{].*?) *\:(\s+(?P.+?))?\s*$#u', $this->currentLine, $values) && (false === strpos($values['key'], ' #') || in_array($values['key'][0], array('"', "'")))) { if ($context && 'sequence' == $context) { throw new ParseException('You cannot define a mapping item when in a sequence'); } @@ -302,7 +302,7 @@ public function parse($value, $exceptionOnInvalidType = false, $objectSupport = /** * Returns the current line number (takes the offset into account). * - * @return int The current line number + * @return int The current line number */ private function getRealCurrentLineNb() { @@ -312,7 +312,7 @@ private function getRealCurrentLineNb() /** * Returns the current line indentation. * - * @return int The current line indentation + * @return int The current line indentation */ private function getCurrentLineIndentation() { @@ -471,11 +471,11 @@ private function parseValue($value, $exceptionOnInvalidType, $objectSupport, $ob /** * Parses a folded scalar. * - * @param string $separator The separator that was used to begin this folded scalar (| or >) - * @param string $indicator The indicator that was used to begin this folded scalar (+ or -) - * @param int $indentation The indentation that was used to begin this folded scalar + * @param string $separator The separator that was used to begin this folded scalar (| or >) + * @param string $indicator The indicator that was used to begin this folded scalar (+ or -) + * @param int $indentation The indentation that was used to begin this folded scalar * - * @return string The text value + * @return string The text value */ private function parseFoldedScalar($separator, $indicator = '', $indentation = 0) { @@ -552,7 +552,7 @@ private function parseFoldedScalar($separator, $indicator = '', $indentation = 0 /** * Returns true if the next line is indented. * - * @return bool Returns true if the next line is indented, false otherwise + * @return bool Returns true if the next line is indented, false otherwise */ private function isNextLineIndented() { @@ -580,7 +580,7 @@ private function isNextLineIndented() /** * Returns true if the current line is blank or if it is a comment line. * - * @return bool Returns true if the current line is empty or if it is a comment line, false otherwise + * @return bool Returns true if the current line is empty or if it is a comment line, false otherwise */ private function isCurrentLineEmpty() { @@ -590,7 +590,7 @@ private function isCurrentLineEmpty() /** * Returns true if the current line is blank. * - * @return bool Returns true if the current line is blank, false otherwise + * @return bool Returns true if the current line is blank, false otherwise */ private function isCurrentLineBlank() { @@ -600,7 +600,7 @@ private function isCurrentLineBlank() /** * Returns true if the current line is a comment line. * - * @return bool Returns true if the current line is a comment line, false otherwise + * @return bool Returns true if the current line is a comment line, false otherwise */ private function isCurrentLineComment() { @@ -651,7 +651,7 @@ private function cleanup($value) /** * Returns true if the next line starts unindented collection * - * @return bool Returns true if the next line starts unindented collection, false otherwise + * @return bool Returns true if the next line starts unindented collection, false otherwise */ private function isNextLineUnIndentedCollection() { @@ -683,7 +683,7 @@ private function isNextLineUnIndentedCollection() /** * Returns true if the string is un-indented collection item * - * @return bool Returns true if the string is un-indented collection item, false otherwise + * @return bool Returns true if the string is un-indented collection item, false otherwise */ private function isStringUnIndentedCollectionItem() { diff --git a/core/vendor/symfony/yaml/Symfony/Component/Yaml/Yaml.php b/core/vendor/symfony/yaml/Symfony/Component/Yaml/Yaml.php index 61793fb..419226a 100644 --- a/core/vendor/symfony/yaml/Symfony/Component/Yaml/Yaml.php +++ b/core/vendor/symfony/yaml/Symfony/Component/Yaml/Yaml.php @@ -38,9 +38,9 @@ class Yaml * you must validate the input before calling this method. Passing a file * as an input is a deprecated feature and will be removed in 3.0. * - * @param string $input Path to a YAML file or a string containing YAML - * @param bool $exceptionOnInvalidType True if an exception must be thrown on invalid types false otherwise - * @param bool $objectSupport True if object support is enabled, false otherwise + * @param string $input Path to a YAML file or a string containing YAML + * @param bool $exceptionOnInvalidType True if an exception must be thrown on invalid types false otherwise + * @param bool $objectSupport True if object support is enabled, false otherwise * * @return array The YAML converted to a PHP array * @@ -80,11 +80,11 @@ public static function parse($input, $exceptionOnInvalidType = false, $objectSup * The dump method, when supplied with an array, will do its best * to convert the array into friendly YAML. * - * @param array $array PHP array - * @param int $inline The level where you switch to inline YAML - * @param int $indent The amount of spaces to use for indentation of nested nodes. - * @param bool $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise - * @param bool $objectSupport true if object support is enabled, false otherwise + * @param array $array PHP array + * @param int $inline The level where you switch to inline YAML + * @param int $indent The amount of spaces to use for indentation of nested nodes. + * @param bool $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise + * @param bool $objectSupport true if object support is enabled, false otherwise * * @return string A YAML string representing the original PHP array *