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

Commit e525248

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

File tree

15 files changed

+21
-7
lines changed

15 files changed

+21
-7
lines changed

‎composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
"psr/log": "~1.0",
2828
"psr/simple-cache": "^1.0",
2929
"symfony/polyfill-apcu": "~1.1",
30+
"symfony/polyfill-ctype": "~1.8",
3031
"symfony/polyfill-intl-icu": "~1.0",
3132
"symfony/polyfill-mbstring": "~1.0",
3233
"symfony/polyfill-php56": "~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.5.9|>=7.0.8",
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": "^3.4.3|^4.0.3",
2222
"symfony/http-foundation": "~2.8|~3.0|~4.0",
2323
"symfony/http-kernel": "^3.3|~4.0",
24+
"symfony/polyfill-ctype": "~1.8",
2425
"twig/twig": "~1.34|~2.4"
2526
},
2627
"require-dev": {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
"symfony/console": "~3.4|~4.0",
2222
"symfony/dependency-injection": "~3.4|~4.0",
2323
"symfony/http-kernel": "~3.3|~4.0",
24+
"symfony/polyfill-ctype": "~1.8",
2425
"symfony/process": "~3.3.14|^3.4.2|^4.0.2"
2526
},
2627
"autoload": {

‎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.5.9|>=7.0.8",
20-
"symfony/filesystem": "~2.8|~3.0|~4.0"
20+
"symfony/filesystem": "~2.8|~3.0|~4.0",
21+
"symfony/polyfill-ctype": "~1.8"
2122
},
2223
"require-dev": {
2324
"symfony/finder": "~3.3|~4.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.5.9|>=7.0.8",
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.5.9|>=7.0.8"
19+
"php": "^5.5.9|>=7.0.8",
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
@@ -31,7 +31,7 @@ class FormRegistry implements FormRegistryInterface
3131
private $extensions = array();
3232

3333
/**
34-
* @var FormTypeInterface[]
34+
* @var ResolvedFormTypeInterface[]
3535
*/
3636
private $types = array();
3737

‎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.8|~3.0|~4.0",
2121
"symfony/intl": "^2.8.18|^3.2.5|~4.0",
2222
"symfony/options-resolver": "~3.4|~4.0",
23+
"symfony/polyfill-ctype": "~1.8",
2324
"symfony/polyfill-mbstring": "~1.0",
2425
"symfony/property-access": "~2.8|~3.0|~4.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.8|~3.0|~4.0",
2121
"symfony/http-foundation": "^3.4.4|^4.0.4",
2222
"symfony/debug": "~2.8|~3.0|~4.0",
23+
"symfony/polyfill-ctype": "~1.8",
2324
"psr/log": "~1.0"
2425
},
2526
"require-dev": {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
}
2424
],
2525
"require": {
26-
"php": "^5.5.9|>=7.0.8"
26+
"php": "^5.5.9|>=7.0.8",
27+
"symfony/polyfill-ctype": "~1.8"
2728
},
2829
"autoload": {
2930
"psr-4": { "Symfony\\Component\\Inflector\\": "" },

‎src/Symfony/Component/Serializer/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.5.9|>=7.0.8"
19+
"php": "^5.5.9|>=7.0.8",
20+
"symfony/polyfill-ctype": "~1.8"
2021
},
2122
"require-dev": {
2223
"symfony/yaml": "~3.4|~4.0",

‎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.5.9|>=7.0.8"
19+
"php": "^5.5.9|>=7.0.8",
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.5.9|>=7.0.8",
20+
"symfony/polyfill-ctype": "~1.8",
2021
"symfony/polyfill-mbstring": "~1.0",
2122
"symfony/translation": "~2.8|~3.0|~4.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.5.9|>=7.0.8"
19+
"php": "^5.5.9|>=7.0.8",
20+
"symfony/polyfill-ctype": "~1.8"
2021
},
2122
"require-dev": {
2223
"symfony/console": "~3.4|~4.0"

0 commit comments

Comments
 (0)
0