Merge branch '3.1'

fabpot · fabpot · commit ba5807105e4f · 2016-06-29T07:43:10.000+02:00
* 3.1: fixed CS fixed CS fixed CS fixed form tests [Console] Fix formatting of SymfonyStyle::comment() [Form] fix post max size translation type extension for >= 2.8 [Security] Allow LDAP loadUser override removed dots at the end of @param and @return fixed typo
diff --git a/DeprecationErrorHandler.php b/DeprecationErrorHandler.php
@@ -33,7 +33,7 @@ class DeprecationErrorHandler
      * - use a number to define the upper bound of allowed deprecations,
      *   making the test suite fail whenever more notices are trigerred.
      *
-     * @param int|string|false $mode The reporting mode. Defaults to not allowing any deprecations.
+     * @param int|string|false $mode The reporting mode, defaults to not allowing any deprecations
      */
     public static function register($mode = 0)
     {
diff --git a/DnsMock.php b/DnsMock.php
@@ -35,7 +35,7 @@ class DnsMock
     /**
      * Configures the mock values for DNS queries.
      *
-     * @param array $hosts Mocked hosts as keys, arrays of DNS records as returned by dns_get_record() as values.
+     * @param array $hosts Mocked hosts as keys, arrays of DNS records as returned by dns_get_record() as values
      */
     public static function withMockedHosts(array $hosts)
     {
diff --git a/SymfonyTestsListener.php b/SymfonyTestsListener.php
@@ -27,7 +27,7 @@ class SymfonyTestsListener extends \PHPUnit_Framework_BaseTestListener
     private $isSkipped = array();
 
     /**
-     * @param array $mockedNamespaces List of namespaces, indexed by mocked features (time-sensitive or dns-sensitive).
+     * @param array $mockedNamespaces List of namespaces, indexed by mocked features (time-sensitive or dns-sensitive)
      */
     public function __construct(array $mockedNamespaces = array())
     {

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ class DeprecationErrorHandler`
`33`	`33`	`* - use a number to define the upper bound of allowed deprecations,`
`34`	`34`	`* making the test suite fail whenever more notices are trigerred.`
`35`	`35`	`*`
`36`		`- * @param int\|string\|false $mode The reporting mode. Defaults to not allowing any deprecations.`
	`36`	`+ * @param int\|string\|false $mode The reporting mode, defaults to not allowing any deprecations`
`37`	`37`	`*/`
`38`	`38`	`public static function register($mode = 0)`
`39`	`39`	`{`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ class DnsMock`
`35`	`35`	`/**`
`36`	`36`	`* Configures the mock values for DNS queries.`
`37`	`37`	`*`
`38`		`- * @param array $hosts Mocked hosts as keys, arrays of DNS records as returned by dns_get_record() as values.`
	`38`	`+ * @param array $hosts Mocked hosts as keys, arrays of DNS records as returned by dns_get_record() as values`
`39`	`39`	`*/`
`40`	`40`	`public static function withMockedHosts(array $hosts)`
`41`	`41`	`{`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ class SymfonyTestsListener extends \PHPUnit_Framework_BaseTestListener`
`27`	`27`	`private $isSkipped = array();`
`28`	`28`
`29`	`29`	`/**`
`30`		`- * @param array $mockedNamespaces List of namespaces, indexed by mocked features (time-sensitive or dns-sensitive).`
	`30`	`+ * @param array $mockedNamespaces List of namespaces, indexed by mocked features (time-sensitive or dns-sensitive)`
`31`	`31`	`*/`
`32`	`32`	`public function __construct(array $mockedNamespaces = array())`
`33`	`33`	`{`