diff --git a/core/composer.json b/core/composer.json index eaf5983..2f1e5f1 100644 --- a/core/composer.json +++ b/core/composer.json @@ -10,10 +10,19 @@ "symfony/http-kernel": "2.1.*", "symfony/routing": "2.1.*", "symfony/serializer": "2.1.*", + "symfony/validator": "2.2.x-dev", "symfony/yaml": "2.1.*", "twig/twig": "1.8.*", "doctrine/common": "2.3.*", "kriswallsmith/assetic": "1.1.*" }, - "minimum-stability": "alpha" + "minimum-stability": "alpha", + "scripts": { + "post-install-cmd": [ + "rm -rf vendor/symfony/validator/Symfony/Component/Validator/Resources/" + ], + "post-update-cmd": [ + "rm -rf vendor/symfony/validator/Symfony/Component/Validator/Resources/" + ] + } } diff --git a/core/composer.lock b/core/composer.lock index 5c8cd01..792e85f 100644 --- a/core/composer.lock +++ b/core/composer.lock @@ -1,61 +1,728 @@ { - "hash": "be2e79923e2be0777a9f60ec185168a8", + "hash": "989281c1935dd4710894d1602de9825d", "packages": [ { - "package": "doctrine/common", - "version": "2.3.0-RC2" + "name": "doctrine/common", + "version": "2.3.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/common", + "reference": "2.3.0" + }, + "dist": { + "type": "zip", + "url": "https://github.com/doctrine/common/zipball/2.3.0", + "reference": "2.3.0", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "time": "2012-09-19 22:55:18", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3.x-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-0": { + "Doctrine\\Common": "lib/" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com", + "homepage": "http://www.jwage.com/" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com", + "homepage": "http://www.instaclick.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com", + "homepage": "http://jmsyst.com", + "role": "Developer of wrapped JMSSerializerBundle" + } + ], + "description": "Common Library for Doctrine projects", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "collections", + "spl", + "eventmanager", + "annotations", + "persistence" + ] }, { - "package": "symfony/class-loader", - "version": "v2.1.0-RC2" + "name": "kriswallsmith/assetic", + "version": "v1.1.0-alpha1", + "source": { + "type": "git", + "url": "http://github.com/kriswallsmith/assetic.git", + "reference": "v1.1.0-alpha1" + }, + "dist": { + "type": "zip", + "url": "https://github.com/kriswallsmith/assetic/zipball/v1.1.0-alpha1", + "reference": "v1.1.0-alpha1", + "shasum": "" + }, + "require": { + "php": ">=5.3.1", + "symfony/process": "2.1.*" + }, + "require-dev": { + "twig/twig": ">=1.6.0,<2.0", + "leafo/lessphp": "*", + "leafo/scssphp": "*", + "ptachoire/cssembed": "*" + }, + "suggest": { + "twig/twig": "Assetic provides the integration with the Twig templating engine", + "leafo/lessphp": "Assetic provides the integration with the lessphp LESS compiler", + "leafo/scssphp": "Assetic provides the integration with the scssphp SCSS compiler", + "ptachoire/cssembed": "Assetic provides the integration with phpcssembed to embed data uris" + }, + "time": "2012-08-28 05:33:44", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-0": { + "Assetic": "src/" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kris Wallsmith", + "email": "kris.wallsmith@gmail.com", + "homepage": "http://kriswallsmith.net/" + } + ], + "description": "Asset Management for PHP", + "homepage": "https://github.com/kriswallsmith/assetic", + "keywords": [ + "assets", + "compression", + "minification" + ] }, { - "package": "symfony/dependency-injection", - "version": "v2.1.0-RC2" + "name": "symfony/class-loader", + "version": "v2.1.3", + "target-dir": "Symfony/Component/ClassLoader", + "source": { + "type": "git", + "url": "https://github.com/symfony/ClassLoader", + "reference": "v2.1.3" + }, + "dist": { + "type": "zip", + "url": "https://github.com/symfony/ClassLoader/zipball/v2.1.3", + "reference": "v2.1.3", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "symfony/finder": "2.1.*" + }, + "time": "2012-10-27 08:59:21", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.1-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-0": { + "Symfony\\Component\\ClassLoader": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony ClassLoader Component", + "homepage": "http://symfony.com" }, { - "package": "symfony/event-dispatcher", - "version": "v2.1.0-RC2" + "name": "symfony/dependency-injection", + "version": "v2.1.3", + "target-dir": "Symfony/Component/DependencyInjection", + "source": { + "type": "git", + "url": "https://github.com/symfony/DependencyInjection", + "reference": "v2.1.3" + }, + "dist": { + "type": "zip", + "url": "https://github.com/symfony/DependencyInjection/zipball/v2.1.3", + "reference": "v2.1.3", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "symfony/yaml": "2.1.*", + "symfony/config": "2.1.*" + }, + "suggest": { + "symfony/yaml": "2.1.*", + "symfony/config": "2.1.*" + }, + "time": "2012-10-22 07:37:12", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.1-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-0": { + "Symfony\\Component\\DependencyInjection": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony DependencyInjection Component", + "homepage": "http://symfony.com" }, { - "package": "symfony/http-foundation", - "version": "v2.1.0-RC2" + "name": "symfony/event-dispatcher", + "version": "v2.1.3", + "target-dir": "Symfony/Component/EventDispatcher", + "source": { + "type": "git", + "url": "https://github.com/symfony/EventDispatcher", + "reference": "v2.1.3" + }, + "dist": { + "type": "zip", + "url": "https://github.com/symfony/EventDispatcher/zipball/v2.1.3", + "reference": "v2.1.3", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "symfony/dependency-injection": "2.1.*" + }, + "suggest": { + "symfony/dependency-injection": "2.1.*", + "symfony/http-kernel": "2.1.*" + }, + "time": "2012-10-04 08:17:57", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.1-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-0": { + "Symfony\\Component\\EventDispatcher": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony EventDispatcher Component", + "homepage": "http://symfony.com" }, { - "package": "symfony/http-kernel", - "version": "v2.1.0-RC2" + "name": "symfony/http-foundation", + "version": "v2.1.3", + "target-dir": "Symfony/Component/HttpFoundation", + "source": { + "type": "git", + "url": "https://github.com/symfony/HttpFoundation", + "reference": "v2.1.3" + }, + "dist": { + "type": "zip", + "url": "https://github.com/symfony/HttpFoundation/zipball/v2.1.3", + "reference": "v2.1.3", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "time": "2012-10-20 00:10:30", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.1-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-0": { + "Symfony\\Component\\HttpFoundation": "", + "SessionHandlerInterface": "Symfony/Component/HttpFoundation/Resources/stubs" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony HttpFoundation Component", + "homepage": "http://symfony.com" }, { - "package": "symfony/process", - "version": "v2.1.0-RC2" + "name": "symfony/http-kernel", + "version": "v2.1.3", + "target-dir": "Symfony/Component/HttpKernel", + "source": { + "type": "git", + "url": "https://github.com/symfony/HttpKernel", + "reference": "v2.1.3" + }, + "dist": { + "type": "zip", + "url": "https://github.com/symfony/HttpKernel/zipball/v2.1.3", + "reference": "v2.1.3", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "symfony/event-dispatcher": "2.1.*", + "symfony/http-foundation": "2.1.*" + }, + "require-dev": { + "symfony/browser-kit": "2.1.*", + "symfony/class-loader": "2.1.*", + "symfony/config": "2.1.*", + "symfony/console": "2.1.*", + "symfony/dependency-injection": "2.1.*", + "symfony/finder": "2.1.*", + "symfony/process": "2.1.*", + "symfony/routing": "2.1.*" + }, + "suggest": { + "symfony/browser-kit": "2.1.*", + "symfony/class-loader": "2.1.*", + "symfony/config": "2.1.*", + "symfony/console": "2.1.*", + "symfony/dependency-injection": "2.1.*", + "symfony/finder": "2.1.*" + }, + "time": "2012-10-30 01:14:14", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.1-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-0": { + "Symfony\\Component\\HttpKernel": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony HttpKernel Component", + "homepage": "http://symfony.com" }, { - "package": "symfony/routing", - "version": "v2.1.0-RC2" + "name": "symfony/process", + "version": "v2.1.3", + "target-dir": "Symfony/Component/Process", + "source": { + "type": "git", + "url": "https://github.com/symfony/Process", + "reference": "v2.1.3" + }, + "dist": { + "type": "zip", + "url": "https://github.com/symfony/Process/zipball/v2.1.3", + "reference": "v2.1.3", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "time": "2012-10-20 00:10:30", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.1-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-0": { + "Symfony\\Component\\Process": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony Process Component", + "homepage": "http://symfony.com" }, { - "package": "symfony/serializer", - "version": "v2.1.2" + "name": "symfony/routing", + "version": "v2.1.3", + "target-dir": "Symfony/Component/Routing", + "source": { + "type": "git", + "url": "https://github.com/symfony/Routing", + "reference": "v2.1.3" + }, + "dist": { + "type": "zip", + "url": "https://github.com/symfony/Routing/zipball/v2.1.3", + "reference": "v2.1.3", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "symfony/config": "2.1.*", + "symfony/yaml": "2.1.*", + "symfony/http-kernel": "2.1.*", + "doctrine/common": ">=2.2,<2.4-dev" + }, + "suggest": { + "symfony/config": "2.1.*", + "symfony/yaml": "2.1.*", + "doctrine/common": ">=2.2,<2.4-dev" + }, + "time": "2012-10-26 02:26:42", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.1-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-0": { + "Symfony\\Component\\Routing": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony Routing Component", + "homepage": "http://symfony.com" }, { - "package": "symfony/yaml", - "version": "v2.1.0-RC2" + "name": "symfony/serializer", + "version": "v2.1.3", + "target-dir": "Symfony/Component/Serializer", + "source": { + "type": "git", + "url": "https://github.com/symfony/Serializer", + "reference": "v2.1.3" + }, + "dist": { + "type": "zip", + "url": "https://github.com/symfony/Serializer/zipball/v2.1.3", + "reference": "v2.1.3", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "time": "2012-10-20 00:10:30", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.1-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-0": { + "Symfony\\Component\\Serializer": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony Serializer Component", + "homepage": "http://symfony.com" }, { - "package": "twig/twig", - "version": "v1.8.3" + "name": "symfony/validator", + "version": "dev-master", + "target-dir": "Symfony/Component/Validator", + "source": { + "type": "git", + "url": "https://github.com/symfony/Validator", + "reference": "db3bbd8e2e7aa5db2e2ea066fd90257cb268120f" + }, + "dist": { + "type": "zip", + "url": "https://github.com/symfony/Validator/archive/db3bbd8e2e7aa5db2e2ea066fd90257cb268120f.zip", + "reference": "db3bbd8e2e7aa5db2e2ea066fd90257cb268120f", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "symfony/http-foundation": "2.2.*", + "symfony/locale": "2.2.*", + "symfony/yaml": "2.2.*" + }, + "suggest": { + "doctrine/common": ">=2.1,<2.4-dev", + "symfony/http-foundation": "2.2.*", + "symfony/yaml": "2.2.*" + }, + "time": "2012-11-24 12:30:10", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.2-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Symfony\\Component\\Validator\\": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony Validator Component", + "homepage": "http://symfony.com" }, { - "package": "kriswallsmith/assetic", - "version": "v1.1.0-alpha1" + "name": "symfony/yaml", + "version": "v2.1.3", + "target-dir": "Symfony/Component/Yaml", + "source": { + "type": "git", + "url": "https://github.com/symfony/Yaml", + "reference": "v2.1.3" + }, + "dist": { + "type": "zip", + "url": "https://github.com/symfony/Yaml/zipball/v2.1.3", + "reference": "v2.1.3", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "time": "2012-10-29 04:15:41", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.1-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-0": { + "Symfony\\Component\\Yaml": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony Yaml Component", + "homepage": "http://symfony.com" + }, + { + "name": "twig/twig", + "version": "v1.8.3", + "source": { + "type": "git", + "url": "git://github.com/fabpot/Twig.git", + "reference": "v1.8.3" + }, + "dist": { + "type": "zip", + "url": "https://github.com/fabpot/Twig/zipball/v1.8.3", + "reference": "v1.8.3", + "shasum": "" + }, + "require": { + "php": ">=5.2.4" + }, + "time": "2012-06-18 18:48:16", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.8-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-0": { + "Twig_": "lib/" + } + }, + "license": [ + "BSD-3" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com", + "homepage": null, + "role": null + }, + { + "name": "Armin Ronacher", + "email": "armin.ronacher@active-4.com", + "homepage": null, + "role": null + } + ], + "description": "Twig, the flexible, fast, and secure template language for PHP", + "homepage": "http://twig.sensiolabs.org", + "keywords": [ + "templating" + ] } ], - "packages-dev": null, + "packages-dev": [ + + ], "aliases": [ ], "minimum-stability": "alpha", - "stability-flags": [ - - ] + "stability-flags": { + "symfony/validator": 20 + } } diff --git a/core/vendor/autoload.php b/core/vendor/autoload.php index 004ba3a..31e0450 100644 --- a/core/vendor/autoload.php +++ b/core/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer' . '/autoload_real.php'; -return ComposerAutoloaderInit::getLoader(); +return ComposerAutoloaderInit074a68b8fe0a9a261c2520545d604365::getLoader(); diff --git a/core/vendor/composer/ClassLoader.php b/core/vendor/composer/ClassLoader.php index 00623e3..a4a0dc5 100644 --- a/core/vendor/composer/ClassLoader.php +++ b/core/vendor/composer/ClassLoader.php @@ -162,14 +162,14 @@ public function loadClass($class) */ public function findFile($class) { - if (isset($this->classMap[$class])) { - return $this->classMap[$class]; - } - if ('\\' == $class[0]) { $class = substr($class, 1); } + if (isset($this->classMap[$class])) { + return $this->classMap[$class]; + } + if (false !== $pos = strrpos($class, '\\')) { // namespaced class name $classPath = str_replace('\\', DIRECTORY_SEPARATOR, substr($class, 0, $pos)) . DIRECTORY_SEPARATOR; @@ -202,6 +202,6 @@ public function findFile($class) return $file; } - $this->classMap[$class] = false; + return $this->classMap[$class] = false; } } diff --git a/core/vendor/composer/autoload_namespaces.php b/core/vendor/composer/autoload_namespaces.php index c278de2..b560136 100644 --- a/core/vendor/composer/autoload_namespaces.php +++ b/core/vendor/composer/autoload_namespaces.php @@ -8,6 +8,7 @@ return array( 'Twig_' => $vendorDir . '/twig/twig/lib/', 'Symfony\\Component\\Yaml' => $vendorDir . '/symfony/yaml/', + 'Symfony\\Component\\Validator\\' => $vendorDir . '/symfony/validator/', 'Symfony\\Component\\Serializer' => $vendorDir . '/symfony/serializer/', 'Symfony\\Component\\Routing' => $vendorDir . '/symfony/routing/', 'Symfony\\Component\\Process' => $vendorDir . '/symfony/process/', diff --git a/core/vendor/composer/autoload_real.php b/core/vendor/composer/autoload_real.php index 7d64f49..b597357 100644 --- a/core/vendor/composer/autoload_real.php +++ b/core/vendor/composer/autoload_real.php @@ -2,13 +2,27 @@ // autoload_real.php generated by Composer -require __DIR__ . '/ClassLoader.php'; - -class ComposerAutoloaderInit +class ComposerAutoloaderInit074a68b8fe0a9a261c2520545d604365 { + private static $loader; + + public static function loadClassLoader($class) + { + if ('Composer\Autoload\ClassLoader' === $class) { + require __DIR__ . '/ClassLoader.php'; + } + } + public static function getLoader() { - $loader = new \Composer\Autoload\ClassLoader(); + if (null !== static::$loader) { + return static::$loader; + } + + spl_autoload_register(array('ComposerAutoloaderInit074a68b8fe0a9a261c2520545d604365', 'loadClassLoader')); + static::$loader = $loader = new \Composer\Autoload\ClassLoader(); + spl_autoload_unregister(array('ComposerAutoloaderInit074a68b8fe0a9a261c2520545d604365', 'loadClassLoader')); + $vendorDir = dirname(__DIR__); $baseDir = dirname($vendorDir); diff --git a/core/vendor/composer/installed.json b/core/vendor/composer/installed.json index 3fe9a18..0b80fb2 100644 --- a/core/vendor/composer/installed.json +++ b/core/vendor/composer/installed.json @@ -3,7 +3,6 @@ "name": "twig/twig", "version": "v1.8.3", "version_normalized": "1.8.3.0", - "time": "2012-06-18 18:48:16", "source": { "type": "git", "url": "git://github.com/fabpot/Twig.git", @@ -18,6 +17,7 @@ "require": { "php": ">=5.2.4" }, + "time": "2012-06-18 18:48:16", "type": "library", "extra": { "branch-alias": { @@ -25,6 +25,11 @@ } }, "installation-source": "dist", + "autoload": { + "psr-0": { + "Twig_": "lib/" + } + }, "license": [ "BSD-3" ], @@ -46,28 +51,84 @@ "homepage": "http://twig.sensiolabs.org", "keywords": [ "templating" - ], + ] + }, + { + "name": "kriswallsmith/assetic", + "version": "v1.1.0-alpha1", + "version_normalized": "1.1.0.0-alpha1", + "source": { + "type": "git", + "url": "http://github.com/kriswallsmith/assetic.git", + "reference": "v1.1.0-alpha1" + }, + "dist": { + "type": "zip", + "url": "https://github.com/kriswallsmith/assetic/zipball/v1.1.0-alpha1", + "reference": "v1.1.0-alpha1", + "shasum": "" + }, + "require": { + "php": ">=5.3.1", + "symfony/process": "2.1.*" + }, + "require-dev": { + "twig/twig": ">=1.6.0,<2.0", + "leafo/lessphp": "*", + "leafo/scssphp": "*", + "ptachoire/cssembed": "*" + }, + "suggest": { + "twig/twig": "Assetic provides the integration with the Twig templating engine", + "leafo/lessphp": "Assetic provides the integration with the lessphp LESS compiler", + "leafo/scssphp": "Assetic provides the integration with the scssphp SCSS compiler", + "ptachoire/cssembed": "Assetic provides the integration with phpcssembed to embed data uris" + }, + "time": "2012-08-28 05:33:44", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "installation-source": "dist", "autoload": { "psr-0": { - "Twig_": "lib/" + "Assetic": "src/" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kris Wallsmith", + "email": "kris.wallsmith@gmail.com", + "homepage": "http://kriswallsmith.net/" } - } + ], + "description": "Asset Management for PHP", + "homepage": "https://github.com/kriswallsmith/assetic", + "keywords": [ + "assets", + "compression", + "minification" + ] }, { "name": "symfony/class-loader", - "version": "v2.1.0-RC2", - "version_normalized": "2.1.0.0-RC2", + "version": "v2.1.3", + "version_normalized": "2.1.3.0", "target-dir": "Symfony/Component/ClassLoader", - "time": "2012-08-27 14:51:49", "source": { "type": "git", "url": "https://github.com/symfony/ClassLoader", - "reference": "v2.1.0-RC2" + "reference": "v2.1.3" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/ClassLoader/zipball/v2.1.0-RC2", - "reference": "v2.1.0-RC2", + "url": "https://github.com/symfony/ClassLoader/zipball/v2.1.3", + "reference": "v2.1.3", "shasum": "" }, "require": { @@ -76,6 +137,7 @@ "require-dev": { "symfony/finder": "2.1.*" }, + "time": "2012-10-27 08:59:21", "type": "library", "extra": { "branch-alias": { @@ -83,46 +145,41 @@ } }, "installation-source": "dist", + "autoload": { + "psr-0": { + "Symfony\\Component\\ClassLoader": "" + } + }, "license": [ "MIT" ], "authors": [ { "name": "Fabien Potencier", - "email": "fabien@symfony.com", - "homepage": null, - "role": null + "email": "fabien@symfony.com" }, { "name": "Symfony Community", - "email": null, - "homepage": "http://symfony.com/contributors", - "role": null + "homepage": "http://symfony.com/contributors" } ], "description": "Symfony ClassLoader Component", - "homepage": "http://symfony.com", - "autoload": { - "psr-0": { - "Symfony\\Component\\ClassLoader": "" - } - } + "homepage": "http://symfony.com" }, { "name": "symfony/dependency-injection", - "version": "v2.1.0-RC2", - "version_normalized": "2.1.0.0-RC2", + "version": "v2.1.3", + "version_normalized": "2.1.3.0", "target-dir": "Symfony/Component/DependencyInjection", - "time": "2012-08-28 06:54:42", "source": { "type": "git", "url": "https://github.com/symfony/DependencyInjection", - "reference": "v2.1.0-RC2" + "reference": "v2.1.3" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/DependencyInjection/zipball/v2.1.0-RC2", - "reference": "v2.1.0-RC2", + "url": "https://github.com/symfony/DependencyInjection/zipball/v2.1.3", + "reference": "v2.1.3", "shasum": "" }, "require": { @@ -133,9 +190,10 @@ "symfony/config": "2.1.*" }, "suggest": { - "symfony/yaml": "v2.1.0-RC2", - "symfony/config": "v2.1.0-RC2" + "symfony/yaml": "2.1.*", + "symfony/config": "2.1.*" }, + "time": "2012-10-22 07:37:12", "type": "library", "extra": { "branch-alias": { @@ -143,50 +201,46 @@ } }, "installation-source": "dist", + "autoload": { + "psr-0": { + "Symfony\\Component\\DependencyInjection": "" + } + }, "license": [ "MIT" ], "authors": [ { "name": "Fabien Potencier", - "email": "fabien@symfony.com", - "homepage": null, - "role": null + "email": "fabien@symfony.com" }, { "name": "Symfony Community", - "email": null, - "homepage": "http://symfony.com/contributors", - "role": null + "homepage": "http://symfony.com/contributors" } ], "description": "Symfony DependencyInjection Component", - "homepage": "http://symfony.com", - "autoload": { - "psr-0": { - "Symfony\\Component\\DependencyInjection": "" - } - } + "homepage": "http://symfony.com" }, { "name": "doctrine/common", - "version": "2.3.0-RC2", - "version_normalized": "2.3.0.0-RC2", - "time": "2012-08-29 13:06:32", + "version": "2.3.0", + "version_normalized": "2.3.0.0", "source": { "type": "git", "url": "https://github.com/doctrine/common", - "reference": "2.3.0-RC2" + "reference": "2.3.0" }, "dist": { "type": "zip", - "url": "https://github.com/doctrine/common/zipball/2.3.0-RC2", - "reference": "2.3.0-RC2", + "url": "https://github.com/doctrine/common/zipball/2.3.0", + "reference": "2.3.0", "shasum": "" }, "require": { "php": ">=5.3.2" }, + "time": "2012-09-19 22:55:18", "type": "library", "extra": { "branch-alias": { @@ -194,6 +248,11 @@ } }, "installation-source": "dist", + "autoload": { + "psr-0": { + "Doctrine\\Common": "lib/" + } + }, "license": [ "MIT" ], @@ -201,26 +260,20 @@ { "name": "Jonathan Wage", "email": "jonwage@gmail.com", - "homepage": "http://www.jwage.com/", - "role": null + "homepage": "http://www.jwage.com/" }, { "name": "Guilherme Blanco", "email": "guilhermeblanco@gmail.com", - "homepage": null, - "role": null + "homepage": "http://www.instaclick.com" }, { "name": "Roman Borschel", - "email": "roman@code-factory.org", - "homepage": null, - "role": null + "email": "roman@code-factory.org" }, { "name": "Benjamin Eberlei", - "email": "kontakt@beberlei.de", - "homepage": null, - "role": null + "email": "kontakt@beberlei.de" }, { "name": "Johannes Schmitt", @@ -237,33 +290,28 @@ "eventmanager", "annotations", "persistence" - ], - "autoload": { - "psr-0": { - "Doctrine\\Common": "lib/" - } - } + ] }, { "name": "symfony/http-foundation", - "version": "v2.1.0-RC2", - "version_normalized": "2.1.0.0-RC2", + "version": "v2.1.3", + "version_normalized": "2.1.3.0", "target-dir": "Symfony/Component/HttpFoundation", - "time": "2012-08-22 12:48:41", "source": { "type": "git", "url": "https://github.com/symfony/HttpFoundation", - "reference": "v2.1.0-RC2" + "reference": "v2.1.3" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/HttpFoundation/zipball/v2.1.0-RC2", - "reference": "v2.1.0-RC2", + "url": "https://github.com/symfony/HttpFoundation/zipball/v2.1.3", + "reference": "v2.1.3", "shasum": "" }, "require": { "php": ">=5.3.3" }, + "time": "2012-10-20 00:10:30", "type": "library", "extra": { "branch-alias": { @@ -271,47 +319,42 @@ } }, "installation-source": "dist", + "autoload": { + "psr-0": { + "Symfony\\Component\\HttpFoundation": "", + "SessionHandlerInterface": "Symfony/Component/HttpFoundation/Resources/stubs" + } + }, "license": [ "MIT" ], "authors": [ { "name": "Fabien Potencier", - "email": "fabien@symfony.com", - "homepage": null, - "role": null + "email": "fabien@symfony.com" }, { "name": "Symfony Community", - "email": null, - "homepage": "http://symfony.com/contributors", - "role": null + "homepage": "http://symfony.com/contributors" } ], "description": "Symfony HttpFoundation Component", - "homepage": "http://symfony.com", - "autoload": { - "psr-0": { - "Symfony\\Component\\HttpFoundation": "", - "SessionHandlerInterface": "Symfony/Component/HttpFoundation/Resources/stubs" - } - } + "homepage": "http://symfony.com" }, { "name": "symfony/event-dispatcher", - "version": "v2.1.0-RC2", - "version_normalized": "2.1.0.0-RC2", + "version": "v2.1.3", + "version_normalized": "2.1.3.0", "target-dir": "Symfony/Component/EventDispatcher", - "time": "2012-08-22 12:48:41", "source": { "type": "git", "url": "https://github.com/symfony/EventDispatcher", - "reference": "v2.1.0-RC2" + "reference": "v2.1.3" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/EventDispatcher/zipball/v2.1.0-RC2", - "reference": "v2.1.0-RC2", + "url": "https://github.com/symfony/EventDispatcher/zipball/v2.1.3", + "reference": "v2.1.3", "shasum": "" }, "require": { @@ -321,9 +364,10 @@ "symfony/dependency-injection": "2.1.*" }, "suggest": { - "symfony/dependency-injection": "v2.1.0-RC2", - "symfony/http-kernel": "v2.1.0-RC2" + "symfony/dependency-injection": "2.1.*", + "symfony/http-kernel": "2.1.*" }, + "time": "2012-10-04 08:17:57", "type": "library", "extra": { "branch-alias": { @@ -331,46 +375,41 @@ } }, "installation-source": "dist", + "autoload": { + "psr-0": { + "Symfony\\Component\\EventDispatcher": "" + } + }, "license": [ "MIT" ], "authors": [ { "name": "Fabien Potencier", - "email": "fabien@symfony.com", - "homepage": null, - "role": null + "email": "fabien@symfony.com" }, { "name": "Symfony Community", - "email": null, - "homepage": "http://symfony.com/contributors", - "role": null + "homepage": "http://symfony.com/contributors" } ], "description": "Symfony EventDispatcher Component", - "homepage": "http://symfony.com", - "autoload": { - "psr-0": { - "Symfony\\Component\\EventDispatcher": "" - } - } + "homepage": "http://symfony.com" }, { "name": "symfony/http-kernel", - "version": "v2.1.0-RC2", - "version_normalized": "2.1.0.0-RC2", + "version": "v2.1.3", + "version_normalized": "2.1.3.0", "target-dir": "Symfony/Component/HttpKernel", - "time": "2012-08-28 07:00:18", "source": { "type": "git", "url": "https://github.com/symfony/HttpKernel", - "reference": "v2.1.0-RC2" + "reference": "v2.1.3" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/HttpKernel/zipball/v2.1.0-RC2", - "reference": "v2.1.0-RC2", + "url": "https://github.com/symfony/HttpKernel/zipball/v2.1.3", + "reference": "v2.1.3", "shasum": "" }, "require": { @@ -389,13 +428,14 @@ "symfony/routing": "2.1.*" }, "suggest": { - "symfony/browser-kit": "v2.1.0-RC2", - "symfony/class-loader": "v2.1.0-RC2", - "symfony/config": "v2.1.0-RC2", - "symfony/console": "v2.1.0-RC2", - "symfony/dependency-injection": "v2.1.0-RC2", - "symfony/finder": "v2.1.0-RC2" + "symfony/browser-kit": "2.1.*", + "symfony/class-loader": "2.1.*", + "symfony/config": "2.1.*", + "symfony/console": "2.1.*", + "symfony/dependency-injection": "2.1.*", + "symfony/finder": "2.1.*" }, + "time": "2012-10-30 01:14:14", "type": "library", "extra": { "branch-alias": { @@ -403,46 +443,41 @@ } }, "installation-source": "dist", + "autoload": { + "psr-0": { + "Symfony\\Component\\HttpKernel": "" + } + }, "license": [ "MIT" ], "authors": [ { "name": "Fabien Potencier", - "email": "fabien@symfony.com", - "homepage": null, - "role": null + "email": "fabien@symfony.com" }, { "name": "Symfony Community", - "email": null, - "homepage": "http://symfony.com/contributors", - "role": null + "homepage": "http://symfony.com/contributors" } ], "description": "Symfony HttpKernel Component", - "homepage": "http://symfony.com", - "autoload": { - "psr-0": { - "Symfony\\Component\\HttpKernel": "" - } - } + "homepage": "http://symfony.com" }, { "name": "symfony/routing", - "version": "v2.1.0-RC2", - "version_normalized": "2.1.0.0-RC2", + "version": "v2.1.3", + "version_normalized": "2.1.3.0", "target-dir": "Symfony/Component/Routing", - "time": "2012-08-28 06:54:42", "source": { "type": "git", "url": "https://github.com/symfony/Routing", - "reference": "v2.1.0-RC2" + "reference": "v2.1.3" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/Routing/zipball/v2.1.0-RC2", - "reference": "v2.1.0-RC2", + "url": "https://github.com/symfony/Routing/zipball/v2.1.3", + "reference": "v2.1.3", "shasum": "" }, "require": { @@ -455,10 +490,11 @@ "doctrine/common": ">=2.2,<2.4-dev" }, "suggest": { - "symfony/config": "v2.1.0-RC2", - "symfony/yaml": "v2.1.0-RC2", + "symfony/config": "2.1.*", + "symfony/yaml": "2.1.*", "doctrine/common": ">=2.2,<2.4-dev" }, + "time": "2012-10-26 02:26:42", "type": "library", "extra": { "branch-alias": { @@ -466,51 +502,95 @@ } }, "installation-source": "dist", + "autoload": { + "psr-0": { + "Symfony\\Component\\Routing": "" + } + }, "license": [ "MIT" ], "authors": [ { "name": "Fabien Potencier", - "email": "fabien@symfony.com", - "homepage": null, - "role": null + "email": "fabien@symfony.com" }, { "name": "Symfony Community", - "email": null, - "homepage": "http://symfony.com/contributors", - "role": null + "homepage": "http://symfony.com/contributors" } ], "description": "Symfony Routing Component", - "homepage": "http://symfony.com", + "homepage": "http://symfony.com" + }, + { + "name": "symfony/serializer", + "version": "v2.1.3", + "version_normalized": "2.1.3.0", + "target-dir": "Symfony/Component/Serializer", + "source": { + "type": "git", + "url": "https://github.com/symfony/Serializer", + "reference": "v2.1.3" + }, + "dist": { + "type": "zip", + "url": "https://github.com/symfony/Serializer/zipball/v2.1.3", + "reference": "v2.1.3", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "time": "2012-10-20 00:10:30", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.1-dev" + } + }, + "installation-source": "dist", "autoload": { "psr-0": { - "Symfony\\Component\\Routing": "" + "Symfony\\Component\\Serializer": "" } - } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony Serializer Component", + "homepage": "http://symfony.com" }, { "name": "symfony/yaml", - "version": "v2.1.0-RC2", - "version_normalized": "2.1.0.0-RC2", + "version": "v2.1.3", + "version_normalized": "2.1.3.0", "target-dir": "Symfony/Component/Yaml", - "time": "2012-08-22 12:48:41", "source": { "type": "git", "url": "https://github.com/symfony/Yaml", - "reference": "v2.1.0-RC2" + "reference": "v2.1.3" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/Yaml/zipball/v2.1.0-RC2", - "reference": "v2.1.0-RC2", + "url": "https://github.com/symfony/Yaml/zipball/v2.1.3", + "reference": "v2.1.3", "shasum": "" }, "require": { "php": ">=5.3.3" }, + "time": "2012-10-29 04:15:41", "type": "library", "extra": { "branch-alias": { @@ -518,51 +598,47 @@ } }, "installation-source": "dist", + "autoload": { + "psr-0": { + "Symfony\\Component\\Yaml": "" + } + }, "license": [ "MIT" ], "authors": [ { "name": "Fabien Potencier", - "email": "fabien@symfony.com", - "homepage": null, - "role": null + "email": "fabien@symfony.com" }, { "name": "Symfony Community", - "email": null, - "homepage": "http://symfony.com/contributors", - "role": null + "homepage": "http://symfony.com/contributors" } ], "description": "Symfony Yaml Component", - "homepage": "http://symfony.com", - "autoload": { - "psr-0": { - "Symfony\\Component\\Yaml": "" - } - } + "homepage": "http://symfony.com" }, { "name": "symfony/process", - "version": "v2.1.0-RC2", - "version_normalized": "2.1.0.0-RC2", + "version": "v2.1.3", + "version_normalized": "2.1.3.0", "target-dir": "Symfony/Component/Process", - "time": "2012-08-26 06:13:51", "source": { "type": "git", "url": "https://github.com/symfony/Process", - "reference": "v2.1.0-RC2" + "reference": "v2.1.3" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/Process/zipball/v2.1.0-RC2", - "reference": "v2.1.0-RC2", + "url": "https://github.com/symfony/Process/zipball/v2.1.3", + "reference": "v2.1.3", "shasum": "" }, "require": { "php": ">=5.3.3" }, + "time": "2012-10-20 00:10:30", "type": "library", "extra": { "branch-alias": { @@ -570,6 +646,11 @@ } }, "installation-source": "dist", + "autoload": { + "psr-0": { + "Symfony\\Component\\Process": "" + } + }, "license": [ "MIT" ], @@ -584,73 +665,64 @@ } ], "description": "Symfony Process Component", - "homepage": "http://symfony.com", - "autoload": { - "psr-0": { - "Symfony\\Component\\Process": "" - } - } + "homepage": "http://symfony.com" }, { - "name": "kriswallsmith/assetic", - "version": "v1.1.0-alpha1", - "version_normalized": "1.1.0.0-alpha1", - "time": "2012-08-28 05:33:44", + "name": "symfony/validator", + "version": "dev-master", + "version_normalized": "9999999-dev", + "target-dir": "Symfony/Component/Validator", "source": { "type": "git", - "url": "http://github.com/kriswallsmith/assetic.git", - "reference": "v1.1.0-alpha1" + "url": "https://github.com/symfony/Validator", + "reference": "db3bbd8e2e7aa5db2e2ea066fd90257cb268120f" }, "dist": { "type": "zip", - "url": "https://github.com/kriswallsmith/assetic/zipball/v1.1.0-alpha1", - "reference": "v1.1.0-alpha1", + "url": "https://github.com/symfony/Validator/archive/db3bbd8e2e7aa5db2e2ea066fd90257cb268120f.zip", + "reference": "db3bbd8e2e7aa5db2e2ea066fd90257cb268120f", "shasum": "" }, "require": { - "php": ">=5.3.1", - "symfony/process": "2.1.*" + "php": ">=5.3.3" }, "require-dev": { - "twig/twig": ">=1.6.0,<2.0", - "leafo/lessphp": "*", - "leafo/scssphp": "*", - "ptachoire/cssembed": "*" + "symfony/http-foundation": "2.2.*", + "symfony/locale": "2.2.*", + "symfony/yaml": "2.2.*" }, "suggest": { - "twig/twig": "Assetic provides the integration with the Twig templating engine", - "leafo/lessphp": "Assetic provides the integration with the lessphp LESS compiler", - "leafo/scssphp": "Assetic provides the integration with the scssphp SCSS compiler", - "ptachoire/cssembed": "Assetic provides the integration with phpcssembed to embed data uris" + "doctrine/common": ">=2.1,<2.4-dev", + "symfony/http-foundation": "2.2.*", + "symfony/yaml": "2.2.*" }, + "time": "2012-11-24 12:30:10", "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "2.2-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Symfony\\Component\\Validator\\": "" } }, - "installation-source": "dist", "license": [ "MIT" ], "authors": [ { - "name": "Kris Wallsmith", - "email": "kris.wallsmith@gmail.com", - "homepage": "http://kriswallsmith.net/" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" } ], - "description": "Asset Management for PHP", - "homepage": "https://github.com/kriswallsmith/assetic", - "keywords": [ - "assets", - "compression", - "minification" - ], - "autoload": { - "psr-0": { - "Assetic": "src/" - } - } + "description": "Symfony Validator Component", + "homepage": "http://symfony.com" } ] diff --git a/core/vendor/doctrine/common/composer.json b/core/vendor/doctrine/common/composer.json index ff87dba..c87258d 100644 --- a/core/vendor/doctrine/common/composer.json +++ b/core/vendor/doctrine/common/composer.json @@ -1,6 +1,6 @@ { "name": "doctrine/common", - "type": "library","version":"2.3.0-RC2", + "type": "library", "description": "Common Library for Doctrine projects", "keywords": ["collections", "spl", "eventmanager", "annotations", "persistence"], "homepage": "http://www.doctrine-project.org", diff --git a/core/vendor/doctrine/common/lib/Doctrine/Common/Annotations/DocLexer.php b/core/vendor/doctrine/common/lib/Doctrine/Common/Annotations/DocLexer.php index fc3c2d4..c9a6f7a 100644 --- a/core/vendor/doctrine/common/lib/Doctrine/Common/Annotations/DocLexer.php +++ b/core/vendor/doctrine/common/lib/Doctrine/Common/Annotations/DocLexer.php @@ -52,6 +52,24 @@ const T_NULL = 111; const T_COLON = 112; + protected $noCase = array( + '@' => self::T_AT, + ',' => self::T_COMMA, + '(' => self::T_OPEN_PARENTHESIS, + ')' => self::T_CLOSE_PARENTHESIS, + '{' => self::T_OPEN_CURLY_BRACES, + '}' => self::T_CLOSE_CURLY_BRACES, + '=' => self::T_EQUALS, + ':' => self::T_COLON, + '\\' => self::T_NAMESPACE_SEPARATOR + ); + + protected $withCase = array( + 'true' => self::T_TRUE, + 'false' => self::T_FALSE, + 'null' => self::T_NULL + ); + /** * {@inheritdoc} */ @@ -83,61 +101,30 @@ protected function getType(&$value) { $type = self::T_NONE; - // Checking numeric value - if (is_numeric($value)) { - return (strpos($value, '.') !== false || stripos($value, 'e') !== false) - ? self::T_FLOAT : self::T_INTEGER; - } - if ($value[0] === '"') { $value = str_replace('""', '"', substr($value, 1, strlen($value) - 2)); return self::T_STRING; - } else { - switch (strtolower($value)) { - case '@': - return self::T_AT; - - case ',': - return self::T_COMMA; - - case '(': - return self::T_OPEN_PARENTHESIS; - - case ')': - return self::T_CLOSE_PARENTHESIS; - - case '{': - return self::T_OPEN_CURLY_BRACES; - - case '}': - return self::T_CLOSE_CURLY_BRACES; - - case '=': - return self::T_EQUALS; - - case '\\': - return self::T_NAMESPACE_SEPARATOR; - - case 'true': - return self::T_TRUE; + } - case 'false': - return self::T_FALSE; + if (isset($this->noCase[$value])) { + return $this->noCase[$value]; + } - case 'null': - return self::T_NULL; + if ($value[0] === '_' || $value[0] === '\\' || ctype_alpha($value[0])) { + return self::T_IDENTIFIER; + } - case ':': - return self::T_COLON; + $lowerValue = strtolower($value); - default: - if (ctype_alpha($value[0]) || $value[0] === '_' || $value[0] === '\\') { - return self::T_IDENTIFIER; - } + if (isset($this->withCase[$lowerValue])) { + return $this->withCase[$lowerValue]; + } - break; - } + // Checking numeric value + if (is_numeric($value)) { + return (strpos($value, '.') !== false || stripos($value, 'e') !== false) + ? self::T_FLOAT : self::T_INTEGER; } return $type; diff --git a/core/vendor/doctrine/common/lib/Doctrine/Common/Cache/FileCache.php b/core/vendor/doctrine/common/lib/Doctrine/Common/Cache/FileCache.php index 4435975..da650b4 100644 --- a/core/vendor/doctrine/common/lib/Doctrine/Common/Cache/FileCache.php +++ b/core/vendor/doctrine/common/lib/Doctrine/Common/Cache/FileCache.php @@ -102,7 +102,7 @@ protected function getFilename($id) */ protected function doDelete($id) { - return unlink($this->getFilename($id)); + return @unlink($this->getFilename($id)); } /** @@ -116,7 +116,7 @@ protected function doFlush() $iterator = new \RegexIterator($iterator, $pattern); foreach ($iterator as $name => $file) { - unlink($name); + @unlink($name); } return true; diff --git a/core/vendor/doctrine/common/lib/Doctrine/Common/Version.php b/core/vendor/doctrine/common/lib/Doctrine/Common/Version.php index 0782163..cca4894 100644 --- a/core/vendor/doctrine/common/lib/Doctrine/Common/Version.php +++ b/core/vendor/doctrine/common/lib/Doctrine/Common/Version.php @@ -36,7 +36,7 @@ class Version /** * Current Doctrine Version */ - const VERSION = '2.3.0-RC2'; + const VERSION = '2.3.0'; /** * Compares a Doctrine version with the current one. diff --git a/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ClassCollectionLoader.php b/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ClassCollectionLoader.php index 7f5bdd1..59318ea 100644 --- a/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ClassCollectionLoader.php +++ b/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ClassCollectionLoader.php @@ -20,6 +20,7 @@ class ClassCollectionLoader { private static $loaded; private static $seen; + private static $useTokenizer = true; /** * Loads a list of classes and caches them in one big file. @@ -135,7 +136,11 @@ public static function load($classes, $cacheDir, $name, $autoReload, $adaptive = */ public static function fixNamespaceDeclarations($source) { - if (!function_exists('token_get_all')) { + if (!function_exists('token_get_all') || !self::$useTokenizer) { + if (preg_match('/namespace(.*?)\s*;/', $source)) { + $source = preg_replace('/namespace(.*?)\s*;/', "namespace$1\n{", $source)."}\n"; + } + return $source; } @@ -317,4 +322,12 @@ private static function getTraits(\ReflectionClass $class) return $classes; } + + /** + * This method is only useful for testing. + */ + public static function enableTokenizer($bool) + { + self::$useTokenizer = (Boolean) $bool; + } } diff --git a/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/ClassCollectionLoaderTest.php b/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/ClassCollectionLoaderTest.php index 90eca1d..d5c153d 100644 --- a/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/ClassCollectionLoaderTest.php +++ b/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/ClassCollectionLoaderTest.php @@ -117,53 +117,34 @@ public function getDifferentOrdersForTraits() ); } - public function testFixNamespaceDeclarations() + /** + * @dataProvider getFixNamespaceDeclarationsData + */ + public function testFixNamespaceDeclarations($source, $expected) { - $source = <<assertEquals('assertEquals('assertEquals($expected, ClassCollectionLoader::fixNamespaceDeclarations($source)); + public function getFixNamespaceDeclarationsData() + { + return array( + array("namespace;\nclass Foo {}\n", "namespace\n{\nclass Foo {}\n}\n"), + array("namespace Foo;\nclass Foo {}\n", "namespace Foo\n{\nclass Foo {}\n}\n"), + array("namespace Bar ;\nclass Foo {}\n", "namespace Bar\n{\nclass Foo {}\n}\n"), + array("namespace Foo\Bar;\nclass Foo {}\n", "namespace Foo\Bar\n{\nclass Foo {}\n}\n"), + array("namespace Foo\Bar\Bar\n{\nclass Foo {}\n}\n", "namespace Foo\Bar\Bar\n{\nclass Foo {}\n}\n"), + array("namespace\n{\nclass Foo {}\n}\n", "namespace\n{\nclass Foo {}\n}\n"), + ); } /** @@ -173,4 +154,10 @@ public function testUnableToLoadClassException() { ClassCollectionLoader::load(array('SomeNotExistingClass'), '', 'foo', false); } + + public function testLoadTwiceClass() + { + ClassCollectionLoader::load(array('Foo'), '', 'foo', false); + ClassCollectionLoader::load(array('Foo'), '', 'foo', false); + } } diff --git a/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/phpunit.xml.dist b/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/phpunit.xml.dist deleted file mode 100644 index ae7e2ad..0000000 --- a/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/phpunit.xml.dist +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - ./Tests/ - - - - - - ./ - - ./Resources - ./Tests - ./vendor - - - - diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php index 19079b4..f7aa471 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php @@ -116,7 +116,7 @@ private function processArguments(array $arguments) * * @param string $id A full id or alias for a service definition. * - * @return Definition The definition related to the supplied id + * @return Definition|null The definition related to the supplied id */ private function getDefinition($id) { diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php index 70592df..ab8895a 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php @@ -70,6 +70,8 @@ public function process(ContainerBuilder $container) * * @param ContainerBuilder $container The ContainerBuilder * @param array $arguments An array of arguments + * + * @return array */ private function inlineArguments(ContainerBuilder $container, array $arguments) { diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/RepeatedPass.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/RepeatedPass.php index d4af431..41779b7 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/RepeatedPass.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/RepeatedPass.php @@ -28,7 +28,8 @@ class RepeatedPass implements CompilerPassInterface * Constructor. * * @param array $passes An array of RepeatablePassInterface objects - * @throws InvalidArgumentException if a pass is not a RepeatablePassInterface instance + * + * @throws InvalidArgumentException when the passes don't implement RepeatablePassInterface */ public function __construct(array $passes) { diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php index 5d00ed6..1964184 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php @@ -97,6 +97,8 @@ private function updateReferences($container, $currentId, $newId) * @param array $arguments An array of Arguments * @param string $currentId The alias identifier * @param string $newId The identifier the alias points to + * + * @return array */ private function updateArgumentReferences(array $arguments, $currentId, $newId) { diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php index 53c6f52..4fb5b0d 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php @@ -58,6 +58,8 @@ public function process(ContainerBuilder $container) * @param DefinitionDecorator $definition * * @return Definition + * + * @throws \RuntimeException When the definition is invalid */ private function resolveDefinition($id, DefinitionDecorator $definition) { diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/ResolveInvalidReferencesPass.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/ResolveInvalidReferencesPass.php index 996199c..0674ad4 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/ResolveInvalidReferencesPass.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/ResolveInvalidReferencesPass.php @@ -71,6 +71,10 @@ public function process(ContainerBuilder $container) * * @param array $arguments An array of Reference objects * @param Boolean $inMethodCall + * + * @return array + * + * @throws \RuntimeException When the config is invalid */ private function processArguments(array $arguments, $inMethodCall = false) { diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php index f6e4c85..0d9ed16 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php @@ -25,6 +25,8 @@ class ResolveParameterPlaceHoldersPass implements CompilerPassInterface * Processes the ContainerBuilder to resolve parameter placeholders. * * @param ContainerBuilder $container + * + * @throws ParameterNotFoundException When an invalid parameter is referenced */ public function process(ContainerBuilder $container) { diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraph.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraph.php index b241bf8..267bac4 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraph.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraph.php @@ -37,6 +37,8 @@ public function __construct() * Checks if the graph has a specific node. * * @param string $id Id to check + * + * @return Boolean */ public function hasNode($id) { diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Container.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Container.php index 88e1f26..1786158 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Container.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Container.php @@ -180,6 +180,9 @@ public function setParameter($name, $value) * @param object $service The service instance * @param string $scope The scope of the service * + * @throws \RuntimeException When trying to set a service in an inactive scope + * @throws \InvalidArgumentException When trying to set a service in the prototype scope + * * @api */ public function set($id, $service, $scope = self::SCOPE_CONTAINER) @@ -229,6 +232,8 @@ public function has($id) * @return object The associated service * * @throws InvalidArgumentException if the service is not defined + * @throws ServiceCircularReferenceException When a circular reference is detected + * @throws ServiceNotFoundException When the service is not defined * * @see Reference * @@ -253,6 +258,11 @@ public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE $service = $this->$method(); } catch (\Exception $e) { unset($this->loading[$id]); + + if (isset($this->services[$id])) { + unset($this->services[$id]); + } + throw $e; } @@ -301,6 +311,9 @@ public function getServiceIds() * * @param string $name * + * @throws RuntimeException When the parent scope is inactive + * @throws InvalidArgumentException When the scope does not exist + * * @api */ public function enterScope($name) @@ -384,6 +397,8 @@ public function leaveScope($name) * * @param ScopeInterface $scope * + * @throws \InvalidArgumentException When the scope is invalid + * * @api */ public function addScope(ScopeInterface $scope) diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ContainerBuilder.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ContainerBuilder.php index 5bf7ead..0fd333a 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ContainerBuilder.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ContainerBuilder.php @@ -62,6 +62,8 @@ public function registerExtension(ExtensionInterface $extension) * * @return ExtensionInterface An extension instance * + * @throws \LogicException if the extension is not registered + * * @api */ public function getExtension($name) @@ -162,6 +164,8 @@ public function addObjectResource($object) * @return ContainerBuilder The current instance * @throws BadMethodCallException When this ContainerBuilder is frozen * + * @throws \LogicException if the container is frozen + * * @api */ public function loadFromExtension($extension, array $values = array()) @@ -493,8 +497,11 @@ public function setAliases(array $aliases) /** * Sets an alias for an existing service. * - * @param string $alias The alias to create - * @param mixed $id The service to alias + * @param string $alias The alias to create + * @param string|Alias $id The service to alias + * + * @throws \InvalidArgumentException if the id is not a string or an Alias + * @throws \InvalidArgumentException if the alias is for itself * * @api */ @@ -546,7 +553,7 @@ public function hasAlias($id) /** * Gets all defined aliases. * - * @return array An array of aliases + * @return Alias[] An array of aliases * * @api */ @@ -625,7 +632,7 @@ public function setDefinitions(array $definitions) /** * Gets all service definitions. * - * @return array An array of Definition instances + * @return Definition[] An array of Definition instances * * @api */ @@ -640,6 +647,8 @@ public function getDefinitions() * @param string $id The service identifier * @param Definition $definition A Definition instance * + * @return Definition the service definition + * * @throws BadMethodCallException When this ContainerBuilder is frozen * * @api @@ -721,9 +730,10 @@ public function findDefinition($id) * @param Definition $definition A service definition instance * @param string $id The service identifier * - * @return object The service described by the service definition + * @return object The service described by the service definition * - * @throws RuntimeException When factory specification is incomplete or scope is inactive + * @throws RuntimeException When the scope is inactive + * @throws RuntimeException When the factory definition is incomplete * @throws InvalidArgumentException When configure callable is not callable */ private function createService(Definition $definition, $id) diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ContainerInterface.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ContainerInterface.php index d5e07a0..1951ae7 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ContainerInterface.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ContainerInterface.php @@ -12,6 +12,8 @@ namespace Symfony\Component\DependencyInjection; use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException; +use Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException; +use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException; /** * ContainerInterface is the interface implemented by service container classes. @@ -49,6 +51,8 @@ public function set($id, $service, $scope = self::SCOPE_CONTAINER); * @return object The associated service * * @throws InvalidArgumentException if the service is not defined + * @throws ServiceCircularReferenceException When a circular reference is detected + * @throws ServiceNotFoundException When the service is not defined * * @see Reference * diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Definition.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Definition.php index e7265f2..6928df8 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Definition.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Definition.php @@ -241,6 +241,8 @@ public function addArgument($argument) * * @return Definition The current instance * + * @throws \OutOfBoundsException When the replaced argument does not exist + * * @api */ public function replaceArgument($index, $argument) @@ -273,6 +275,8 @@ public function getArguments() * * @return mixed The argument value * + * @throws \OutOfBoundsException When the argument does not exist + * * @api */ public function getArgument($index) @@ -628,7 +632,7 @@ public function isAbstract() /** * Sets a configurator to call after the service is fully initialized. * - * @param mixed $callable A PHP callable + * @param callable $callable A PHP callable * * @return Definition The current instance * @@ -644,7 +648,7 @@ public function setConfigurator($callable) /** * Gets the configurator to call after the service is fully initialized. * - * @return mixed The PHP callable to call + * @return callable The PHP callable to call * * @api */ diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/DefinitionDecorator.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/DefinitionDecorator.php index 0306f75..3ac561a 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/DefinitionDecorator.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/DefinitionDecorator.php @@ -29,7 +29,7 @@ class DefinitionDecorator extends Definition /** * Constructor. * - * @param Definition $parent The Definition instance to decorate. + * @param string $parent The id of Definition instance to decorate. * * @api */ @@ -44,7 +44,7 @@ public function __construct($parent) /** * Returns the Definition being decorated. * - * @return Definition + * @return string * * @api */ @@ -159,6 +159,8 @@ public function setPublic($boolean) * * @return mixed The argument value * + * @throws \OutOfBoundsException When the argument does not exist + * * @api */ public function getArgument($index) diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php index 4a29d23..870e96b 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php @@ -186,6 +186,9 @@ private function addServiceInclude($id, $definition) * @param Definition $definition * * @return string + * + * @throws \RuntimeException When the factory definition is incomplete + * @throws ServiceCircularReferenceException When a circular reference is detected */ private function addServiceInlinedDefinitions($id, $definition) { @@ -877,9 +880,9 @@ private function wrapServiceConditionals($value, $code) /** * Builds service calls from arguments * - * @param array $arguments - * @param string &$calls By reference - * @param string &$behavior By reference + * @param array $arguments + * @param array &$calls By reference + * @param array &$behavior By reference */ private function getServiceCallsFromArguments(array $arguments, array &$calls, array &$behavior) { diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php index d8791ce..66d6c5d 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php @@ -63,7 +63,7 @@ public function dump(array $options = array()) /** * Adds parameters. * - * @param DOMElement $parent + * @param \DOMElement $parent */ private function addParameters(\DOMElement $parent) { @@ -84,8 +84,8 @@ private function addParameters(\DOMElement $parent) /** * Adds method calls. * - * @param array $methodcalls - * @param DOMElement $parent + * @param array $methodcalls + * @param \DOMElement $parent */ private function addMethodCalls(array $methodcalls, \DOMElement $parent) { @@ -102,9 +102,9 @@ private function addMethodCalls(array $methodcalls, \DOMElement $parent) /** * Adds a service. * - * @param Definition $definition - * @param string $id - * @param DOMElement $parent + * @param Definition $definition + * @param string $id + * @param \DOMElement $parent */ private function addService($definition, $id, \DOMElement $parent) { @@ -172,9 +172,9 @@ private function addService($definition, $id, \DOMElement $parent) /** * Adds a service alias. * - * @param string $alias - * @param string $id - * @param DOMElement $parent + * @param string $alias + * @param string $id + * @param \DOMElement $parent */ private function addServiceAlias($alias, $id, \DOMElement $parent) { @@ -190,7 +190,7 @@ private function addServiceAlias($alias, $id, \DOMElement $parent) /** * Adds services. * - * @param DOMElement $parent + * @param \DOMElement $parent */ private function addServices(\DOMElement $parent) { @@ -213,10 +213,10 @@ private function addServices(\DOMElement $parent) /** * Converts parameters. * - * @param array $parameters - * @param string $type - * @param DOMElement $parent - * @param string $keyAttribute + * @param array $parameters + * @param string $type + * @param \DOMElement $parent + * @param string $keyAttribute */ private function convertParameters($parameters, $type, \DOMElement $parent, $keyAttribute = 'key') { @@ -280,6 +280,10 @@ private function escape($arguments) * Converts php types to xml types. * * @param mixed $value Value to convert + * + * @return string + * + * @throws RuntimeException When trying to dump object or resource */ public static function phpToXml($value) { diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php index 9717a25..bd87161 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php @@ -12,7 +12,9 @@ namespace Symfony\Component\DependencyInjection\Dumper; use Symfony\Component\Yaml\Dumper as YmlDumper; +use Symfony\Component\DependencyInjection\Alias; use Symfony\Component\DependencyInjection\ContainerInterface; +use Symfony\Component\DependencyInjection\Definition; use Symfony\Component\DependencyInjection\Parameter; use Symfony\Component\DependencyInjection\Reference; use Symfony\Component\DependencyInjection\Exception\RuntimeException; @@ -135,7 +137,7 @@ private function addService($id, $definition) * Adds a service alias * * @param string $alias - * @param string $id + * @param Alias $id * * @return string */ @@ -196,6 +198,8 @@ private function addParameters() * * @param mixed $value * + * @return mixed + * * @throws RuntimeException When trying to dump object or resource */ private function dumpValue($value) diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Loader/FileLoader.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Loader/FileLoader.php index 0699ab9..ad437b5 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Loader/FileLoader.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Loader/FileLoader.php @@ -13,7 +13,7 @@ use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\Config\Loader\FileLoader as BaseFileLoader; -use Symfony\Component\Config\FileLocator; +use Symfony\Component\Config\FileLocatorInterface; /** * FileLoader is the abstract class used by all built-in loaders that are file based. @@ -28,9 +28,9 @@ * Constructor. * * @param ContainerBuilder $container A ContainerBuilder instance - * @param FileLocator $locator A FileLocator instance + * @param FileLocatorInterface $locator A FileLocator instance */ - public function __construct(ContainerBuilder $container, FileLocator $locator) + public function __construct(ContainerBuilder $container, FileLocatorInterface $locator) { $this->container = $container; diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php index 5329195..b3a6fca 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php @@ -200,7 +200,9 @@ private function parseDefinition($id, $service, $file) * * @param string $file Path to a file * - * @throws InvalidArgumentException When loading of XML file returns error + * @return SimpleXMLElement + * + * @throws \InvalidArgumentException When loading of XML file returns error */ private function parseFile($file) { @@ -286,8 +288,8 @@ private function processAnonymousServices(SimpleXMLElement $xml, $file) /** * Validates an XML document. * - * @param DOMDocument $dom - * @param string $file + * @param \DOMDocument $dom + * @param string $file */ private function validate(\DOMDocument $dom, $file) { @@ -302,7 +304,7 @@ private function validate(\DOMDocument $dom, $file) * @param string $file * * @throws RuntimeException When extension references a non-existent XSD file - * @throws InvalidArgumentException When XML doesn't validate its XSD schema + * @throws InvalidArgumentException When xml doesn't validate its xsd schema */ private function validateSchema(\DOMDocument $dom, $file) { @@ -404,6 +406,8 @@ private function validateExtensions(\DOMDocument $dom, $file) /** * Returns an array of XML errors. * + * @param Boolean $internalErrors + * * @return array */ private function getXmlErrors($internalErrors) diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php index 63f3893..6ef3e73 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php @@ -119,6 +119,8 @@ private function parseDefinitions($content, $file) * @param string $id * @param array $service * @param string $file + * + * @throws InvalidArgumentException When tags are invalid */ private function parseDefinition($id, $service, $file) { diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php index 908e2a1..70f3956 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php @@ -84,7 +84,7 @@ public function all() * * @return mixed The parameter value * - * @throws ParameterNotFoundException if the parameter is not defined + * @throws ParameterNotFoundException if the parameter is not defined * * @api */ @@ -129,13 +129,13 @@ public function has($name) /** * Removes a parameter. * - * @param string $key The key + * @param string $name The parameter name * * @api */ - public function remove($key) + public function remove($name) { - unset($this->parameters[$key]); + unset($this->parameters[strtolower($name)]); } /** diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/ContainerTest.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/ContainerTest.php index 1be5106..95b3953 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/ContainerTest.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/ContainerTest.php @@ -98,7 +98,7 @@ public function testGetServiceIds() $this->assertEquals(array('service_container', 'foo', 'bar'), $sc->getServiceIds(), '->getServiceIds() returns all defined service ids'); $sc = new ProjectServiceContainer(); - $this->assertEquals(array('scoped', 'scoped_foo', 'bar', 'foo_bar', 'foo.baz', 'circular', 'throw_exception', 'service_container'), $sc->getServiceIds(), '->getServiceIds() returns defined service ids by getXXXService() methods'); + $this->assertEquals(array('scoped', 'scoped_foo', 'bar', 'foo_bar', 'foo.baz', 'circular', 'throw_exception', 'throws_exception_on_service_configuration', 'service_container'), $sc->getServiceIds(), '->getServiceIds() returns defined service ids by getXXXService() methods'); } /** @@ -367,6 +367,27 @@ public function testGetThrowsException() } } + public function testGetThrowsExceptionOnServiceConfiguration() + { + $c = new ProjectServiceContainer(); + + try { + $c->get('throws_exception_on_service_configuration'); + $this->fail('The container can not contain invalid service!'); + } catch (\Exception $e) { + $this->assertEquals('Something was terribly wrong while trying to configure the service!', $e->getMessage()); + } + $this->assertFalse($c->initialized('throws_exception_on_service_configuration')); + + try { + $c->get('throws_exception_on_service_configuration'); + $this->fail('The container can not contain invalid service!'); + } catch (\Exception $e) { + $this->assertEquals('Something was terribly wrong while trying to configure the service!', $e->getMessage()); + } + $this->assertFalse($c->initialized('throws_exception_on_service_configuration')); + } + public function getInvalidParentScopes() { return array( @@ -447,4 +468,11 @@ protected function getThrowExceptionService() { throw new \Exception('Something went terribly wrong!'); } + + protected function getThrowsExceptionOnServiceConfigurationService() + { + $this->services['throws_exception_on_service_configuration'] = $instance = new \stdClass(); + + throw new \Exception('Something was terribly wrong while trying to configure the service!'); + } } diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/ParameterBag/ParameterBagTest.php b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/ParameterBag/ParameterBagTest.php index 46fb358..968ae9b 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/ParameterBag/ParameterBagTest.php +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/ParameterBag/ParameterBagTest.php @@ -54,6 +54,8 @@ public function testRemove() )); $bag->remove('foo'); $this->assertEquals(array('bar' => 'bar'), $bag->all(), '->remove() removes a parameter'); + $bag->remove('BAR'); + $this->assertEquals(array(), $bag->all(), '->remove() converts key to lowercase before removing'); } /** diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/composer.json b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/composer.json index 81811c3..de7ad5d 100644 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/composer.json +++ b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/composer.json @@ -23,8 +23,8 @@ "symfony/config": "2.1.*" }, "suggest": { - "symfony/yaml": "self.version", - "symfony/config": "self.version" + "symfony/yaml": "2.1.*", + "symfony/config": "2.1.*" }, "autoload": { "psr-0": { "Symfony\\Component\\DependencyInjection": "" } diff --git a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/phpunit.xml.dist b/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/phpunit.xml.dist deleted file mode 100644 index 554d104..0000000 --- a/core/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/phpunit.xml.dist +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - ./Tests/ - - - - - - ./ - - ./Resources - ./Tests - ./vendor - - - - diff --git a/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/composer.json b/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/composer.json index 93abade..159a920 100644 --- a/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/composer.json +++ b/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/composer.json @@ -22,8 +22,8 @@ "symfony/dependency-injection": "2.1.*" }, "suggest": { - "symfony/dependency-injection": "self.version", - "symfony/http-kernel": "self.version" + "symfony/dependency-injection": "2.1.*", + "symfony/http-kernel": "2.1.*" }, "autoload": { "psr-0": { "Symfony\\Component\\EventDispatcher": "" } diff --git a/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/phpunit.xml.dist b/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/phpunit.xml.dist deleted file mode 100644 index c557135..0000000 --- a/core/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/phpunit.xml.dist +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - ./Tests/ - - - - - - ./ - - ./Resources - ./Tests - ./vendor - - - - diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/HeaderBag.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/HeaderBag.php index bb579b6..f26899d 100644 --- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/HeaderBag.php +++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/HeaderBag.php @@ -223,7 +223,9 @@ public function remove($key) * @param string $key The parameter key * @param \DateTime $default The default value * - * @return \DateTime The filtered value + * @return null|\DateTime The filtered value + * + * @throws \RuntimeException When the HTTP header is not parseable * * @api */ diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Request.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Request.php index 848c3d1..9254693 100644 --- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Request.php +++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Request.php @@ -217,7 +217,7 @@ public static function createFromGlobals() { $request = new static($_GET, $_POST, array(), $_COOKIE, $_FILES, $_SERVER); - if (0 === strpos($request->server->get('CONTENT_TYPE'), 'application/x-www-form-urlencoded') + if (0 === strpos($request->headers->get('CONTENT_TYPE'), 'application/x-www-form-urlencoded') && in_array(strtoupper($request->server->get('REQUEST_METHOD', 'GET')), array('PUT', 'DELETE', 'PATCH')) ) { parse_str($request->getContent(), $data); @@ -286,7 +286,7 @@ public static function create($uri, $method = 'GET', $parameters = array(), $coo } if (!isset($components['path'])) { - $components['path'] = ''; + $components['path'] = '/'; } switch (strtoupper($method)) { @@ -795,11 +795,14 @@ public function getRequestUri() /** * Gets the scheme and HTTP host. * + * If the URL was called with basic authentication, the user + * and the password are not added to the generated string. + * * @return string The scheme and HTTP host */ public function getSchemeAndHttpHost() { - return $this->getScheme().'://'.(('' != $auth = $this->getUserInfo()) ? $auth.'@' : '').$this->getHttpHost(); + return $this->getScheme().'://'.$this->getHttpHost(); } /** @@ -1040,7 +1043,7 @@ public function setRequestFormat($format) */ public function getContentType() { - return $this->getFormat($this->server->get('CONTENT_TYPE')); + return $this->getFormat($this->headers->get('CONTENT_TYPE')); } /** @@ -1052,7 +1055,11 @@ public function getContentType() */ public function setDefaultLocale($locale) { - $this->setPhpDefaultLocale($this->defaultLocale = $locale); + $this->defaultLocale = $locale; + + if (null === $this->locale) { + $this->setPhpDefaultLocale($locale); + } } /** @@ -1274,23 +1281,31 @@ public function splitHttpAcceptHeader($header) } $values = array(); + $groups = array(); foreach (array_filter(explode(',', $header)) as $value) { // Cut off any q-value that might come after a semi-colon if (preg_match('/;\s*(q=.*$)/', $value, $match)) { - $q = (float) substr(trim($match[1]), 2); + $q = substr(trim($match[1]), 2); $value = trim(substr($value, 0, -strlen($match[0]))); } else { $q = 1; } + $groups[$q][] = $value; + } + + krsort($groups); + + foreach ($groups as $q => $items) { + $q = (float) $q; + if (0 < $q) { - $values[trim($value)] = $q; + foreach ($items as $value) { + $values[trim($value)] = $q; + } } } - arsort($values); - reset($values); - return $values; } @@ -1306,8 +1321,11 @@ protected function prepareRequestUri() { $requestUri = ''; - if ($this->headers->has('X_REWRITE_URL') && false !== stripos(PHP_OS, 'WIN')) { - // check this first so IIS will catch + if ($this->headers->has('X_ORIGINAL_URL') && false !== stripos(PHP_OS, 'WIN')) { + // IIS with Microsoft Rewrite Module + $requestUri = $this->headers->get('X_ORIGINAL_URL'); + } elseif ($this->headers->has('X_REWRITE_URL') && false !== stripos(PHP_OS, 'WIN')) { + // IIS with ISAPI_Rewrite $requestUri = $this->headers->get('X_REWRITE_URL'); } elseif ($this->server->get('IIS_WasUrlRewritten') == '1' && $this->server->get('UNENCODED_URL') != '') { // IIS7 with URL Rewrite: make sure we get the unencoded url (double slash problem) diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/RequestMatcher.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/RequestMatcher.php index 2982952..ff2e24c 100644 --- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/RequestMatcher.php +++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/RequestMatcher.php @@ -198,7 +198,7 @@ protected function checkIp4($requestIp, $ip) */ protected function checkIp6($requestIp, $ip) { - if (!defined('AF_INET6')) { + if (!((extension_loaded('sockets') && defined('AF_INET6')) || @inet_pton('::1'))) { throw new \RuntimeException('Unable to check Ipv6. Check that PHP was not compiled with option "disable-ipv6".'); } diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Resources/stubs/SessionHandlerInterface.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Resources/stubs/SessionHandlerInterface.php index 1d2106e..b6bbfc2 100644 --- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Resources/stubs/SessionHandlerInterface.php +++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Resources/stubs/SessionHandlerInterface.php @@ -50,6 +50,8 @@ public function close(); /** * Read session. * + * @param string $sessionId + * * @see http://php.net/sessionhandlerinterface.read * * @throws \RuntimeException On fatal error but not "record not found". diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Response.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Response.php index dbc82d1..d36ad44 100644 --- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Response.php +++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Response.php @@ -574,7 +574,7 @@ public function mustRevalidate() */ public function getDate() { - return $this->headers->getDate('Date'); + return $this->headers->getDate('Date', new \DateTime()); } /** diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Flash/FlashBagInterface.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Flash/FlashBagInterface.php index 9ae5a3d..a68dcfd 100644 --- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Flash/FlashBagInterface.php +++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Flash/FlashBagInterface.php @@ -31,18 +31,18 @@ public function add($type, $message); /** * Registers a message for a given type. * - * @param string $type - * @param string $message + * @param string $type + * @param string|array $message */ public function set($type, $message); /** - * Gets flash message for a given type. + * Gets flash messages for a given type. * * @param string $type Message category type. - * @param array $default Default value if $type doee not exist. + * @param array $default Default value if $type does not exist. * - * @return string + * @return array */ public function peek($type, array $default = array()); @@ -57,9 +57,9 @@ public function peekAll(); * Gets and clears flash from the stack. * * @param string $type - * @param array $default Default value if $type doee not exist. + * @param array $default Default value if $type does not exist. * - * @return string + * @return array */ public function get($type, array $default = array()); diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/JsonResponseTest.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/JsonResponseTest.php index a89da93..8f1383f 100644 --- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/JsonResponseTest.php +++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/JsonResponseTest.php @@ -13,11 +13,6 @@ use Symfony\Component\HttpFoundation\JsonResponse; -/** - * @covers Symfony\Component\HttpFoundation\JsonResponse::__construct - * @covers Symfony\Component\HttpFoundation\JsonResponse::setData - * @covers Symfony\Component\HttpFoundation\JsonResponse::setCallback - */ class JsonResponseTest extends \PHPUnit_Framework_TestCase { public function testConstructorEmptyCreatesJsonObject() @@ -89,6 +84,73 @@ public function testCreate() $this->assertEquals(204, $response->getStatusCode()); } + public function testStaticCreateEmptyJsonObject() + { + $response = JsonResponse::create(); + $this->assertInstanceOf('Symfony\Component\HttpFoundation\JsonResponse', $response); + $this->assertSame('{}', $response->getContent()); + } + + public function testStaticCreateJsonArray() + { + $response = JsonResponse::create(array(0, 1, 2, 3)); + $this->assertInstanceOf('Symfony\Component\HttpFoundation\JsonResponse', $response); + $this->assertSame('[0,1,2,3]', $response->getContent()); + } + + public function testStaticCreateJsonObject() + { + $response = JsonResponse::create(array('foo' => 'bar')); + $this->assertInstanceOf('Symfony\Component\HttpFoundation\JsonResponse', $response); + $this->assertSame('{"foo":"bar"}', $response->getContent()); + } + + public function testStaticCreateWithSimpleTypes() + { + $response = JsonResponse::create('foo'); + $this->assertInstanceOf('Symfony\Component\HttpFoundation\JsonResponse', $response); + $this->assertSame('"foo"', $response->getContent()); + + $response = JsonResponse::create(0); + $this->assertInstanceOf('Symfony\Component\HttpFoundation\JsonResponse', $response); + $this->assertSame('0', $response->getContent()); + + $response = JsonResponse::create(0.1); + $this->assertInstanceOf('Symfony\Component\HttpFoundation\JsonResponse', $response); + $this->assertSame('0.1', $response->getContent()); + + $response = JsonResponse::create(true); + $this->assertInstanceOf('Symfony\Component\HttpFoundation\JsonResponse', $response); + $this->assertSame('true', $response->getContent()); + } + + public function testStaticCreateWithCustomStatus() + { + $response = JsonResponse::create(array(), 202); + $this->assertSame(202, $response->getStatusCode()); + } + + public function testStaticCreateAddsContentTypeHeader() + { + $response = JsonResponse::create(); + $this->assertSame('application/json', $response->headers->get('Content-Type')); + } + + public function testStaticCreateWithCustomHeaders() + { + $response = JsonResponse::create(array(), 200, array('ETag' => 'foo')); + $this->assertSame('application/json', $response->headers->get('Content-Type')); + $this->assertSame('foo', $response->headers->get('ETag')); + } + + public function testStaticCreateWithCustomContentType() + { + $headers = array('Content-Type' => 'application/vnd.acme.blog-v1+json'); + + $response = JsonResponse::create(array(), 200, $headers); + $this->assertSame('application/vnd.acme.blog-v1+json', $response->headers->get('Content-Type')); + } + public function testSetCallback() { $response = JsonResponse::create(array('foo' => 'bar'))->setCallback('callback'); diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/RedirectResponseTest.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/RedirectResponseTest.php index b55c3b6..330d9fe 100644 --- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/RedirectResponseTest.php +++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/RedirectResponseTest.php @@ -25,6 +25,22 @@ public function testGenerateMetaRedirect() )); } + /** + * @expectedException \InvalidArgumentException + */ + public function testRedirectResponseConstructorNullUrl() + { + $response = new RedirectResponse(null); + } + + /** + * @expectedException \InvalidArgumentException + */ + public function testRedirectResponseConstructorWrongStatusCode() + { + $response = new RedirectResponse('foo.bar', 404); + } + public function testGenerateLocationHeader() { $response = new RedirectResponse('foo.bar'); @@ -48,6 +64,15 @@ public function testSetTargetUrl() $this->assertEquals('baz.beep', $response->getTargetUrl()); } + /** + * @expectedException \InvalidArgumentException + */ + public function testSetTargetUrlNull() + { + $response = new RedirectResponse('foo.bar'); + $response->setTargetUrl(null); + } + public function testCreate() { $response = RedirectResponse::create('foo', 301); diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/RequestTest.php index 1e447c5..dad2f61 100644 --- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/RequestTest.php +++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/RequestTest.php @@ -127,6 +127,14 @@ public function testCreate() $this->assertEquals('test.com', $request->getHttpHost()); $this->assertFalse($request->isSecure()); + $request = Request::create('http://test.com?test=1'); + $this->assertEquals('http://test.com/?test=1', $request->getUri()); + $this->assertEquals('/', $request->getPathInfo()); + $this->assertEquals('test=1', $request->getQueryString()); + $this->assertEquals(80, $request->getPort()); + $this->assertEquals('test.com', $request->getHttpHost()); + $this->assertFalse($request->isSecure()); + $request = Request::create('http://test.com:90/?test=1'); $this->assertEquals('http://test.com:90/?test=1', $request->getUri()); $this->assertEquals('/', $request->getPathInfo()); @@ -136,7 +144,7 @@ public function testCreate() $this->assertFalse($request->isSecure()); $request = Request::create('http://test:test@test.com'); - $this->assertEquals('http://test:test@test.com/', $request->getUri()); + $this->assertEquals('http://test.com/', $request->getUri()); $this->assertEquals('/', $request->getPathInfo()); $this->assertEquals('', $request->getQueryString()); $this->assertEquals(80, $request->getPort()); @@ -146,7 +154,7 @@ public function testCreate() $this->assertFalse($request->isSecure()); $request = Request::create('http://testnopass@test.com'); - $this->assertEquals('http://testnopass@test.com/', $request->getUri()); + $this->assertEquals('http://test.com/', $request->getUri()); $this->assertEquals('/', $request->getPathInfo()); $this->assertEquals('', $request->getQueryString()); $this->assertEquals(80, $request->getPort()); @@ -340,11 +348,11 @@ public function testGetUri() $server['PHP_AUTH_USER'] = 'fabien'; $request->initialize(array(), array(), array(), array(), array(), $server); - $this->assertEquals('http://fabien@hostname:8080/ba%20se/index_dev.php/foo%20bar/in+fo?query=string', $request->getUri()); + $this->assertEquals('http://hostname:8080/ba%20se/index_dev.php/foo%20bar/in+fo?query=string', $request->getUri()); $server['PHP_AUTH_PW'] = 'symfony'; $request->initialize(array(), array(), array(), array(), array(), $server); - $this->assertEquals('http://fabien:symfony@hostname:8080/ba%20se/index_dev.php/foo%20bar/in+fo?query=string', $request->getUri()); + $this->assertEquals('http://hostname:8080/ba%20se/index_dev.php/foo%20bar/in+fo?query=string', $request->getUri()); } /** @@ -450,11 +458,11 @@ public function testGetUriForPath() $server['PHP_AUTH_USER'] = 'fabien'; $request->initialize(array(), array(), array(), array(), array(), $server); - $this->assertEquals('http://fabien@servername/some/path', $request->getUriForPath('/some/path')); + $this->assertEquals('http://servername/some/path', $request->getUriForPath('/some/path')); $server['PHP_AUTH_PW'] = 'symfony'; $request->initialize(array(), array(), array(), array(), array(), $server); - $this->assertEquals('http://fabien:symfony@servername/some/path', $request->getUriForPath('/some/path')); + $this->assertEquals('http://servername/some/path', $request->getUriForPath('/some/path')); } /** @@ -491,15 +499,15 @@ public function testGetSchemeAndHttpHost() $server['PHP_AUTH_USER'] = 'fabien'; $request->initialize(array(), array(), array(), array(), array(), $server); - $this->assertEquals('http://fabien@servername:90', $request->getSchemeAndHttpHost()); + $this->assertEquals('http://servername:90', $request->getSchemeAndHttpHost()); $server['PHP_AUTH_USER'] = '0'; $request->initialize(array(), array(), array(), array(), array(), $server); - $this->assertEquals('http://0@servername:90', $request->getSchemeAndHttpHost()); + $this->assertEquals('http://servername:90', $request->getSchemeAndHttpHost()); $server['PHP_AUTH_PW'] = '0'; $request->initialize(array(), array(), array(), array(), array(), $server); - $this->assertEquals('http://0:0@servername:90', $request->getSchemeAndHttpHost()); + $this->assertEquals('http://servername:90', $request->getSchemeAndHttpHost()); } /** @@ -900,6 +908,27 @@ public function testIsXmlHttpRequest() $this->assertFalse($request->isXmlHttpRequest()); } + public function testIntlLocale() + { + if (!extension_loaded('intl')) { + $this->markTestSkipped('The intl extension is needed to run this test.'); + } + + $request = new Request(); + + $request->setDefaultLocale('fr'); + $this->assertEquals('fr', $request->getLocale()); + $this->assertEquals('fr', \Locale::getDefault()); + + $request->setLocale('en'); + $this->assertEquals('en', $request->getLocale()); + $this->assertEquals('en', \Locale::getDefault()); + + $request->setDefaultLocale('de'); + $this->assertEquals('en', $request->getLocale()); + $this->assertEquals('en', \Locale::getDefault()); + } + public function testGetCharsets() { $request = new Request(); @@ -913,7 +942,7 @@ public function testGetCharsets() $request = new Request(); $request->headers->set('Accept-Charset', 'ISO-8859-1,utf-8;q=0.7,*;q=0.7'); - $this->assertEquals(array('ISO-8859-1', '*', 'utf-8'), $request->getCharsets()); + $this->assertEquals(array('ISO-8859-1', 'utf-8', '*'), $request->getCharsets()); } public function testGetAcceptableContentTypes() @@ -925,7 +954,7 @@ public function testGetAcceptableContentTypes() $request = new Request(); $request->headers->set('Accept', 'application/vnd.wap.wmlscriptc, text/vnd.wap.wml, application/vnd.wap.xhtml+xml, application/xhtml+xml, text/html, multipart/mixed, */*'); - $this->assertEquals(array('multipart/mixed', '*/*', 'text/html', 'application/xhtml+xml', 'text/vnd.wap.wml', 'application/vnd.wap.xhtml+xml', 'application/vnd.wap.wmlscriptc'), $request->getAcceptableContentTypes()); + $this->assertEquals(array('application/vnd.wap.wmlscriptc', 'text/vnd.wap.wml', 'application/vnd.wap.xhtml+xml', 'application/xhtml+xml', 'text/html', 'multipart/mixed', '*/*'), $request->getAcceptableContentTypes()); } public function testGetLanguages() @@ -939,6 +968,18 @@ public function testGetLanguages() $this->assertEquals(array('zh', 'en_US', 'en'), $request->getLanguages()); $request = new Request(); + $request->headers->set('Accept-language', 'zh, en-us; q=0.6, en; q=0.8'); + $this->assertEquals(array('zh', 'en', 'en_US'), $request->getLanguages()); // Test out of order qvalues + + $request = new Request(); + $request->headers->set('Accept-language', 'zh, en, en-us'); + $this->assertEquals(array('zh', 'en', 'en_US'), $request->getLanguages()); // Test equal weighting without qvalues + + $request = new Request(); + $request->headers->set('Accept-language', 'zh; q=0.6, en, en-us; q=0.6'); + $this->assertEquals(array('en', 'zh', 'en_US'), $request->getLanguages()); // Test equal weighting with qvalues + + $request = new Request(); $request->headers->set('Accept-language', 'zh, i-cherokee; q=0.6'); $this->assertEquals(array('zh', 'cherokee'), $request->getLanguages()); } diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/ResponseHeaderBagTest.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/ResponseHeaderBagTest.php index 0e8a67d..fc3d908 100644 --- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/ResponseHeaderBagTest.php +++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/ResponseHeaderBagTest.php @@ -76,6 +76,29 @@ public function testToStringIncludesCookieHeaders() $this->assertContains("Set-Cookie: foo=deleted; expires=".gmdate("D, d-M-Y H:i:s T", time() - 31536001)."; httponly", explode("\r\n", $bag->__toString())); } + public function testReplace() + { + $bag = new ResponseHeaderBag(array()); + $this->assertEquals('no-cache', $bag->get('Cache-Control')); + $this->assertTrue($bag->hasCacheControlDirective('no-cache')); + + $bag->replace(array('Cache-Control' => 'public')); + $this->assertEquals('public', $bag->get('Cache-Control')); + $this->assertTrue($bag->hasCacheControlDirective('public')); + } + + public function testReplaceWithRemove() + { + $bag = new ResponseHeaderBag(array()); + $this->assertEquals('no-cache', $bag->get('Cache-Control')); + $this->assertTrue($bag->hasCacheControlDirective('no-cache')); + + $bag->remove('Cache-Control'); + $bag->replace(array()); + $this->assertEquals('no-cache', $bag->get('Cache-Control')); + $this->assertTrue($bag->hasCacheControlDirective('no-cache')); + } + public function testCookiesWithSameNames() { $bag = new ResponseHeaderBag(); @@ -119,6 +142,34 @@ public function testRemoveCookie() $this->assertFalse(isset($cookies['foo.bar'])); } + public function testRemoveCookieWithNullRemove() + { + $bag = new ResponseHeaderBag(); + $bag->setCookie(new Cookie('foo', 'bar', 0)); + $bag->setCookie(new Cookie('bar', 'foo', 0)); + + $cookies = $bag->getCookies(ResponseHeaderBag::COOKIES_ARRAY); + $this->assertTrue(isset($cookies['']['/'])); + + $bag->removeCookie('foo', null); + $cookies = $bag->getCookies(ResponseHeaderBag::COOKIES_ARRAY); + $this->assertFalse(isset($cookies['']['/']['foo'])); + + $bag->removeCookie('bar', null); + $cookies = $bag->getCookies(ResponseHeaderBag::COOKIES_ARRAY); + $this->assertFalse(isset($cookies['']['/']['bar'])); + } + + /** + * @expectedException \InvalidArgumentException + */ + public function testGetCookiesWithInvalidArgument() + { + $bag = new ResponseHeaderBag(); + + $cookies = $bag->getCookies('invalid_argument'); + } + /** * @expectedException \InvalidArgumentException */ diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/ResponseTest.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/ResponseTest.php index cbbdd29..c14dc4b 100644 --- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/ResponseTest.php +++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/ResponseTest.php @@ -25,6 +25,99 @@ public function testCreate() $this->assertEquals('bar', $response->headers->get('foo')); } + public function testToString() + { + $response = new Response(); + $response = explode("\r\n", $response); + $this->assertEquals("HTTP/1.0 200 OK", $response[0]); + $this->assertEquals("Cache-Control: no-cache", $response[1]); + } + + public function testClone() + { + $response = new Response(); + $responseClone = clone $response; + $this->assertEquals($response, $responseClone); + } + + public function testSendHeaders() + { + $response = new Response(); + $headers = $response->sendHeaders(); + $this->assertObjectHasAttribute('headers', $headers); + $this->assertObjectHasAttribute('content', $headers); + $this->assertObjectHasAttribute('version', $headers); + $this->assertObjectHasAttribute('statusCode', $headers); + $this->assertObjectHasAttribute('statusText', $headers); + $this->assertObjectHasAttribute('charset', $headers); + } + + public function testSend() + { + $response = new Response(); + $responseSend = $response->send(); + $this->assertObjectHasAttribute('headers', $responseSend); + $this->assertObjectHasAttribute('content', $responseSend); + $this->assertObjectHasAttribute('version', $responseSend); + $this->assertObjectHasAttribute('statusCode', $responseSend); + $this->assertObjectHasAttribute('statusText', $responseSend); + $this->assertObjectHasAttribute('charset', $responseSend); + } + + public function testGetCharset() + { + $response = new Response(); + $charsetOrigin = 'UTF-8'; + $response->setCharset($charsetOrigin); + $charset = $response->getCharset(); + $this->assertEquals($charsetOrigin, $charset); + } + + public function testIsCacheable() + { + $response = new Response(); + $this->assertFalse($response->isCacheable()); + } + + public function testIsCacheableWithSetTtl() + { + $response = new Response(); + $response->setTtl(10); + $this->assertTrue($response->isCacheable()); + } + + public function testMustRevalidate() + { + $response = new Response(); + $this->assertFalse($response->mustRevalidate()); + } + + public function testSetNotModified() + { + $response = new Response(); + $modified = $response->setNotModified(); + $this->assertObjectHasAttribute('headers', $modified); + $this->assertObjectHasAttribute('content', $modified); + $this->assertObjectHasAttribute('version', $modified); + $this->assertObjectHasAttribute('statusCode', $modified); + $this->assertObjectHasAttribute('statusText', $modified); + $this->assertObjectHasAttribute('charset', $modified); + $this->assertEquals(304, $modified->getStatusCode()); + } + + public function testIsSuccessful() + { + $response = new Response(); + $this->assertTrue($response->isSuccessful()); + } + + public function testIsNotModified() + { + $response = new Response(); + $modified = $response->isNotModified(new Request()); + $this->assertFalse($modified); + } + public function testIsValidateable() { $response = new Response('', 200, array('Last-Modified' => $this->createDateTimeOneHourAgo()->format(DATE_RFC2822))); @@ -50,6 +143,10 @@ public function testGetDate() $now = $this->createDateTimeNow(); $response->headers->set('Date', $now->format(DATE_RFC2822)); $this->assertEquals(0, $now->diff($response->getDate())->format('%s'), '->getDate() returns the date when the header has been modified'); + + $response = new Response('', 200); + $response->headers->remove('Date'); + $this->assertInstanceOf('\DateTime', $response->getDate()); } public function testGetMaxAge() diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php index c9eb0b3..fb4811d 100644 --- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php +++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php @@ -18,35 +18,32 @@ */ class MongoDbSessionHandlerTest extends \PHPUnit_Framework_TestCase { - private static $mongo; - - public static function setUpBeforeClass() - { - if (class_exists('\Mongo')) { - try { - self::$mongo = new \Mongo(); - } catch (\Exception $e) { - } - } - } + /** + * @var \PHPUnit_Framework_MockObject_MockObject + */ + private $mongo; + private $storage; + public $options; protected function setUp() { - if (null === self::$mongo) { - $this->markTestSkipped('MongoDbSessionHandler requires the php "mongo" extension and a mongodb server on localhost'); + if (!class_exists('\Mongo')) { + $this->markTestSkipped('MongoDbSessionHandler requires the php "mongo" extension'); } - $this->options = array('database' => 'sf2-test', 'collection' => 'session-test'); - $this->options = array('database' => 'sf2-test', 'collection' => 'session-test'); + $this->mongo = $this->getMockBuilder('Mongo') + ->disableOriginalConstructor() + ->getMock(); - $this->storage = new MongoDbSessionHandler(self::$mongo, $this->options); - } + $this->options = array( + 'id_field' => 'sess_id', + 'data_field' => 'sess_data', + 'time_field' => 'sess_time', + 'database' => 'sf2-test', + 'collection' => 'session-test' + ); - protected function tearDown() - { - if (null !== self::$mongo) { - self::$mongo->dropDB($this->options['database']); - } + $this->storage = new MongoDbSessionHandler($this->mongo, $this->options); } public function testOpenMethodAlwaysReturnTrue() @@ -61,39 +58,136 @@ public function testCloseMethodAlwaysReturnTrue() public function testWrite() { + $database = $this->getMockBuilder('MongoDB') + ->disableOriginalConstructor() + ->getMock(); + + $collection = $this->getMockBuilder('MongoCollection') + ->disableOriginalConstructor() + ->getMock(); + + $this->mongo->expects($this->once()) + ->method('selectDB') + ->with($this->options['database']) + ->will($this->returnValue($database)); + + $database->expects($this->once()) + ->method('selectCollection') + ->with($this->options['collection']) + ->will($this->returnValue($collection)); + + $that = $this; + $data = array(); + + $collection->expects($this->once()) + ->method('update') + ->will($this->returnCallback(function($citeria, $updateData, $options) use ($that, &$data) { + $that->assertEquals(array($that->options['id_field'] => 'foo'), $citeria); + $that->assertEquals(array('upsert' => true), $options); + + $data = $updateData['$set']; + })); + $this->assertTrue($this->storage->write('foo', 'bar')); - $this->assertEquals('bar', $this->storage->read('foo')); + + $this->assertEquals('foo', $data[$this->options['id_field']]); + $this->assertEquals('bar', $data[$this->options['data_field']]->bin); } public function testReplaceSessionData() { + $database = $this->getMockBuilder('MongoDB') + ->disableOriginalConstructor() + ->getMock(); + + $collection = $this->getMockBuilder('MongoCollection') + ->disableOriginalConstructor() + ->getMock(); + + $this->mongo->expects($this->once()) + ->method('selectDB') + ->with($this->options['database']) + ->will($this->returnValue($database)); + + $database->expects($this->once()) + ->method('selectCollection') + ->with($this->options['collection']) + ->will($this->returnValue($collection)); + + $data = array(); + + $collection->expects($this->exactly(2)) + ->method('update') + ->will($this->returnCallback(function($citeria, $updateData, $options) use (&$data) { + $data = $updateData; + })); + $this->storage->write('foo', 'bar'); $this->storage->write('foo', 'foobar'); - $coll = self::$mongo->selectDB($this->options['database'])->selectCollection($this->options['collection']); - - $this->assertEquals('foobar', $this->storage->read('foo')); - $this->assertEquals(1, $coll->find(array('sess_id' => 'foo'))->count()); + $this->assertEquals('foobar', $data['$set'][$this->options['data_field']]->bin); } public function testDestroy() { - $this->storage->write('foo', 'bar'); - $this->storage->destroy('foo'); + $database = $this->getMockBuilder('MongoDB') + ->disableOriginalConstructor() + ->getMock(); + + $collection = $this->getMockBuilder('MongoCollection') + ->disableOriginalConstructor() + ->getMock(); + + $this->mongo->expects($this->once()) + ->method('selectDB') + ->with($this->options['database']) + ->will($this->returnValue($database)); + + $database->expects($this->once()) + ->method('selectCollection') + ->with($this->options['collection']) + ->will($this->returnValue($collection)); - $this->assertEquals('', $this->storage->read('foo')); + $collection->expects($this->once()) + ->method('remove') + ->with( + array($this->options['id_field'] => 'foo'), + array('justOne' => true) + ); + + + $this->storage->destroy('foo'); } public function testGc() { - $this->storage->write('foo', 'bar'); - $this->storage->write('bar', 'foo'); + $database = $this->getMockBuilder('MongoDB') + ->disableOriginalConstructor() + ->getMock(); - $coll = self::$mongo->selectDB($this->options['database'])->selectCollection($this->options['collection']); + $collection = $this->getMockBuilder('MongoCollection') + ->disableOriginalConstructor() + ->getMock(); - $this->assertEquals(2, $coll->count()); - $this->storage->gc(-1); - $this->assertEquals(0, $coll->count()); + $this->mongo->expects($this->once()) + ->method('selectDB') + ->with($this->options['database']) + ->will($this->returnValue($database)); + $database->expects($this->once()) + ->method('selectCollection') + ->with($this->options['collection']) + ->will($this->returnValue($collection)); + + $that = $this; + + $collection->expects($this->once()) + ->method('remove') + ->will($this->returnCallback(function($citeria) use($that) { + $that->assertInstanceOf('MongoTimestamp', $citeria[$that->options['time_field']]['$lt']); + $that->assertGreaterThanOrEqual(time() - -1, $citeria[$that->options['time_field']]['$lt']->sec); + })); + + $this->storage->gc(-1); } } diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php index 4b88a23..b99941a 100644 --- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php +++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php @@ -29,6 +29,8 @@ class NativeSessionStorageTest extends \PHPUnit_Framework_TestCase { /** + * @param array $options + * * @return NativeSessionStorage */ protected function getStorage(array $options = array()) diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/StreamedResponseTest.php b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/StreamedResponseTest.php index f52badf..0dfe651 100644 --- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/StreamedResponseTest.php +++ b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests/StreamedResponseTest.php @@ -76,13 +76,22 @@ public function testSendContent() */ public function testSendContentWithNonCallable() { - $response = new StreamedResponse('foobar'); + $response = new StreamedResponse(null); $response->sendContent(); } /** * @expectedException \LogicException */ + public function testSetCallbackNonCallable() + { + $response = new StreamedResponse(null); + $response->setCallback(null); + } + + /** + * @expectedException \LogicException + */ public function testSetContent() { $response = new StreamedResponse(function () { echo 'foo'; }); diff --git a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/phpunit.xml.dist b/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/phpunit.xml.dist deleted file mode 100644 index 2a760f2..0000000 --- a/core/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/phpunit.xml.dist +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - ./Tests/ - - - - - - ./ - - ./Resources - ./Tests - ./vendor - - - - diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/DataCollector.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/DataCollector.php index 98eabdb..7d9c289 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/DataCollector.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/DataCollector.php @@ -31,4 +31,45 @@ public function unserialize($data) { $this->data = unserialize($data); } + + /** + * Converts a PHP variable to a string. + * + * @param mixed $var A PHP variable + * + * @return string The string representation of the variable + */ + protected function varToString($var) + { + if (is_object($var)) { + return sprintf('Object(%s)', get_class($var)); + } + + if (is_array($var)) { + $a = array(); + foreach ($var as $k => $v) { + $a[] = sprintf('%s => %s', $k, $this->varToString($v)); + } + + return sprintf("Array(%s)", implode(', ', $a)); + } + + if (is_resource($var)) { + return sprintf('Resource(%s)', get_resource_type($var)); + } + + if (null === $var) { + return 'null'; + } + + if (false === $var) { + return 'false'; + } + + if (true === $var) { + return 'true'; + } + + return (string) $var; + } } diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/ExceptionDataCollector.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/ExceptionDataCollector.php index 20ff597..10a010b 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/ExceptionDataCollector.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/ExceptionDataCollector.php @@ -14,7 +14,6 @@ use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\FlattenException; -use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface; /** * ExceptionDataCollector. diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php index b410c23..930ea14 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php @@ -11,7 +11,6 @@ namespace Symfony\Component\HttpKernel\DataCollector; -use Symfony\Component\HttpFoundation\Cookie; use Symfony\Component\HttpFoundation\ParameterBag; use Symfony\Component\HttpFoundation\HeaderBag; use Symfony\Component\HttpFoundation\Request; @@ -51,14 +50,7 @@ public function collect(Request $request, Response $response, \Exception $except $attributes = array(); foreach ($request->attributes->all() as $key => $value) { - if (is_object($value)) { - $attributes[$key] = sprintf('Object(%s)', get_class($value)); - if (is_callable(array($value, '__toString'))) { - $attributes[$key] .= sprintf(' = %s', (string) $value); - } - } else { - $attributes[$key] = $value; - } + $attributes[$key] = $this->varToString($value); } $content = null; diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Debug/ExceptionHandler.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Debug/ExceptionHandler.php index c0133d4..19a684c 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Debug/ExceptionHandler.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Debug/ExceptionHandler.php @@ -43,6 +43,8 @@ public function __construct($debug = true, $charset = 'UTF-8') /** * Register the exception handler. * + * @param Boolean $debug + * * @return ExceptionHandler The registered exception handler */ public static function register($debug = true) diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Event/FilterResponseEvent.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Event/FilterResponseEvent.php index 196bd67..8de76a5 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Event/FilterResponseEvent.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Event/FilterResponseEvent.php @@ -30,7 +30,7 @@ class FilterResponseEvent extends KernelEvent { /** * The current response object - * @var Symfony\Component\HttpFoundation\Response + * @var Response */ private $response; @@ -44,7 +44,7 @@ public function __construct(HttpKernelInterface $kernel, Request $request, $requ /** * Returns the current response object * - * @return Symfony\Component\HttpFoundation\Response + * @return Response * * @api */ @@ -56,7 +56,7 @@ public function getResponse() /** * Sets a new response object * - * @param Symfony\Component\HttpFoundation\Response $response + * @param Response $response * * @api */ diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Event/GetResponseEvent.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Event/GetResponseEvent.php index c8c2f00..f71ccae 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Event/GetResponseEvent.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Event/GetResponseEvent.php @@ -28,14 +28,14 @@ class GetResponseEvent extends KernelEvent { /** * The response object - * @var Symfony\Component\HttpFoundation\Response + * @var Response */ private $response; /** * Returns the response object * - * @return Symfony\Component\HttpFoundation\Response + * @return Response * * @api */ @@ -47,7 +47,7 @@ public function getResponse() /** * Sets a response and stops event propagation * - * @param Symfony\Component\HttpFoundation\Response $response + * @param Response $response * * @api */ diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Event/KernelEvent.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Event/KernelEvent.php index 2e1790a..e57eed4 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Event/KernelEvent.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Event/KernelEvent.php @@ -26,13 +26,13 @@ class KernelEvent extends Event { /** * The kernel in which this event was thrown - * @var Symfony\Component\HttpKernel\HttpKernelInterface + * @var HttpKernelInterface */ private $kernel; /** * The request the kernel is currently processing - * @var Symfony\Component\HttpFoundation\Request + * @var Request */ private $request; @@ -53,7 +53,7 @@ public function __construct(HttpKernelInterface $kernel, Request $request, $requ /** * Returns the kernel in which this event was thrown * - * @return Symfony\Component\HttpKernel\HttpKernelInterface + * @return HttpKernelInterface * * @api */ @@ -65,7 +65,7 @@ public function getKernel() /** * Returns the request the kernel is currently processing * - * @return Symfony\Component\HttpFoundation\Request + * @return Request * * @api */ diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/AccessDeniedHttpException.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/AccessDeniedHttpException.php index 7778df8..714102b 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/AccessDeniedHttpException.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/AccessDeniedHttpException.php @@ -22,9 +22,9 @@ class AccessDeniedHttpException extends HttpException /** * Constructor. * - * @param string $message The internal exception message - * @param Exception $previous The previous exception - * @param integer $code The internal exception code + * @param string $message The internal exception message + * @param \Exception $previous The previous exception + * @param integer $code The internal exception code */ public function __construct($message = null, \Exception $previous = null, $code = 0) { diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/MethodNotAllowedHttpException.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/MethodNotAllowedHttpException.php index cdfcc8a..3a81586 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/MethodNotAllowedHttpException.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/MethodNotAllowedHttpException.php @@ -21,10 +21,10 @@ class MethodNotAllowedHttpException extends HttpException /** * Constructor. * - * @param array $allow An array of allowed methods - * @param string $message The internal exception message - * @param Exception $previous The previous exception - * @param integer $code The internal exception code + * @param array $allow An array of allowed methods + * @param string $message The internal exception message + * @param \Exception $previous The previous exception + * @param integer $code The internal exception code */ public function __construct(array $allow, $message = null, \Exception $previous = null, $code = 0) { diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/NotFoundHttpException.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/NotFoundHttpException.php index c99502d..547976c 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/NotFoundHttpException.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Exception/NotFoundHttpException.php @@ -21,9 +21,9 @@ class NotFoundHttpException extends HttpException /** * Constructor. * - * @param string $message The internal exception message - * @param Exception $previous The previous exception - * @param integer $code The internal exception code + * @param string $message The internal exception message + * @param \Exception $previous The previous exception + * @param integer $code The internal exception code */ public function __construct($message = null, \Exception $previous = null, $code = 0) { diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Kernel.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Kernel.php index d601e4b..723292b 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Kernel.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Kernel.php @@ -58,12 +58,12 @@ protected $classes; protected $errorReportingLevel; - const VERSION = '2.1.0-RC2'; + const VERSION = '2.1.3'; const VERSION_ID = '20100'; const MAJOR_VERSION = '2'; const MINOR_VERSION = '1'; - const RELEASE_VERSION = '0'; - const EXTRA_VERSION = 'RC2'; + const RELEASE_VERSION = '3'; + const EXTRA_VERSION = ''; /** * Constructor. @@ -250,7 +250,7 @@ public function isClassInActiveBundle($class) public function getBundle($name, $first = true) { if (!isset($this->bundleMap[$name])) { - throw new \InvalidArgumentException(sprintf('Bundle "%s" does not exist or it is not enabled. Maybe you forgot to add it in the registerBundles() function of your %s.php file?', $name, get_class($this))); + throw new \InvalidArgumentException(sprintf('Bundle "%s" does not exist or it is not enabled. Maybe you forgot to add it in the registerBundles() method of your %s.php file?', $name, get_class($this))); } if (true === $first) { diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php index 94052f8..4505ba2 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php @@ -34,7 +34,7 @@ class FileProfilerStorage implements ProfilerStorageInterface public function __construct($dsn) { if (0 !== strpos($dsn, 'file:')) { - throw new \RuntimeException(sprintf('Please check your configuration. You are trying to use FileStorage with an invalid dsn "%s". The expected format is "file:/path/to/the/storage/folder".', $this->dsn)); + throw new \RuntimeException(sprintf('Please check your configuration. You are trying to use FileStorage with an invalid dsn "%s". The expected format is "file:/path/to/the/storage/folder".', $dsn)); } $this->folder = substr($dsn, 5); diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/MongoDbProfilerStorage.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/MongoDbProfilerStorage.php index 0dcad22..59a9282 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/MongoDbProfilerStorage.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/MongoDbProfilerStorage.php @@ -95,7 +95,7 @@ public function write(Profile $profile) $record = array( '_id' => $profile->getToken(), 'parent' => $profile->getParentToken(), - 'data' => serialize($profile->getCollectors()), + 'data' => base64_encode(serialize($profile->getCollectors())), 'ip' => $profile->getIp(), 'method' => $profile->getMethod(), 'url' => $profile->getUrl(), @@ -220,7 +220,7 @@ private function getProfile(array $data) $profile->setMethod($data['method']); $profile->setUrl($data['url']); $profile->setTime($data['time']); - $profile->setCollectors(unserialize($data['data'])); + $profile->setCollectors(unserialize(base64_decode($data['data']))); return $profile; } diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/Profiler.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/Profiler.php index f2fc8a9..e3ec45f 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/Profiler.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Profiler/Profiler.php @@ -168,7 +168,7 @@ public function collect(Request $request, Response $response, \Exception $except $profile = new Profile(uniqid()); $profile->setTime(time()); $profile->setUrl($request->getUri()); - $profile->setIp($request->server->get('REMOTE_ADDR')); + $profile->setIp($request->getClientIp()); $profile->setMethod($request->getMethod()); $response->headers->set('X-Debug-Token', $profile->getToken()); diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Profiler/Mock/RedisMock.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Profiler/Mock/RedisMock.php index b79e097..4b8cf07 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Profiler/Mock/RedisMock.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Profiler/Mock/RedisMock.php @@ -29,7 +29,7 @@ public function __construct() } /** - * Add a memcached server to connection pool + * Add a server to connection pool * * @param string $host * @param integer $port diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Profiler/MongoDbProfilerStorageTest.php b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Profiler/MongoDbProfilerStorageTest.php index bff52e7..b2d148d 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Profiler/MongoDbProfilerStorageTest.php +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests/Profiler/MongoDbProfilerStorageTest.php @@ -13,6 +13,9 @@ use Symfony\Component\HttpKernel\Profiler\MongoDbProfilerStorage; use Symfony\Component\HttpKernel\Profiler\Profile; +use Symfony\Component\HttpKernel\DataCollector\DataCollector; +use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpFoundation\Response; class DummyMongoDbProfilerStorage extends MongoDbProfilerStorage { @@ -22,6 +25,28 @@ public function getMongo() } } +class MongoDbProfilerStorageTestDataCollector extends DataCollector +{ + public function setData($data) + { + $this->data = $data; + } + + public function getData() + { + return $this->data; + } + + public function collect(Request $request, Response $response, \Exception $exception = null) + { + } + + public function getName() + { + return 'test_data_collector'; + } +} + class MongoDbProfilerStorageTest extends AbstractProfilerStorageTest { protected static $storage; @@ -62,6 +87,28 @@ public function testCleanup() self::$storage->purge(); } + public function testUtf8() + { + $profile = new Profile('utf8_test_profile'); + + $data = 'HЁʃʃϿ, ϢorЃd!'; + $nonUtf8Data = mb_convert_encoding($data, 'UCS-2'); + + $collector = new MongoDbProfilerStorageTestDataCollector(); + $collector->setData($nonUtf8Data); + + $profile->setCollectors(array($collector)); + + self::$storage->write($profile); + + $readProfile = self::$storage->read('utf8_test_profile'); + $collectors = $readProfile->getCollectors(); + + $this->assertCount(1, $collectors); + $this->assertArrayHasKey('test_data_collector', $collectors); + $this->assertEquals($nonUtf8Data, $collectors['test_data_collector']->getData(), 'Non-UTF8 data is properly encoded/decoded'); + } + /** * @return \Symfony\Component\HttpKernel\Profiler\ProfilerStorageInterface */ @@ -79,3 +126,4 @@ protected function setUp() } } } + diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/composer.json b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/composer.json index 12ea499..9071a37 100644 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/composer.json +++ b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/composer.json @@ -31,12 +31,12 @@ "symfony/routing": "2.1.*" }, "suggest": { - "symfony/browser-kit": "self.version", - "symfony/class-loader": "self.version", - "symfony/config": "self.version", - "symfony/console": "self.version", - "symfony/dependency-injection": "self.version", - "symfony/finder": "self.version" + "symfony/browser-kit": "2.1.*", + "symfony/class-loader": "2.1.*", + "symfony/config": "2.1.*", + "symfony/console": "2.1.*", + "symfony/dependency-injection": "2.1.*", + "symfony/finder": "2.1.*" }, "autoload": { "psr-0": { "Symfony\\Component\\HttpKernel": "" } diff --git a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/phpunit.xml.dist b/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/phpunit.xml.dist deleted file mode 100644 index dd824ac..0000000 --- a/core/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/phpunit.xml.dist +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - ./Tests/ - - - - - - ./ - - ./Tests - ./vendor - - - - diff --git a/core/vendor/symfony/process/Symfony/Component/Process/Process.php b/core/vendor/symfony/process/Symfony/Component/Process/Process.php index 4dfd16f..ba76255 100644 --- a/core/vendor/symfony/process/Symfony/Component/Process/Process.php +++ b/core/vendor/symfony/process/Symfony/Component/Process/Process.php @@ -11,6 +11,8 @@ namespace Symfony\Component\Process; +use Symfony\Component\Process\Exception\RuntimeException; + /** * Process is a thin wrapper around proc_* functions to ease * start independent PHP processes. @@ -44,6 +46,7 @@ class Process private $stdout; private $stderr; private $enhanceWindowsCompatibility; + private $enhanceSigchildCompatibility; private $pipes; private $process; private $status = self::STATUS_READY; @@ -51,6 +54,8 @@ class Process private $fileHandles; private $readBytes; + private static $sigchild; + /** * Exit codes translation table. * @@ -134,6 +139,7 @@ public function __construct($commandline, $cwd = null, array $env = null, $stdin $this->stdin = $stdin; $this->setTimeout($timeout); $this->enhanceWindowsCompatibility = true; + $this->enhanceSigchildCompatibility = !defined('PHP_WINDOWS_VERSION_BUILD') && $this->isSigchildEnabled(); $this->options = array_replace(array('suppress_errors' => true, 'binary_pipes' => true), $options); } @@ -216,9 +222,14 @@ public function start($callback = null) array('pipe', 'r'), // stdin array('pipe', 'w'), // stdout array('pipe', 'w'), // stderr - array('pipe', 'w') // last exit code is output on the fourth pipe and caught to work around --enable-sigchild ); - $this->commandline = '('.$this->commandline.') 3>/dev/null; echo $? >&3'; + + if ($this->enhanceSigchildCompatibility && $this->isSigchildEnabled()) { + // last exit code is output on the fourth pipe and caught to work around --enable-sigchild + $descriptors = array_merge($descriptors, array(array('pipe', 'w'))); + + $this->commandline = '('.$this->commandline.') 3>/dev/null; code=$?; echo $code >&3; exit $code'; + } } $commandline = $this->commandline; @@ -418,10 +429,16 @@ public function getErrorOutput() * * @return integer The exit status code * + * @throws RuntimeException In case --enable-sigchild is activated and the sigchild compatibility mode is disabled + * * @api */ public function getExitCode() { + if ($this->isSigchildEnabled() && !$this->enhanceSigchildCompatibility) { + throw new RuntimeException('This PHP has been compiled with --enable-sigchild. You must use setEnhanceSigchildCompatibility() to use this method'); + } + $this->updateStatus(); return $this->exitcode; @@ -435,14 +452,16 @@ public function getExitCode() * * @return string A string representation for the exit status code * + * @throws RuntimeException In case --enable-sigchild is activated and the sigchild compatibility mode is disabled + * * @see http://tldp.org/LDP/abs/html/exitcodes.html * @see http://en.wikipedia.org/wiki/Unix_signal */ public function getExitCodeText() { - $this->updateStatus(); + $exitcode = $this->getExitCode(); - return isset(self::$exitCodes[$this->exitcode]) ? self::$exitCodes[$this->exitcode] : 'Unknown error'; + return isset(self::$exitCodes[$exitcode]) ? self::$exitCodes[$exitcode] : 'Unknown error'; } /** @@ -450,13 +469,13 @@ public function getExitCodeText() * * @return Boolean true if the process ended successfully, false otherwise * + * @throws RuntimeException In case --enable-sigchild is activated and the sigchild compatibility mode is disabled + * * @api */ public function isSuccessful() { - $this->updateStatus(); - - return 0 == $this->exitcode; + return 0 == $this->getExitCode(); } /** @@ -466,10 +485,16 @@ public function isSuccessful() * * @return Boolean * + * @throws RuntimeException In case --enable-sigchild is activated + * * @api */ public function hasBeenSignaled() { + if ($this->isSigchildEnabled()) { + throw new RuntimeException('This PHP has been compiled with --enable-sigchild. Term signal can not be retrieved'); + } + $this->updateStatus(); return $this->processInformation['signaled']; @@ -482,10 +507,16 @@ public function hasBeenSignaled() * * @return integer * + * @throws RuntimeException In case --enable-sigchild is activated + * * @api */ public function getTermSignal() { + if ($this->isSigchildEnabled()) { + throw new RuntimeException('This PHP has been compiled with --enable-sigchild. Term signal can not be retrieved'); + } + $this->updateStatus(); return $this->processInformation['termsig']; @@ -508,7 +539,7 @@ public function hasBeenStopped() } /** - * Returns the number of the signal that caused the child process to stop its execution + * Returns the number of the signal that caused the child process to stop its execution. * * It is only meaningful if hasBeenStopped() returns true. * @@ -544,7 +575,7 @@ public function isRunning() * * @param float $timeout The timeout in seconds * - * @return integer The exitcode of the process + * @return integer The exit-code of the process * * @throws \RuntimeException if the process got signaled */ @@ -579,26 +610,51 @@ public function stop($timeout=10) return $this->exitcode; } + /** + * Adds a line to the STDOUT stream. + * + * @param string $line The line to append + */ public function addOutput($line) { $this->stdout .= $line; } + /** + * Adds a line to the STDERR stream. + * + * @param string $line The line to append + */ public function addErrorOutput($line) { $this->stderr .= $line; } + /** + * Gets the command line to be executed. + * + * @return string The command to execute + */ public function getCommandLine() { return $this->commandline; } + /** + * Sets the command line to be executed. + * + * @param string $commandline The command to execute + */ public function setCommandLine($commandline) { $this->commandline = $commandline; } + /** + * Gets the process timeout. + * + * @return integer|null The timeout in seconds or null if it's disabled + */ public function getTimeout() { return $this->timeout; @@ -609,7 +665,9 @@ public function getTimeout() * * To disable the timeout, set this value to null. * - * @param integer|null + * @param integer|null $timeout The timeout in seconds + * + * @throws \InvalidArgumentException if the timeout is negative */ public function setTimeout($timeout) { @@ -628,57 +686,133 @@ public function setTimeout($timeout) $this->timeout = $timeout; } + /** + * Gets the working directory. + * + * @return string The current working directory + */ public function getWorkingDirectory() { return $this->cwd; } + /** + * Sets the current working directory. + * + * @param string $cwd The new working directory + */ public function setWorkingDirectory($cwd) { $this->cwd = $cwd; } + /** + * Gets the environment variables. + * + * @return array The current environment variables + */ public function getEnv() { return $this->env; } + /** + * Sets the environment variables. + * + * @param array $env The new environment variables + */ public function setEnv(array $env) { $this->env = $env; } + /** + * Gets the contents of STDIN. + * + * @return string The current contents + */ public function getStdin() { return $this->stdin; } + /** + * Sets the contents of STDIN. + * + * @param string $stdin The new contents + */ public function setStdin($stdin) { $this->stdin = $stdin; } + /** + * Gets the options for proc_open. + * + * @return array The current options + */ public function getOptions() { return $this->options; } + /** + * Sets the options for proc_open. + * + * @param array $options The new options + */ public function setOptions(array $options) { $this->options = $options; } + /** + * Gets whether or not Windows compatibility is enabled + * + * This is true by default. + * + * @return Boolean + */ public function getEnhanceWindowsCompatibility() { return $this->enhanceWindowsCompatibility; } + /** + * Sets whether or not Windows compatibility is enabled + * + * @param Boolean $enhance + */ public function setEnhanceWindowsCompatibility($enhance) { $this->enhanceWindowsCompatibility = (Boolean) $enhance; } /** + * Return whether sigchild compatibility mode is activated or not + * + * @return Boolean + */ + public function getEnhanceSigchildCompatibility() + { + return $this->enhanceSigchildCompatibility; + } + + /** + * Activate sigchild compatibility mode + * + * Sigchild compatibility mode is required to get the exit code and + * determine the success of a process when PHP has been compiled with + * the --enable-sigchild option + * + * @param Boolean $enhance + */ + public function setEnhanceSigchildCompatibility($enhance) + { + $this->enhanceSigchildCompatibility = (Boolean) $enhance; + } + + /** * Builds up the callback used by wait(). * * The callbacks adds all occurred output to the specific buffer and calls @@ -744,6 +878,23 @@ protected function updateOutput() } /** + * Return whether PHP has been compiled with the '--enable-sigchild' option or not + * + * @return Boolean + */ + protected function isSigchildEnabled() + { + if (null !== self::$sigchild) { + return self::$sigchild; + } + + ob_start(); + phpinfo(INFO_GENERAL); + + return self::$sigchild = false !== strpos(ob_get_clean(), '--enable-sigchild'); + } + + /** * Handles the windows file handles fallbacks * * @param mixed $callback A valid PHP callback diff --git a/core/vendor/symfony/process/Symfony/Component/Process/Tests/ProcessTest.php b/core/vendor/symfony/process/Symfony/Component/Process/Tests/ProcessTest.php deleted file mode 100644 index c54f5d8..0000000 --- a/core/vendor/symfony/process/Symfony/Component/Process/Tests/ProcessTest.php +++ /dev/null @@ -1,202 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Component\Process\Tests; - -use Symfony\Component\Process\Process; - -/** - * @author Robert Schönthal - */ -class ProcessTest extends \PHPUnit_Framework_TestCase -{ - /** - * @expectedException \InvalidArgumentException - */ - public function testNegativeTimeoutFromConstructor() - { - new Process('', null, null, null, -1); - } - - /** - * @expectedException \InvalidArgumentException - */ - public function testNegativeTimeoutFromSetter() - { - $p = new Process(''); - $p->setTimeout(-1); - } - - public function testNullTimeout() - { - $p = new Process(''); - $p->setTimeout(10); - $p->setTimeout(null); - - $this->assertNull($p->getTimeout()); - } - - /** - * tests results from sub processes - * - * @dataProvider responsesCodeProvider - */ - public function testProcessResponses($expected, $getter, $code) - { - $p = new Process(sprintf('php -r %s', escapeshellarg($code))); - $p->run(); - - $this->assertSame($expected, $p->$getter()); - } - - /** - * tests results from sub processes - * - * @dataProvider pipesCodeProvider - */ - public function testProcessPipes($expected, $code) - { - if (strpos(PHP_OS, "WIN") === 0) { - $this->markTestSkipped('Test hangs on Windows & PHP due to https://bugs.php.net/bug.php?id=60120 and https://bugs.php.net/bug.php?id=51800'); - } - - $p = new Process(sprintf('php -r %s', escapeshellarg($code))); - $p->setStdin($expected); - $p->run(); - - $this->assertSame($expected, $p->getOutput()); - $this->assertSame($expected, $p->getErrorOutput()); - $this->assertSame(0, $p->getExitCode()); - } - - public function testCallbackIsExecutedForOutput() - { - $p = new Process(sprintf('php -r %s', escapeshellarg('echo \'foo\';'))); - - $called = false; - $p->run(function ($type, $buffer) use (&$called) { - $called = $buffer === 'foo'; - }); - - $this->assertTrue($called, 'The callback should be executed with the output'); - } - - public function testExitCodeText() - { - $process = new Process(''); - $r = new \ReflectionObject($process); - $p = $r->getProperty('exitcode'); - $p->setAccessible(true); - - $p->setValue($process, 2); - $this->assertEquals('Misuse of shell builtins', $process->getExitCodeText()); - } - - public function testStartIsNonBlocking() - { - $process = new Process('php -r "sleep(4);"'); - $start = microtime(true); - $process->start(); - $end = microtime(true); - $this->assertLessThan(1 , $end-$start); - } - - public function testUpdateStatus() - { - $process = new Process('php -h'); - $process->start(); - usleep(300000); // wait for output - $this->assertEquals(0, $process->getExitCode()); - $this->assertTrue(strlen($process->getOutput()) > 0); - } - - public function testIsRunning() - { - $process = new Process('php -r "sleep(1);"'); - $this->assertFalse($process->isRunning()); - $process->start(); - $this->assertTrue($process->isRunning()); - $process->wait(); - $this->assertFalse($process->isRunning()); - } - - public function testStop() - { - $process = new Process('php -r "while (true) {}"'); - $process->start(); - $this->assertTrue($process->isRunning()); - $process->stop(); - $this->assertFalse($process->isRunning()); - - // skip this check on windows since it does not support signals - if (!defined('PHP_WINDOWS_VERSION_MAJOR')) { - $this->assertTrue($process->hasBeenSignaled()); - } - } - - public function testPhpDeadlock() - { - $this->markTestSkipped('Can course php to hang'); - - // Sleep doesn't work as it will allow the process to handle signals and close - // file handles from the other end. - $process = new Process('php -r "while (true) {}"'); - $process->start(); - - // PHP will deadlock when it tries to cleanup $process - } - - public function responsesCodeProvider() - { - return array( - //expected output / getter / code to execute - //array(1,'getExitCode','exit(1);'), - //array(true,'isSuccessful','exit();'), - array('output', 'getOutput', 'echo \'output\';'), - ); - } - - public function pipesCodeProvider() - { - $variations = array( - 'fwrite(STDOUT, $in = file_get_contents(\'php://stdin\')); fwrite(STDERR, $in);', - 'include \'' . __DIR__ . '/ProcessTestHelper.php\';', - ); - $baseData = str_repeat('*', 1024); - - $codes = array(); - foreach (array(1, 16, 64, 1024, 4096) as $size) { - $data = str_repeat($baseData, $size) . '!'; - foreach ($variations as $code) { - $codes[] = array($data, $code); - } - } - - return $codes; - } - - /** - * provides default method names for simple getter/setter - */ - public function methodProvider() - { - $defaults = array( - array('CommandLine'), - array('Timeout'), - array('WorkingDirectory'), - array('Env'), - array('Stdin'), - array('Options') - ); - - return $defaults; - } -} diff --git a/core/vendor/symfony/process/Symfony/Component/Process/phpunit.xml.dist b/core/vendor/symfony/process/Symfony/Component/Process/phpunit.xml.dist deleted file mode 100644 index c120a97..0000000 --- a/core/vendor/symfony/process/Symfony/Component/Process/phpunit.xml.dist +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - ./Tests/ - - - - - - ./ - - ./Tests - - - - diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/Generator/Dumper/PhpGeneratorDumper.php b/core/vendor/symfony/routing/Symfony/Component/Routing/Generator/Dumper/PhpGeneratorDumper.php index 9b5cc05..49aceca 100644 --- a/core/vendor/symfony/routing/Symfony/Component/Routing/Generator/Dumper/PhpGeneratorDumper.php +++ b/core/vendor/symfony/routing/Symfony/Component/Routing/Generator/Dumper/PhpGeneratorDumper.php @@ -11,8 +11,6 @@ namespace Symfony\Component\Routing\Generator\Dumper; -use Symfony\Component\Routing\Route; - /** * PhpGeneratorDumper creates a PHP class able to generate URLs for a given set of routes. * diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/Generator/UrlGenerator.php b/core/vendor/symfony/routing/Symfony/Component/Routing/Generator/UrlGenerator.php index 18edd16..7390649 100644 --- a/core/vendor/symfony/routing/Symfony/Component/Routing/Generator/UrlGenerator.php +++ b/core/vendor/symfony/routing/Symfony/Component/Routing/Generator/UrlGenerator.php @@ -11,7 +11,6 @@ namespace Symfony\Component\Routing\Generator; -use Symfony\Component\Routing\Route; use Symfony\Component\Routing\RouteCollection; use Symfony\Component\Routing\RequestContext; use Symfony\Component\Routing\Exception\InvalidParameterException; diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/Loader/XmlFileLoader.php b/core/vendor/symfony/routing/Symfony/Component/Routing/Loader/XmlFileLoader.php index 5e0093d..695494b 100644 --- a/core/vendor/symfony/routing/Symfony/Component/Routing/Loader/XmlFileLoader.php +++ b/core/vendor/symfony/routing/Symfony/Component/Routing/Loader/XmlFileLoader.php @@ -61,10 +61,10 @@ public function load($file, $type = null) /** * Parses a node from a loaded XML file. * - * @param RouteCollection $collection the collection to associate with the node - * @param DOMElement $node the node to parse - * @param string $path the path of the XML file being processed - * @param string $file + * @param RouteCollection $collection the collection to associate with the node + * @param \DOMElement $node the node to parse + * @param string $path the path of the XML file being processed + * @param string $file */ protected function parseNode(RouteCollection $collection, \DOMElement $node, $path, $file) { diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/Loader/YamlFileLoader.php b/core/vendor/symfony/routing/Symfony/Component/Routing/Loader/YamlFileLoader.php index d51e339..d6d0539 100644 --- a/core/vendor/symfony/routing/Symfony/Component/Routing/Loader/YamlFileLoader.php +++ b/core/vendor/symfony/routing/Symfony/Component/Routing/Loader/YamlFileLoader.php @@ -123,7 +123,7 @@ protected function parseRoute(RouteCollection $collection, $name, $config, $file * * @return array * - * @throws InvalidArgumentException if one of the provided config keys is not supported + * @throws \InvalidArgumentException if one of the provided config keys is not supported */ private function normalizeRouteConfig(array $config) { diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/Matcher/UrlMatcher.php b/core/vendor/symfony/routing/Symfony/Component/Routing/Matcher/UrlMatcher.php index c417d94..8e757bf 100644 --- a/core/vendor/symfony/routing/Symfony/Component/Routing/Matcher/UrlMatcher.php +++ b/core/vendor/symfony/routing/Symfony/Component/Routing/Matcher/UrlMatcher.php @@ -174,13 +174,12 @@ protected function handleRouteRequirements($pathinfo, $name, Route $route) */ protected function mergeDefaults($params, $defaults) { - $parameters = $defaults; foreach ($params as $key => $value) { if (!is_int($key)) { - $parameters[$key] = $value; + $defaults[$key] = $value; } } - return $parameters; + return $defaults; } } diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/Route.php b/core/vendor/symfony/routing/Symfony/Component/Routing/Route.php index 318426a..8f33b41 100644 --- a/core/vendor/symfony/routing/Symfony/Component/Routing/Route.php +++ b/core/vendor/symfony/routing/Symfony/Component/Routing/Route.php @@ -95,13 +95,9 @@ public function getPattern() */ public function setPattern($pattern) { - $this->pattern = trim($pattern); - - // a route must start with a slash - if ('' === $this->pattern || '/' !== $this->pattern[0]) { - $this->pattern = '/'.$this->pattern; - } - + // A pattern must start with a slash and must not have multiple slashes at the beginning because the + // generated path for this route would be confused with a network path, e.g. '//domain.com/path'. + $this->pattern = '/' . ltrim(trim($pattern), '/'); $this->compiled = null; return $this; diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/RouteCollection.php b/core/vendor/symfony/routing/Symfony/Component/Routing/RouteCollection.php index 7a0e4c9..17be00e 100644 --- a/core/vendor/symfony/routing/Symfony/Component/Routing/RouteCollection.php +++ b/core/vendor/symfony/routing/Symfony/Component/Routing/RouteCollection.php @@ -223,25 +223,25 @@ public function addCollection(RouteCollection $collection, $prefix = '', $defaul */ public function addPrefix($prefix, $defaults = array(), $requirements = array(), $options = array()) { - // a prefix must not end with a slash - $prefix = rtrim($prefix, '/'); + $prefix = trim(trim($prefix), '/'); if ('' === $prefix && empty($defaults) && empty($requirements) && empty($options)) { return; } - // a prefix must start with a slash - if ('' !== $prefix && '/' !== $prefix[0]) { - $prefix = '/'.$prefix; + // a prefix must start with a single slash and must not end with a slash + if ('' !== $prefix) { + $this->prefix = '/' . $prefix . $this->prefix; } - $this->prefix = $prefix.$this->prefix; - foreach ($this->routes as $route) { if ($route instanceof RouteCollection) { - $route->addPrefix($prefix, $defaults, $requirements, $options); + // we add the slashes so the prefix is not lost by trimming in the sub-collection + $route->addPrefix('/' . $prefix . '/', $defaults, $requirements, $options); } else { - $route->setPattern($prefix.$route->getPattern()); + if ('' !== $prefix) { + $route->setPattern('/' . $prefix . $route->getPattern()); + } $route->addDefaults($defaults); $route->addRequirements($requirements); $route->addOptions($options); diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/Router.php b/core/vendor/symfony/routing/Symfony/Component/Routing/Router.php index f617a60..90984e9 100644 --- a/core/vendor/symfony/routing/Symfony/Component/Routing/Router.php +++ b/core/vendor/symfony/routing/Symfony/Component/Routing/Router.php @@ -15,6 +15,8 @@ use Symfony\Component\Config\ConfigCache; use Symfony\Component\HttpKernel\Log\LoggerInterface; use Symfony\Component\Routing\Generator\ConfigurableRequirementsInterface; +use Symfony\Component\Routing\Generator\UrlGeneratorInterface; +use Symfony\Component\Routing\Matcher\UrlMatcherInterface; /** * The Router class is an example of the integration of all pieces of the @@ -83,17 +85,15 @@ public function setOptions(array $options) // check option names and live merge, if errors are encountered Exception will be thrown $invalid = array(); - $isInvalid = false; foreach ($options as $key => $value) { if (array_key_exists($key, $this->options)) { $this->options[$key] = $value; } else { - $isInvalid = true; $invalid[] = $key; } } - if ($isInvalid) { + if ($invalid) { throw new \InvalidArgumentException(sprintf('The Router does not support the following options: "%s".', implode('\', \'', $invalid))); } } @@ -152,8 +152,12 @@ public function setContext(RequestContext $context) { $this->context = $context; - $this->getMatcher()->setContext($context); - $this->getGenerator()->setContext($context); + if (null !== $this->matcher) { + $this->getMatcher()->setContext($context); + } + if (null !== $this->generator) { + $this->getGenerator()->setContext($context); + } } /** diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php b/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php index 69c06a4..935b14e 100644 --- a/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php +++ b/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php @@ -175,7 +175,7 @@ public function testGenerateForRouteWithInvalidOptionalParameterNonStrict() public function testGenerateForRouteWithInvalidOptionalParameterNonStrictWithLogger() { - if (!class_exists('Symfony\Component\HttpKernel\Log\LoggerInterface')) { + if (!interface_exists('Symfony\Component\HttpKernel\Log\LoggerInterface')) { $this->markTestSkipped('The "HttpKernel" component is not available'); } @@ -214,6 +214,14 @@ public function testSchemeRequirementForcesAbsoluteUrl() $routes = $this->getRoutes('test', new Route('/', array(), array('_scheme' => 'http'))); $this->assertEquals('http://localhost/app.php/', $this->getGenerator($routes, array('scheme' => 'https'))->generate('test')); } + + public function testPathWithTwoStartingSlashes() + { + $routes = $this->getRoutes('test', new Route('//path-and-not-domain')); + + // this must not generate '//path-and-not-domain' because that would be a network path + $this->assertSame('/path-and-not-domain', $this->getGenerator($routes, array('BaseUrl' => ''))->generate('test')); + } public function testNoTrailingSlashForMultipleOptionalParameters() { diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/RouteCollectionTest.php b/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/RouteCollectionTest.php index 792e65d..14584e9 100644 --- a/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/RouteCollectionTest.php +++ b/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/RouteCollectionTest.php @@ -140,14 +140,19 @@ public function testAddPrefix() { $collection = new RouteCollection(); $collection->add('foo', $foo = new Route('/foo')); - $collection->add('bar', $bar = new Route('/bar')); + $collection2 = new RouteCollection(); + $collection2->add('bar', $bar = new Route('/bar')); + $collection->addCollection($collection2); + $this->assertSame('', $collection->getPrefix(), '->getPrefix() is initialized with ""'); + $collection->addPrefix(' / '); + $this->assertSame('', $collection->getPrefix(), '->addPrefix() trims the prefix and a single slash has no effect'); $collection->addPrefix('/{admin}', array('admin' => 'admin'), array('admin' => '\d+'), array('foo' => 'bar')); $this->assertEquals('/{admin}/foo', $collection->get('foo')->getPattern(), '->addPrefix() adds a prefix to all routes'); $this->assertEquals('/{admin}/bar', $collection->get('bar')->getPattern(), '->addPrefix() adds a prefix to all routes'); - $this->assertEquals(array('admin' => 'admin'), $collection->get('foo')->getDefaults(), '->addPrefix() adds a prefix to all routes'); - $this->assertEquals(array('admin' => 'admin'), $collection->get('bar')->getDefaults(), '->addPrefix() adds a prefix to all routes'); - $this->assertEquals(array('admin' => '\d+'), $collection->get('foo')->getRequirements(), '->addPrefix() adds a prefix to all routes'); - $this->assertEquals(array('admin' => '\d+'), $collection->get('bar')->getRequirements(), '->addPrefix() adds a prefix to all routes'); + $this->assertEquals(array('admin' => 'admin'), $collection->get('foo')->getDefaults(), '->addPrefix() adds defaults to all routes'); + $this->assertEquals(array('admin' => 'admin'), $collection->get('bar')->getDefaults(), '->addPrefix() adds defaults to all routes'); + $this->assertEquals(array('admin' => '\d+'), $collection->get('foo')->getRequirements(), '->addPrefix() adds requirements to all routes'); + $this->assertEquals(array('admin' => '\d+'), $collection->get('bar')->getRequirements(), '->addPrefix() adds requirements to all routes'); $this->assertEquals( array('foo' => 'bar', 'compiler_class' => 'Symfony\\Component\\Routing\\RouteCompiler'), $collection->get('foo')->getOptions(), '->addPrefix() adds an option to all routes' @@ -158,6 +163,10 @@ public function testAddPrefix() ); $collection->addPrefix('0'); $this->assertEquals('/0/{admin}', $collection->getPrefix(), '->addPrefix() ensures a prefix must start with a slash and must not end with a slash'); + $collection->addPrefix('/ /'); + $this->assertSame('/ /0/{admin}', $collection->getPrefix(), '->addPrefix() can handle spaces if desired'); + $this->assertSame('/ /0/{admin}/foo', $collection->get('foo')->getPattern(), 'the route pattern is in synch with the collection prefix'); + $this->assertSame('/ /0/{admin}/bar', $collection->get('bar')->getPattern(), 'the route pattern in a sub-collection is in synch with the collection prefix'); } public function testAddPrefixOverridesDefaultsAndRequirements() diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/RouteTest.php b/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/RouteTest.php index 8e46682..8aa601a 100644 --- a/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/RouteTest.php +++ b/core/vendor/symfony/routing/Symfony/Component/Routing/Tests/RouteTest.php @@ -34,6 +34,8 @@ public function testPattern() $route->setPattern('bar'); $this->assertEquals('/bar', $route->getPattern(), '->setPattern() adds a / at the beginning of the pattern if needed'); $this->assertEquals($route, $route->setPattern(''), '->setPattern() implements a fluent interface'); + $route->setPattern('//path'); + $this->assertEquals('/path', $route->getPattern(), '->setPattern() does not allow two slahes "//" at the beginning of the pattern as it would be confused with a network path when generating the path from the route'); } public function testOptions() diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/composer.json b/core/vendor/symfony/routing/Symfony/Component/Routing/composer.json index 09706a6..ae2e764 100644 --- a/core/vendor/symfony/routing/Symfony/Component/Routing/composer.json +++ b/core/vendor/symfony/routing/Symfony/Component/Routing/composer.json @@ -25,8 +25,8 @@ "doctrine/common": ">=2.2,<2.4-dev" }, "suggest": { - "symfony/config": "self.version", - "symfony/yaml": "self.version", + "symfony/config": "2.1.*", + "symfony/yaml": "2.1.*", "doctrine/common": ">=2.2,<2.4-dev" }, "autoload": { diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/phpunit.xml.dist b/core/vendor/symfony/routing/Symfony/Component/Routing/phpunit.xml.dist deleted file mode 100644 index 6d25ebf..0000000 --- a/core/vendor/symfony/routing/Symfony/Component/Routing/phpunit.xml.dist +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - ./Tests/ - - - - - - ./ - - ./vendor - ./Tests - - - - diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php index 4dfe177..43931bc 100644 --- a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php +++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php @@ -176,7 +176,8 @@ private function supports($class) /** * Checks if a method's name is get.* and can be called without parameters. * - * @param ReflectionMethod $method the method to check + * @param \ReflectionMethod $method the method to check + * * @return Boolean whether the method is a getter. */ private function isGetMethod(\ReflectionMethod $method) diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/phpunit.xml.dist b/core/vendor/symfony/serializer/Symfony/Component/Serializer/phpunit.xml.dist deleted file mode 100644 index c85ffa7..0000000 --- a/core/vendor/symfony/serializer/Symfony/Component/Serializer/phpunit.xml.dist +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - ./Tests/ - - - - - - ./ - - ./vendor - ./Tests - - - - diff --git a/core/vendor/symfony/yaml/Symfony/Component/Yaml/Escaper.php b/core/vendor/symfony/yaml/Symfony/Component/Yaml/Escaper.php index fe9f33f..f77545d 100644 --- a/core/vendor/symfony/yaml/Symfony/Component/Yaml/Escaper.php +++ b/core/vendor/symfony/yaml/Symfony/Component/Yaml/Escaper.php @@ -25,13 +25,13 @@ class Escaper // first to ensure proper escaping because str_replace operates iteratively // on the input arrays. This ordering of the characters avoids the use of strtr, // which performs more slowly. - private static $escapees = array('\\\\', '\\"', + private static $escapees = array('\\\\', '\\"', '"', "\x00", "\x01", "\x02", "\x03", "\x04", "\x05", "\x06", "\x07", "\x08", "\x09", "\x0a", "\x0b", "\x0c", "\x0d", "\x0e", "\x0f", "\x10", "\x11", "\x12", "\x13", "\x14", "\x15", "\x16", "\x17", "\x18", "\x19", "\x1a", "\x1b", "\x1c", "\x1d", "\x1e", "\x1f", "\xc2\x85", "\xc2\xa0", "\xe2\x80\xa8", "\xe2\x80\xa9"); - private static $escaped = array('\\"', '\\\\', + private static $escaped = array('\\"', '\\\\', '\\"', "\\0", "\\x01", "\\x02", "\\x03", "\\x04", "\\x05", "\\x06", "\\a", "\\b", "\\t", "\\n", "\\v", "\\f", "\\r", "\\x0e", "\\x0f", "\\x10", "\\x11", "\\x12", "\\x13", "\\x14", "\\x15", "\\x16", "\\x17", diff --git a/core/vendor/symfony/yaml/Symfony/Component/Yaml/Parser.php b/core/vendor/symfony/yaml/Symfony/Component/Yaml/Parser.php index f28d89b..d09227b 100644 --- a/core/vendor/symfony/yaml/Symfony/Component/Yaml/Parser.php +++ b/core/vendor/symfony/yaml/Symfony/Component/Yaml/Parser.php @@ -608,11 +608,11 @@ private function isNextLineUnIndentedCollection() } /** - * Returns true if the string is unindented collection item + * Returns true if the string is un-indented collection item * - * @return Boolean Returns true if the string is unindented collection item, false otherwise + * @return Boolean Returns true if the string is un-indented collection item, false otherwise */ - private function isStringUnIndentedCollectionItem($string) + private function isStringUnIndentedCollectionItem() { return (0 === strpos($this->currentLine, '- ')); } diff --git a/core/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/escapedCharacters.yml b/core/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/escapedCharacters.yml index 7f17ed5..09bf86e 100644 --- a/core/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/escapedCharacters.yml +++ b/core/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/escapedCharacters.yml @@ -137,3 +137,11 @@ yaml: | \x41 \u0041 \U00000041" php: | "Fun with \x5C\n\x22 \x07 \x08 \x1B \x0C\n\x0A \x0D \x09 \x0B \x00\n\x20 \xA0 \x85 \xe2\x80\xa8 \xe2\x80\xa9\nA A A" +--- +test: Double quotes with a line feed +yaml: | + { double: "some value\n \"some quoted string\" and 'some single quotes one'" } +php: | + array( + 'double' => "some value\n \"some quoted string\" and 'some single quotes one'" + ) diff --git a/core/vendor/symfony/yaml/Symfony/Component/Yaml/phpunit.xml.dist b/core/vendor/symfony/yaml/Symfony/Component/Yaml/phpunit.xml.dist deleted file mode 100644 index d025f9e..0000000 --- a/core/vendor/symfony/yaml/Symfony/Component/Yaml/phpunit.xml.dist +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - ./Tests/ - - - - - - ./ - - ./vendor - ./Tests - - - -