Merge branch '3.4' into 4.0

nicolas-grekas · nicolas-grekas · commit a488d555ffe1 · 2018-05-01T16:00:51.000-07:00
* 3.4:
  Remove symfony/polyfill-ctype where not needed
  Use symfony/polyfill-ctype
  [Form] fixes instance variable phpdoc in FormRegistry class
  bumped Symfony version to 3.4.10
  updated VERSION for 3.4.9
  updated CHANGELOG for 3.4.9
  Add CODE_OF_CONDUCT.md
  Added .github/CODEOWNERS
  bumped Symfony version to 2.8.40
  updated VERSION for 2.8.39
  updated CHANGELOG for 2.8.39
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -0,0 +1,14 @@
+# LDAP
+/src/Symfony/Component/Ldap/* @csarrazi
+# Lock
+/src/Symfony/Component/Lock/* @jderusse
+# Messenger
+/src/Symfony/Bridge/Doctrine/Messenger/* @sroze
+/src/Symfony/Component/Messenger/* @sroze
+# Workflow
+/src/Symfony/Bridge/Twig/Extension/WorkflowExtension.php @lyrixx
+/src/Symfony/Bridge/Twig/Tests/Extension/WorkflowExtensionTest.php @lyrixx
+/src/Symfony/Bundle/FrameworkBundle/Command/WorkflowDumpCommand.php @lyrixx
+/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ValidateWorkflowsPass.php @lyrixx
+/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/WorkflowGuardListenerPass.php @lyrixx
+/src/Symfony/Component/Workflow/* @lyrixx
diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md
@@ -0,0 +1,8 @@
+# Code of Conduct
+
+This project follows a [Code of Conduct][code_of_conduct] in order to ensure an open and welcoming environment.
+Please read the full text for understanding the accepted and unaccepted behavior.
+Please read also the [reporting guidelines][guidelines], in case you encountered or witnessed any misbehavior.
+
+[code_of_conduct]: https://symfony.com/doc/current/contributing/code_of_conduct/index.html
+[guidelines]: https://symfony.com/doc/current/contributing/code_of_conduct/reporting_guidelines.html
diff --git a/composer.json b/composer.json
@@ -26,6 +26,7 @@
         "psr/link": "^1.0",
         "psr/log": "~1.0",
         "psr/simple-cache": "^1.0",
+        "symfony/polyfill-ctype": "~1.8",
         "symfony/polyfill-intl-icu": "~1.0",
         "symfony/polyfill-mbstring": "~1.0",
         "symfony/polyfill-php72": "~1.5"
diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
@@ -18,6 +18,7 @@
     "require": {
         "php": "^7.1.3",
         "doctrine/common": "~2.4",
+        "symfony/polyfill-ctype": "~1.8",
         "symfony/polyfill-mbstring": "~1.0"
     },
     "require-dev": {
diff --git a/src/Symfony/Bundle/TwigBundle/composer.json b/src/Symfony/Bundle/TwigBundle/composer.json
@@ -21,6 +21,7 @@
         "symfony/twig-bridge": "^3.4.3|^4.0.3",
         "symfony/http-foundation": "~3.4|~4.0",
         "symfony/http-kernel": "~3.4|~4.0",
+        "symfony/polyfill-ctype": "~1.8",
         "twig/twig": "~1.34|~2.4"
     },
     "require-dev": {
diff --git a/src/Symfony/Bundle/WebServerBundle/composer.json b/src/Symfony/Bundle/WebServerBundle/composer.json
@@ -21,6 +21,7 @@
         "symfony/console": "~3.4|~4.0",
         "symfony/dependency-injection": "~3.4|~4.0",
         "symfony/http-kernel": "~3.4|~4.0",
+        "symfony/polyfill-ctype": "~1.8",
         "symfony/process": "^3.4.2|^4.0.2"
     },
     "autoload": {
diff --git a/src/Symfony/Component/Config/composer.json b/src/Symfony/Component/Config/composer.json
@@ -17,7 +17,8 @@
     ],
     "require": {
         "php": "^7.1.3",
-        "symfony/filesystem": "~3.4|~4.0"
+        "symfony/filesystem": "~3.4|~4.0",
+        "symfony/polyfill-ctype": "~1.8"
     },
     "require-dev": {
         "symfony/dependency-injection": "~3.4|~4.0",
diff --git a/src/Symfony/Component/DomCrawler/composer.json b/src/Symfony/Component/DomCrawler/composer.json
@@ -17,6 +17,7 @@
     ],
     "require": {
         "php": "^7.1.3",
+        "symfony/polyfill-ctype": "~1.8",
         "symfony/polyfill-mbstring": "~1.0"
     },
     "require-dev": {
diff --git a/src/Symfony/Component/Filesystem/composer.json b/src/Symfony/Component/Filesystem/composer.json
@@ -16,7 +16,8 @@
         }
     ],
     "require": {
-        "php": "^7.1.3"
+        "php": "^7.1.3",
+        "symfony/polyfill-ctype": "~1.8"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Filesystem\\": "" },
diff --git a/src/Symfony/Component/Form/FormRegistry.php b/src/Symfony/Component/Form/FormRegistry.php
@@ -31,7 +31,7 @@ class FormRegistry implements FormRegistryInterface
     private $extensions = array();
 
     /**
-     * @var FormTypeInterface[]
+     * @var ResolvedFormTypeInterface[]
      */
     private $types = array();
 
diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json
@@ -20,6 +20,7 @@
         "symfony/event-dispatcher": "~3.4|~4.0",
         "symfony/intl": "~3.4|~4.0",
         "symfony/options-resolver": "~3.4|~4.0",
+        "symfony/polyfill-ctype": "~1.8",
         "symfony/polyfill-mbstring": "~1.0",
         "symfony/property-access": "~3.4|~4.0"
     },
diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json
@@ -20,6 +20,7 @@
         "symfony/event-dispatcher": "~3.4|~4.0",
         "symfony/http-foundation": "~3.4.4|~4.0.4",
         "symfony/debug": "~3.4|~4.0",
+        "symfony/polyfill-ctype": "~1.8",
         "psr/log": "~1.0"
     },
     "require-dev": {
diff --git a/src/Symfony/Component/Inflector/composer.json b/src/Symfony/Component/Inflector/composer.json
@@ -23,7 +23,8 @@
         }
     ],
     "require": {
-        "php": "^7.1.3"
+        "php": "^7.1.3",
+        "symfony/polyfill-ctype": "~1.8"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Inflector\\": "" },
diff --git a/src/Symfony/Component/Serializer/composer.json b/src/Symfony/Component/Serializer/composer.json
@@ -16,7 +16,8 @@
         }
     ],
     "require": {
-        "php": "^7.1.3"
+        "php": "^7.1.3",
+        "symfony/polyfill-ctype": "~1.8"
     },
     "require-dev": {
         "symfony/yaml": "~3.4|~4.0",
diff --git a/src/Symfony/Component/Templating/composer.json b/src/Symfony/Component/Templating/composer.json
@@ -16,7 +16,8 @@
         }
     ],
     "require": {
-        "php": "^7.1.3"
+        "php": "^7.1.3",
+        "symfony/polyfill-ctype": "~1.8"
     },
     "require-dev": {
         "psr/log": "~1.0"
diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json
@@ -17,6 +17,7 @@
     ],
     "require": {
         "php": "^7.1.3",
+        "symfony/polyfill-ctype": "~1.8",
         "symfony/polyfill-mbstring": "~1.0",
         "symfony/translation": "~3.4|~4.0"
     },
diff --git a/src/Symfony/Component/Yaml/composer.json b/src/Symfony/Component/Yaml/composer.json
@@ -16,7 +16,8 @@
         }
     ],
     "require": {
-        "php": "^7.1.3"
+        "php": "^7.1.3",
+        "symfony/polyfill-ctype": "~1.8"
     },
     "require-dev": {
         "symfony/console": "~3.4|~4.0"
