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

Commit 087c667

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '2.7' into 2.8
* 2.7: Remove symfony/polyfill-ctype where not needed Use symfony/polyfill-ctype [Form] fixes instance variable phpdoc in FormRegistry class
2 parents 6dcdb58 + 046f092 commit 087c667

File tree

14 files changed

+19
-6
lines changed

14 files changed

+19
-6
lines changed

‎composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
"psr/log": "~1.0",
2424
"symfony/security-acl": "~2.7|~3.0.0",
2525
"symfony/polyfill-apcu": "~1.1",
26+
"symfony/polyfill-ctype": "~1.8",
2627
"symfony/polyfill-intl-icu": "~1.0",
2728
"symfony/polyfill-mbstring": "~1.0",
2829
"symfony/polyfill-php54": "~1.0",

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"require": {
1919
"php": ">=5.3.9",
2020
"doctrine/common": "~2.4",
21+
"symfony/polyfill-ctype": "~1.8",
2122
"symfony/polyfill-mbstring": "~1.0"
2223
},
2324
"require-dev": {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
"symfony/twig-bridge": "~2.7|~3.0.0",
2222
"symfony/http-foundation": "~2.5|~3.0.0",
2323
"symfony/http-kernel": "~2.7.23|^2.8.16",
24+
"symfony/polyfill-ctype": "~1.8",
2425
"twig/twig": "~1.34|~2.4"
2526
},
2627
"require-dev": {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
],
1818
"require": {
1919
"php": ">=5.3.9",
20-
"symfony/filesystem": "~2.3|~3.0.0"
20+
"symfony/filesystem": "~2.3|~3.0.0",
21+
"symfony/polyfill-ctype": "~1.8"
2122
},
2223
"require-dev": {
2324
"symfony/yaml": "~2.7|~3.0.0"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
],
1818
"require": {
1919
"php": ">=5.3.9",
20+
"symfony/polyfill-ctype": "~1.8",
2021
"symfony/polyfill-mbstring": "~1.0"
2122
},
2223
"require-dev": {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
}
1717
],
1818
"require": {
19-
"php": ">=5.3.9"
19+
"php": ">=5.3.9",
20+
"symfony/polyfill-ctype": "~1.8"
2021
},
2122
"autoload": {
2223
"psr-4": { "Symfony\\Component\\Filesystem\\": "" },

‎src/Symfony/Component/Form/FormRegistry.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class FormRegistry implements FormRegistryInterface
3030
private $extensions = array();
3131

3232
/**
33-
* @var FormTypeInterface[]
33+
* @var ResolvedFormTypeInterface[]
3434
*/
3535
private $types = array();
3636

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"symfony/event-dispatcher": "~2.1|~3.0.0",
2121
"symfony/intl": "~2.7.25|^2.8.18|~3.2.5",
2222
"symfony/options-resolver": "~2.6",
23+
"symfony/polyfill-ctype": "~1.8",
2324
"symfony/polyfill-mbstring": "~1.0",
2425
"symfony/property-access": "~2.3|~3.0.0"
2526
},

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"symfony/event-dispatcher": "^2.6.7|~3.0.0",
2121
"symfony/http-foundation": "~2.7.36|~2.8.29|~3.1.6",
2222
"symfony/debug": "^2.6.2",
23+
"symfony/polyfill-ctype": "~1.8",
2324
"psr/log": "~1.0"
2425
},
2526
"require-dev": {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
}
1717
],
1818
"require": {
19-
"php": ">=5.3.9"
19+
"php": ">=5.3.9",
20+
"symfony/polyfill-ctype": "~1.8"
2021
},
2122
"autoload": {
2223
"psr-4": { "Symfony\\Component\\PropertyAccess\\": "" },

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
],
1818
"require": {
1919
"php": ">=5.3.9",
20+
"symfony/polyfill-ctype": "~1.8",
2021
"symfony/polyfill-php55": "~1.0"
2122
},
2223
"require-dev": {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
}
1717
],
1818
"require": {
19-
"php": ">=5.3.9"
19+
"php": ">=5.3.9",
20+
"symfony/polyfill-ctype": "~1.8"
2021
},
2122
"require-dev": {
2223
"psr/log": "~1.0"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
],
1818
"require": {
1919
"php": ">=5.3.9",
20+
"symfony/polyfill-ctype": "~1.8",
2021
"symfony/polyfill-mbstring": "~1.0",
2122
"symfony/translation": "~2.4|~3.0.0"
2223
},

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
}
1717
],
1818
"require": {
19-
"php": ">=5.3.9"
19+
"php": ">=5.3.9",
20+
"symfony/polyfill-ctype": "~1.8"
2021
},
2122
"autoload": {
2223
"psr-4": { "Symfony\\Component\\Yaml\\": "" },

0 commit comments

Comments
 (0)
0