diff --git a/core/composer.lock b/core/composer.lock
index 014507970b9e362a903dae740b9673e017dea7d5..536389885055c7fbe744f614f3c197376db55b31 100644
--- a/core/composer.lock
+++ b/core/composer.lock
@@ -1,7 +1,7 @@
{
"_readme": [
"This file locks the dependencies of your project to a known state",
- "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "61a2b6dec8252d78e904d37fbf1637d7",
@@ -2143,21 +2143,20 @@
},
{
"name": "symfony/browser-kit",
- "version": "v2.6.9",
- "target-dir": "Symfony/Component/BrowserKit",
+ "version": "v2.7.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/BrowserKit.git",
- "reference": "cf950c42947ea2f29c36a1f443202b6134f5c303"
+ "reference": "70cdc18dd601a486a8cc69ee26367cbaedd60400"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/cf950c42947ea2f29c36a1f443202b6134f5c303",
- "reference": "cf950c42947ea2f29c36a1f443202b6134f5c303",
+ "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/70cdc18dd601a486a8cc69ee26367cbaedd60400",
+ "reference": "70cdc18dd601a486a8cc69ee26367cbaedd60400",
"shasum": ""
},
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.9",
"symfony/dom-crawler": "~2.0,>=2.0.5"
},
"require-dev": {
@@ -2171,11 +2170,11 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.6-dev"
+ "dev-master": "2.7-dev"
}
},
"autoload": {
- "psr-0": {
+ "psr-4": {
"Symfony\\Component\\BrowserKit\\": ""
}
},
@@ -2195,7 +2194,7 @@
],
"description": "Symfony BrowserKit Component",
"homepage": "https://symfony.com",
- "time": "2015-05-02 15:18:45"
+ "time": "2015-05-02 15:21:08"
},
{
"name": "symfony/class-loader",
@@ -2249,16 +2248,16 @@
},
{
"name": "symfony/console",
- "version": "v2.7.0-BETA2",
+ "version": "v2.7.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/Console.git",
- "reference": "555ba7fc54a538e1b83988e2299db09b6b6dca64"
+ "reference": "7f0bec04961c61c961df0cb8c2ae88dbfd83f399"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Console/zipball/555ba7fc54a538e1b83988e2299db09b6b6dca64",
- "reference": "555ba7fc54a538e1b83988e2299db09b6b6dca64",
+ "url": "https://api.github.com/repos/symfony/Console/zipball/7f0bec04961c61c961df0cb8c2ae88dbfd83f399",
+ "reference": "7f0bec04961c61c961df0cb8c2ae88dbfd83f399",
"shasum": ""
},
"require": {
@@ -2302,7 +2301,7 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
- "time": "2015-05-02 15:21:08"
+ "time": "2015-05-29 16:22:24"
},
{
"name": "symfony/css-selector",
@@ -2359,21 +2358,20 @@
},
{
"name": "symfony/debug",
- "version": "v2.6.9",
- "target-dir": "Symfony/Component/Debug",
+ "version": "v2.7.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/Debug.git",
- "reference": "4851a041c48e76b91a221db84ab5850daa6a7b33"
+ "reference": "1df2971b27a6ff73dae4ea622f42802000ec332d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Debug/zipball/4851a041c48e76b91a221db84ab5850daa6a7b33",
- "reference": "4851a041c48e76b91a221db84ab5850daa6a7b33",
+ "url": "https://api.github.com/repos/symfony/Debug/zipball/1df2971b27a6ff73dae4ea622f42802000ec332d",
+ "reference": "1df2971b27a6ff73dae4ea622f42802000ec332d",
"shasum": ""
},
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.9",
"psr/log": "~1.0"
},
"conflict": {
@@ -2392,11 +2390,11 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.6-dev"
+ "dev-master": "2.7-dev"
}
},
"autoload": {
- "psr-0": {
+ "psr-4": {
"Symfony\\Component\\Debug\\": ""
}
},
@@ -2416,7 +2414,7 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
- "time": "2015-05-20 13:09:45"
+ "time": "2015-05-22 14:54:25"
},
{
"name": "symfony/dependency-injection",
@@ -2480,21 +2478,20 @@
},
{
"name": "symfony/dom-crawler",
- "version": "v2.6.9",
- "target-dir": "Symfony/Component/DomCrawler",
+ "version": "v2.7.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/DomCrawler.git",
- "reference": "c74fe625d8c65fee512de2b40cceabba1b09503b"
+ "reference": "11d8eb8ccc1533f4c2d89a025f674894fda520b3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/c74fe625d8c65fee512de2b40cceabba1b09503b",
- "reference": "c74fe625d8c65fee512de2b40cceabba1b09503b",
+ "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/11d8eb8ccc1533f4c2d89a025f674894fda520b3",
+ "reference": "11d8eb8ccc1533f4c2d89a025f674894fda520b3",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=5.3.9"
},
"require-dev": {
"symfony/css-selector": "~2.3",
@@ -2506,11 +2503,11 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.6-dev"
+ "dev-master": "2.7-dev"
}
},
"autoload": {
- "psr-0": {
+ "psr-4": {
"Symfony\\Component\\DomCrawler\\": ""
}
},
@@ -2530,7 +2527,7 @@
],
"description": "Symfony DomCrawler Component",
"homepage": "https://symfony.com",
- "time": "2015-05-22 14:53:08"
+ "time": "2015-05-22 14:54:25"
},
{
"name": "symfony/event-dispatcher",
diff --git a/core/vendor/composer/autoload_namespaces.php b/core/vendor/composer/autoload_namespaces.php
index 305ab18c6815cb8762d1081d67ef3a583f722bc5..60382889c8692e1d931fbe4ca98274c9aae02e93 100644
--- a/core/vendor/composer/autoload_namespaces.php
+++ b/core/vendor/composer/autoload_namespaces.php
@@ -9,9 +9,6 @@
'phpDocumentor' => array($vendorDir . '/phpdocumentor/reflection-docblock/src'),
'org\\bovigo\\vfs\\' => array($vendorDir . '/mikey179/vfsStream/src/main/php'),
'Twig_' => array($vendorDir . '/twig/twig/lib'),
- 'Symfony\\Component\\DomCrawler\\' => array($vendorDir . '/symfony/dom-crawler'),
- 'Symfony\\Component\\Debug\\' => array($vendorDir . '/symfony/debug'),
- 'Symfony\\Component\\BrowserKit\\' => array($vendorDir . '/symfony/browser-kit'),
'Stack' => array($vendorDir . '/stack/builder/src'),
'Psr\\Log\\' => array($vendorDir . '/psr/log'),
'Prophecy\\' => array($vendorDir . '/phpspec/prophecy/src'),
diff --git a/core/vendor/composer/autoload_psr4.php b/core/vendor/composer/autoload_psr4.php
index af91507e48002f81284b5850fc593a504fd924ea..a026f26f59a56f44bd902bf68fce7b45b26b119d 100644
--- a/core/vendor/composer/autoload_psr4.php
+++ b/core/vendor/composer/autoload_psr4.php
@@ -18,10 +18,13 @@
'Symfony\\Component\\HttpKernel\\' => array($vendorDir . '/symfony/http-kernel'),
'Symfony\\Component\\HttpFoundation\\' => array($vendorDir . '/symfony/http-foundation'),
'Symfony\\Component\\EventDispatcher\\' => array($vendorDir . '/symfony/event-dispatcher'),
+ 'Symfony\\Component\\DomCrawler\\' => array($vendorDir . '/symfony/dom-crawler'),
'Symfony\\Component\\DependencyInjection\\' => array($vendorDir . '/symfony/dependency-injection'),
+ 'Symfony\\Component\\Debug\\' => array($vendorDir . '/symfony/debug'),
'Symfony\\Component\\CssSelector\\' => array($vendorDir . '/symfony/css-selector'),
'Symfony\\Component\\Console\\' => array($vendorDir . '/symfony/console'),
'Symfony\\Component\\ClassLoader\\' => array($vendorDir . '/symfony/class-loader'),
+ 'Symfony\\Component\\BrowserKit\\' => array($vendorDir . '/symfony/browser-kit'),
'Symfony\\Cmf\\Component\\Routing\\' => array($vendorDir . '/symfony-cmf/routing'),
'React\\Promise\\' => array($vendorDir . '/react/promise/src'),
'Masterminds\\' => array($vendorDir . '/masterminds/html5/src'),
diff --git a/core/vendor/composer/installed.json b/core/vendor/composer/installed.json
index ca6969b7daba72b6405c12d14cbe9d506f385dc2..457c12ec125a9f142f93766cb8020f795b621d0d 100644
--- a/core/vendor/composer/installed.json
+++ b/core/vendor/composer/installed.json
@@ -2478,65 +2478,6 @@
"description": "Symfony ClassLoader Component",
"homepage": "https://symfony.com"
},
- {
- "name": "symfony/console",
- "version": "v2.7.0-BETA2",
- "version_normalized": "2.7.0.0-beta2",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/Console.git",
- "reference": "555ba7fc54a538e1b83988e2299db09b6b6dca64"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/Console/zipball/555ba7fc54a538e1b83988e2299db09b6b6dca64",
- "reference": "555ba7fc54a538e1b83988e2299db09b6b6dca64",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.9"
- },
- "require-dev": {
- "psr/log": "~1.0",
- "symfony/event-dispatcher": "~2.1",
- "symfony/phpunit-bridge": "~2.7",
- "symfony/process": "~2.1"
- },
- "suggest": {
- "psr/log": "For using the console logger",
- "symfony/event-dispatcher": "",
- "symfony/process": ""
- },
- "time": "2015-05-02 15:21:08",
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.7-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "psr-4": {
- "Symfony\\Component\\Console\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony Console Component",
- "homepage": "https://symfony.com"
- },
{
"name": "symfony/css-selector",
"version": "v2.7.0",
@@ -2654,69 +2595,6 @@
"description": "Symfony DependencyInjection Component",
"homepage": "https://symfony.com"
},
- {
- "name": "symfony/debug",
- "version": "v2.6.9",
- "version_normalized": "2.6.9.0",
- "target-dir": "Symfony/Component/Debug",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/Debug.git",
- "reference": "4851a041c48e76b91a221db84ab5850daa6a7b33"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/Debug/zipball/4851a041c48e76b91a221db84ab5850daa6a7b33",
- "reference": "4851a041c48e76b91a221db84ab5850daa6a7b33",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3",
- "psr/log": "~1.0"
- },
- "conflict": {
- "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
- },
- "require-dev": {
- "symfony/class-loader": "~2.2",
- "symfony/http-foundation": "~2.1",
- "symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2",
- "symfony/phpunit-bridge": "~2.7"
- },
- "suggest": {
- "symfony/http-foundation": "",
- "symfony/http-kernel": ""
- },
- "time": "2015-05-20 13:09:45",
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.6-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "psr-0": {
- "Symfony\\Component\\Debug\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony Debug Component",
- "homepage": "https://symfony.com"
- },
{
"name": "symfony/http-foundation",
"version": "v2.7.0",
@@ -3287,24 +3165,144 @@
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com"
},
+ {
+ "name": "symfony/console",
+ "version": "v2.7.0",
+ "version_normalized": "2.7.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/Console.git",
+ "reference": "7f0bec04961c61c961df0cb8c2ae88dbfd83f399"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/Console/zipball/7f0bec04961c61c961df0cb8c2ae88dbfd83f399",
+ "reference": "7f0bec04961c61c961df0cb8c2ae88dbfd83f399",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.9"
+ },
+ "require-dev": {
+ "psr/log": "~1.0",
+ "symfony/event-dispatcher": "~2.1",
+ "symfony/phpunit-bridge": "~2.7",
+ "symfony/process": "~2.1"
+ },
+ "suggest": {
+ "psr/log": "For using the console logger",
+ "symfony/event-dispatcher": "",
+ "symfony/process": ""
+ },
+ "time": "2015-05-29 16:22:24",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.7-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Component\\Console\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony Console Component",
+ "homepage": "https://symfony.com"
+ },
+ {
+ "name": "symfony/debug",
+ "version": "v2.7.0",
+ "version_normalized": "2.7.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/Debug.git",
+ "reference": "1df2971b27a6ff73dae4ea622f42802000ec332d"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/Debug/zipball/1df2971b27a6ff73dae4ea622f42802000ec332d",
+ "reference": "1df2971b27a6ff73dae4ea622f42802000ec332d",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.9",
+ "psr/log": "~1.0"
+ },
+ "conflict": {
+ "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
+ },
+ "require-dev": {
+ "symfony/class-loader": "~2.2",
+ "symfony/http-foundation": "~2.1",
+ "symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2",
+ "symfony/phpunit-bridge": "~2.7"
+ },
+ "suggest": {
+ "symfony/http-foundation": "",
+ "symfony/http-kernel": ""
+ },
+ "time": "2015-05-22 14:54:25",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.7-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Component\\Debug\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony Debug Component",
+ "homepage": "https://symfony.com"
+ },
{
"name": "symfony/dom-crawler",
- "version": "v2.6.9",
- "version_normalized": "2.6.9.0",
- "target-dir": "Symfony/Component/DomCrawler",
+ "version": "v2.7.0",
+ "version_normalized": "2.7.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/DomCrawler.git",
- "reference": "c74fe625d8c65fee512de2b40cceabba1b09503b"
+ "reference": "11d8eb8ccc1533f4c2d89a025f674894fda520b3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/c74fe625d8c65fee512de2b40cceabba1b09503b",
- "reference": "c74fe625d8c65fee512de2b40cceabba1b09503b",
+ "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/11d8eb8ccc1533f4c2d89a025f674894fda520b3",
+ "reference": "11d8eb8ccc1533f4c2d89a025f674894fda520b3",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=5.3.9"
},
"require-dev": {
"symfony/css-selector": "~2.3",
@@ -3313,16 +3311,16 @@
"suggest": {
"symfony/css-selector": ""
},
- "time": "2015-05-22 14:53:08",
+ "time": "2015-05-22 14:54:25",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.6-dev"
+ "dev-master": "2.7-dev"
}
},
"installation-source": "dist",
"autoload": {
- "psr-0": {
+ "psr-4": {
"Symfony\\Component\\DomCrawler\\": ""
}
},
@@ -3345,22 +3343,21 @@
},
{
"name": "symfony/browser-kit",
- "version": "v2.6.9",
- "version_normalized": "2.6.9.0",
- "target-dir": "Symfony/Component/BrowserKit",
+ "version": "v2.7.0",
+ "version_normalized": "2.7.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/BrowserKit.git",
- "reference": "cf950c42947ea2f29c36a1f443202b6134f5c303"
+ "reference": "70cdc18dd601a486a8cc69ee26367cbaedd60400"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/cf950c42947ea2f29c36a1f443202b6134f5c303",
- "reference": "cf950c42947ea2f29c36a1f443202b6134f5c303",
+ "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/70cdc18dd601a486a8cc69ee26367cbaedd60400",
+ "reference": "70cdc18dd601a486a8cc69ee26367cbaedd60400",
"shasum": ""
},
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.9",
"symfony/dom-crawler": "~2.0,>=2.0.5"
},
"require-dev": {
@@ -3371,16 +3368,16 @@
"suggest": {
"symfony/process": ""
},
- "time": "2015-05-02 15:18:45",
+ "time": "2015-05-02 15:21:08",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.6-dev"
+ "dev-master": "2.7-dev"
}
},
"installation-source": "dist",
"autoload": {
- "psr-0": {
+ "psr-4": {
"Symfony\\Component\\BrowserKit\\": ""
}
},
diff --git a/core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/.gitignore b/core/vendor/symfony/browser-kit/.gitignore
similarity index 100%
rename from core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/.gitignore
rename to core/vendor/symfony/browser-kit/.gitignore
diff --git a/core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/CHANGELOG.md b/core/vendor/symfony/browser-kit/CHANGELOG.md
similarity index 100%
rename from core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/CHANGELOG.md
rename to core/vendor/symfony/browser-kit/CHANGELOG.md
diff --git a/core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Client.php b/core/vendor/symfony/browser-kit/Client.php
similarity index 100%
rename from core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Client.php
rename to core/vendor/symfony/browser-kit/Client.php
diff --git a/core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Cookie.php b/core/vendor/symfony/browser-kit/Cookie.php
similarity index 100%
rename from core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Cookie.php
rename to core/vendor/symfony/browser-kit/Cookie.php
diff --git a/core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/CookieJar.php b/core/vendor/symfony/browser-kit/CookieJar.php
similarity index 100%
rename from core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/CookieJar.php
rename to core/vendor/symfony/browser-kit/CookieJar.php
diff --git a/core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/History.php b/core/vendor/symfony/browser-kit/History.php
similarity index 100%
rename from core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/History.php
rename to core/vendor/symfony/browser-kit/History.php
diff --git a/core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/LICENSE b/core/vendor/symfony/browser-kit/LICENSE
similarity index 100%
rename from core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/LICENSE
rename to core/vendor/symfony/browser-kit/LICENSE
diff --git a/core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/README.md b/core/vendor/symfony/browser-kit/README.md
similarity index 100%
rename from core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/README.md
rename to core/vendor/symfony/browser-kit/README.md
diff --git a/core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Request.php b/core/vendor/symfony/browser-kit/Request.php
similarity index 100%
rename from core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Request.php
rename to core/vendor/symfony/browser-kit/Request.php
diff --git a/core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Response.php b/core/vendor/symfony/browser-kit/Response.php
similarity index 100%
rename from core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Response.php
rename to core/vendor/symfony/browser-kit/Response.php
diff --git a/core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Tests/ClientTest.php b/core/vendor/symfony/browser-kit/Tests/ClientTest.php
similarity index 100%
rename from core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Tests/ClientTest.php
rename to core/vendor/symfony/browser-kit/Tests/ClientTest.php
diff --git a/core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Tests/CookieJarTest.php b/core/vendor/symfony/browser-kit/Tests/CookieJarTest.php
similarity index 100%
rename from core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Tests/CookieJarTest.php
rename to core/vendor/symfony/browser-kit/Tests/CookieJarTest.php
diff --git a/core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Tests/CookieTest.php b/core/vendor/symfony/browser-kit/Tests/CookieTest.php
similarity index 100%
rename from core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Tests/CookieTest.php
rename to core/vendor/symfony/browser-kit/Tests/CookieTest.php
diff --git a/core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Tests/HistoryTest.php b/core/vendor/symfony/browser-kit/Tests/HistoryTest.php
similarity index 100%
rename from core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Tests/HistoryTest.php
rename to core/vendor/symfony/browser-kit/Tests/HistoryTest.php
diff --git a/core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Tests/RequestTest.php b/core/vendor/symfony/browser-kit/Tests/RequestTest.php
similarity index 100%
rename from core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Tests/RequestTest.php
rename to core/vendor/symfony/browser-kit/Tests/RequestTest.php
diff --git a/core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Tests/ResponseTest.php b/core/vendor/symfony/browser-kit/Tests/ResponseTest.php
similarity index 100%
rename from core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/Tests/ResponseTest.php
rename to core/vendor/symfony/browser-kit/Tests/ResponseTest.php
diff --git a/core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/composer.json b/core/vendor/symfony/browser-kit/composer.json
similarity index 82%
rename from core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/composer.json
rename to core/vendor/symfony/browser-kit/composer.json
index 343ecd3a33d06264ad326585a87b2e43a8307e80..0cb629c085424d5ffd80b0907721ade5f78cb470 100644
--- a/core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/composer.json
+++ b/core/vendor/symfony/browser-kit/composer.json
@@ -16,7 +16,7 @@
}
],
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.9",
"symfony/dom-crawler": "~2.0,>=2.0.5"
},
"require-dev": {
@@ -28,13 +28,12 @@
"symfony/process": ""
},
"autoload": {
- "psr-0": { "Symfony\\Component\\BrowserKit\\": "" }
+ "psr-4": { "Symfony\\Component\\BrowserKit\\": "" }
},
- "target-dir": "Symfony/Component/BrowserKit",
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.6-dev"
+ "dev-master": "2.7-dev"
}
}
}
diff --git a/core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/phpunit.xml.dist b/core/vendor/symfony/browser-kit/phpunit.xml.dist
similarity index 99%
rename from core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/phpunit.xml.dist
rename to core/vendor/symfony/browser-kit/phpunit.xml.dist
index d6ca28bf1c6b59eb381010341d4a517781d1872b..d76b2b98afd80b1edd715e62f687511e7c899a44 100644
--- a/core/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/phpunit.xml.dist
+++ b/core/vendor/symfony/browser-kit/phpunit.xml.dist
@@ -9,6 +9,7 @@
<php>
<ini name="error_reporting" value="-1" />
</php>
+
<testsuites>
<testsuite name="Symfony BrowserKit Component Test Suite">
<directory>./Tests/</directory>
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/.gitignore b/core/vendor/symfony/console/.gitignore
similarity index 100%
rename from core/vendor/symfony/debug/Symfony/Component/Debug/.gitignore
rename to core/vendor/symfony/console/.gitignore
diff --git a/core/vendor/symfony/console/Application.php b/core/vendor/symfony/console/Application.php
index 11ac33378f712e264384a3d4efdb6188c4610ee4..1ee2831b7978c3b35ca4c5e5c2376cbbd7c06263 100644
--- a/core/vendor/symfony/console/Application.php
+++ b/core/vendor/symfony/console/Application.php
@@ -717,7 +717,7 @@ public function renderException($e, $output)
'args' => array(),
));
- for ($i = 0, $count = count($trace); $i < $count; $i++) {
+ for ($i = 0, $count = count($trace); $i < $count; ++$i) {
$class = isset($trace[$i]['class']) ? $trace[$i]['class'] : '';
$type = isset($trace[$i]['type']) ? $trace[$i]['type'] : '';
$function = $trace[$i]['function'];
@@ -925,12 +925,12 @@ protected function getDefaultInputDefinition()
return new InputDefinition(array(
new InputArgument('command', InputArgument::REQUIRED, 'The command to execute'),
- new InputOption('--help', '-h', InputOption::VALUE_NONE, 'Display this help message'),
- new InputOption('--quiet', '-q', InputOption::VALUE_NONE, 'Do not output any message'),
- new InputOption('--verbose', '-v|vv|vvv', InputOption::VALUE_NONE, 'Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug'),
- new InputOption('--version', '-V', InputOption::VALUE_NONE, 'Display this application version'),
- new InputOption('--ansi', '', InputOption::VALUE_NONE, 'Force ANSI output'),
- new InputOption('--no-ansi', '', InputOption::VALUE_NONE, 'Disable ANSI output'),
+ new InputOption('--help', '-h', InputOption::VALUE_NONE, 'Display this help message'),
+ new InputOption('--quiet', '-q', InputOption::VALUE_NONE, 'Do not output any message'),
+ new InputOption('--verbose', '-v|vv|vvv', InputOption::VALUE_NONE, 'Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug'),
+ new InputOption('--version', '-V', InputOption::VALUE_NONE, 'Display this application version'),
+ new InputOption('--ansi', '', InputOption::VALUE_NONE, 'Force ANSI output'),
+ new InputOption('--no-ansi', '', InputOption::VALUE_NONE, 'Disable ANSI output'),
new InputOption('--no-interaction', '-n', InputOption::VALUE_NONE, 'Do not ask any interactive question'),
));
}
diff --git a/core/vendor/symfony/console/Command/HelpCommand.php b/core/vendor/symfony/console/Command/HelpCommand.php
index 4cf93624198fca3f59f55e518e8940fee140574e..ae06af50e591c3ab67c1ec7b21cd717812b21d3a 100644
--- a/core/vendor/symfony/console/Command/HelpCommand.php
+++ b/core/vendor/symfony/console/Command/HelpCommand.php
@@ -38,7 +38,7 @@ protected function configure()
->setDefinition(array(
new InputArgument('command_name', InputArgument::OPTIONAL, 'The command name', 'help'),
new InputOption('xml', null, InputOption::VALUE_NONE, 'To output help as XML'),
- new InputOption('format', null, InputOption::VALUE_REQUIRED, 'To output help in other formats', 'txt'),
+ new InputOption('format', null, InputOption::VALUE_REQUIRED, 'The output format (txt, xml, json, or md)', 'txt'),
new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw command help'),
))
->setDescription('Displays help for a command')
@@ -77,6 +77,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
}
if ($input->getOption('xml')) {
+ trigger_error('The --xml option was deprecated in version 2.7 and will be removed in version 3.0. Use the --format option instead.', E_USER_DEPRECATED);
+
$input->setOption('format', 'xml');
}
diff --git a/core/vendor/symfony/console/Command/ListCommand.php b/core/vendor/symfony/console/Command/ListCommand.php
index 58868e4706ac7fe3ee998da064a02574a477ff4b..c42a6f27d3489a0327b87809232b6d4daa3b311e 100644
--- a/core/vendor/symfony/console/Command/ListCommand.php
+++ b/core/vendor/symfony/console/Command/ListCommand.php
@@ -69,6 +69,8 @@ public function getNativeDefinition()
protected function execute(InputInterface $input, OutputInterface $output)
{
if ($input->getOption('xml')) {
+ trigger_error('The --xml option was deprecated in version 2.7 and will be removed in version 3.0. Use the --format option instead.', E_USER_DEPRECATED);
+
$input->setOption('format', 'xml');
}
@@ -89,7 +91,7 @@ private function createDefinition()
new InputArgument('namespace', InputArgument::OPTIONAL, 'The namespace name'),
new InputOption('xml', null, InputOption::VALUE_NONE, 'To output list as XML'),
new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw command list'),
- new InputOption('format', null, InputOption::VALUE_REQUIRED, 'To output list in other formats', 'txt'),
+ new InputOption('format', null, InputOption::VALUE_REQUIRED, 'The output format (txt, xml, json, or md)', 'txt'),
));
}
}
diff --git a/core/vendor/symfony/console/Formatter/OutputFormatter.php b/core/vendor/symfony/console/Formatter/OutputFormatter.php
index 90b1970f4b299ca04780f70dec2236ed21427da8..a053ac6ba09668efa5a9d313776eaaab551b7278 100644
--- a/core/vendor/symfony/console/Formatter/OutputFormatter.php
+++ b/core/vendor/symfony/console/Formatter/OutputFormatter.php
@@ -142,6 +142,7 @@ public function getStyle($name)
*/
public function format($message)
{
+ $message = (string) $message;
$offset = 0;
$output = '';
$tagRegex = '[a-z][a-z0-9_=;-]*';
diff --git a/core/vendor/symfony/console/Helper/DialogHelper.php b/core/vendor/symfony/console/Helper/DialogHelper.php
index ebac99c9e33437e4c8eb1a6b58e8a884d6743c00..886baafd42a3d4f66c405bf418e638ad741cbd6e 100644
--- a/core/vendor/symfony/console/Helper/DialogHelper.php
+++ b/core/vendor/symfony/console/Helper/DialogHelper.php
@@ -145,7 +145,7 @@ public function ask(OutputInterface $output, $question, $default = null, array $
// Backspace Character
if ("\177" === $c) {
if (0 === $numMatches && 0 !== $i) {
- $i--;
+ --$i;
// Move cursor backwards
$output->write("\033[1D");
}
@@ -198,7 +198,7 @@ public function ask(OutputInterface $output, $question, $default = null, array $
} else {
$output->write($c);
$ret .= $c;
- $i++;
+ ++$i;
$numMatches = 0;
$ofs = 0;
diff --git a/core/vendor/symfony/console/Input/ArgvInput.php b/core/vendor/symfony/console/Input/ArgvInput.php
index f5cc5d136bd37506e713a02c9963269085a02eae..97b0cfc05d2174ff221d1e24b07c52d7c954e7ed 100644
--- a/core/vendor/symfony/console/Input/ArgvInput.php
+++ b/core/vendor/symfony/console/Input/ArgvInput.php
@@ -123,7 +123,7 @@ private function parseShortOption($token)
private function parseShortOptionSet($name)
{
$len = strlen($name);
- for ($i = 0; $i < $len; $i++) {
+ for ($i = 0; $i < $len; ++$i) {
if (!$this->definition->hasShortcut($name[$i])) {
throw new \RuntimeException(sprintf('The "-%s" option does not exist.', $name[$i]));
}
diff --git a/core/vendor/symfony/console/Input/InputDefinition.php b/core/vendor/symfony/console/Input/InputDefinition.php
index 7efb849ab2470a2a43b5542200030c702acab192..044ec265b246db3c14d355ca9fe9d07147da7171 100644
--- a/core/vendor/symfony/console/Input/InputDefinition.php
+++ b/core/vendor/symfony/console/Input/InputDefinition.php
@@ -391,7 +391,7 @@ private function shortcutToName($shortcut)
/**
* Gets the synopsis.
*
- * @param bool $short Whether to return the short version (with options foloded) or not
+ * @param bool $short Whether to return the short version (with options folded) or not
*
* @return string The synopsis
*/
diff --git a/core/vendor/symfony/console/Output/StreamOutput.php b/core/vendor/symfony/console/Output/StreamOutput.php
index 8de10b4716f4f64920212b28428c05c4ad92c2df..494cded85ed1306b64016c0ac11f9774a6342204 100644
--- a/core/vendor/symfony/console/Output/StreamOutput.php
+++ b/core/vendor/symfony/console/Output/StreamOutput.php
@@ -94,7 +94,7 @@ protected function doWrite($message, $newline)
*/
protected function hasColorSupport()
{
- if (DIRECTORY_SEPARATOR == '\\') {
+ if (DIRECTORY_SEPARATOR === '\\') {
return false !== getenv('ANSICON') || 'ON' === getenv('ConEmuANSI');
}
diff --git a/core/vendor/symfony/console/Question/ChoiceQuestion.php b/core/vendor/symfony/console/Question/ChoiceQuestion.php
index ce4ff67779e7e07535a3c74a3257baed7368281a..9586c5bf3ac02c070020c065a9a57bb2c4c2ee67 100644
--- a/core/vendor/symfony/console/Question/ChoiceQuestion.php
+++ b/core/vendor/symfony/console/Question/ChoiceQuestion.php
@@ -149,19 +149,19 @@ private function getDefaultValidator()
$result = array_search($value, $choices);
if (!$isAssoc) {
- if (!empty($result)) {
+ if (false !== $result) {
$result = $choices[$result];
} elseif (isset($choices[$value])) {
$result = $choices[$value];
}
- } elseif (empty($result) && array_key_exists($value, $choices)) {
+ } elseif (false === $result && isset($choices[$value])) {
$result = $value;
}
- if (empty($result)) {
+ if (false === $result) {
throw new \InvalidArgumentException(sprintf($errorMessage, $value));
}
- array_push($multiselectChoices, $result);
+ array_push($multiselectChoices, (string) $result);
}
if ($multiselect) {
diff --git a/core/vendor/symfony/console/Resources/bin/hiddeninput.exe b/core/vendor/symfony/console/Resources/bin/hiddeninput.exe
index b59fd5b7935e856dc92af806dd500f9346b0e92a..9f4a2aa6357a7dd48f810a66982dc0f78a1c27f6 100644
--- a/core/vendor/symfony/console/Resources/bin/hiddeninput.exe
+++ b/core/vendor/symfony/console/Resources/bin/hiddeninput.exe
@@ -1,4 +1,4 @@
-MZ�������ÿÿ��¸�������@�����������������������������������è��� º�´ Í!¸LÍ!This program cannot be run in DOS mode.
+MZ�������ÿÿ��¸�������@�����������������������������������è��� º�´ Í!¸LÍ!This program cannot be run in DOS mode.
$�������Æ,Í;§Bž;§Bž;§Bž2ßמ:§Bž2ßÁž-§Bž2ßÆž9§Bž2ßÑž?§Bž a9ž8§Bž;§Cž§Bž2ßÈž:§Bž2ßÖž:§Bž2ßÓž:§BžRich;§Bž��������PE��L�¬MoO��������à� ��
���������8������ ����@����������������������`�����?œ���@���������������������������"��P����@�� �������������������P��p���!�� ���������������������������8!��@������������ ��Ø���������������������������.text��� ������
����������������� ��`.rdata����� ���
diff --git a/core/vendor/symfony/console/Style/StyleInterface.php b/core/vendor/symfony/console/Style/StyleInterface.php
index 214782e3939fdbfb28102bf45deb4bd076f0cb58..2448547f855aacfc26e2c5fd78468d91346640a2 100644
--- a/core/vendor/symfony/console/Style/StyleInterface.php
+++ b/core/vendor/symfony/console/Style/StyleInterface.php
@@ -12,7 +12,7 @@
namespace Symfony\Component\Console\Style;
/**
- * Output style helpers
+ * Output style helpers.
*
* @author Kevin Bond <kevinbond@gmail.com>
*/
@@ -92,9 +92,9 @@ public function table(array $headers, array $rows);
/**
* Asks a question.
*
- * @param string $question
- * @param string|null $default
- * @param callable|null $validator
+ * @param string $question
+ * @param string|null $default
+ * @param callable|null $validator
*
* @return string
*/
@@ -132,7 +132,7 @@ public function confirm($question, $default = true);
public function choice($question, array $choices, $default = null);
/**
- * Add newline(s)
+ * Add newline(s).
*
* @param int $count The number of newlines
*/
diff --git a/core/vendor/symfony/console/Style/SymfonyStyle.php b/core/vendor/symfony/console/Style/SymfonyStyle.php
index 1ccccc9df3c59577b6cb02fecd0bca4b710575c7..6d69eca54af89d2b848d9d50cc440b4eadc0b119 100644
--- a/core/vendor/symfony/console/Style/SymfonyStyle.php
+++ b/core/vendor/symfony/console/Style/SymfonyStyle.php
@@ -52,15 +52,15 @@ public function __construct(InputInterface $input, OutputInterface $output)
/**
* Formats a message as a block of text.
*
- * @param string|array $messages The message to write in the block
- * @param string|null $type The block type (added in [] on first line)
- * @param string|null $style The style to apply to the whole block
- * @param string $prefix The prefix for the block
- * @param bool $padding Whether to add vertical padding
+ * @param string|array $messages The message to write in the block
+ * @param string|null $type The block type (added in [] on first line)
+ * @param string|null $style The style to apply to the whole block
+ * @param string $prefix The prefix for the block
+ * @param bool $padding Whether to add vertical padding
*/
public function block($messages, $type = null, $style = null, $prefix = ' ', $padding = false)
{
- $messages = array_values((array) $messages);
+ $messages = is_array($messages) ? array_values($messages) : array($messages);
$lines = array();
// add type
@@ -85,7 +85,7 @@ public function block($messages, $type = null, $style = null, $prefix = ' ', $pa
foreach ($lines as &$line) {
$line = sprintf('%s%s', $prefix, $line);
- $line .= str_repeat(' ', $this->lineLength - Helper::strlen($line));
+ $line .= str_repeat(' ', $this->lineLength - Helper::strlenWithoutDecoration($this->getFormatter(), $line));
if ($style) {
$line = sprintf('<%s>%s</>', $style, $line);
diff --git a/core/vendor/symfony/console/Tests/Command/CommandTest.php b/core/vendor/symfony/console/Tests/Command/CommandTest.php
index 08761163eb2d874a3776dffa6c4c69aa8660c705..1f1160efb60b5500d521ba48b3e600d08f8a201e 100644
--- a/core/vendor/symfony/console/Tests/Command/CommandTest.php
+++ b/core/vendor/symfony/console/Tests/Command/CommandTest.php
@@ -167,15 +167,6 @@ public function testGetHelper()
$this->assertEquals($formatterHelper->getName(), $command->getHelper('formatter')->getName(), '->getHelper() returns the correct helper');
}
- public function testGet()
- {
- $application = new Application();
- $command = new \TestCommand();
- $command->setApplication($application);
- $formatterHelper = new FormatterHelper();
- $this->assertEquals($formatterHelper->getName(), $command->getHelper('formatter')->getName(), '->__get() returns the correct helper');
- }
-
public function testMergeApplicationDefinition()
{
$application1 = new Application();
diff --git a/core/vendor/symfony/console/Tests/Fixtures/application_1.json b/core/vendor/symfony/console/Tests/Fixtures/application_1.json
index aa4ae9a0dc9d09c28b350561e2861c8067c00551..b17b38d8a3ed9d051bb2fd071083aa93d447dc6a 100644
--- a/core/vendor/symfony/console/Tests/Fixtures/application_1.json
+++ b/core/vendor/symfony/console/Tests/Fixtures/application_1.json
@@ -1 +1 @@
-{"commands":[{"name":"help","usage":["help [--xml] [--format FORMAT] [--raw] [--] [<command_name>]"],"description":"Displays help for a command","help":"The <info>help<\/info> command displays help for a given command:\n\n <info>php app\/console help list<\/info>\n\nYou can also output the help in other formats by using the <comment>--format<\/comment> option:\n\n <info>php app\/console help --format=xml list<\/info>\n\nTo display the list of available commands, please use the <info>list<\/info> command.","definition":{"arguments":{"command_name":{"name":"command_name","is_required":false,"is_array":false,"description":"The command name","default":"help"}},"options":{"xml":{"name":"--xml","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output help as XML","default":false},"format":{"name":"--format","shortcut":"","accept_value":true,"is_value_required":true,"is_multiple":false,"description":"To output help in other formats","default":"txt"},"raw":{"name":"--raw","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output raw command help","default":false},"help":{"name":"--help","shortcut":"-h","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Display this help message","default":false},"quiet":{"name":"--quiet","shortcut":"-q","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Do not output any message","default":false},"verbose":{"name":"--verbose","shortcut":"-v|-vv|-vvv","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug","default":false},"version":{"name":"--version","shortcut":"-V","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Display this application version","default":false},"ansi":{"name":"--ansi","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Force ANSI output","default":false},"no-ansi":{"name":"--no-ansi","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Disable ANSI output","default":false},"no-interaction":{"name":"--no-interaction","shortcut":"-n","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Do not ask any interactive question","default":false}}}},{"name":"list","usage":["list [--xml] [--raw] [--format FORMAT] [--] [<namespace>]"],"description":"Lists commands","help":"The <info>list<\/info> command lists all commands:\n\n <info>php app\/console list<\/info>\n\nYou can also display the commands for a specific namespace:\n\n <info>php app\/console list test<\/info>\n\nYou can also output the information in other formats by using the <comment>--format<\/comment> option:\n\n <info>php app\/console list --format=xml<\/info>\n\nIt's also possible to get raw list of commands (useful for embedding command runner):\n\n <info>php app\/console list --raw<\/info>","definition":{"arguments":{"namespace":{"name":"namespace","is_required":false,"is_array":false,"description":"The namespace name","default":null}},"options":{"xml":{"name":"--xml","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output list as XML","default":false},"raw":{"name":"--raw","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output raw command list","default":false},"format":{"name":"--format","shortcut":"","accept_value":true,"is_value_required":true,"is_multiple":false,"description":"To output list in other formats","default":"txt"}}}}],"namespaces":[{"id":"_global","commands":["help","list"]}]}
+{"commands":[{"name":"help","usage":["help [--xml] [--format FORMAT] [--raw] [--] [<command_name>]"],"description":"Displays help for a command","help":"The <info>help<\/info> command displays help for a given command:\n\n <info>php app\/console help list<\/info>\n\nYou can also output the help in other formats by using the <comment>--format<\/comment> option:\n\n <info>php app\/console help --format=xml list<\/info>\n\nTo display the list of available commands, please use the <info>list<\/info> command.","definition":{"arguments":{"command_name":{"name":"command_name","is_required":false,"is_array":false,"description":"The command name","default":"help"}},"options":{"xml":{"name":"--xml","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output help as XML","default":false},"format":{"name":"--format","shortcut":"","accept_value":true,"is_value_required":true,"is_multiple":false,"description":"The output format (txt, xml, json, or md)","default":"txt"},"raw":{"name":"--raw","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output raw command help","default":false},"help":{"name":"--help","shortcut":"-h","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Display this help message","default":false},"quiet":{"name":"--quiet","shortcut":"-q","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Do not output any message","default":false},"verbose":{"name":"--verbose","shortcut":"-v|-vv|-vvv","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug","default":false},"version":{"name":"--version","shortcut":"-V","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Display this application version","default":false},"ansi":{"name":"--ansi","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Force ANSI output","default":false},"no-ansi":{"name":"--no-ansi","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Disable ANSI output","default":false},"no-interaction":{"name":"--no-interaction","shortcut":"-n","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Do not ask any interactive question","default":false}}}},{"name":"list","usage":["list [--xml] [--raw] [--format FORMAT] [--] [<namespace>]"],"description":"Lists commands","help":"The <info>list<\/info> command lists all commands:\n\n <info>php app\/console list<\/info>\n\nYou can also display the commands for a specific namespace:\n\n <info>php app\/console list test<\/info>\n\nYou can also output the information in other formats by using the <comment>--format<\/comment> option:\n\n <info>php app\/console list --format=xml<\/info>\n\nIt's also possible to get raw list of commands (useful for embedding command runner):\n\n <info>php app\/console list --raw<\/info>","definition":{"arguments":{"namespace":{"name":"namespace","is_required":false,"is_array":false,"description":"The namespace name","default":null}},"options":{"xml":{"name":"--xml","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output list as XML","default":false},"raw":{"name":"--raw","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output raw command list","default":false},"format":{"name":"--format","shortcut":"","accept_value":true,"is_value_required":true,"is_multiple":false,"description":"The output format (txt, xml, json, or md)","default":"txt"}}}}],"namespaces":[{"id":"_global","commands":["help","list"]}]}
diff --git a/core/vendor/symfony/console/Tests/Fixtures/application_1.md b/core/vendor/symfony/console/Tests/Fixtures/application_1.md
index c389061389238fab26a6d25fe3b5169136a975a5..82a605da6998660797dbb8d313837b2c29532c33 100644
--- a/core/vendor/symfony/console/Tests/Fixtures/application_1.md
+++ b/core/vendor/symfony/console/Tests/Fixtures/application_1.md
@@ -51,7 +51,7 @@ To display the list of available commands, please use the <info>list</info> comm
* Accept value: yes
* Is value required: yes
* Is multiple: no
-* Description: To output help in other formats
+* Description: The output format (txt, xml, json, or md)
* Default: `'txt'`
**raw:**
@@ -197,5 +197,5 @@ It's also possible to get raw list of commands (useful for embedding command run
* Accept value: yes
* Is value required: yes
* Is multiple: no
-* Description: To output list in other formats
+* Description: The output format (txt, xml, json, or md)
* Default: `'txt'`
diff --git a/core/vendor/symfony/console/Tests/Fixtures/application_1.xml b/core/vendor/symfony/console/Tests/Fixtures/application_1.xml
index ed84905a06865ddc3cf3f90d9b6b42e695305276..35d1db4dc95fe8d42fadfa2644dee36af7ea7d98 100644
--- a/core/vendor/symfony/console/Tests/Fixtures/application_1.xml
+++ b/core/vendor/symfony/console/Tests/Fixtures/application_1.xml
@@ -28,7 +28,7 @@
<description>To output help as XML</description>
</option>
<option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
- <description>To output help in other formats</description>
+ <description>The output format (txt, xml, json, or md)</description>
<defaults>
<default>txt</default>
</defaults>
@@ -93,7 +93,7 @@
<description>To output raw command list</description>
</option>
<option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
- <description>To output list in other formats</description>
+ <description>The output format (txt, xml, json, or md)</description>
<defaults>
<default>txt</default>
</defaults>
diff --git a/core/vendor/symfony/console/Tests/Fixtures/application_2.json b/core/vendor/symfony/console/Tests/Fixtures/application_2.json
index 241d4813b98b4840bf42d45a371fe450bc335858..e47a7a962157a2e4082e0bc3855ec52449c90dbe 100644
--- a/core/vendor/symfony/console/Tests/Fixtures/application_2.json
+++ b/core/vendor/symfony/console/Tests/Fixtures/application_2.json
@@ -1 +1 @@
-{"commands":[{"name":"help","usage":["help [--xml] [--format FORMAT] [--raw] [--] [<command_name>]"],"description":"Displays help for a command","help":"The <info>help<\/info> command displays help for a given command:\n\n <info>php app\/console help list<\/info>\n\nYou can also output the help in other formats by using the <comment>--format<\/comment> option:\n\n <info>php app\/console help --format=xml list<\/info>\n\nTo display the list of available commands, please use the <info>list<\/info> command.","definition":{"arguments":{"command_name":{"name":"command_name","is_required":false,"is_array":false,"description":"The command name","default":"help"}},"options":{"xml":{"name":"--xml","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output help as XML","default":false},"format":{"name":"--format","shortcut":"","accept_value":true,"is_value_required":true,"is_multiple":false,"description":"To output help in other formats","default":"txt"},"raw":{"name":"--raw","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output raw command help","default":false},"help":{"name":"--help","shortcut":"-h","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Display this help message","default":false},"quiet":{"name":"--quiet","shortcut":"-q","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Do not output any message","default":false},"verbose":{"name":"--verbose","shortcut":"-v|-vv|-vvv","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug","default":false},"version":{"name":"--version","shortcut":"-V","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Display this application version","default":false},"ansi":{"name":"--ansi","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Force ANSI output","default":false},"no-ansi":{"name":"--no-ansi","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Disable ANSI output","default":false},"no-interaction":{"name":"--no-interaction","shortcut":"-n","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Do not ask any interactive question","default":false}}}},{"name":"list","usage":["list [--xml] [--raw] [--format FORMAT] [--] [<namespace>]"],"description":"Lists commands","help":"The <info>list<\/info> command lists all commands:\n\n <info>php app\/console list<\/info>\n\nYou can also display the commands for a specific namespace:\n\n <info>php app\/console list test<\/info>\n\nYou can also output the information in other formats by using the <comment>--format<\/comment> option:\n\n <info>php app\/console list --format=xml<\/info>\n\nIt's also possible to get raw list of commands (useful for embedding command runner):\n\n <info>php app\/console list --raw<\/info>","definition":{"arguments":{"namespace":{"name":"namespace","is_required":false,"is_array":false,"description":"The namespace name","default":null}},"options":{"xml":{"name":"--xml","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output list as XML","default":false},"raw":{"name":"--raw","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output raw command list","default":false},"format":{"name":"--format","shortcut":"","accept_value":true,"is_value_required":true,"is_multiple":false,"description":"To output list in other formats","default":"txt"}}}},{"name":"descriptor:command1","usage":["descriptor:command1", "alias1", "alias2"],"description":"command 1 description","help":"command 1 help","definition":{"arguments":[],"options":{"help":{"name":"--help","shortcut":"-h","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Display this help message","default":false},"quiet":{"name":"--quiet","shortcut":"-q","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Do not output any message","default":false},"verbose":{"name":"--verbose","shortcut":"-v|-vv|-vvv","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug","default":false},"version":{"name":"--version","shortcut":"-V","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Display this application version","default":false},"ansi":{"name":"--ansi","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Force ANSI output","default":false},"no-ansi":{"name":"--no-ansi","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Disable ANSI output","default":false},"no-interaction":{"name":"--no-interaction","shortcut":"-n","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Do not ask any interactive question","default":false}}}},{"name":"descriptor:command2","usage":["descriptor:command2 [-o|--option_name] [--] <argument_name>", "descriptor:command2 -o|--option_name <argument_name>", "descriptor:command2 <argument_name>"],"description":"command 2 description","help":"command 2 help","definition":{"arguments":{"argument_name":{"name":"argument_name","is_required":true,"is_array":false,"description":"","default":null}},"options":{"option_name":{"name":"--option_name","shortcut":"-o","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"","default":false},"help":{"name":"--help","shortcut":"-h","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Display this help message","default":false},"quiet":{"name":"--quiet","shortcut":"-q","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Do not output any message","default":false},"verbose":{"name":"--verbose","shortcut":"-v|-vv|-vvv","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug","default":false},"version":{"name":"--version","shortcut":"-V","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Display this application version","default":false},"ansi":{"name":"--ansi","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Force ANSI output","default":false},"no-ansi":{"name":"--no-ansi","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Disable ANSI output","default":false},"no-interaction":{"name":"--no-interaction","shortcut":"-n","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Do not ask any interactive question","default":false}}}}],"namespaces":[{"id":"_global","commands":["alias1","alias2","help","list"]},{"id":"descriptor","commands":["descriptor:command1","descriptor:command2"]}]}
\ No newline at end of file
+{"commands":[{"name":"help","usage":["help [--xml] [--format FORMAT] [--raw] [--] [<command_name>]"],"description":"Displays help for a command","help":"The <info>help<\/info> command displays help for a given command:\n\n <info>php app\/console help list<\/info>\n\nYou can also output the help in other formats by using the <comment>--format<\/comment> option:\n\n <info>php app\/console help --format=xml list<\/info>\n\nTo display the list of available commands, please use the <info>list<\/info> command.","definition":{"arguments":{"command_name":{"name":"command_name","is_required":false,"is_array":false,"description":"The command name","default":"help"}},"options":{"xml":{"name":"--xml","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output help as XML","default":false},"format":{"name":"--format","shortcut":"","accept_value":true,"is_value_required":true,"is_multiple":false,"description":"The output format (txt, xml, json, or md)","default":"txt"},"raw":{"name":"--raw","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output raw command help","default":false},"help":{"name":"--help","shortcut":"-h","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Display this help message","default":false},"quiet":{"name":"--quiet","shortcut":"-q","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Do not output any message","default":false},"verbose":{"name":"--verbose","shortcut":"-v|-vv|-vvv","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug","default":false},"version":{"name":"--version","shortcut":"-V","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Display this application version","default":false},"ansi":{"name":"--ansi","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Force ANSI output","default":false},"no-ansi":{"name":"--no-ansi","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Disable ANSI output","default":false},"no-interaction":{"name":"--no-interaction","shortcut":"-n","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Do not ask any interactive question","default":false}}}},{"name":"list","usage":["list [--xml] [--raw] [--format FORMAT] [--] [<namespace>]"],"description":"Lists commands","help":"The <info>list<\/info> command lists all commands:\n\n <info>php app\/console list<\/info>\n\nYou can also display the commands for a specific namespace:\n\n <info>php app\/console list test<\/info>\n\nYou can also output the information in other formats by using the <comment>--format<\/comment> option:\n\n <info>php app\/console list --format=xml<\/info>\n\nIt's also possible to get raw list of commands (useful for embedding command runner):\n\n <info>php app\/console list --raw<\/info>","definition":{"arguments":{"namespace":{"name":"namespace","is_required":false,"is_array":false,"description":"The namespace name","default":null}},"options":{"xml":{"name":"--xml","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output list as XML","default":false},"raw":{"name":"--raw","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output raw command list","default":false},"format":{"name":"--format","shortcut":"","accept_value":true,"is_value_required":true,"is_multiple":false,"description":"The output format (txt, xml, json, or md)","default":"txt"}}}},{"name":"descriptor:command1","usage":["descriptor:command1", "alias1", "alias2"],"description":"command 1 description","help":"command 1 help","definition":{"arguments":[],"options":{"help":{"name":"--help","shortcut":"-h","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Display this help message","default":false},"quiet":{"name":"--quiet","shortcut":"-q","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Do not output any message","default":false},"verbose":{"name":"--verbose","shortcut":"-v|-vv|-vvv","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug","default":false},"version":{"name":"--version","shortcut":"-V","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Display this application version","default":false},"ansi":{"name":"--ansi","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Force ANSI output","default":false},"no-ansi":{"name":"--no-ansi","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Disable ANSI output","default":false},"no-interaction":{"name":"--no-interaction","shortcut":"-n","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Do not ask any interactive question","default":false}}}},{"name":"descriptor:command2","usage":["descriptor:command2 [-o|--option_name] [--] <argument_name>", "descriptor:command2 -o|--option_name <argument_name>", "descriptor:command2 <argument_name>"],"description":"command 2 description","help":"command 2 help","definition":{"arguments":{"argument_name":{"name":"argument_name","is_required":true,"is_array":false,"description":"","default":null}},"options":{"option_name":{"name":"--option_name","shortcut":"-o","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"","default":false},"help":{"name":"--help","shortcut":"-h","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Display this help message","default":false},"quiet":{"name":"--quiet","shortcut":"-q","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Do not output any message","default":false},"verbose":{"name":"--verbose","shortcut":"-v|-vv|-vvv","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug","default":false},"version":{"name":"--version","shortcut":"-V","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Display this application version","default":false},"ansi":{"name":"--ansi","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Force ANSI output","default":false},"no-ansi":{"name":"--no-ansi","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Disable ANSI output","default":false},"no-interaction":{"name":"--no-interaction","shortcut":"-n","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Do not ask any interactive question","default":false}}}}],"namespaces":[{"id":"_global","commands":["alias1","alias2","help","list"]},{"id":"descriptor","commands":["descriptor:command1","descriptor:command2"]}]}
\ No newline at end of file
diff --git a/core/vendor/symfony/console/Tests/Fixtures/application_2.md b/core/vendor/symfony/console/Tests/Fixtures/application_2.md
index 8e0bfd35025302a22e6b044f32ba369fb21de44d..f031c9e5c33b2a8b7b7faed999830a3025740499 100644
--- a/core/vendor/symfony/console/Tests/Fixtures/application_2.md
+++ b/core/vendor/symfony/console/Tests/Fixtures/application_2.md
@@ -58,7 +58,7 @@ To display the list of available commands, please use the <info>list</info> comm
* Accept value: yes
* Is value required: yes
* Is multiple: no
-* Description: To output help in other formats
+* Description: The output format (txt, xml, json, or md)
* Default: `'txt'`
**raw:**
@@ -204,7 +204,7 @@ It's also possible to get raw list of commands (useful for embedding command run
* Accept value: yes
* Is value required: yes
* Is multiple: no
-* Description: To output list in other formats
+* Description: The output format (txt, xml, json, or md)
* Default: `'txt'`
descriptor:command1
diff --git a/core/vendor/symfony/console/Tests/Fixtures/application_2.xml b/core/vendor/symfony/console/Tests/Fixtures/application_2.xml
index 18e5db1f64a5e977e97fc6f31fcfd6bd80e2da7d..bc8ab219d89c5e9147dd4f1bae759c1f9fbd540e 100644
--- a/core/vendor/symfony/console/Tests/Fixtures/application_2.xml
+++ b/core/vendor/symfony/console/Tests/Fixtures/application_2.xml
@@ -28,7 +28,7 @@
<description>To output help as XML</description>
</option>
<option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
- <description>To output help in other formats</description>
+ <description>The output format (txt, xml, json, or md)</description>
<defaults>
<default>txt</default>
</defaults>
@@ -93,7 +93,7 @@
<description>To output raw command list</description>
</option>
<option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
- <description>To output list in other formats</description>
+ <description>The output format (txt, xml, json, or md)</description>
<defaults>
<default>txt</default>
</defaults>
diff --git a/core/vendor/symfony/console/Tests/Fixtures/application_asxml1.txt b/core/vendor/symfony/console/Tests/Fixtures/application_asxml1.txt
index edc9d3f894ac27b9bb1262ca38804920653ddd8e..3901cd898c233451766886d12be70ebb18e90451 100644
--- a/core/vendor/symfony/console/Tests/Fixtures/application_asxml1.txt
+++ b/core/vendor/symfony/console/Tests/Fixtures/application_asxml1.txt
@@ -28,7 +28,7 @@
<description>To output help as XML</description>
</option>
<option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
- <description>To output help in other formats</description>
+ <description>The output format (txt, xml, json, or md)</description>
<defaults>
<default>txt</default>
</defaults>
@@ -93,7 +93,7 @@
<description>To output raw command list</description>
</option>
<option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
- <description>To output list in other formats</description>
+ <description>The output format (txt, xml, json, or md)</description>
<defaults>
<default>txt</default>
</defaults>
diff --git a/core/vendor/symfony/console/Tests/Fixtures/application_run2.txt b/core/vendor/symfony/console/Tests/Fixtures/application_run2.txt
index 4f7699751772902dbd6a4986edeb6d77a01c32ad..d28b928ec38305c841a708c51ca655d8d5b1992f 100644
--- a/core/vendor/symfony/console/Tests/Fixtures/application_run2.txt
+++ b/core/vendor/symfony/console/Tests/Fixtures/application_run2.txt
@@ -7,7 +7,7 @@ Arguments:
Options:
--xml To output help as XML
- --format=FORMAT To output help in other formats [default: "txt"]
+ --format=FORMAT The output format (txt, xml, json, or md) [default: "txt"]
--raw To output raw command help
-h, --help Display this help message
-q, --quiet Do not output any message
diff --git a/core/vendor/symfony/console/Tests/Fixtures/application_run3.txt b/core/vendor/symfony/console/Tests/Fixtures/application_run3.txt
index 748982475360f2be18656c5a21f8932c9f51c365..bc51995f856bce71fe8ffa71af99807e8082bb41 100644
--- a/core/vendor/symfony/console/Tests/Fixtures/application_run3.txt
+++ b/core/vendor/symfony/console/Tests/Fixtures/application_run3.txt
@@ -7,7 +7,7 @@ Arguments:
Options:
--xml To output list as XML
--raw To output raw command list
- --format=FORMAT To output list in other formats [default: "txt"]
+ --format=FORMAT The output format (txt, xml, json, or md) [default: "txt"]
Help:
The list command lists all commands:
diff --git a/core/vendor/symfony/console/Tests/Formatter/OutputFormatterTest.php b/core/vendor/symfony/console/Tests/Formatter/OutputFormatterTest.php
index deb64a75a5b28b812a97a0690bc8b1c474d2eade..510a4e74149cb9215fe3e21f052ea9420a53679e 100644
--- a/core/vendor/symfony/console/Tests/Formatter/OutputFormatterTest.php
+++ b/core/vendor/symfony/console/Tests/Formatter/OutputFormatterTest.php
@@ -166,6 +166,14 @@ public function testFormatLongString()
$this->assertEquals("\033[37;41msome error\033[39;49m".$long, $formatter->format('<error>some error</error>'.$long));
}
+ public function testFormatToStringObject()
+ {
+ $formatter = new OutputFormatter(false);
+ $this->assertEquals(
+ 'some info', $formatter->format(new TableCell())
+ );
+ }
+
public function testNotDecoratedFormatter()
{
$formatter = new OutputFormatter(false);
@@ -255,3 +263,11 @@ public function testContentWithLineBreaks()
));
}
}
+
+class TableCell
+{
+ public function __toString()
+ {
+ return '<info>some info</info>';
+ }
+}
diff --git a/core/vendor/symfony/console/Tests/Helper/QuestionHelperTest.php b/core/vendor/symfony/console/Tests/Helper/QuestionHelperTest.php
index ccd889b0aa24c575af838d798a4f6a3e0d843a03..99c89edc0e4573be36af8e5d09d907bbe26785df 100644
--- a/core/vendor/symfony/console/Tests/Helper/QuestionHelperTest.php
+++ b/core/vendor/symfony/console/Tests/Helper/QuestionHelperTest.php
@@ -203,13 +203,83 @@ public function testAskAndValidate()
$dialog->setInputStream($this->getInputStream("green\nyellow\norange\n"));
try {
- $this->assertEquals('white', $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
+ $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question);
$this->fail();
} catch (\InvalidArgumentException $e) {
$this->assertEquals($error, $e->getMessage());
}
}
+ /**
+ * @dataProvider simpleAnswerProvider
+ */
+ public function testSelectChoiceFromSimpleChoices($providedAnswer, $expectedValue)
+ {
+ $possibleChoices = array(
+ 'My environment 1',
+ 'My environment 2',
+ 'My environment 3',
+ );
+
+ $dialog = new QuestionHelper();
+ $dialog->setInputStream($this->getInputStream($providedAnswer."\n"));
+ $helperSet = new HelperSet(array(new FormatterHelper()));
+ $dialog->setHelperSet($helperSet);
+
+ $question = new ChoiceQuestion('Please select the environment to load', $possibleChoices);
+ $answer = $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question);
+
+ $this->assertSame($expectedValue, $answer);
+ }
+
+ public function simpleAnswerProvider()
+ {
+ return array(
+ array(0, 'My environment 1'),
+ array(1, 'My environment 2'),
+ array(2, 'My environment 3'),
+ array('My environment 1', 'My environment 1'),
+ array('My environment 2', 'My environment 2'),
+ array('My environment 3', 'My environment 3'),
+ );
+ }
+
+ /**
+ * @dataProvider mixedKeysChoiceListAnswerProvider
+ */
+ public function testChoiceFromChoicelistWithMixedKeys($providedAnswer, $expectedValue)
+ {
+ $possibleChoices = array(
+ '0' => 'No environment',
+ '1' => 'My environment 1',
+ 'env_2' => 'My environment 2',
+ 3 => 'My environment 3',
+ );
+
+ $dialog = new QuestionHelper();
+ $dialog->setInputStream($this->getInputStream($providedAnswer."\n"));
+ $helperSet = new HelperSet(array(new FormatterHelper()));
+ $dialog->setHelperSet($helperSet);
+
+ $question = new ChoiceQuestion('Please select the environment to load', $possibleChoices);
+ $question->setMaxAttempts(1);
+ $answer = $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question);
+
+ $this->assertSame($expectedValue, $answer);
+ }
+
+ public function mixedKeysChoiceListAnswerProvider()
+ {
+ return array(
+ array('0', '0'),
+ array('No environment', '0'),
+ array('1', '1'),
+ array('env_2', 'env_2'),
+ array(3, '3'),
+ array('My environment 1', '1'),
+ );
+ }
+
/**
* @dataProvider answerProvider
*/
@@ -227,15 +297,20 @@ public function testSelectChoiceFromChoiceList($providedAnswer, $expectedValue)
$dialog->setHelperSet($helperSet);
$question = new ChoiceQuestion('Please select the environment to load', $possibleChoices);
+ $question->setMaxAttempts(1);
$answer = $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question);
$this->assertSame($expectedValue, $answer);
}
+ /**
+ * @expectedException \InvalidArgumentException
+ * @expectedExceptionMessage The provided answer is ambiguous. Value should be one of env_2 or env_3.
+ */
public function testAmbiguousChoiceFromChoicelist()
{
$possibleChoices = array(
- 'env_1' => 'My environment 1',
+ 'env_1' => 'My first environment',
'env_2' => 'My environment',
'env_3' => 'My environment',
);
@@ -246,12 +321,9 @@ public function testAmbiguousChoiceFromChoicelist()
$dialog->setHelperSet($helperSet);
$question = new ChoiceQuestion('Please select the environment to load', $possibleChoices);
+ $question->setMaxAttempts(1);
- try {
- $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question);
- } catch (\InvalidArgumentException $e) {
- $this->assertEquals('The provided answer is ambiguous. Value should be one of env_2 or env_3.', $e->getMessage());
- }
+ $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question);
}
public function answerProvider()
diff --git a/core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/.gitignore b/core/vendor/symfony/debug/.gitignore
similarity index 100%
rename from core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/.gitignore
rename to core/vendor/symfony/debug/.gitignore
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/CHANGELOG.md b/core/vendor/symfony/debug/CHANGELOG.md
similarity index 67%
rename from core/vendor/symfony/debug/Symfony/Component/Debug/CHANGELOG.md
rename to core/vendor/symfony/debug/CHANGELOG.md
index ff7c6af2b7d079f4ad72cf239fd014dfc8d16f1e..31f0de9c23fb680f76ade9e1c9e9390ec52a5364 100644
--- a/core/vendor/symfony/debug/Symfony/Component/Debug/CHANGELOG.md
+++ b/core/vendor/symfony/debug/CHANGELOG.md
@@ -1,6 +1,14 @@
CHANGELOG
=========
+2.7.0
+-----
+
+* added deprecations checking for parent interfaces/classes to DebugClassLoader
+* added ZTS support to symfony_debug extension
+* added symfony_debug_backtrace() to symfony_debug extension
+ to track the backtrace of fatal errors
+
2.6.0
-----
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/Debug.php b/core/vendor/symfony/debug/Debug.php
similarity index 100%
rename from core/vendor/symfony/debug/Symfony/Component/Debug/Debug.php
rename to core/vendor/symfony/debug/Debug.php
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/DebugClassLoader.php b/core/vendor/symfony/debug/DebugClassLoader.php
similarity index 69%
rename from core/vendor/symfony/debug/Symfony/Component/Debug/DebugClassLoader.php
rename to core/vendor/symfony/debug/DebugClassLoader.php
index b70a4c4ac3d2471c541b8cd0a9b9574b8d1b6ecf..f26e12e663fad699b17595a075e50be2e862aa44 100644
--- a/core/vendor/symfony/debug/Symfony/Component/Debug/DebugClassLoader.php
+++ b/core/vendor/symfony/debug/DebugClassLoader.php
@@ -30,20 +30,22 @@ class DebugClassLoader
private $isFinder;
private $wasFinder;
private static $caseCheck;
+ private static $deprecated = array();
+ private static $php7Reserved = array('int', 'float', 'bool', 'string', 'true', 'false', 'null');
/**
* Constructor.
*
- * @param callable|object $classLoader
+ * @param callable|object $classLoader Passing an object is @deprecated since version 2.5 and support for it will be removed in 3.0
*
* @api
- * @deprecated since 2.5, passing an object is deprecated and support for it will be removed in 3.0
*/
public function __construct($classLoader)
{
$this->wasFinder = is_object($classLoader) && method_exists($classLoader, 'findFile');
if ($this->wasFinder) {
+ trigger_error('The '.__METHOD__.' method will no longer support receiving an object into its $classLoader argument in 3.0.', E_USER_DEPRECATED);
$this->classLoader = array($classLoader, 'loadClass');
$this->isFinder = true;
} else {
@@ -59,9 +61,7 @@ public function __construct($classLoader)
/**
* Gets the wrapped class loader.
*
- * @return callable|object a class loader
- *
- * @deprecated since 2.5, returning an object is deprecated and support for it will be removed in 3.0
+ * @return callable|object A class loader. Since version 2.5, returning an object is @deprecated and support for it will be removed in 3.0
*/
public function getClassLoader()
{
@@ -69,7 +69,7 @@ public function getClassLoader()
}
/**
- * Wraps all autoloaders
+ * Wraps all autoloaders.
*/
public static function enable()
{
@@ -117,16 +117,18 @@ public static function disable()
}
/**
- * Finds a file by class name
+ * Finds a file by class name.
*
* @param string $class A class name to resolve to file
*
* @return string|null
*
- * @deprecated Deprecated since 2.5, to be removed in 3.0.
+ * @deprecated since version 2.5, to be removed in 3.0.
*/
public function findFile($class)
{
+ trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
+
if ($this->wasFinder) {
return $this->classLoader[0]->findFile($class);
}
@@ -175,6 +177,39 @@ public function loadClass($class)
if ($name !== $class && 0 === strcasecmp($name, $class)) {
throw new \RuntimeException(sprintf('Case mismatch between loaded and declared class names: %s vs %s', $class, $name));
}
+
+ if (in_array(strtolower($refl->getShortName()), self::$php7Reserved)) {
+ trigger_error(sprintf('%s uses a reserved class name (%s) that will break on PHP 7 and higher', $name, $refl->getShortName()), E_USER_DEPRECATED);
+ } elseif (preg_match('#\n \* @deprecated (.*?)\r?\n \*(?: @|/$)#s', $refl->getDocComment(), $notice)) {
+ self::$deprecated[$name] = preg_replace('#\s*\r?\n \* +#', ' ', $notice[1]);
+ } else {
+ if (2 > $len = 1 + (strpos($name, '\\', 1 + strpos($name, '\\')) ?: strpos($name, '_'))) {
+ $len = 0;
+ $ns = '';
+ } else {
+ switch ($ns = substr($name, 0, $len)) {
+ case 'Symfony\Bridge\\':
+ case 'Symfony\Bundle\\':
+ case 'Symfony\Component\\':
+ $ns = 'Symfony\\';
+ $len = strlen($ns);
+ break;
+ }
+ }
+ $parent = $refl->getParentClass();
+
+ if (!$parent || strncmp($ns, $parent->name, $len)) {
+ if ($parent && isset(self::$deprecated[$parent->name]) && strncmp($ns, $parent->name, $len)) {
+ trigger_error(sprintf('The %s class extends %s that is deprecated %s', $name, $parent->name, self::$deprecated[$parent->name]), E_USER_DEPRECATED);
+ }
+
+ foreach ($refl->getInterfaceNames() as $interface) {
+ if (isset(self::$deprecated[$interface]) && strncmp($ns, $interface, $len) && !($parent && $parent->implementsInterface($interface))) {
+ trigger_error(sprintf('The %s %s %s that is deprecated %s', $name, $refl->isInterface() ? 'interface extends' : 'class implements', $interface, self::$deprecated[$interface]), E_USER_DEPRECATED);
+ }
+ }
+ }
+ }
}
if ($file) {
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/ErrorHandler.php b/core/vendor/symfony/debug/ErrorHandler.php
similarity index 91%
rename from core/vendor/symfony/debug/Symfony/Component/Debug/ErrorHandler.php
rename to core/vendor/symfony/debug/ErrorHandler.php
index eed05c191f19812f1c0290f1daab8298ee0d8bc1..116ff4b5f3b7323a35f3fc5384f5917b564b8248 100644
--- a/core/vendor/symfony/debug/Symfony/Component/Debug/ErrorHandler.php
+++ b/core/vendor/symfony/debug/ErrorHandler.php
@@ -47,7 +47,7 @@
class ErrorHandler
{
/**
- * @deprecated since 2.6, to be removed in 3.0.
+ * @deprecated since version 2.6, to be removed in 3.0.
*/
const TYPE_DEPRECATION = -100;
@@ -72,19 +72,19 @@ class ErrorHandler
private $loggers = array(
E_DEPRECATED => array(null, LogLevel::INFO),
E_USER_DEPRECATED => array(null, LogLevel::INFO),
- E_NOTICE => array(null, LogLevel::NOTICE),
- E_USER_NOTICE => array(null, LogLevel::NOTICE),
- E_STRICT => array(null, LogLevel::NOTICE),
+ E_NOTICE => array(null, LogLevel::WARNING),
+ E_USER_NOTICE => array(null, LogLevel::WARNING),
+ E_STRICT => array(null, LogLevel::WARNING),
E_WARNING => array(null, LogLevel::WARNING),
E_USER_WARNING => array(null, LogLevel::WARNING),
E_COMPILE_WARNING => array(null, LogLevel::WARNING),
E_CORE_WARNING => array(null, LogLevel::WARNING),
- E_USER_ERROR => array(null, LogLevel::ERROR),
- E_RECOVERABLE_ERROR => array(null, LogLevel::ERROR),
- E_COMPILE_ERROR => array(null, LogLevel::EMERGENCY),
- E_PARSE => array(null, LogLevel::EMERGENCY),
- E_ERROR => array(null, LogLevel::EMERGENCY),
- E_CORE_ERROR => array(null, LogLevel::EMERGENCY),
+ E_USER_ERROR => array(null, LogLevel::CRITICAL),
+ E_RECOVERABLE_ERROR => array(null, LogLevel::CRITICAL),
+ E_COMPILE_ERROR => array(null, LogLevel::CRITICAL),
+ E_PARSE => array(null, LogLevel::CRITICAL),
+ E_ERROR => array(null, LogLevel::CRITICAL),
+ E_CORE_ERROR => array(null, LogLevel::CRITICAL),
);
private $thrownErrors = 0x1FFF; // E_ALL - E_DEPRECATED - E_USER_DEPRECATED
@@ -104,14 +104,14 @@ class ErrorHandler
/**
* Same init value as thrownErrors.
*
- * @deprecated since 2.6, to be removed in 3.0.
+ * @deprecated since version 2.6, to be removed in 3.0.
*/
private $displayErrors = 0x1FFF;
/**
* Registers the error handler.
*
- * @param self|null|int $handler The handler to register, or @deprecated (since 2.6, to be removed in 3.0) bit field of thrown levels
+ * @param self|null|int $handler The handler to register, or @deprecated (since version 2.6, to be removed in 3.0) bit field of thrown levels
* @param bool $replace Whether to replace or not any existing handler
*
* @return self The registered error handler
@@ -257,7 +257,7 @@ public function throwAt($levels, $replace = false)
}
$this->reRegister($prev | $this->loggedErrors);
- // $this->displayErrors is @deprecated since 2.6
+ // $this->displayErrors is @deprecated since version 2.6
$this->displayErrors = $this->thrownErrors;
return $prev;
@@ -402,10 +402,10 @@ public function handleError($type, $message, $file, $line, array $context)
if ($this->scopedErrors & $type) {
$e['scope_vars'] = $context;
if ($trace) {
- $e['stack'] = debug_backtrace(true); // Provide object
+ $e['stack'] = debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT);
}
} elseif ($trace) {
- $e['stack'] = debug_backtrace(PHP_VERSION_ID >= 50306 ? DEBUG_BACKTRACE_IGNORE_ARGS : false);
+ $e['stack'] = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
}
}
@@ -607,10 +607,12 @@ protected function getFatalErrorHandlers()
*
* @param int|null $level The level (null to use the error_reporting() value and 0 to disable)
*
- * @deprecated since 2.6, to be removed in 3.0. Use throwAt() instead.
+ * @deprecated since version 2.6, to be removed in 3.0. Use throwAt() instead.
*/
public function setLevel($level)
{
+ trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the throwAt() method instead.', E_USER_DEPRECATED);
+
$level = null === $level ? error_reporting() : $level;
$this->throwAt($level, true);
}
@@ -620,10 +622,12 @@ public function setLevel($level)
*
* @param int $displayErrors The display_errors flag value
*
- * @deprecated since 2.6, to be removed in 3.0. Use throwAt() instead.
+ * @deprecated since version 2.6, to be removed in 3.0. Use throwAt() instead.
*/
public function setDisplayErrors($displayErrors)
{
+ trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the throwAt() method instead.', E_USER_DEPRECATED);
+
if ($displayErrors) {
$this->throwAt($this->displayErrors, true);
} else {
@@ -639,10 +643,12 @@ public function setDisplayErrors($displayErrors)
* @param LoggerInterface $logger A logger interface
* @param string $channel The channel associated with the logger (deprecation, emergency or scream)
*
- * @deprecated since 2.6, to be removed in 3.0. Use setLoggers() or setDefaultLogger() instead.
+ * @deprecated since version 2.6, to be removed in 3.0. Use setLoggers() or setDefaultLogger() instead.
*/
public static function setLogger(LoggerInterface $logger, $channel = 'deprecation')
{
+ trigger_error('The '.__METHOD__.' static method is deprecated since version 2.6 and will be removed in 3.0. Use the setLoggers() or setDefaultLogger() methods instead.', E_USER_DEPRECATED);
+
$handler = set_error_handler('var_dump', 0);
$handler = is_array($handler) ? $handler[0] : null;
restore_error_handler();
@@ -662,20 +668,24 @@ public static function setLogger(LoggerInterface $logger, $channel = 'deprecatio
}
/**
- * @deprecated since 2.6, to be removed in 3.0. Use handleError() instead.
+ * @deprecated since version 2.6, to be removed in 3.0. Use handleError() instead.
*/
public function handle($level, $message, $file = 'unknown', $line = 0, $context = array())
{
+ $this->handleError(E_USER_DEPRECATED, 'The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the handleError() method instead.', __FILE__, __LINE__, array());
+
return $this->handleError($level, $message, $file, $line, (array) $context);
}
/**
* Handles PHP fatal errors.
*
- * @deprecated since 2.6, to be removed in 3.0. Use handleFatalError() instead.
+ * @deprecated since version 2.6, to be removed in 3.0. Use handleFatalError() instead.
*/
public function handleFatal()
{
+ trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the handleFatalError() method instead.', E_USER_DEPRECATED);
+
static::handleFatalError();
}
}
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/Exception/ClassNotFoundException.php b/core/vendor/symfony/debug/Exception/ClassNotFoundException.php
similarity index 100%
rename from core/vendor/symfony/debug/Symfony/Component/Debug/Exception/ClassNotFoundException.php
rename to core/vendor/symfony/debug/Exception/ClassNotFoundException.php
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/Exception/ContextErrorException.php b/core/vendor/symfony/debug/Exception/ContextErrorException.php
similarity index 100%
rename from core/vendor/symfony/debug/Symfony/Component/Debug/Exception/ContextErrorException.php
rename to core/vendor/symfony/debug/Exception/ContextErrorException.php
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/Exception/DummyException.php b/core/vendor/symfony/debug/Exception/DummyException.php
similarity index 76%
rename from core/vendor/symfony/debug/Symfony/Component/Debug/Exception/DummyException.php
rename to core/vendor/symfony/debug/Exception/DummyException.php
index 967e033777322ad5b0c8f763ed068860180dcf43..378cbcc10f804e73f8b1dd7727a2c6cb4d47443c 100644
--- a/core/vendor/symfony/debug/Symfony/Component/Debug/Exception/DummyException.php
+++ b/core/vendor/symfony/debug/Exception/DummyException.php
@@ -11,6 +11,8 @@
namespace Symfony\Component\Debug\Exception;
+trigger_error('The '.__NAMESPACE__.'\DummyException class is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
+
/**
* @author Fabien Potencier <fabien@symfony.com>
*
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/Exception/FatalBaseException.php b/core/vendor/symfony/debug/Exception/FatalBaseException.php
similarity index 100%
rename from core/vendor/symfony/debug/Symfony/Component/Debug/Exception/FatalBaseException.php
rename to core/vendor/symfony/debug/Exception/FatalBaseException.php
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/Exception/FatalErrorException.php b/core/vendor/symfony/debug/Exception/FatalErrorException.php
similarity index 92%
rename from core/vendor/symfony/debug/Symfony/Component/Debug/Exception/FatalErrorException.php
rename to core/vendor/symfony/debug/Exception/FatalErrorException.php
index d142051ba996dbd89e8c5657699e4794e6a9e813..41bb97c6a9c13ef11f3f2a02451288b5c3daa420 100644
--- a/core/vendor/symfony/debug/Symfony/Component/Debug/Exception/FatalErrorException.php
+++ b/core/vendor/symfony/debug/Exception/FatalErrorException.php
@@ -69,6 +69,11 @@ public function __construct($message, $code, $severity, $filename, $lineno, $tra
unset($frame);
$trace = array_reverse($trace);
+ } elseif (function_exists('symfony_debug_backtrace')) {
+ $trace = symfony_debug_backtrace();
+ if (0 < $traceOffset) {
+ array_splice($trace, 0, $traceOffset);
+ }
} else {
$trace = array();
}
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/Exception/FlattenException.php b/core/vendor/symfony/debug/Exception/FlattenException.php
similarity index 100%
rename from core/vendor/symfony/debug/Symfony/Component/Debug/Exception/FlattenException.php
rename to core/vendor/symfony/debug/Exception/FlattenException.php
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/Exception/OutOfMemoryException.php b/core/vendor/symfony/debug/Exception/OutOfMemoryException.php
similarity index 100%
rename from core/vendor/symfony/debug/Symfony/Component/Debug/Exception/OutOfMemoryException.php
rename to core/vendor/symfony/debug/Exception/OutOfMemoryException.php
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/Exception/UndefinedFunctionException.php b/core/vendor/symfony/debug/Exception/UndefinedFunctionException.php
similarity index 100%
rename from core/vendor/symfony/debug/Symfony/Component/Debug/Exception/UndefinedFunctionException.php
rename to core/vendor/symfony/debug/Exception/UndefinedFunctionException.php
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/Exception/UndefinedMethodException.php b/core/vendor/symfony/debug/Exception/UndefinedMethodException.php
similarity index 100%
rename from core/vendor/symfony/debug/Symfony/Component/Debug/Exception/UndefinedMethodException.php
rename to core/vendor/symfony/debug/Exception/UndefinedMethodException.php
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/ExceptionHandler.php b/core/vendor/symfony/debug/ExceptionHandler.php
similarity index 97%
rename from core/vendor/symfony/debug/Symfony/Component/Debug/ExceptionHandler.php
rename to core/vendor/symfony/debug/ExceptionHandler.php
index bc66741bc8751c6ac53cfcc8fb27dfcfaaab46e8..02546b403d0811dead793bbd1fe9a7c0e51e7ddc 100644
--- a/core/vendor/symfony/debug/Symfony/Component/Debug/ExceptionHandler.php
+++ b/core/vendor/symfony/debug/ExceptionHandler.php
@@ -423,19 +423,12 @@ private function formatArgs(array $args)
/**
* Returns an UTF-8 and HTML encoded string.
+ *
+ * @deprecated since version 2.7, to be removed in 3.0.
*/
protected static function utf8Htmlize($str)
{
- if (!preg_match('//u', $str) && function_exists('iconv')) {
- set_error_handler('var_dump', 0);
- $charset = ini_get('default_charset');
- if ('UTF-8' === $charset || $str !== @iconv($charset, $charset, $str)) {
- $charset = 'CP1252';
- }
- restore_error_handler();
-
- $str = iconv($charset, 'UTF-8', $str);
- }
+ trigger_error('The '.__METHOD__.' method is deprecated since version 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);
return htmlspecialchars($str, ENT_QUOTES | (PHP_VERSION_ID >= 50400 ? ENT_SUBSTITUTE : 0), 'UTF-8');
}
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php b/core/vendor/symfony/debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php
similarity index 100%
rename from core/vendor/symfony/debug/Symfony/Component/Debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php
rename to core/vendor/symfony/debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/FatalErrorHandler/FatalErrorHandlerInterface.php b/core/vendor/symfony/debug/FatalErrorHandler/FatalErrorHandlerInterface.php
similarity index 100%
rename from core/vendor/symfony/debug/Symfony/Component/Debug/FatalErrorHandler/FatalErrorHandlerInterface.php
rename to core/vendor/symfony/debug/FatalErrorHandler/FatalErrorHandlerInterface.php
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php b/core/vendor/symfony/debug/FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php
similarity index 100%
rename from core/vendor/symfony/debug/Symfony/Component/Debug/FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php
rename to core/vendor/symfony/debug/FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php b/core/vendor/symfony/debug/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php
similarity index 93%
rename from core/vendor/symfony/debug/Symfony/Component/Debug/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php
rename to core/vendor/symfony/debug/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php
index 917794cfa0c017d2b887cb297a32c90941cddeb5..f734d6bb7dd9e3fc324a125474c9c9c6172214c0 100644
--- a/core/vendor/symfony/debug/Symfony/Component/Debug/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php
+++ b/core/vendor/symfony/debug/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php
@@ -34,7 +34,7 @@ public function handleError(array $error, FatalErrorException $exception)
$className = $matches[1];
$methodName = $matches[2];
- $message = sprintf('Attempted to call method "%s" on class "%s".', $methodName, $className);
+ $message = sprintf('Attempted to call an undefined method named "%s" of class "%s".', $methodName, $className);
$candidates = array();
foreach (get_class_methods($className) as $definedMethodName) {
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/LICENSE b/core/vendor/symfony/debug/LICENSE
similarity index 100%
rename from core/vendor/symfony/debug/Symfony/Component/Debug/LICENSE
rename to core/vendor/symfony/debug/LICENSE
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/README.md b/core/vendor/symfony/debug/README.md
similarity index 100%
rename from core/vendor/symfony/debug/Symfony/Component/Debug/README.md
rename to core/vendor/symfony/debug/README.md
diff --git a/core/vendor/symfony/debug/Resources/ext/README.md b/core/vendor/symfony/debug/Resources/ext/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..0672ef8f4ace19e5bcb4e7478d7d351f6719c43f
--- /dev/null
+++ b/core/vendor/symfony/debug/Resources/ext/README.md
@@ -0,0 +1,133 @@
+Symfony Debug Extension
+=======================
+
+This extension publishes several functions to help building powerful debugging tools.
+
+symfony_zval_info()
+-------------------
+
+- exposes zval_hash/refcounts, allowing e.g. efficient exploration of arbitrary structures in PHP,
+- does work with references, preventing memory copying.
+
+Its behavior is about the same as:
+
+```php
+<?php
+
+function symfony_zval_info($key, $array, $options = 0)
+{
+
+ // $options is currently not used, but could be in future version.
+
+ if (!array_key_exists($key, $array)) {
+ return null;
+ }
+
+ $info = array(
+ 'type' => gettype($array[$key]),
+ 'zval_hash' => /* hashed memory address of $array[$key] */,
+ 'zval_refcount' => /* internal zval refcount of $array[$key] */,
+ 'zval_isref' => /* is_ref status of $array[$key] */,
+ );
+
+ switch ($info['type']) {
+ case 'object':
+ $info += array(
+ 'object_class' => get_class($array[$key]),
+ 'object_refcount' => /* internal object refcount of $array[$key] */,
+ 'object_hash' => spl_object_hash($array[$key]),
+ 'object_handle' => /* internal object handle $array[$key] */,
+ );
+ break;
+
+ case 'resource':
+ $info += array(
+ 'resource_handle' => (int) $array[$key],
+ 'resource_type' => get_resource_type($array[$key]),
+ 'resource_refcount' => /* internal resource refcount of $array[$key] */,
+ );
+ break;
+
+ case 'array':
+ $info += array(
+ 'array_count' => count($array[$key]),
+ );
+ break;
+
+ case 'string':
+ $info += array(
+ 'strlen' => strlen($array[$key]),
+ );
+ break;
+ }
+
+ return $info;
+}
+```
+
+symfony_debug_backtrace()
+-------------------------
+
+This function works like debug_backtrace(), except that it can fetch the full backtrace in case of fatal errors:
+
+```php
+function foo() { fatal(); }
+function bar() { foo(); }
+
+function sd() { var_dump(symfony_debug_backtrace()); }
+
+register_shutdown_function('sd');
+
+bar();
+
+/* Will output
+Fatal error: Call to undefined function fatal() in foo.php on line 42
+array(3) {
+ [0]=>
+ array(2) {
+ ["function"]=>
+ string(2) "sd"
+ ["args"]=>
+ array(0) {
+ }
+ }
+ [1]=>
+ array(4) {
+ ["file"]=>
+ string(7) "foo.php"
+ ["line"]=>
+ int(1)
+ ["function"]=>
+ string(3) "foo"
+ ["args"]=>
+ array(0) {
+ }
+ }
+ [2]=>
+ array(4) {
+ ["file"]=>
+ string(102) "foo.php"
+ ["line"]=>
+ int(2)
+ ["function"]=>
+ string(3) "bar"
+ ["args"]=>
+ array(0) {
+ }
+ }
+}
+*/
+```
+
+Usage
+-----
+
+The extension is compatible with ZTS mode, and should be supported by PHP5.3, 5.4, 5.5 and 5.6.
+To enable the extension from source, run:
+
+```
+ phpize
+ ./configure
+ make
+ sudo make install
+```
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/Resources/ext/config.m4 b/core/vendor/symfony/debug/Resources/ext/config.m4
similarity index 100%
rename from core/vendor/symfony/debug/Symfony/Component/Debug/Resources/ext/config.m4
rename to core/vendor/symfony/debug/Resources/ext/config.m4
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/Resources/ext/config.w32 b/core/vendor/symfony/debug/Resources/ext/config.w32
similarity index 100%
rename from core/vendor/symfony/debug/Symfony/Component/Debug/Resources/ext/config.w32
rename to core/vendor/symfony/debug/Resources/ext/config.w32
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/Resources/ext/php_symfony_debug.h b/core/vendor/symfony/debug/Resources/ext/php_symfony_debug.h
similarity index 70%
rename from core/vendor/symfony/debug/Symfony/Component/Debug/Resources/ext/php_symfony_debug.h
rename to core/vendor/symfony/debug/Resources/ext/php_symfony_debug.h
index c935f670192994ae698a68d541e9c6147970871b..26d0e8c0120300cda3204ed5cefd445a354e7cac 100644
--- a/core/vendor/symfony/debug/Symfony/Component/Debug/Resources/ext/php_symfony_debug.h
+++ b/core/vendor/symfony/debug/Resources/ext/php_symfony_debug.h
@@ -13,7 +13,7 @@
extern zend_module_entry symfony_debug_module_entry;
#define phpext_symfony_debug_ptr &symfony_debug_module_entry
-#define PHP_SYMFONY_DEBUG_VERSION "1.0"
+#define PHP_SYMFONY_DEBUG_VERSION "2.7"
#ifdef PHP_WIN32
# define PHP_SYMFONY_DEBUG_API __declspec(dllexport)
@@ -29,6 +29,8 @@ extern zend_module_entry symfony_debug_module_entry;
ZEND_BEGIN_MODULE_GLOBALS(symfony_debug)
intptr_t req_rand_init;
+ void (*old_error_cb)(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args);
+ zval *debug_bt;
ZEND_END_MODULE_GLOBALS(symfony_debug)
PHP_MINIT_FUNCTION(symfony_debug);
@@ -40,11 +42,14 @@ PHP_GINIT_FUNCTION(symfony_debug);
PHP_GSHUTDOWN_FUNCTION(symfony_debug);
PHP_FUNCTION(symfony_zval_info);
+PHP_FUNCTION(symfony_debug_backtrace);
-static char *_symfony_debug_memory_address_hash(void *);
+static char *_symfony_debug_memory_address_hash(void * TSRMLS_DC);
static const char *_symfony_debug_zval_type(zval *);
-static const char* _symfony_debug_get_resource_type(long);
-static int _symfony_debug_get_resource_refcount(long);
+static const char* _symfony_debug_get_resource_type(long TSRMLS_DC);
+static int _symfony_debug_get_resource_refcount(long TSRMLS_DC);
+
+void symfony_debug_error_cb(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args);
#ifdef ZTS
#define SYMFONY_DEBUG_G(v) TSRMG(symfony_debug_globals_id, zend_symfony_debug_globals *, v)
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/Resources/ext/symfony_debug.c b/core/vendor/symfony/debug/Resources/ext/symfony_debug.c
similarity index 66%
rename from core/vendor/symfony/debug/Symfony/Component/Debug/Resources/ext/symfony_debug.c
rename to core/vendor/symfony/debug/Resources/ext/symfony_debug.c
index 8dc5d4356a81919fb063ab255b865c935b569a80..0d7cb602320f93e440ad8f0043bd69f97b1a7863 100644
--- a/core/vendor/symfony/debug/Symfony/Component/Debug/Resources/ext/symfony_debug.c
+++ b/core/vendor/symfony/debug/Resources/ext/symfony_debug.c
@@ -12,6 +12,9 @@
#endif
#include "php.h"
+#ifdef ZTS
+#include "TSRM.h"
+#endif
#include "php_ini.h"
#include "ext/standard/info.h"
#include "php_symfony_debug.h"
@@ -19,6 +22,13 @@
#include "ext/standard/php_lcg.h"
#include "ext/spl/php_spl.h"
#include "Zend/zend_gc.h"
+#include "Zend/zend_builtin_functions.h"
+#include "Zend/zend_extensions.h" /* for ZEND_EXTENSION_API_NO */
+#include "ext/standard/php_array.h"
+#include "Zend/zend_interfaces.h"
+#include "SAPI.h"
+
+#define IS_PHP_53 ZEND_EXTENSION_API_NO == 220090626
ZEND_DECLARE_MODULE_GLOBALS(symfony_debug)
@@ -30,9 +40,28 @@ ZEND_END_ARG_INFO()
const zend_function_entry symfony_debug_functions[] = {
PHP_FE(symfony_zval_info, symfony_zval_arginfo)
+ PHP_FE(symfony_debug_backtrace, NULL)
PHP_FE_END
};
+PHP_FUNCTION(symfony_debug_backtrace)
+{
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
+ }
+#if IS_PHP_53
+ zend_fetch_debug_backtrace(return_value, 1, 0 TSRMLS_CC);
+#else
+ zend_fetch_debug_backtrace(return_value, 1, 0, 0 TSRMLS_CC);
+#endif
+
+ if (!SYMFONY_DEBUG_G(debug_bt)) {
+ return;
+ }
+
+ php_array_merge(Z_ARRVAL_P(return_value), Z_ARRVAL_P(SYMFONY_DEBUG_G(debug_bt)), 0 TSRMLS_CC);
+}
+
PHP_FUNCTION(symfony_zval_info)
{
zval *key = NULL, *arg = NULL;
@@ -40,7 +69,7 @@ PHP_FUNCTION(symfony_zval_info)
HashTable *array = NULL;
long options = 0;
- if (zend_parse_parameters(ZEND_NUM_ARGS(), "zh|l", &key, &array, &options) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zh|l", &key, &array, &options) == FAILURE) {
return;
}
@@ -62,13 +91,14 @@ PHP_FUNCTION(symfony_zval_info)
array_init(return_value);
add_assoc_string(return_value, "type", (char *)_symfony_debug_zval_type(arg), 1);
- add_assoc_stringl(return_value, "zval_hash", _symfony_debug_memory_address_hash((void *)arg), 16, 1);
+ add_assoc_stringl(return_value, "zval_hash", _symfony_debug_memory_address_hash((void *)arg TSRMLS_CC), 16, 0);
add_assoc_long(return_value, "zval_refcount", Z_REFCOUNT_P(arg));
add_assoc_bool(return_value, "zval_isref", (zend_bool)Z_ISREF_P(arg));
if (Z_TYPE_P(arg) == IS_OBJECT) {
- static char hash[33] = {0};
- php_spl_object_hash(arg, (char *)hash);
+ char hash[33] = {0};
+
+ php_spl_object_hash(arg, (char *)hash TSRMLS_CC);
add_assoc_stringl(return_value, "object_class", (char *)Z_OBJCE_P(arg)->name, Z_OBJCE_P(arg)->name_length, 1);
add_assoc_long(return_value, "object_refcount", EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(arg)].bucket.obj.refcount);
add_assoc_string(return_value, "object_hash", hash, 1);
@@ -77,17 +107,41 @@ PHP_FUNCTION(symfony_zval_info)
add_assoc_long(return_value, "array_count", zend_hash_num_elements(Z_ARRVAL_P(arg)));
} else if(Z_TYPE_P(arg) == IS_RESOURCE) {
add_assoc_long(return_value, "resource_handle", Z_LVAL_P(arg));
- add_assoc_string(return_value, "resource_type", (char *)_symfony_debug_get_resource_type(Z_LVAL_P(arg)), 1);
- add_assoc_long(return_value, "resource_refcount", _symfony_debug_get_resource_refcount(Z_LVAL_P(arg)));
+ add_assoc_string(return_value, "resource_type", (char *)_symfony_debug_get_resource_type(Z_LVAL_P(arg) TSRMLS_CC), 1);
+ add_assoc_long(return_value, "resource_refcount", _symfony_debug_get_resource_refcount(Z_LVAL_P(arg) TSRMLS_CC));
} else if (Z_TYPE_P(arg) == IS_STRING) {
add_assoc_long(return_value, "strlen", Z_STRLEN_P(arg));
}
}
-static const char* _symfony_debug_get_resource_type(long rsid)
+void symfony_debug_error_cb(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args)
+{
+ TSRMLS_FETCH();
+ zval *retval;
+
+ switch (type) {
+ case E_ERROR:
+ case E_PARSE:
+ case E_CORE_ERROR:
+ case E_CORE_WARNING:
+ case E_COMPILE_ERROR:
+ case E_COMPILE_WARNING:
+ ALLOC_INIT_ZVAL(retval);
+#if IS_PHP_53
+ zend_fetch_debug_backtrace(retval, 1, 0 TSRMLS_CC);
+#else
+ zend_fetch_debug_backtrace(retval, 1, 0, 0 TSRMLS_CC);
+#endif
+ SYMFONY_DEBUG_G(debug_bt) = retval;
+ }
+
+ SYMFONY_DEBUG_G(old_error_cb)(type, error_filename, error_lineno, format, args);
+}
+
+static const char* _symfony_debug_get_resource_type(long rsid TSRMLS_DC)
{
const char *res_type;
- res_type = zend_rsrc_list_get_rsrc_type(rsid);
+ res_type = zend_rsrc_list_get_rsrc_type(rsid TSRMLS_CC);
if (!res_type) {
return "Unknown";
@@ -96,7 +150,7 @@ static const char* _symfony_debug_get_resource_type(long rsid)
return res_type;
}
-static int _symfony_debug_get_resource_refcount(long rsid)
+static int _symfony_debug_get_resource_refcount(long rsid TSRMLS_DC)
{
zend_rsrc_list_entry *le;
@@ -107,21 +161,21 @@ static int _symfony_debug_get_resource_refcount(long rsid)
return 0;
}
-static char *_symfony_debug_memory_address_hash(void *address)
+static char *_symfony_debug_memory_address_hash(void *address TSRMLS_DC)
{
- static char result[17] = {0};
+ char *result = NULL;
intptr_t address_rand;
if (!SYMFONY_DEBUG_G(req_rand_init)) {
if (!BG(mt_rand_is_seeded)) {
php_mt_srand(GENERATE_SEED() TSRMLS_CC);
}
- SYMFONY_DEBUG_G(req_rand_init) = (intptr_t)php_mt_rand();
+ SYMFONY_DEBUG_G(req_rand_init) = (intptr_t)php_mt_rand(TSRMLS_C);
}
address_rand = (intptr_t)address ^ SYMFONY_DEBUG_G(req_rand_init);
- snprintf(result, 17, "%016zx", address_rand);
+ spprintf(&result, 17, "%016zx", address_rand);
return result;
}
@@ -187,7 +241,7 @@ ZEND_GET_MODULE(symfony_debug)
PHP_GINIT_FUNCTION(symfony_debug)
{
- symfony_debug_globals->req_rand_init = 0;
+ memset(symfony_debug_globals, 0 , sizeof(*symfony_debug_globals));
}
PHP_GSHUTDOWN_FUNCTION(symfony_debug)
@@ -197,11 +251,16 @@ PHP_GSHUTDOWN_FUNCTION(symfony_debug)
PHP_MINIT_FUNCTION(symfony_debug)
{
+ SYMFONY_DEBUG_G(old_error_cb) = zend_error_cb;
+ zend_error_cb = symfony_debug_error_cb;
+
return SUCCESS;
}
PHP_MSHUTDOWN_FUNCTION(symfony_debug)
{
+ zend_error_cb = SYMFONY_DEBUG_G(old_error_cb);
+
return SUCCESS;
}
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/Resources/ext/tests/001.phpt b/core/vendor/symfony/debug/Resources/ext/tests/001.phpt
similarity index 99%
rename from core/vendor/symfony/debug/Symfony/Component/Debug/Resources/ext/tests/001.phpt
rename to core/vendor/symfony/debug/Resources/ext/tests/001.phpt
index 30b25a25e22383b7313d5c531b24ed60c46d442b..4d41417b436e3b7e40f8cb3efd6ca5083dcff669 100644
--- a/core/vendor/symfony/debug/Symfony/Component/Debug/Resources/ext/tests/001.phpt
+++ b/core/vendor/symfony/debug/Resources/ext/tests/001.phpt
@@ -3,7 +3,7 @@ Test symfony_zval_info API
--SKIPIF--
<?php if (!extension_loaded("symfony_debug")) print "skip"; ?>
--FILE--
-<?php
+<?php
$int = 42;
$float = 42.42;
@@ -88,7 +88,7 @@ array(8) {
["object_hash"]=>
string(32) "%s"
["object_handle"]=>
- int(1)
+ int(%d)
}
array(5) {
["type"]=>
@@ -112,7 +112,7 @@ array(7) {
["zval_isref"]=>
bool(false)
["resource_handle"]=>
- int(4)
+ int(%d)
["resource_type"]=>
string(6) "stream"
["resource_refcount"]=>
diff --git a/core/vendor/symfony/debug/Resources/ext/tests/002.phpt b/core/vendor/symfony/debug/Resources/ext/tests/002.phpt
new file mode 100644
index 0000000000000000000000000000000000000000..ebe2f32d8f30322aa7e163b70201d9bd99e2f02f
--- /dev/null
+++ b/core/vendor/symfony/debug/Resources/ext/tests/002.phpt
@@ -0,0 +1,64 @@
+--TEST--
+Test symfony_debug_backtrace in case of fatal error
+--SKIPIF--
+<?php if (!extension_loaded("symfony_debug")) print "skip"; ?>
+--FILE--
+<?php
+
+function bar()
+{
+ foo();
+}
+
+function foo()
+{
+ notexist();
+}
+
+function bt()
+{
+ print_r(symfony_debug_backtrace());
+
+}
+
+register_shutdown_function('bt');
+
+bar();
+
+?>
+--EXPECTF--
+Fatal error: Call to undefined function notexist() in %s on line %d
+Array
+(
+ [0] => Array
+ (
+ [function] => bt
+ [args] => Array
+ (
+ )
+
+ )
+
+ [1] => Array
+ (
+ [file] => %s
+ [line] => %d
+ [function] => foo
+ [args] => Array
+ (
+ )
+
+ )
+
+ [2] => Array
+ (
+ [file] => %s
+ [line] => %d
+ [function] => bar
+ [args] => Array
+ (
+ )
+
+ )
+
+)
diff --git a/core/vendor/symfony/debug/Resources/ext/tests/002_1.phpt b/core/vendor/symfony/debug/Resources/ext/tests/002_1.phpt
new file mode 100644
index 0000000000000000000000000000000000000000..4d52dbf45702a5d72ed3dcadd8de4b947bc25c54
--- /dev/null
+++ b/core/vendor/symfony/debug/Resources/ext/tests/002_1.phpt
@@ -0,0 +1,47 @@
+--TEST--
+Test symfony_debug_backtrace in case of non fatal error
+--SKIPIF--
+<?php if (!extension_loaded("symfony_debug")) print "skip"; ?>
+--FILE--
+<?php
+
+function bar()
+{
+ bt();
+}
+
+function bt()
+{
+ print_r(symfony_debug_backtrace());
+
+}
+
+bar();
+
+?>
+--EXPECTF--
+Array
+(
+ [0] => Array
+ (
+ [file] => %s
+ [line] => %d
+ [function] => bt
+ [args] => Array
+ (
+ )
+
+ )
+
+ [1] => Array
+ (
+ [file] => %s
+ [line] => %d
+ [function] => bar
+ [args] => Array
+ (
+ )
+
+ )
+
+)
diff --git a/core/vendor/symfony/debug/Resources/ext/tests/003.phpt b/core/vendor/symfony/debug/Resources/ext/tests/003.phpt
new file mode 100644
index 0000000000000000000000000000000000000000..1d464720b7e3120429a545fba8cb0af54dc4bd46
--- /dev/null
+++ b/core/vendor/symfony/debug/Resources/ext/tests/003.phpt
@@ -0,0 +1,85 @@
+--TEST--
+Test ErrorHandler in case of fatal error
+--SKIPIF--
+<?php if (!extension_loaded("symfony_debug")) print "skip"; ?>
+--FILE--
+<?php
+
+namespace Psr\Log;
+
+class LogLevel
+{
+ const EMERGENCY = 'emergency';
+ const ALERT = 'alert';
+ const CRITICAL = 'critical';
+ const ERROR = 'error';
+ const WARNING = 'warning';
+ const NOTICE = 'notice';
+ const INFO = 'info';
+ const DEBUG = 'debug';
+}
+
+namespace Symfony\Component\Debug;
+
+$dir = __DIR__.'/../../../';
+require $dir.'ErrorHandler.php';
+require $dir.'Exception/FatalErrorException.php';
+require $dir.'Exception/UndefinedFunctionException.php';
+require $dir.'FatalErrorHandler/FatalErrorHandlerInterface.php';
+require $dir.'FatalErrorHandler/ClassNotFoundFatalErrorHandler.php';
+require $dir.'FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php';
+require $dir.'FatalErrorHandler/UndefinedMethodFatalErrorHandler.php';
+
+function bar()
+{
+ foo();
+}
+
+function foo()
+{
+ notexist();
+}
+
+$handler = ErrorHandler::register();
+$handler->setExceptionHandler('print_r');
+
+if (function_exists('xdebug_disable')) {
+ xdebug_disable();
+}
+
+bar();
+?>
+--EXPECTF--
+Fatal error: Call to undefined function Symfony\Component\Debug\notexist() in %s on line %d
+Symfony\Component\Debug\Exception\UndefinedFunctionException Object
+(
+ [message:protected] => Attempted to call function "notexist" from namespace "Symfony\Component\Debug".
+ [string:Exception:private] =>
+ [code:protected] => 0
+ [file:protected] => -
+ [line:protected] => %d
+ [trace:Exception:private] => Array
+ (
+ [0] => Array
+ (
+%A [function] => Symfony\Component\Debug\foo
+%A [args] => Array
+ (
+ )
+
+ )
+
+ [1] => Array
+ (
+%A [function] => Symfony\Component\Debug\bar
+%A [args] => Array
+ (
+ )
+
+ )
+%A
+ )
+
+ [previous:Exception:private] =>
+ [severity:protected] => 1
+)
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/Resources/ext/README.rst b/core/vendor/symfony/debug/Symfony/Component/Debug/Resources/ext/README.rst
deleted file mode 100644
index b0d1c58959fc986afa89c41dd4899609d68a9967..0000000000000000000000000000000000000000
--- a/core/vendor/symfony/debug/Symfony/Component/Debug/Resources/ext/README.rst
+++ /dev/null
@@ -1,72 +0,0 @@
-Symfony Debug Extension
-=======================
-
-This extension adds a ``symfony_zval_info($key, $array, $options = 0)`` function that:
-
-- exposes zval_hash/refcounts, allowing e.g. efficient exploration of arbitrary structures in PHP,
-- does work with references, preventing memory copying.
-
-Its behavior is about the same as:
-
-.. code-block:: php
-
- <?php
-
- function symfony_zval_info($key, $array, $options = 0)
- {
- // $options is currently not used, but could be in future version.
-
- if (!array_key_exists($key, $array)) {
- return null;
- }
-
- $info = array(
- 'type' => gettype($array[$key]),
- 'zval_hash' => /* hashed memory address of $array[$key] */,
- 'zval_refcount' => /* internal zval refcount of $array[$key] */,
- 'zval_isref' => /* is_ref status of $array[$key] */,
- );
-
- switch ($info['type']) {
- case 'object':
- $info += array(
- 'object_class' => get_class($array[$key]),
- 'object_refcount' => /* internal object refcount of $array[$key] */,
- 'object_hash' => spl_object_hash($array[$key]),
- 'object_handle' => /* internal object handle $array[$key] */,
- );
- break;
-
- case 'resource':
- $info += array(
- 'resource_handle' => (int) $array[$key],
- 'resource_type' => get_resource_type($array[$key]),
- 'resource_refcount' => /* internal resource refcount of $array[$key] */,
- );
- break;
-
- case 'array':
- $info += array(
- 'array_count' => count($array[$key]),
- );
- break;
-
- case 'string':
- $info += array(
- 'strlen' => strlen($array[$key]),
- );
- break;
- }
-
- return $info;
- }
-
-To enable the extension from source, run:
-
-.. code-block:: sh
-
- phpize
- ./configure
- make
- sudo make install
-
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php b/core/vendor/symfony/debug/Tests/DebugClassLoaderTest.php
similarity index 65%
rename from core/vendor/symfony/debug/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php
rename to core/vendor/symfony/debug/Tests/DebugClassLoaderTest.php
index 169f4210ed58ea4f5cd2f1acb4863b48d8a6767f..46953290d872635f936e7df86fb22f480582e3e8 100644
--- a/core/vendor/symfony/debug/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php
+++ b/core/vendor/symfony/debug/Tests/DebugClassLoaderTest.php
@@ -162,6 +162,87 @@ public function testClassAlias()
{
$this->assertTrue(class_exists(__NAMESPACE__.'\Fixtures\ClassAlias', true));
}
+
+ /**
+ * @dataProvider provideDeprecatedSuper
+ */
+ public function testDeprecatedSuper($class, $super, $type)
+ {
+ set_error_handler('var_dump', 0);
+ $e = error_reporting(0);
+ trigger_error('', E_USER_DEPRECATED);
+
+ class_exists('Test\\'.__NAMESPACE__.'\\'.$class, true);
+
+ error_reporting($e);
+ restore_error_handler();
+
+ $lastError = error_get_last();
+ unset($lastError['file'], $lastError['line']);
+
+ $xError = array(
+ 'type' => E_USER_DEPRECATED,
+ 'message' => 'The Test\Symfony\Component\Debug\Tests\\'.$class.' class '.$type.' Symfony\Component\Debug\Tests\Fixtures\\'.$super.' that is deprecated but this is a test deprecation notice.',
+ );
+
+ $this->assertSame($xError, $lastError);
+ }
+
+ public function provideDeprecatedSuper()
+ {
+ return array(
+ array('DeprecatedInterfaceClass', 'DeprecatedInterface', 'implements'),
+ array('DeprecatedParentClass', 'DeprecatedClass', 'extends'),
+ );
+ }
+
+ public function testDeprecatedSuperInSameNamespace()
+ {
+ set_error_handler('var_dump', 0);
+ $e = error_reporting(0);
+ trigger_error('', E_USER_NOTICE);
+
+ class_exists('Symfony\Bridge\Debug\Tests\Fixtures\ExtendsDeprecatedParent', true);
+
+ error_reporting($e);
+ restore_error_handler();
+
+ $lastError = error_get_last();
+ unset($lastError['file'], $lastError['line']);
+
+ $xError = array(
+ 'type' => E_USER_NOTICE,
+ 'message' => '',
+ );
+
+ $this->assertSame($xError, $lastError);
+ }
+
+ public function testReservedForPhp7()
+ {
+ if (PHP_VERSION_ID >= 70000) {
+ $this->markTestSkipped('PHP7 already prevents using reserved names.');
+ }
+
+ set_error_handler('var_dump', 0);
+ $e = error_reporting(0);
+ trigger_error('', E_USER_NOTICE);
+
+ class_exists('Test\\'.__NAMESPACE__.'\\Float', true);
+
+ error_reporting($e);
+ restore_error_handler();
+
+ $lastError = error_get_last();
+ unset($lastError['file'], $lastError['line']);
+
+ $xError = array(
+ 'type' => E_USER_DEPRECATED,
+ 'message' => 'Test\Symfony\Component\Debug\Tests\Float uses a reserved class name (Float) that will break on PHP 7 and higher',
+ );
+
+ $this->assertSame($xError, $lastError);
+ }
}
class ClassLoader
@@ -191,6 +272,16 @@ public function findFile($class)
return __DIR__.'/Fixtures/reallyNotPsr0.php';
} elseif (__NAMESPACE__.'\Fixtures\NotPSR0bis' === $class) {
return __DIR__.'/Fixtures/notPsr0Bis.php';
+ } elseif (__NAMESPACE__.'\Fixtures\DeprecatedInterface' === $class) {
+ return __DIR__.'/Fixtures/DeprecatedInterface.php';
+ } elseif ('Symfony\Bridge\Debug\Tests\Fixtures\ExtendsDeprecatedParent' === $class) {
+ eval('namespace Symfony\Bridge\Debug\Tests\Fixtures; class ExtendsDeprecatedParent extends \\'.__NAMESPACE__.'\Fixtures\DeprecatedClass {}');
+ } elseif ('Test\\'.__NAMESPACE__.'\DeprecatedParentClass' === $class) {
+ eval('namespace Test\\'.__NAMESPACE__.'; class DeprecatedParentClass extends \\'.__NAMESPACE__.'\Fixtures\DeprecatedClass {}');
+ } elseif ('Test\\'.__NAMESPACE__.'\DeprecatedInterfaceClass' === $class) {
+ eval('namespace Test\\'.__NAMESPACE__.'; class DeprecatedInterfaceClass implements \\'.__NAMESPACE__.'\Fixtures\DeprecatedInterface {}');
+ } elseif ('Test\\'.__NAMESPACE__.'\Float' === $class) {
+ eval('namespace Test\\'.__NAMESPACE__.'; class Float {}');
}
}
}
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/Tests/ErrorHandlerTest.php b/core/vendor/symfony/debug/Tests/ErrorHandlerTest.php
similarity index 95%
rename from core/vendor/symfony/debug/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
rename to core/vendor/symfony/debug/Tests/ErrorHandlerTest.php
index 1b3f7b41ed92d54376ed56650a774f8c4dcfdfb9..8b2d0bce215d793943894cf53f0f12a0bb282982 100644
--- a/core/vendor/symfony/debug/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
+++ b/core/vendor/symfony/debug/Tests/ErrorHandlerTest.php
@@ -141,19 +141,19 @@ public function testDefaultLogger()
$loggers = array(
E_DEPRECATED => array(null, LogLevel::INFO),
E_USER_DEPRECATED => array(null, LogLevel::INFO),
- E_NOTICE => array($logger, LogLevel::NOTICE),
+ E_NOTICE => array($logger, LogLevel::WARNING),
E_USER_NOTICE => array($logger, LogLevel::CRITICAL),
- E_STRICT => array(null, LogLevel::NOTICE),
+ E_STRICT => array(null, LogLevel::WARNING),
E_WARNING => array(null, LogLevel::WARNING),
E_USER_WARNING => array(null, LogLevel::WARNING),
E_COMPILE_WARNING => array(null, LogLevel::WARNING),
E_CORE_WARNING => array(null, LogLevel::WARNING),
- E_USER_ERROR => array(null, LogLevel::ERROR),
- E_RECOVERABLE_ERROR => array(null, LogLevel::ERROR),
- E_COMPILE_ERROR => array(null, LogLevel::EMERGENCY),
- E_PARSE => array(null, LogLevel::EMERGENCY),
- E_ERROR => array(null, LogLevel::EMERGENCY),
- E_CORE_ERROR => array(null, LogLevel::EMERGENCY),
+ E_USER_ERROR => array(null, LogLevel::CRITICAL),
+ E_RECOVERABLE_ERROR => array(null, LogLevel::CRITICAL),
+ E_COMPILE_ERROR => array(null, LogLevel::CRITICAL),
+ E_PARSE => array(null, LogLevel::CRITICAL),
+ E_ERROR => array(null, LogLevel::CRITICAL),
+ E_CORE_ERROR => array(null, LogLevel::CRITICAL),
);
$this->assertSame($loggers, $handler->setLoggers(array()));
@@ -389,7 +389,7 @@ public function testLegacyInterface()
;
$handler = ErrorHandler::register(E_NOTICE);
- $handler->setLogger($logger, 'scream');
+ @$handler->setLogger($logger, 'scream');
unset($undefVar);
@$undefVar++;
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/Tests/Exception/FlattenExceptionTest.php b/core/vendor/symfony/debug/Tests/Exception/FlattenExceptionTest.php
similarity index 100%
rename from core/vendor/symfony/debug/Symfony/Component/Debug/Tests/Exception/FlattenExceptionTest.php
rename to core/vendor/symfony/debug/Tests/Exception/FlattenExceptionTest.php
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/Tests/ExceptionHandlerTest.php b/core/vendor/symfony/debug/Tests/ExceptionHandlerTest.php
similarity index 100%
rename from core/vendor/symfony/debug/Symfony/Component/Debug/Tests/ExceptionHandlerTest.php
rename to core/vendor/symfony/debug/Tests/ExceptionHandlerTest.php
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php b/core/vendor/symfony/debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php
similarity index 100%
rename from core/vendor/symfony/debug/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php
rename to core/vendor/symfony/debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/Tests/FatalErrorHandler/UndefinedFunctionFatalErrorHandlerTest.php b/core/vendor/symfony/debug/Tests/FatalErrorHandler/UndefinedFunctionFatalErrorHandlerTest.php
similarity index 100%
rename from core/vendor/symfony/debug/Symfony/Component/Debug/Tests/FatalErrorHandler/UndefinedFunctionFatalErrorHandlerTest.php
rename to core/vendor/symfony/debug/Tests/FatalErrorHandler/UndefinedFunctionFatalErrorHandlerTest.php
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php b/core/vendor/symfony/debug/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php
similarity index 83%
rename from core/vendor/symfony/debug/Symfony/Component/Debug/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php
rename to core/vendor/symfony/debug/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php
index 7837d1daa67f5bb923afe5c12d40d8a6b000c189..5d1ff238024a5f08e327004ba3487780293161d7 100644
--- a/core/vendor/symfony/debug/Symfony/Component/Debug/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php
+++ b/core/vendor/symfony/debug/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php
@@ -41,7 +41,7 @@ public function provideUndefinedMethodData()
'file' => 'foo.php',
'message' => 'Call to undefined method SplObjectStorage::what()',
),
- 'Attempted to call method "what" on class "SplObjectStorage".',
+ 'Attempted to call an undefined method named "what" of class "SplObjectStorage".',
),
array(
array(
@@ -50,7 +50,7 @@ public function provideUndefinedMethodData()
'file' => 'foo.php',
'message' => 'Call to undefined method SplObjectStorage::walid()',
),
- "Attempted to call method \"walid\" on class \"SplObjectStorage\".\nDid you mean to call \"valid\"?",
+ "Attempted to call an undefined method named \"walid\" of class \"SplObjectStorage\".\nDid you mean to call \"valid\"?",
),
array(
array(
@@ -59,7 +59,7 @@ public function provideUndefinedMethodData()
'file' => 'foo.php',
'message' => 'Call to undefined method SplObjectStorage::offsetFet()',
),
- "Attempted to call method \"offsetFet\" on class \"SplObjectStorage\".\nDid you mean to call e.g. \"offsetGet\", \"offsetSet\" or \"offsetUnset\"?",
+ "Attempted to call an undefined method named \"offsetFet\" of class \"SplObjectStorage\".\nDid you mean to call e.g. \"offsetGet\", \"offsetSet\" or \"offsetUnset\"?",
),
);
}
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/Tests/Fixtures/ClassAlias.php b/core/vendor/symfony/debug/Tests/Fixtures/ClassAlias.php
similarity index 100%
rename from core/vendor/symfony/debug/Symfony/Component/Debug/Tests/Fixtures/ClassAlias.php
rename to core/vendor/symfony/debug/Tests/Fixtures/ClassAlias.php
diff --git a/core/vendor/symfony/debug/Tests/Fixtures/DeprecatedClass.php b/core/vendor/symfony/debug/Tests/Fixtures/DeprecatedClass.php
new file mode 100644
index 0000000000000000000000000000000000000000..b4c78cd140f13c927e58b3b81b55beb959af3ca2
--- /dev/null
+++ b/core/vendor/symfony/debug/Tests/Fixtures/DeprecatedClass.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Symfony\Component\Debug\Tests\Fixtures;
+
+/**
+ * @deprecated but this is a test
+ * deprecation notice.
+ * @foobar
+ */
+class DeprecatedClass
+{
+}
diff --git a/core/vendor/symfony/debug/Tests/Fixtures/DeprecatedInterface.php b/core/vendor/symfony/debug/Tests/Fixtures/DeprecatedInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..505eccae751b9111bcda78d16df8f16c81323973
--- /dev/null
+++ b/core/vendor/symfony/debug/Tests/Fixtures/DeprecatedInterface.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Symfony\Component\Debug\Tests\Fixtures;
+
+/**
+ * @deprecated but this is a test
+ * deprecation notice.
+ * @foobar
+ */
+interface DeprecatedInterface
+{
+}
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/Tests/Fixtures/PEARClass.php b/core/vendor/symfony/debug/Tests/Fixtures/PEARClass.php
similarity index 100%
rename from core/vendor/symfony/debug/Symfony/Component/Debug/Tests/Fixtures/PEARClass.php
rename to core/vendor/symfony/debug/Tests/Fixtures/PEARClass.php
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/Tests/Fixtures/casemismatch.php b/core/vendor/symfony/debug/Tests/Fixtures/casemismatch.php
similarity index 100%
rename from core/vendor/symfony/debug/Symfony/Component/Debug/Tests/Fixtures/casemismatch.php
rename to core/vendor/symfony/debug/Tests/Fixtures/casemismatch.php
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/Tests/Fixtures/notPsr0Bis.php b/core/vendor/symfony/debug/Tests/Fixtures/notPsr0Bis.php
similarity index 100%
rename from core/vendor/symfony/debug/Symfony/Component/Debug/Tests/Fixtures/notPsr0Bis.php
rename to core/vendor/symfony/debug/Tests/Fixtures/notPsr0Bis.php
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/Tests/Fixtures/psr4/Psr4CaseMismatch.php b/core/vendor/symfony/debug/Tests/Fixtures/psr4/Psr4CaseMismatch.php
similarity index 100%
rename from core/vendor/symfony/debug/Symfony/Component/Debug/Tests/Fixtures/psr4/Psr4CaseMismatch.php
rename to core/vendor/symfony/debug/Tests/Fixtures/psr4/Psr4CaseMismatch.php
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/Tests/Fixtures/reallyNotPsr0.php b/core/vendor/symfony/debug/Tests/Fixtures/reallyNotPsr0.php
similarity index 100%
rename from core/vendor/symfony/debug/Symfony/Component/Debug/Tests/Fixtures/reallyNotPsr0.php
rename to core/vendor/symfony/debug/Tests/Fixtures/reallyNotPsr0.php
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/Tests/Fixtures2/RequiredTwice.php b/core/vendor/symfony/debug/Tests/Fixtures2/RequiredTwice.php
similarity index 100%
rename from core/vendor/symfony/debug/Symfony/Component/Debug/Tests/Fixtures2/RequiredTwice.php
rename to core/vendor/symfony/debug/Tests/Fixtures2/RequiredTwice.php
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/Tests/MockExceptionHandler.php b/core/vendor/symfony/debug/Tests/MockExceptionHandler.php
similarity index 100%
rename from core/vendor/symfony/debug/Symfony/Component/Debug/Tests/MockExceptionHandler.php
rename to core/vendor/symfony/debug/Tests/MockExceptionHandler.php
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/composer.json b/core/vendor/symfony/debug/composer.json
similarity index 86%
rename from core/vendor/symfony/debug/Symfony/Component/Debug/composer.json
rename to core/vendor/symfony/debug/composer.json
index 2d101813a53ef7751d7b6ea286688f5f1db15582..3b1568831177e3a3d8a3ae0c7fe9c3709e360a38 100644
--- a/core/vendor/symfony/debug/Symfony/Component/Debug/composer.json
+++ b/core/vendor/symfony/debug/composer.json
@@ -16,7 +16,7 @@
}
],
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.9",
"psr/log": "~1.0"
},
"conflict": {
@@ -33,13 +33,12 @@
"symfony/http-kernel": ""
},
"autoload": {
- "psr-0": { "Symfony\\Component\\Debug\\": "" }
+ "psr-4": { "Symfony\\Component\\Debug\\": "" }
},
- "target-dir": "Symfony/Component/Debug",
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.6-dev"
+ "dev-master": "2.7-dev"
}
}
}
diff --git a/core/vendor/symfony/debug/Symfony/Component/Debug/phpunit.xml.dist b/core/vendor/symfony/debug/phpunit.xml.dist
similarity index 83%
rename from core/vendor/symfony/debug/Symfony/Component/Debug/phpunit.xml.dist
rename to core/vendor/symfony/debug/phpunit.xml.dist
index e91766065749a245341a2dc473f4709a1c2b6172..e99c4ddf4460330bf0fbd3145d79a943b8fcd6db 100644
--- a/core/vendor/symfony/debug/Symfony/Component/Debug/phpunit.xml.dist
+++ b/core/vendor/symfony/debug/phpunit.xml.dist
@@ -9,10 +9,14 @@
<php>
<ini name="error_reporting" value="-1" />
</php>
+
<testsuites>
<testsuite name="Symfony Debug Component Test Suite">
<directory>./Tests/</directory>
</testsuite>
+ <testsuite name="Symfony Debug Extension Test Suite">
+ <directory suffix=".phpt">./Resources/ext/tests/</directory>
+ </testsuite>
</testsuites>
<filter>
diff --git a/core/vendor/symfony/dom-crawler/.gitignore b/core/vendor/symfony/dom-crawler/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..c49a5d8df5c6548379f00c77fe572a7217bce218
--- /dev/null
+++ b/core/vendor/symfony/dom-crawler/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/CHANGELOG.md b/core/vendor/symfony/dom-crawler/CHANGELOG.md
similarity index 100%
rename from core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/CHANGELOG.md
rename to core/vendor/symfony/dom-crawler/CHANGELOG.md
diff --git a/core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Crawler.php b/core/vendor/symfony/dom-crawler/Crawler.php
similarity index 98%
rename from core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Crawler.php
rename to core/vendor/symfony/dom-crawler/Crawler.php
index 82a790c47bbb8bff11a3c082bb361009d92956fe..3fd87bd766cdac5689a39640988b033e5bba7f0e 100644
--- a/core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Crawler.php
+++ b/core/vendor/symfony/dom-crawler/Crawler.php
@@ -582,15 +582,7 @@ public function html()
$html = '';
foreach ($this->getNode(0)->childNodes as $child) {
- if (PHP_VERSION_ID >= 50306) {
- // node parameter was added to the saveHTML() method in PHP 5.3.6
- // @see http://php.net/manual/en/domdocument.savehtml.php
- $html .= $child->ownerDocument->saveHTML($child);
- } else {
- $document = new \DOMDocument('1.0', 'UTF-8');
- $document->appendChild($document->importNode($child, true));
- $html .= rtrim($document->saveHTML());
- }
+ $html .= $child->ownerDocument->saveHTML($child);
}
return $html;
diff --git a/core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Field/ChoiceFormField.php b/core/vendor/symfony/dom-crawler/Field/ChoiceFormField.php
similarity index 100%
rename from core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Field/ChoiceFormField.php
rename to core/vendor/symfony/dom-crawler/Field/ChoiceFormField.php
diff --git a/core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Field/FileFormField.php b/core/vendor/symfony/dom-crawler/Field/FileFormField.php
similarity index 100%
rename from core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Field/FileFormField.php
rename to core/vendor/symfony/dom-crawler/Field/FileFormField.php
diff --git a/core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Field/FormField.php b/core/vendor/symfony/dom-crawler/Field/FormField.php
similarity index 100%
rename from core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Field/FormField.php
rename to core/vendor/symfony/dom-crawler/Field/FormField.php
diff --git a/core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Field/InputFormField.php b/core/vendor/symfony/dom-crawler/Field/InputFormField.php
similarity index 100%
rename from core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Field/InputFormField.php
rename to core/vendor/symfony/dom-crawler/Field/InputFormField.php
diff --git a/core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Field/TextareaFormField.php b/core/vendor/symfony/dom-crawler/Field/TextareaFormField.php
similarity index 100%
rename from core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Field/TextareaFormField.php
rename to core/vendor/symfony/dom-crawler/Field/TextareaFormField.php
diff --git a/core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Form.php b/core/vendor/symfony/dom-crawler/Form.php
similarity index 100%
rename from core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Form.php
rename to core/vendor/symfony/dom-crawler/Form.php
diff --git a/core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/FormFieldRegistry.php b/core/vendor/symfony/dom-crawler/FormFieldRegistry.php
similarity index 100%
rename from core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/FormFieldRegistry.php
rename to core/vendor/symfony/dom-crawler/FormFieldRegistry.php
diff --git a/core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/LICENSE b/core/vendor/symfony/dom-crawler/LICENSE
similarity index 100%
rename from core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/LICENSE
rename to core/vendor/symfony/dom-crawler/LICENSE
diff --git a/core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Link.php b/core/vendor/symfony/dom-crawler/Link.php
similarity index 100%
rename from core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Link.php
rename to core/vendor/symfony/dom-crawler/Link.php
diff --git a/core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/README.md b/core/vendor/symfony/dom-crawler/README.md
similarity index 100%
rename from core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/README.md
rename to core/vendor/symfony/dom-crawler/README.md
diff --git a/core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Tests/CrawlerTest.php b/core/vendor/symfony/dom-crawler/Tests/CrawlerTest.php
similarity index 99%
rename from core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Tests/CrawlerTest.php
rename to core/vendor/symfony/dom-crawler/Tests/CrawlerTest.php
index 1431908591d1155dca72d1d23bc6b7c212377106..3c281eb479b52333e4226315723cdb556b78630c 100755
--- a/core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Tests/CrawlerTest.php
+++ b/core/vendor/symfony/dom-crawler/Tests/CrawlerTest.php
@@ -986,6 +986,13 @@ public function getBaseTagWithFormData()
);
}
+ public function testCountOfNestedElements()
+ {
+ $crawler = new Crawler('<html><body><ul><li>List item 1<ul><li>Sublist item 1</li><li>Sublist item 2</ul></li></ul></body></html>');
+
+ $this->assertCount(1, $crawler->filter('li:contains("List item 1")'));
+ }
+
public function createTestCrawler($uri = null)
{
$dom = new \DOMDocument();
diff --git a/core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Tests/Field/ChoiceFormFieldTest.php b/core/vendor/symfony/dom-crawler/Tests/Field/ChoiceFormFieldTest.php
similarity index 100%
rename from core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Tests/Field/ChoiceFormFieldTest.php
rename to core/vendor/symfony/dom-crawler/Tests/Field/ChoiceFormFieldTest.php
diff --git a/core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Tests/Field/FileFormFieldTest.php b/core/vendor/symfony/dom-crawler/Tests/Field/FileFormFieldTest.php
similarity index 100%
rename from core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Tests/Field/FileFormFieldTest.php
rename to core/vendor/symfony/dom-crawler/Tests/Field/FileFormFieldTest.php
diff --git a/core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Tests/Field/FormFieldTest.php b/core/vendor/symfony/dom-crawler/Tests/Field/FormFieldTest.php
similarity index 100%
rename from core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Tests/Field/FormFieldTest.php
rename to core/vendor/symfony/dom-crawler/Tests/Field/FormFieldTest.php
diff --git a/core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Tests/Field/FormFieldTestCase.php b/core/vendor/symfony/dom-crawler/Tests/Field/FormFieldTestCase.php
similarity index 100%
rename from core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Tests/Field/FormFieldTestCase.php
rename to core/vendor/symfony/dom-crawler/Tests/Field/FormFieldTestCase.php
diff --git a/core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Tests/Field/InputFormFieldTest.php b/core/vendor/symfony/dom-crawler/Tests/Field/InputFormFieldTest.php
similarity index 100%
rename from core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Tests/Field/InputFormFieldTest.php
rename to core/vendor/symfony/dom-crawler/Tests/Field/InputFormFieldTest.php
diff --git a/core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Tests/Field/TextareaFormFieldTest.php b/core/vendor/symfony/dom-crawler/Tests/Field/TextareaFormFieldTest.php
similarity index 100%
rename from core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Tests/Field/TextareaFormFieldTest.php
rename to core/vendor/symfony/dom-crawler/Tests/Field/TextareaFormFieldTest.php
diff --git a/core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Tests/Fixtures/no-extension b/core/vendor/symfony/dom-crawler/Tests/Fixtures/no-extension
similarity index 100%
rename from core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Tests/Fixtures/no-extension
rename to core/vendor/symfony/dom-crawler/Tests/Fixtures/no-extension
diff --git a/core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Tests/Fixtures/windows-1250.html b/core/vendor/symfony/dom-crawler/Tests/Fixtures/windows-1250.html
similarity index 100%
rename from core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Tests/Fixtures/windows-1250.html
rename to core/vendor/symfony/dom-crawler/Tests/Fixtures/windows-1250.html
diff --git a/core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Tests/FormTest.php b/core/vendor/symfony/dom-crawler/Tests/FormTest.php
similarity index 100%
rename from core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Tests/FormTest.php
rename to core/vendor/symfony/dom-crawler/Tests/FormTest.php
diff --git a/core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Tests/LinkTest.php b/core/vendor/symfony/dom-crawler/Tests/LinkTest.php
similarity index 100%
rename from core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/Tests/LinkTest.php
rename to core/vendor/symfony/dom-crawler/Tests/LinkTest.php
diff --git a/core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/composer.json b/core/vendor/symfony/dom-crawler/composer.json
similarity index 81%
rename from core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/composer.json
rename to core/vendor/symfony/dom-crawler/composer.json
index c84959add7716e28c88a74e78da84b7ed58e6d1c..f3dc8c9bd429fe2f9247d2fc6fe1ed63da5d409e 100644
--- a/core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/composer.json
+++ b/core/vendor/symfony/dom-crawler/composer.json
@@ -16,7 +16,7 @@
}
],
"require": {
- "php": ">=5.3.3"
+ "php": ">=5.3.9"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7",
@@ -26,13 +26,12 @@
"symfony/css-selector": ""
},
"autoload": {
- "psr-0": { "Symfony\\Component\\DomCrawler\\": "" }
+ "psr-4": { "Symfony\\Component\\DomCrawler\\": "" }
},
- "target-dir": "Symfony/Component/DomCrawler",
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.6-dev"
+ "dev-master": "2.7-dev"
}
}
}
diff --git a/core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/phpunit.xml.dist b/core/vendor/symfony/dom-crawler/phpunit.xml.dist
similarity index 100%
rename from core/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/phpunit.xml.dist
rename to core/vendor/symfony/dom-crawler/phpunit.xml.dist