Merge branch '2.8'

* 2.8:
  added the new Composer exclude-from-classmap option
  added the new Composer exclude-from-classmap option
  fix docblock description for the build() method
  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 16:35:59 -07:00
commit bc0c8c1b5b
49 changed files with 193 additions and 55 deletions

View File

@ -18,7 +18,7 @@
"require": { "require": {
"php": ">=5.5.9", "php": ">=5.5.9",
"doctrine/common": "~2.4", "doctrine/common": "~2.4",
"twig/twig": "~1.20|~2.0", "twig/twig": "~1.23|~2.0",
"psr/log": "~1.0", "psr/log": "~1.0",
"symfony/polyfill-intl-icu": "~1.0", "symfony/polyfill-intl-icu": "~1.0",
"symfony/polyfill-mbstring": "~1.0", "symfony/polyfill-mbstring": "~1.0",
@ -100,6 +100,9 @@
}, },
"classmap": [ "classmap": [
"src/Symfony/Component/Intl/Resources/stubs" "src/Symfony/Component/Intl/Resources/stubs"
],
"exclude-from-classmap": [
"**/Tests/"
] ]
}, },
"minimum-stability": "dev", "minimum-stability": "dev",

View File

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

View File

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

View File

@ -23,7 +23,10 @@
}, },
"autoload": { "autoload": {
"files": [ "bootstrap.php" ], "files": [ "bootstrap.php" ],
"psr-4": { "Symfony\\Bridge\\PhpUnit\\": "" } "psr-4": { "Symfony\\Bridge\\PhpUnit\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
}, },
"minimum-stability": "dev", "minimum-stability": "dev",
"extra": { "extra": {

View File

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

View File

@ -21,7 +21,7 @@ use Symfony\Component\Form\ChoiceList\View\ChoiceView;
* @author Fabien Potencier <fabien@symfony.com> * @author Fabien Potencier <fabien@symfony.com>
* @author Bernhard Schussek <bschussek@gmail.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 * This property is public so that it can be accessed directly from compiled

View File

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

View File

@ -31,7 +31,10 @@
"symfony/dependency-injection": "For using as a service from the container" "symfony/dependency-injection": "For using as a service from the container"
}, },
"autoload": { "autoload": {
"psr-4": { "Symfony\\Bundle\\DebugBundle\\": "" } "psr-4": { "Symfony\\Bundle\\DebugBundle\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
}, },
"minimum-stability": "dev", "minimum-stability": "dev",
"extra": { "extra": {

View File

@ -61,7 +61,10 @@
"symfony/property-info": "For using the property_info_extractor service" "symfony/property-info": "For using the property_info_extractor service"
}, },
"autoload": { "autoload": {
"psr-4": { "Symfony\\Bundle\\FrameworkBundle\\": "" } "psr-4": { "Symfony\\Bundle\\FrameworkBundle\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
}, },
"minimum-stability": "dev", "minimum-stability": "dev",
"extra": { "extra": {

View File

@ -37,10 +37,13 @@
"symfony/yaml": "~2.8|~3.0", "symfony/yaml": "~2.8|~3.0",
"symfony/expression-language": "~2.8|~3.0", "symfony/expression-language": "~2.8|~3.0",
"doctrine/doctrine-bundle": "~1.4", "doctrine/doctrine-bundle": "~1.4",
"twig/twig": "~1.20|~2.0" "twig/twig": "~1.23|~2.0"
}, },
"autoload": { "autoload": {
"psr-4": { "Symfony\\Bundle\\SecurityBundle\\": "" } "psr-4": { "Symfony\\Bundle\\SecurityBundle\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
}, },
"minimum-stability": "dev", "minimum-stability": "dev",
"extra": { "extra": {

View File

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

View File

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

View File

@ -25,7 +25,10 @@
"symfony/http-foundation": "~2.8|~3.0" "symfony/http-foundation": "~2.8|~3.0"
}, },
"autoload": { "autoload": {
"psr-4": { "Symfony\\Component\\Asset\\": "" } "psr-4": { "Symfony\\Component\\Asset\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
}, },
"minimum-stability": "dev", "minimum-stability": "dev",
"extra": { "extra": {

View File

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

View File

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

View File

@ -63,11 +63,14 @@ class XmlUtilsTest extends \PHPUnit_Framework_TestCase
public function testLoadFileWithInternalErrorsEnabled() public function testLoadFileWithInternalErrorsEnabled()
{ {
libxml_use_internal_errors(true); $internalErrors = libxml_use_internal_errors(true);
$this->assertSame(array(), libxml_get_errors()); $this->assertSame(array(), libxml_get_errors());
$this->assertInstanceOf('DOMDocument', XmlUtils::loadFile(__DIR__.'/../Fixtures/Util/invalid_schema.xml')); $this->assertInstanceOf('DOMDocument', XmlUtils::loadFile(__DIR__.'/../Fixtures/Util/invalid_schema.xml'));
$this->assertSame(array(), libxml_get_errors()); $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() public function testLoadEmptyXmlFile()
{ {
$file = __DIR__.'/../Fixtures/foo.xml'; $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); XmlUtils::loadFile($file);
} }

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -127,7 +127,7 @@ class ParameterBag implements \IteratorAggregate, \Countable
* Returns the alphabetic characters of the parameter value. * Returns the alphabetic characters of the parameter value.
* *
* @param string $key The parameter key * @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 * @param bool $deep If true, a path like foo[bar] will find deeper items
* *
* @return string The filtered value * @return string The filtered value
@ -141,7 +141,7 @@ class ParameterBag implements \IteratorAggregate, \Countable
* Returns the alphabetic characters and digits of the parameter value. * Returns the alphabetic characters and digits of the parameter value.
* *
* @param string $key The parameter key * @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 * @param bool $deep If true, a path like foo[bar] will find deeper items
* *
* @return string The filtered value * @return string The filtered value
@ -155,7 +155,7 @@ class ParameterBag implements \IteratorAggregate, \Countable
* Returns the digits of the parameter value. * Returns the digits of the parameter value.
* *
* @param string $key The parameter key * @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 * @param bool $deep If true, a path like foo[bar] will find deeper items
* *
* @return string The filtered value * @return string The filtered value
@ -170,7 +170,7 @@ class ParameterBag implements \IteratorAggregate, \Countable
* Returns the parameter value converted to integer. * Returns the parameter value converted to integer.
* *
* @param string $key The parameter key * @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 * @param bool $deep If true, a path like foo[bar] will find deeper items
* *
* @return int The filtered value * @return int The filtered value

View File

@ -22,7 +22,10 @@
"symfony/expression-language": "~2.8|~3.0" "symfony/expression-language": "~2.8|~3.0"
}, },
"autoload": { "autoload": {
"psr-4": { "Symfony\\Component\\HttpFoundation\\": "" } "psr-4": { "Symfony\\Component\\HttpFoundation\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
}, },
"minimum-stability": "dev", "minimum-stability": "dev",
"extra": { "extra": {

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -238,7 +238,7 @@ class RouteCollectionBuilder
} }
/** /**
* Creates the final ArrayCollection, returns it, and clears everything. * Creates the final RouteCollection and returns it.
* *
* @return RouteCollection * @return RouteCollection
*/ */

View File

@ -38,7 +38,10 @@
"symfony/dependency-injection": "For loading routes from a service" "symfony/dependency-injection": "For loading routes from a service"
}, },
"autoload": { "autoload": {
"psr-4": { "Symfony\\Component\\Routing\\": "" } "psr-4": { "Symfony\\Component\\Routing\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
}, },
"minimum-stability": "dev", "minimum-stability": "dev",
"extra": { "extra": {

View File

@ -37,7 +37,10 @@
"symfony/ldap": "For using LDAP integration" "symfony/ldap": "For using LDAP integration"
}, },
"autoload": { "autoload": {
"psr-4": { "Symfony\\Component\\Security\\Core\\": "" } "psr-4": { "Symfony\\Component\\Security\\Core\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
}, },
"minimum-stability": "dev", "minimum-stability": "dev",
"extra": { "extra": {

View File

@ -28,7 +28,10 @@
"symfony/http-foundation": "For using the class SessionTokenStorage." "symfony/http-foundation": "For using the class SessionTokenStorage."
}, },
"autoload": { "autoload": {
"psr-4": { "Symfony\\Component\\Security\\Csrf\\": "" } "psr-4": { "Symfony\\Component\\Security\\Csrf\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
}, },
"minimum-stability": "dev", "minimum-stability": "dev",
"extra": { "extra": {

View File

@ -24,7 +24,10 @@
"psr/log": "~1.0" "psr/log": "~1.0"
}, },
"autoload": { "autoload": {
"psr-4": { "Symfony\\Component\\Security\\Guard\\": "" } "psr-4": { "Symfony\\Component\\Security\\Guard\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
}, },
"minimum-stability": "dev", "minimum-stability": "dev",
"extra": { "extra": {

View File

@ -35,7 +35,10 @@
"symfony/routing": "For using the HttpUtils class to create sub-requests, redirect the user, and match URLs" "symfony/routing": "For using the HttpUtils class to create sub-requests, redirect the user, and match URLs"
}, },
"autoload": { "autoload": {
"psr-4": { "Symfony\\Component\\Security\\Http\\": "" } "psr-4": { "Symfony\\Component\\Security\\Http\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
}, },
"minimum-stability": "dev", "minimum-stability": "dev",
"extra": { "extra": {

View File

@ -53,7 +53,10 @@
"symfony/ldap": "For using the LDAP user and authentication providers" "symfony/ldap": "For using the LDAP user and authentication providers"
}, },
"autoload": { "autoload": {
"psr-4": { "Symfony\\Component\\Security\\": "" } "psr-4": { "Symfony\\Component\\Security\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
}, },
"minimum-stability": "dev", "minimum-stability": "dev",
"extra": { "extra": {

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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