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

composer.json

@@ -23,6 +23,7 @@
         "psr/log": "~1.0",
         "symfony/security-acl": "~2.7|~3.0.0",
         "symfony/polyfill-apcu": "~1.1",
+        "symfony/polyfill-ctype": "~1.8",
         "symfony/polyfill-intl-icu": "~1.0",
         "symfony/polyfill-mbstring": "~1.0",
         "symfony/polyfill-php54": "~1.0",

src/Symfony/Bridge/Doctrine/composer.json

@@ -18,6 +18,7 @@
     "require": {
         "php": ">=5.3.9",
         "doctrine/common": "~2.4",
+        "symfony/polyfill-ctype": "~1.8",
         "symfony/polyfill-mbstring": "~1.0"
     },
     "require-dev": {

src/Symfony/Bundle/TwigBundle/composer.json

@@ -21,6 +21,7 @@
         "symfony/twig-bridge": "~2.7|~3.0.0",
         "symfony/http-foundation": "~2.5|~3.0.0",
         "symfony/http-kernel": "~2.7.23|^2.8.16",
+        "symfony/polyfill-ctype": "~1.8",
         "twig/twig": "~1.34|~2.4"
     },
     "require-dev": {

src/Symfony/Component/Config/composer.json

@@ -17,7 +17,8 @@
     ],
     "require": {
         "php": ">=5.3.9",
-        "symfony/filesystem": "~2.3|~3.0.0"
+        "symfony/filesystem": "~2.3|~3.0.0",
+        "symfony/polyfill-ctype": "~1.8"
     },
     "require-dev": {
         "symfony/yaml": "~2.7|~3.0.0"

src/Symfony/Component/DomCrawler/composer.json

@@ -17,6 +17,7 @@
     ],
     "require": {
         "php": ">=5.3.9",
+        "symfony/polyfill-ctype": "~1.8",
         "symfony/polyfill-mbstring": "~1.0"
     },
     "require-dev": {

src/Symfony/Component/Filesystem/composer.json

@@ -16,7 +16,8 @@
         }
     ],
     "require": {
-        "php": ">=5.3.9"
+        "php": ">=5.3.9",
+        "symfony/polyfill-ctype": "~1.8"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Filesystem\\": "" },

src/Symfony/Component/Form/FormRegistry.php

@@ -30,7 +30,7 @@ class FormRegistry implements FormRegistryInterface
     private $extensions = array();
 
     /**
-     * @var FormTypeInterface[]
+     * @var ResolvedFormTypeInterface[]
      */
     private $types = array();
 

src/Symfony/Component/Form/composer.json

@@ -20,6 +20,7 @@
         "symfony/event-dispatcher": "~2.1|~3.0.0",
         "symfony/intl": "~2.7.25|^2.8.18|~3.2.5",
         "symfony/options-resolver": "~2.6",
+        "symfony/polyfill-ctype": "~1.8",
         "symfony/polyfill-mbstring": "~1.0",
         "symfony/property-access": "~2.3|~3.0.0"
     },

src/Symfony/Component/HttpKernel/composer.json

@@ -20,6 +20,7 @@
         "symfony/event-dispatcher": "^2.6.7|~3.0.0",
         "symfony/http-foundation": "~2.7.36|~2.8.29|~3.1.6",
         "symfony/debug": "^2.6.2",
+        "symfony/polyfill-ctype": "~1.8",
         "psr/log": "~1.0"
     },
     "require-dev": {

src/Symfony/Component/PropertyAccess/composer.json

@@ -16,7 +16,8 @@
         }
     ],
     "require": {
-        "php": ">=5.3.9"
+        "php": ">=5.3.9",
+        "symfony/polyfill-ctype": "~1.8"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\PropertyAccess\\": "" },

src/Symfony/Component/Serializer/composer.json

@@ -17,6 +17,7 @@
     ],
     "require": {
         "php": ">=5.3.9",
+        "symfony/polyfill-ctype": "~1.8",
         "symfony/polyfill-php55": "~1.0"
     },
     "require-dev": {

src/Symfony/Component/Templating/composer.json

@@ -16,7 +16,8 @@
         }
     ],
     "require": {
-        "php": ">=5.3.9"
+        "php": ">=5.3.9",
+        "symfony/polyfill-ctype": "~1.8"
     },
     "require-dev": {
         "psr/log": "~1.0"

src/Symfony/Component/Validator/composer.json

@@ -17,6 +17,7 @@
     ],
     "require": {
         "php": ">=5.3.9",
+        "symfony/polyfill-ctype": "~1.8",
         "symfony/polyfill-mbstring": "~1.0",
         "symfony/translation": "~2.4|~3.0.0"
     },

src/Symfony/Component/Yaml/composer.json

@@ -16,7 +16,8 @@
         }
     ],
     "require": {
-        "php": ">=5.3.9"
+        "php": ">=5.3.9",
+        "symfony/polyfill-ctype": "~1.8"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Yaml\\": "" },