diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.3' into 2.7 

* 2.3:
  added the new Composer exclude-from-classmap option
  fix expected argument type docblock
  Set back libxml settings after testings.
  fixed Twig deprecation notices
This commit is contained in:
Fabien Potencier 2015-10-30 13:10:21 -07:00
parent 7f62133939 ebd55fcb38
commit 05c2ecc124
41 changed files with 165 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
composer.json
View File

@ -18,7 +18,7 @@
"require": {
"php": ">=5.3.9",
"doctrine/common": "~2.4",
"twig/twig": "~1.20|~2.0",
"twig/twig": "~1.23|~2.0",
"psr/log": "~1.0"
},
"replace": {
@ -91,7 +91,10 @@
"src/Symfony/Component/HttpFoundation/Resources/stubs",
"src/Symfony/Component/Intl/Resources/stubs"
],
"files": [ "src/Symfony/Component/Intl/Resources/stubs/functions.php" ]
"files": [ "src/Symfony/Component/Intl/Resources/stubs/functions.php" ],
"exclude-from-classmap": [
"**/Tests/"
]
},
"minimum-stability": "dev",
"extra": {

5
src/Symfony/Bridge/Doctrine/composer.json
View File

@ -41,7 +41,10 @@
"doctrine/orm": ""
},
"autoload": {
"psr-4": { "Symfony\\Bridge\\Doctrine\\": "" }
"psr-4": { "Symfony\\Bridge\\Doctrine\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
},
"minimum-stability": "dev",
"extra": {

5
src/Symfony/Bridge/Monolog/composer.json
View File

@ -30,7 +30,10 @@
"symfony/event-dispatcher": "Needed when using log messages in console commands."
},
"autoload": {
"psr-4": { "Symfony\\Bridge\\Monolog\\": "" }
"psr-4": { "Symfony\\Bridge\\Monolog\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
},
"minimum-stability": "dev",
"extra": {

5
src/Symfony/Bridge/ProxyManager/composer.json
View File

@ -24,7 +24,10 @@
"symfony/config": "~2.3"
},
"autoload": {
"psr-4": { "Symfony\\Bridge\\ProxyManager\\": "" }
"psr-4": { "Symfony\\Bridge\\ProxyManager\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
},
"minimum-stability": "dev",
"extra": {

5
src/Symfony/Bridge/Swiftmailer/composer.json
View File

@ -23,7 +23,10 @@
"symfony/http-kernel": ""
},
"autoload": {
"psr-4": { "Symfony\\Bridge\\Swiftmailer\\": "" }
"psr-4": { "Symfony\\Bridge\\Swiftmailer\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
},
"minimum-stability": "dev",
"extra": {

2
src/Symfony/Bridge/Twig/Extension/FormExtension.php
View File

@ -21,7 +21,7 @@ use Symfony\Component\Form\Extension\Core\View\ChoiceView;
* @author Fabien Potencier <fabien@symfony.com>
* @author Bernhard Schussek <bschussek@gmail.com>
*/
class FormExtension extends \Twig_Extension
class FormExtension extends \Twig_Extension implements \Twig_Extension_InitRuntimeInterface
{
/**
* This property is public so that it can be accessed directly from compiled

7
src/Symfony/Bridge/Twig/composer.json
View File

@ -17,7 +17,7 @@
],
"require": {
"php": ">=5.3.9",
"twig/twig": "~1.20|~2.0"
"twig/twig": "~1.23|~2.0"
},
"require-dev": {
"symfony/asset": "~2.7",
@ -51,7 +51,10 @@
"symfony/expression-language": "For using the ExpressionExtension"
},
"autoload": {
"psr-4": { "Symfony\\Bridge\\Twig\\": "" }
"psr-4": { "Symfony\\Bridge\\Twig\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
},
"minimum-stability": "dev",
"extra": {

5
src/Symfony/Bundle/FrameworkBundle/composer.json
View File

@ -57,7 +57,10 @@
"doctrine/cache": "For using alternative cache drivers"
},
"autoload": {
"psr-4": { "Symfony\\Bundle\\FrameworkBundle\\": "" }
"psr-4": { "Symfony\\Bundle\\FrameworkBundle\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
},
"minimum-stability": "dev",
"extra": {

7
src/Symfony/Bundle/SecurityBundle/composer.json
View File

@ -37,11 +37,14 @@
"symfony/yaml": "~2.0,>=2.0.5",
"symfony/expression-language": "~2.6",
"doctrine/doctrine-bundle": "~1.2",
"twig/twig": "~1.20|~2.0",
"twig/twig": "~1.23|~2.0",
"ircmaxell/password-compat": "~1.0"
},
"autoload": {
"psr-4": { "Symfony\\Bundle\\SecurityBundle\\": "" }
"psr-4": { "Symfony\\Bundle\\SecurityBundle\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
},
"minimum-stability": "dev",
"extra": {

5
src/Symfony/Bundle/TwigBundle/composer.json
View File

@ -34,7 +34,10 @@
"symfony/framework-bundle": "~2.7"
},
"autoload": {
"psr-4": { "Symfony\\Bundle\\TwigBundle\\": "" }
"psr-4": { "Symfony\\Bundle\\TwigBundle\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
},
"minimum-stability": "dev",
"extra": {

5
src/Symfony/Bundle/WebProfilerBundle/composer.json
View File

@ -28,7 +28,10 @@
"symfony/stopwatch": "~2.2"
},
"autoload": {
"psr-4": { "Symfony\\Bundle\\WebProfilerBundle\\": "" }
"psr-4": { "Symfony\\Bundle\\WebProfilerBundle\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
},
"minimum-stability": "dev",
"extra": {

5
src/Symfony/Component/BrowserKit/composer.json
View File

@ -27,7 +27,10 @@
"symfony/process": ""
},
"autoload": {
"psr-4": { "Symfony\\Component\\BrowserKit\\": "" }
"psr-4": { "Symfony\\Component\\BrowserKit\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
},
"minimum-stability": "dev",
"extra": {

5
src/Symfony/Component/ClassLoader/composer.json
View File

@ -23,7 +23,10 @@
"symfony/finder": "~2.0,>=2.0.5"
},
"autoload": {
"psr-4": { "Symfony\\Component\\ClassLoader\\": "" }
"psr-4": { "Symfony\\Component\\ClassLoader\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
},
"extra": {
"branch-alias": {

7
src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php
View File

@ -63,11 +63,14 @@ class XmlUtilsTest extends \PHPUnit_Framework_TestCase
public function testLoadFileWithInternalErrorsEnabled()
{
libxml_use_internal_errors(true);
$internalErrors = libxml_use_internal_errors(true);
$this->assertSame(array(), libxml_get_errors());
$this->assertInstanceOf('DOMDocument', XmlUtils::loadFile(__DIR__.'/../Fixtures/Util/invalid_schema.xml'));
$this->assertSame(array(), libxml_get_errors());
libxml_clear_errors();
libxml_use_internal_errors($internalErrors);
}
/**
@ -147,7 +150,7 @@ class XmlUtilsTest extends \PHPUnit_Framework_TestCase
public function testLoadEmptyXmlFile()
{
$file = __DIR__.'/../Fixtures/foo.xml';
$this->setExpectedException('InvalidArgumentException', 'File '.$file.' does not contain valid XML, it is empty.');
$this->setExpectedException('InvalidArgumentException', sprintf('File %s does not contain valid XML, it is empty.', $file));
XmlUtils::loadFile($file);
}

5
src/Symfony/Component/Config/composer.json
View File

@ -20,7 +20,10 @@
"symfony/filesystem": "~2.3"
},
"autoload": {
"psr-4": { "Symfony\\Component\\Config\\": "" }
"psr-4": { "Symfony\\Component\\Config\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
},
"minimum-stability": "dev",
"extra": {

5
src/Symfony/Component/Console/composer.json
View File

@ -29,7 +29,10 @@
"psr/log": "For using the console logger"
},
"autoload": {
"psr-4": { "Symfony\\Component\\Console\\": "" }
"psr-4": { "Symfony\\Component\\Console\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
},
"minimum-stability": "dev",
"extra": {

5
src/Symfony/Component/CssSelector/composer.json
View File

@ -23,7 +23,10 @@
"php": ">=5.3.9"
},
"autoload": {
"psr-4": { "Symfony\\Component\\CssSelector\\": "" }
"psr-4": { "Symfony\\Component\\CssSelector\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
},
"minimum-stability": "dev",
"extra": {

5
src/Symfony/Component/Debug/composer.json
View File

@ -27,7 +27,10 @@
"symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2"
},
"autoload": {
"psr-4": { "Symfony\\Component\\Debug\\": "" }
"psr-4": { "Symfony\\Component\\Debug\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
},
"minimum-stability": "dev",
"extra": {

5
src/Symfony/Component/DependencyInjection/composer.json
View File

@ -32,7 +32,10 @@
"symfony/proxy-manager-bridge": "Generate service proxies to lazy load them"
},
"autoload": {
"psr-4": { "Symfony\\Component\\DependencyInjection\\": "" }
"psr-4": { "Symfony\\Component\\DependencyInjection\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
},
"minimum-stability": "dev",
"extra": {

5
src/Symfony/Component/DomCrawler/composer.json
View File

@ -25,7 +25,10 @@
"symfony/css-selector": ""
},
"autoload": {
"psr-4": { "Symfony\\Component\\DomCrawler\\": "" }
"psr-4": { "Symfony\\Component\\DomCrawler\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
},
"minimum-stability": "dev",
"extra": {

5
src/Symfony/Component/EventDispatcher/composer.json
View File

@ -30,7 +30,10 @@
"symfony/http-kernel": ""
},
"autoload": {
"psr-4": { "Symfony\\Component\\EventDispatcher\\": "" }
"psr-4": { "Symfony\\Component\\EventDispatcher\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
},
"minimum-stability": "dev",
"extra": {

5
src/Symfony/Component/Filesystem/composer.json
View File

@ -19,7 +19,10 @@
"php": ">=5.3.9"
},
"autoload": {
"psr-4": { "Symfony\\Component\\Filesystem\\": "" }
"psr-4": { "Symfony\\Component\\Filesystem\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
},
"minimum-stability": "dev",
"extra": {

5
src/Symfony/Component/Finder/composer.json
View File

@ -19,7 +19,10 @@
"php": ">=5.3.9"
},
"autoload": {
"psr-4": { "Symfony\\Component\\Finder\\": "" }
"psr-4": { "Symfony\\Component\\Finder\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
},
"minimum-stability": "dev",
"extra": {

5
src/Symfony/Component/Form/composer.json
View File

@ -42,7 +42,10 @@
"symfony/framework-bundle": "For templating with PHP."
},
"autoload": {
"psr-4": { "Symfony\\Component\\Form\\": "" }
"psr-4": { "Symfony\\Component\\Form\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
},
"minimum-stability": "dev",
"extra": {

8
src/Symfony/Component/HttpFoundation/ParameterBag.php
View File

@ -172,7 +172,7 @@ class ParameterBag implements \IteratorAggregate, \Countable
* Returns the alphabetic characters of the parameter value.
*
* @param string $key The parameter key
* @param mixed $default The default value if the parameter key does not exist
* @param string $default The default value if the parameter key does not exist
* @param bool $deep If true, a path like foo[bar] will find deeper items
*
* @return string The filtered value
@ -186,7 +186,7 @@ class ParameterBag implements \IteratorAggregate, \Countable
* Returns the alphabetic characters and digits of the parameter value.
*
* @param string $key The parameter key
* @param mixed $default The default value if the parameter key does not exist
* @param string $default The default value if the parameter key does not exist
* @param bool $deep If true, a path like foo[bar] will find deeper items
*
* @return string The filtered value
@ -200,7 +200,7 @@ class ParameterBag implements \IteratorAggregate, \Countable
* Returns the digits of the parameter value.
*
* @param string $key The parameter key
* @param mixed $default The default value if the parameter key does not exist
* @param string $default The default value if the parameter key does not exist
* @param bool $deep If true, a path like foo[bar] will find deeper items
*
* @return string The filtered value
@ -215,7 +215,7 @@ class ParameterBag implements \IteratorAggregate, \Countable
* Returns the parameter value converted to integer.
*
* @param string $key The parameter key
* @param mixed $default The default value if the parameter key does not exist
* @param int $default The default value if the parameter key does not exist
* @param bool $deep If true, a path like foo[bar] will find deeper items
*
* @return int The filtered value

5
src/Symfony/Component/HttpFoundation/composer.json
View File

@ -23,7 +23,10 @@
},
"autoload": {
"psr-4": { "Symfony\\Component\\HttpFoundation\\": "" },
"classmap": [ "Resources/stubs" ]
"classmap": [ "Resources/stubs" ],
"exclude-from-classmap": [
"/Tests/"
]
},
"minimum-stability": "dev",
"extra": {

5
src/Symfony/Component/HttpKernel/composer.json
View File

@ -52,7 +52,10 @@
"symfony/var-dumper": ""
},
"autoload": {
"psr-4": { "Symfony\\Component\\HttpKernel\\": "" }
"psr-4": { "Symfony\\Component\\HttpKernel\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
},
"minimum-stability": "dev",
"extra": {

5
src/Symfony/Component/Intl/composer.json
View File

@ -35,7 +35,10 @@
"autoload": {
"psr-4": { "Symfony\\Component\\Intl\\": "" },
"classmap": [ "Resources/stubs" ],
"files": [ "Resources/stubs/functions.php" ]
"files": [ "Resources/stubs/functions.php" ],
"exclude-from-classmap": [
"/Tests/"
]
},
"minimum-stability": "dev",
"extra": {

5
src/Symfony/Component/Locale/composer.json
View File

@ -20,7 +20,10 @@
"symfony/intl": "~2.7"
},
"autoload": {
"psr-4": { "Symfony\\Component\\Locale\\": "" }
"psr-4": { "Symfony\\Component\\Locale\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
},
"minimum-stability": "dev",
"extra": {

5
src/Symfony/Component/OptionsResolver/composer.json
View File

@ -19,7 +19,10 @@
"php": ">=5.3.9"
},
"autoload": {
"psr-4": { "Symfony\\Component\\OptionsResolver\\": "" }
"psr-4": { "Symfony\\Component\\OptionsResolver\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
},
"minimum-stability": "dev",
"extra": {

5
src/Symfony/Component/Process/composer.json
View File

@ -19,7 +19,10 @@
"php": ">=5.3.9"
},
"autoload": {
"psr-4": { "Symfony\\Component\\Process\\": "" }
"psr-4": { "Symfony\\Component\\Process\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
},
"minimum-stability": "dev",
"extra": {

5
src/Symfony/Component/PropertyAccess/composer.json
View File

@ -19,7 +19,10 @@
"php": ">=5.3.9"
},
"autoload": {
"psr-4": { "Symfony\\Component\\PropertyAccess\\": "" }
"psr-4": { "Symfony\\Component\\PropertyAccess\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
},
"minimum-stability": "dev",
"extra": {

5
src/Symfony/Component/Routing/composer.json
View File

@ -37,7 +37,10 @@
"doctrine/annotations": "For using the annotation loader"
},
"autoload": {
"psr-4": { "Symfony\\Component\\Routing\\": "" }
"psr-4": { "Symfony\\Component\\Routing\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
},
"minimum-stability": "dev",
"extra": {

5
src/Symfony/Component/Security/composer.json
View File

@ -56,7 +56,10 @@
"paragonie/random_compat": ""
},
"autoload": {
"psr-4": { "Symfony\\Component\\Security\\": "" }
"psr-4": { "Symfony\\Component\\Security\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
},
"minimum-stability": "dev",
"extra": {

5
src/Symfony/Component/Serializer/composer.json
View File

@ -33,7 +33,10 @@
"symfony/property-access": "For using the ObjectNormalizer."
},
"autoload": {
"psr-4": { "Symfony\\Component\\Serializer\\": "" }
"psr-4": { "Symfony\\Component\\Serializer\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
},
"minimum-stability": "dev",
"extra": {

5
src/Symfony/Component/Stopwatch/composer.json
View File

@ -19,7 +19,10 @@
"php": ">=5.3.9"
},
"autoload": {
"psr-4": { "Symfony\\Component\\Stopwatch\\": "" }
"psr-4": { "Symfony\\Component\\Stopwatch\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
},
"minimum-stability": "dev",
"extra": {

5
src/Symfony/Component/Templating/composer.json
View File

@ -25,7 +25,10 @@
"psr/log": "For using debug logging in loaders"
},
"autoload": {
"psr-4": { "Symfony\\Component\\Templating\\": "" }
"psr-4": { "Symfony\\Component\\Templating\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
},
"minimum-stability": "dev",
"extra": {

5
src/Symfony/Component/Translation/Tests/Loader/XliffFileLoaderTest.php
View File

@ -30,7 +30,7 @@ class XliffFileLoaderTest extends \PHPUnit_Framework_TestCase
public function testLoadWithInternalErrorsEnabled()
{
libxml_use_internal_errors(true);
$internalErrors = libxml_use_internal_errors(true);
$this->assertSame(array(), libxml_get_errors());
@ -41,6 +41,9 @@ class XliffFileLoaderTest extends \PHPUnit_Framework_TestCase
$this->assertEquals('en', $catalogue->getLocale());
$this->assertEquals(array(new FileResource($resource)), $catalogue->getResources());
$this->assertSame(array(), libxml_get_errors());
libxml_clear_errors();
libxml_use_internal_errors($internalErrors);
}
public function testLoadWithResname()

5
src/Symfony/Component/Translation/composer.json
View File

@ -33,7 +33,10 @@
"psr/log": "To use logging capability in translator"
},
"autoload": {
"psr-4": { "Symfony\\Component\\Translation\\": "" }
"psr-4": { "Symfony\\Component\\Translation\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
},
"minimum-stability": "dev",
"extra": {

5
src/Symfony/Component/Validator/composer.json
View File

@ -43,7 +43,10 @@
"symfony/expression-language": "For using the 2.4 Expression validator"
},
"autoload": {
"psr-4": { "Symfony\\Component\\Validator\\": "" }
"psr-4": { "Symfony\\Component\\Validator\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
},
"minimum-stability": "dev",
"extra": {

5
src/Symfony/Component/Yaml/composer.json
View File

@ -19,7 +19,10 @@
"php": ">=5.3.9"
},
"autoload": {
"psr-4": { "Symfony\\Component\\Yaml\\": "" }
"psr-4": { "Symfony\\Component\\Yaml\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
},
"minimum-stability": "dev",
"extra": {