Skip to content

Commit a15c9eb

Browse files
fabpotfabpot
committed
Merge branch '2.7' into 2.8
* 2.7: added the new Composer exclude-from-classmap option added the new Composer exclude-from-classmap option fix expected argument type docblock Set back libxml settings after testings. fixed Twig deprecation notices
2 parents e2022ce + 6d0e05c commit a15c9eb

File tree

50 files changed

+200
-56
lines changed

Some content is hidden

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

50 files changed

+200
-56
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.3.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/security-acl": "~2.7",
2424
"symfony/polyfill-intl-icu": "~1.0",
@@ -102,6 +102,9 @@
102102
},
103103
"classmap": [
104104
"src/Symfony/Component/Intl/Resources/stubs"
105+
],
106+
"exclude-from-classmap": [
107+
"**/Tests/"
105108
]
106109
},
107110
"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.3|~3.0.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/Swiftmailer/composer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@
2323
"symfony/http-kernel": ""
2424
},
2525
"autoload": {
26-
"psr-4": { "Symfony\\Bridge\\Swiftmailer\\": "" }
26+
"psr-4": { "Symfony\\Bridge\\Swiftmailer\\": "" },
27+
"exclude-from-classmap": [
28+
"/Tests/"
29+
]
2730
},
2831
"minimum-stability": "dev",
2932
"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.3.9",
20-
"twig/twig": "~1.20|~2.0"
20+
"twig/twig": "~1.23|~2.0"
2121
},
2222
"require-dev": {
2323
"symfony/asset": "~2.7|~3.0.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": {

0 commit comments

Comments
 (0)