8000 Merge branch '2.8' · symfony/symfony@bc0c8c1 · GitHub
[go: up one dir, main page]
Skip to content

Commit bc0c8c1

Browse files
fabpotfabpot
committed
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
2 parents 1db740e + a15c9eb commit bc0c8c1

File tree

49 files changed

+193
-55
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+193
-55
lines changed

‎composer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"require": {
1919
"php": ">=5.5.9",
2020
"doctrine/common": "~2.4",
21-
"twig/twig": "~1.20|~2.0",
21+
"twig/twig": "~1.23|~2.0",
2222
"psr/log": "~1.0",
2323
"symfony/polyfill-intl-icu": "~1.0",
2424
"symfony/polyfill-mbstring": "~1.0",
@@ -100,6 +100,9 @@
100100
},
101101
"classmap": [
102102
"src/Symfony/Component/Intl/Resources/stubs"
103+
],
104+
"exclude-from-classmap": [
105+
"**/Tests/"
103106
]
104107
},
105108
"minimum-stability": "dev",

‎src/Symfony/Bridge/Doctrine/composer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,10 @@
4343
"doctrine/orm": ""
4444
},
4545
"autoload": {
46-
"psr-4": { "Symfony\\Bridge\\Doctrine\\": "" }
46+
"psr-4": { "Symfony\\Bridge\\Doctrine\\": "" },
47+
"exclude-from-classmap": [
48+
"/Tests/"
49+
]
4750
},
4851
"minimum-stability": "dev",
4952
"extra": {

‎src/Symfony/Bridge/Monolog/composer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@
3030
"symfony/event-dispatcher": "Needed when using log messages in console commands."
3131
},
3232
"autoload": {
33-
"psr-4": { "Symfony\\Bridge\\Monolog\\": "" }
33+
"psr-4": { "Symfony\\Bridge\\Monolog\\": "" },
34+
"exclude-from-classmap": [
35+
"/Tests/"
36+
]
3437
},
3538
"minimum-stability": "dev",
3639
"extra": {

‎src/Symfony/Bridge/PhpUnit/composer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@
2323
},
2424
"autoload": {
2525
"files": [ "bootstrap.php" ],
26-
"psr-4": { "Symfony\\Bridge\\PhpUnit\\": "" }
26+
"psr-4": { "Symfony\\Bridge\\PhpUnit\\": "" },
27+
"exclude-from-classmap": [
28+
"/Tests/"
29+
]
2730
},
2831
"minimum-stability": "dev",
2932
"extra": {

‎src/Symfony/Bridge/ProxyManager/composer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,10 @@
2424
"symfony/config": "~2.8|~3.0"
2525
},
2626
"autoload": {
27-
"psr-4": { "Symfony\\Bridge\\ProxyManager\\": "" }
27+
"psr-4": { "Symfony\\Bridge\\ProxyManager\\": "" },
28+
"exclude-from-classmap": [
29+
"/Tests/"
30+
]
2831
},
2932
"minimum-stability": "dev",
3033
"extra": {

‎src/Symfony/Bridge/Twig/Extension/FormExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* @author Fabien Potencier <fabien@symfony.com>
2222
* @author Bernhard Schussek <bschussek@gmail.com>
2323
*/
24-
class FormExtension extends \Twig_Extension
24+
class FormExtension extends \Twig_Extension implements \Twig_Extension_InitRuntimeInterface
2525
{
2626
/**
2727
* This property is public so that it can be accessed directly from compiled

‎src/Symfony/Bridge/Twig/composer.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
],
1818
"require": {
1919
"php": ">=5.5.9",
20-
"twig/twig": "~1.20|~2.0"
20+
"twig/twig": "~1.23|~2.0"
2121
},
2222
"require-dev": {
2323
"symfony/asset": "~2.8|~3.0",
@@ -51,7 +51,10 @@
5151
"symfony/expression-language": "For using the ExpressionExtension"
5252
},
5353
"autoload": {
54-
"psr-4": { "Symfony\\Bridge\\Twig\\": "" }
54+
"psr-4": { "Symfony\\Bridge\\Twig\\": "" },
55+
"exclude-from-classmap": [
56+
"/Tests/"
57+
]
5558
},
5659
"minimum-stability": "dev",
5760
"extra": {

‎src/Symfony/Bundle/DebugBundle/composer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,10 @@
3131
"symfony/dependency-injection": "For using as a service from the container"
3232
},
3333
"autoload": {
34-
"psr-4": { "Symfony\\Bundle\\DebugBundle\\": "" }
34+
"psr-4": { "Symfony\\Bundle\\DebugBundle\\": "" },
35+
"exclude-from-classmap": [
36+
"/Tests/"
37+
]
3538
},
3639
"minimum-stability": "dev",
3740
"extra": {

‎src/Symfony/Bundle/FrameworkBundle/composer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,10 @@
6161
"symfony/property-info": "For using the property_info_extractor service"
6262
},
6363
"autoload": {
64-
"psr-4": { "Symfony\\Bundle\\FrameworkBundle\\": "" }
64+
"psr-4": { "Symfony\\Bundle\\FrameworkBundle\\": "" },
65+
"exclude-from-classmap": [
66+
"/Tests/"
67+
]
6568
},
6669
"minimum-stability": "dev",
6770
"extra": {

‎src/Symfony/Bundle/SecurityBundle/composer.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,13 @@
3737
"symfony/yaml": "~2.8|~3.0",
3838
"symfony/expression-language": "~2.8|~3.0",
3939
"doctrine/doctrine-bundle": "~1.4",
40-
"twig/twig": "~1.20|~2.0"
40+
"twig/twig": "~1.23|~2.0"
4141
},
4242
"autoload": {
43-
"psr-4": { "Symfony\\Bundle\\SecurityBundle\\": "" }
43+
"psr-4": { "Symfony\\Bundle\\SecurityBundle\\": "" },
44+
"exclude-from-classmap": [
45+
"/Tests/"
46+
]
4447
},
4548
"minimum-stability": "dev",
4649
"extra": {

‎src/Symfony/Bundle/TwigBundle/composer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@
3434
"symfony/framework-bundle": "~2.8|~3.0"
3535
},
3636
"autoload": {
37-
"psr-4": { "Symfony\\Bundle\\TwigBundle\\": "" }
37+
"psr-4": { "Symfony\\Bundle\\TwigBundle\\": "" },
38+
"exclude-from-classmap": [
39+
"/Tests/"
40+
]
3841
},
3942
"minimum-stability": "dev",
4043
"extra": {

‎src/Symfony/Bundle/WebProfilerBundle/composer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@
2828
"symfony/stopwatch": "~2.8|~3.0"
2929
},
3030
"autoload": {
31-
"psr-4": { "Symfony\\Bundle\\WebProfilerBundle\\": "" }
31+
"psr-4": { "Symfony\\Bundle\\WebProfilerBundle\\": "" },
32+
"exclude-from-classmap": [
33+
"/Tests/"
34+
]
3235
},
3336
"minimum-stability": "dev",
3437
"extra": {

‎src/Symfony/Component/Asset/composer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@
2525
"symfony/http-foundation": "~2.8|~3.0"
2626
},
2727
"autoload": {
28-
"psr-4": { "Symfony\\Component\\Asset\\": "" }
28+
"psr-4": { "Symfony\\Component\\Asset\\": "" },
29+
"exclude-from-classmap": [
30+
"/Tests/"
31+
]
2932
},
3033
"minimum-stability": "dev",
3134
"extra": {

‎src/Symfony/Component/BrowserKit/composer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@
2727
"symfony/process": ""
2828
},
2929
"autoload": {
30-
"psr-4": { "Symfony\\Component\\BrowserKit\\": "" }
30+
"psr-4": { "Symfony\\Component\\BrowserKit\\": "" },
31+
"exclude-from-classmap": [
32+
"/Tests/"
33+
]
3134
},
3235
"minimum-stability": "dev",
3336
"extra": {

‎src/Symfony/Component/ClassLoader/composer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@
2323
"symfony/finder": "~2.8|~3.0"
2424
},
2525
"autoload": {
26-
"psr-4": { "Symfony\\Component\\ClassLoader\\": "" }
26+
"psr-4": { "Symfony\\Component\\ClassLoader\\": "" },
27+
"exclude-from-classmap": [
28+
"/Tests/"
29+
]
2730
},
2831
"extra": {
2932
"branch-alias": {

‎src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,14 @@ public function testLoadFile()
6363

6464
public function testLoadFileWithInternalErrorsEnabled()
6565
{
66-
libxml_use_internal_errors(true);
66+
$internalErrors = libxml_use_internal_errors(true);
6767

6868
$this->assertSame(array(), libxml_get_errors());
6969
$this->assertInstanceOf('DOMDocument', XmlUtils::loadFile(__DIR__.'/../Fixtures/Util/invalid_schema.xml'));
7070
$this->assertSame(array(), libxml_get_errors());
71+
72+
libxml_clear_errors();
73+
libxml_use_internal_errors($internalErrors);
7174
}
7275

7376
/**
@@ -147,7 +150,7 @@ public function getDataForPhpize()
147150
public function testLoadEmptyXmlFile()
148151
{
149152
$file = __DIR__.'/../Fixtures/foo.xml';
150-
$this->setExpectedException('InvalidArgumentException', 'File '.$file.' does not contain valid XML, it is empty.');
153+
$this->setExpectedException('InvalidArgumentException', sprintf('File %s does not contain valid XML, it is empty.', $file));
151154
XmlUtils::loadFile($file);
152155
}
153156

‎src/Symfony/Component/Config/composer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@
2020
"symfony/filesystem": "~2.8|~3.0"
2121
},
2222
"autoload": {
23-
"psr-4": { "Symfony\\Component\\Config\\": "" }
23+
"psr-4": { "Symfony\\Component\\Config\\": "" },
24+
"exclude-from-classmap": [
25+
"/Tests/"
26+
]
2427
},
2528
"minimum-stability": "dev",
2629
"extra": {

‎src/Symfony/Component/Console/composer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@
3030
"psr/log": "For using the console logger"
3131
},
3232
"autoload": {
33-
"psr-4": { "Symfony\\Component\\Console\\": "" }
33+
"psr-4": { "Symfony\\Component\\Console\\": "" },
34+
"exclude-from-classmap": [
35+
"/Tests/"
36+
]
3437
},
3538
"minimum-stability": "dev",
3639
"extra": {

‎src/Symfony/Component/CssSelector/composer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@
2323
"php": ">=5.5.9"
2424
},
2525
"autoload": {
26-
"psr-4": { "Symfony\\Component\\CssSelector\\": "" }
26+
"psr-4": { "Symfony\\Component\\CssSelector\\": "" },
27+
"exclude-from-classmap": [
28+
"/Tests/"
29+
]
2730
},
2831
"minimum-stability": "dev",
2932
"extra": {

‎src/Symfony/Component/Debug/composer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@
2727
"symfony/http-kernel": "~2.8|~3.0"
2828
},
2929
"autoload": {
30-
"psr-4": { "Symfony\\Component\\Debug\\": "" }
30+
"psr-4": { "Symfony\\Component\\Debug\\": "" },
31+
"exclude-from-classmap": [
32+
"/Tests/"
33+
]
3134
},
3235
"minimum-stability": "dev",
3336
"extra": {

‎src/Symfony/Component/DependencyInjection/composer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@
2929
"symfony/proxy-manager-bridge": "Generate service proxies to lazy load them"
3030
},
3131
"autoload": {
32-
"psr-4": { "Symfony\\Component\\DependencyInjection\\": "" }
32+
"psr-4": { "Symfony\\Component\\DependencyInjection\\": "" },
33+
"exclude-from-classmap": [
34+
"/Tests/"
35+
]
3336
},
3437
"minimum-stability": "dev",
3538
"extra": {

‎src/Symfony/Component/DomCrawler/composer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@
2626
"symfony/css-selector": ""
2727
},
2828
"autoload": {
29-
"psr-4": { "Symfony\\Component\\DomCrawler\\": "" }
29+
"psr-4": { "Symfony\\Component\\DomCrawler\\": "" },
30+
"exclude-from-classmap": [
31+
"/Tests/"
32+
]
3033
},
3134
"minimum-stability": "dev",
3235
"extra": {

‎src/Symfony/Component/EventDispatcher/composer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@
3030
"symfony/http-kernel": ""
3131
},
3232
"autoload": {
33-
"psr-4": { "Symfony\\Component\\EventDispatcher\\": "" }
33+
"psr-4": { "Symfony\\Component\\EventDispatcher\\": "" },
34+
"exclude-from-classmap": [
35+
"/Tests/"
36+
]
3437
},
3538
"minimum-stability": "dev",
3639
"extra": {

‎src/Symfony/Component/ExpressionLanguage/composer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@
1919
"php": ">=5.5.9"
2020
},
2121
"autoload": {
22-
"psr-4": { "Symfony\\Component\\ExpressionLanguage\\": "" }
22+
"psr-4": { "Symfony\\Component\\ExpressionLanguage\\": "" },
23+
"exclude-from-classmap": [
24+
"/Tests/"
25+
]
2326
},
2427
"minimum-stability": "dev",
2528
"extra": {

‎src/Symfony/Component/Filesystem/composer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@
1919
"php": ">=5.5.9"
2020
},
2121
"autoload": {
22-
"psr-4": { "Symfony\\Component\\Filesystem\\": "" }
22+
"psr-4": { "Symfony\\Component\\Filesystem\\": "" },
23+
"exclude-from-classmap": [
24+
"/Tests/"
25+
]
2326
},
2427
"minimum-stability": "dev",
2528
"extra": {

‎src/Symfony/Component/Finder/composer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@
1919
"php": ">=5.5.9"
2020
},
2121
"autoload": {
22-
"psr-4": { "Symfony\\Component\\Finder\\": "" }
22+
"psr-4": { "Symfony\\Component\\Finder\\": "" },
23+
"exclude-from-classmap": [
24+
"/Tests/"
25+
]
2326
},
2427
"minimum-stability": "dev",
2528
"extra": {

‎src/Symfony/Component/Form/composer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,10 @@
4444
"symfony/framework-bundle": "For templating with PHP."
4545
},
4646
"autoload": {
47-
"psr-4": { "Symfony\\Component\\Form\\": "" }
47+
"psr-4": { "Symfony\\Component\\Form\\": "" },
48+
"exclude-from-classmap": [
49+
"/Tests/"
50+
]
4851
},
4952
"minimum-stability": "dev",
5053
"extra": {

‎src/Symfony/Component/HttpFoundation/ParameterBag.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public function remove($key)
127127
* Returns the alphabetic characters of the parameter value.
128128
*
129129
* @param string $key The parameter key
130-
* @param mixed $default The default value if the parameter key does not exist
130+
* @param string $default The default value if the parameter key does not exist
131131
* @param bool $deep If true, a path like foo[bar] will find deeper items
132132
*
133133
* @return string The filtered value
@@ -141,7 +141,7 @@ public function getAlpha($key, $default = '', $deep = false)
141141
* Returns the alphabetic characters and digits of the parameter value.
142142
*
143143
* @param string $key The parameter key
144-
* @param mixed $default The default value if the parameter key does not exist
144+
* @param string $default The default value if the parameter key does not exist
145145
* @param bool $deep If true, a path like foo[bar] will find deeper items
146146
*
147147
* @return string The filtered value
@@ -155,7 +155,7 @@ public function getAlnum($key, $default = '', $deep = false)
155155
* Returns the digits of the parameter value.
156156
*
157157
* @param string $key The parameter key
158-
* @param mixed $default The default value if the parameter key does not exist
158+
* @param string $default The default value if the parameter key does not exist
159159
* @param bool $deep If true, a path like foo[bar] will find deeper items
160160
*
161161
* @return string The filtered value
@@ -170,7 +170,7 @@ public function getDigits($key, $default = '', $deep = false)
170170
* Returns the parameter value converted to integer.
171171
*
172172
* @param string $key The parameter key
173-
* @param mixed $default The default value if the parameter key does not exist
173+
* @param int $default The default value if the parameter key does not exist
174174
* @param bool $deep If true, a path like foo[bar] will find deeper items
175175
*
176176
* @return int The filtered value

0 commit comments

Comments
 (0)
0