Merge branch '3.3' into 3.4

fabpot · fabpot · commit 6fc5a29021ca · 2017-09-11T13:45:17.000-07:00
* 3.3:
  [CS] Apply phpdoc_annotation_without_dot
  bumped Symfony version to 3.3.10
  updated VERSION for 3.3.9
  updated CHANGELOG for 3.3.9
  [DomCrawler] Fix conversion to int on GetPhpFiles
  Remove `protected_to_private` rule.
  Filtering empty uuids in ORMQueryBuilderLoader.
diff --git a/Data/Bundle/Compiler/GenrbCompiler.php b/Data/Bundle/Compiler/GenrbCompiler.php
@@ -34,7 +34,7 @@ class GenrbCompiler implements BundleCompilerInterface
      * @param string $envVars Optional. Environment variables to be loaded when
      *                        running "genrb".
      *
-     * @throws RuntimeException If the "genrb" cannot be found.
+     * @throws RuntimeException if the "genrb" cannot be found
      */
     public function __construct($genrb = 'genrb', $envVars = '')
     {
diff --git a/Data/Bundle/Reader/BufferedBundleReader.php b/Data/Bundle/Reader/BufferedBundleReader.php
@@ -31,8 +31,8 @@ class BufferedBundleReader implements BundleReaderInterface
      * Buffers a given reader.
      *
      * @param BundleReaderInterface $reader     The reader to buffer
-     * @param int                   $bufferSize The number of entries to store
-     *                                          in the buffer.
+     * @param int                   $bufferSize the number of entries to store
+     *                                          in the buffer
      */
     public function __construct(BundleReaderInterface $reader, $bufferSize)
     {
diff --git a/Data/Bundle/Reader/BundleEntryReaderInterface.php b/Data/Bundle/Reader/BundleEntryReaderInterface.php
@@ -46,8 +46,8 @@ interface BundleEntryReaderInterface extends BundleReaderInterface
      *                           (i.e. array or \ArrayAccess) or cannot be found
      *                           in the requested locale.
      *
-     * @return mixed Returns an array or {@link \ArrayAccess} instance for
-     *               complex data and a scalar value for simple data.
+     * @return mixed returns an array or {@link \ArrayAccess} instance for
+     *               complex data and a scalar value for simple data
      *
      * @throws MissingResourceException If the indices cannot be accessed
      */
diff --git a/Data/Bundle/Reader/BundleReaderInterface.php b/Data/Bundle/Reader/BundleReaderInterface.php
@@ -26,8 +26,8 @@ interface BundleReaderInterface
      * @param string $path   The path to the resource bundle
      * @param string $locale The locale to read
      *
-     * @return mixed Returns an array or {@link \ArrayAccess} instance for
-     *               complex data, a scalar value otherwise.
+     * @return mixed returns an array or {@link \ArrayAccess} instance for
+     *               complex data, a scalar value otherwise
      */
     public function read($path, $locale);
 }
diff --git a/Data/Bundle/Writer/TextBundleWriter.php b/Data/Bundle/Writer/TextBundleWriter.php
@@ -46,8 +46,8 @@ public function write($path, $locale, $data, $fallback = true)
      * @param resource $file       The file handle to write to
      * @param string   $bundleName The name of the bundle
      * @param mixed    $value      The value of the node
-     * @param bool     $fallback   Whether the resource bundle should be merged
-     *                             with the fallback locale.
+     * @param bool     $fallback   whether the resource bundle should be merged
+     *                             with the fallback locale
      *
      * @see http://source.icu-project.org/repos/icu/icuhtml/trunk/design/bnf_rb.txt
      */
@@ -66,8 +66,8 @@ private function writeResourceBundle($file, $bundleName, $value, $fallback)
      * @param resource $file          The file handle to write to
      * @param mixed    $value         The value of the node
      * @param int      $indentation   The number of levels to indent
-     * @param bool     $requireBraces Whether to require braces to be printed
-     *                                around the value.
+     * @param bool     $requireBraces whether to require braces to be printed
+     *                                around the value
      *
      * @see http://source.icu-project.org/repos/icu/icuhtml/trunk/design/bnf_rb.txt
      */
@@ -153,8 +153,8 @@ private function writeIntVector($file, array $value, $indentation)
      *
      * @param resource $file          The file handle to write to
      * @param string   $value         The value of the node
-     * @param bool     $requireBraces Whether to require braces to be printed
-     *                                around the value.
+     * @param bool     $requireBraces whether to require braces to be printed
+     *                                around the value
      *
      * @see http://source.icu-project.org/repos/icu/icuhtml/trunk/design/bnf_rb.txt
      */
@@ -199,11 +199,11 @@ private function writeArray($file, array $value, $indentation)
      * @param resource           $file        The file handle to write to
      * @param array|\Traversable $value       The value of the node
      * @param int                $indentation The number of levels to indent
-     * @param bool               $fallback    Whether the table should be merged
-     *                                        with the fallback locale.
+     * @param bool               $fallback    whether the table should be merged
+     *                                        with the fallback locale
      *
-     * @throws UnexpectedTypeException When $value is not an array and not a
-     *                                 \Traversable instance.
+     * @throws UnexpectedTypeException when $value is not an array and not a
+     *                                 \Traversable instance
      */
     private function writeTable($file, $value, $indentation, $fallback = true)
     {
diff --git a/DateFormatter/IntlDateFormatter.php b/DateFormatter/IntlDateFormatter.php
@@ -169,8 +169,8 @@ public function __construct($locale, $datetype, $timetype, $timezone = null, $ca
      * @param int    $datetype Type of date formatting, one of the format type constants
      * @param int    $timetype Type of time formatting, one of the format type constants
      * @param string $timezone Timezone identifier
-     * @param int    $calendar Calendar to use for formatting or parsing; default is Gregorian
-     *                         One of the calendar constants.
+     * @param int    $calendar calendar to use for formatting or parsing; default is Gregorian
+     *                         One of the calendar constants
      * @param string $pattern  Optional pattern to use when formatting
      *
      * @return self
@@ -519,7 +519,7 @@ public function setPattern($pattern)
     /**
      * Set the formatter's timezone identifier.
      *
-     * @param string $timeZoneId The time zone ID string of the time zone to use
+     * @param string $timeZoneId The time zone ID string of the time zone to use.
      *                           If NULL or the empty string, the default time zone for the
      *                           runtime is used.
      *
diff --git a/NumberFormatter/NumberFormatter.php b/NumberFormatter/NumberFormatter.php
@@ -260,7 +260,7 @@ class NumberFormatter
      * Constructor.
      *
      * @param string $locale  The locale code. The only currently supported locale is "en" (or null using the default locale, i.e. "en")
-     * @param int    $style   Style of the formatting, one of the format style constants
+     * @param int    $style   Style of the formatting, one of the format style constants.
      *                        The only supported styles are NumberFormatter::DECIMAL
      *                        and NumberFormatter::CURRENCY.
      * @param string $pattern Not supported. A pattern string in case $style is NumberFormat::PATTERN_DECIMAL or
@@ -297,7 +297,7 @@ public function __construct($locale = 'en', $style = null, $pattern = null)
      * Static constructor.
      *
      * @param string $locale  The locale code. The only supported locale is "en" (or null using the default locale, i.e. "en")
-     * @param int    $style   Style of the formatting, one of the format style constants
+     * @param int    $style   Style of the formatting, one of the format style constants.
      *                        The only currently supported styles are NumberFormatter::DECIMAL
      *                        and NumberFormatter::CURRENCY.
      * @param string $pattern Not supported. A pattern string in case $style is NumberFormat::PATTERN_DECIMAL or
@@ -357,8 +357,8 @@ public function formatCurrency($value, $currency)
     /**
      * Format a number.
      *
-     * @param int|float $value The value to format
-     * @param int       $type  Type of the formatting, one of the format type constants
+     * @param int|float $value the value to format
+     * @param int       $type  Type of the formatting, one of the format type constants.
      *                         Only type NumberFormatter::TYPE_DEFAULT is currently supported.
      *
      * @return bool|string The formatted value or false on error
@@ -518,9 +518,9 @@ public function parseCurrency($value, &$currency, &$position = null)
     /**
      * Parse a number.
      *
-     * @param string $value    The value to parse
-     * @param int    $type     Type of the formatting, one of the format type constants. NumberFormatter::TYPE_DOUBLE by default
-     * @param int    $position Offset to begin the parsing on return this value will hold the offset at which the parsing ended
+     * @param string $value    the value to parse
+     * @param int    $type     Type of the formatting, one of the format type constants. NumberFormatter::TYPE_DOUBLE by default.
+     * @param int    $position offset to begin the parsing on return this value will hold the offset at which the parsing ended
      *
      * @return int|float|false The parsed value of false on error
      *
@@ -568,10 +568,10 @@ public function parse($value, $type = self::TYPE_DOUBLE, &$position = 0)
     /**
      * Set an attribute.
      *
-     * @param int $attr  An attribute specifier, one of the numeric attribute constants
+     * @param int $attr  An attribute specifier, one of the numeric attribute constants.
      *                   The only currently supported attributes are NumberFormatter::FRACTION_DIGITS,
      *                   NumberFormatter::GROUPING_USED and NumberFormatter::ROUNDING_MODE.
-     * @param int $value The attribute value
+     * @param int $value the attribute value
      *
      * @return bool true on success or false on failure
      *
diff --git a/Util/IcuVersion.php b/Util/IcuVersion.php
@@ -84,8 +84,8 @@ public static function compare($version1, $version2, $operator, $precision = nul
      * @param int|null $precision The number of components to include. Pass
      *                            NULL to return the version unchanged.
      *
-     * @return string|null The normalized ICU version or NULL if it couldn't be
-     *                     normalized.
+     * @return string|null the normalized ICU version or NULL if it couldn't be
+     *                     normalized
      */
     public static function normalize($version, $precision)
     {
diff --git a/Util/SvnCommit.php b/Util/SvnCommit.php
@@ -26,8 +26,8 @@ class SvnCommit
     /**
      * Creates a commit from the given "svn info" data.
      *
-     * @param \SimpleXMLElement $svnInfo The XML result from the "svn info"
-     *                                   command.
+     * @param \SimpleXMLElement $svnInfo the XML result from the "svn info"
+     *                                   command
      */
     public function __construct(\SimpleXMLElement $svnInfo)
     {
diff --git a/Util/SvnRepository.php b/Util/SvnRepository.php
@@ -44,7 +44,7 @@ class SvnRepository
      *
      * @return static
      *
-     * @throws RuntimeException If an error occurs during the download.
+     * @throws RuntimeException if an error occurs during the download
      */
     public static function download($url, $targetDir)
     {
@@ -119,7 +119,7 @@ public function getLastCommit()
      *
      * @return \SimpleXMLElement The XML result from the "svn info" command
      *
-     * @throws RuntimeException If the "svn info" command failed.
+     * @throws RuntimeException if the "svn info" command failed
      */
     private function getSvnInfo()
     {
diff --git a/Util/Version.php b/Util/Version.php
@@ -67,8 +67,8 @@ public static function compare($version1, $version2, $operator, $precision = nul
      * @param int|null $precision The number of components to include. Pass
      *                            NULL to return the version unchanged.
      *
-     * @return string|null The normalized version or NULL if it couldn't be
-     *                     normalized.
+     * @return string|null the normalized version or NULL if it couldn't be
+     *                     normalized
      */
     public static function normalize($version, $precision)
     {

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ class GenrbCompiler implements BundleCompilerInterface`
`34`	`34`	`* @param string $envVars Optional. Environment variables to be loaded when`
`35`	`35`	`* running "genrb".`
`36`	`36`	`*`
`37`		`- * @throws RuntimeException If the "genrb" cannot be found.`
	`37`	`+ * @throws RuntimeException if the "genrb" cannot be found`
`38`	`38`	`*/`
`39`	`39`	`public function __construct($genrb = 'genrb', $envVars = '')`
`40`	`40`	`{`
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,8 @@ class BufferedBundleReader implements BundleReaderInterface`
`31`	`31`	`* Buffers a given reader.`
`32`	`32`	`*`
`33`	`33`	`* @param BundleReaderInterface $reader The reader to buffer`
`34`		`- * @param int $bufferSize The number of entries to store`
`35`		`- * in the buffer.`
	`34`	`+ * @param int $bufferSize the number of entries to store`
	`35`	`+ * in the buffer`
`36`	`36`	`*/`
`37`	`37`	`public function __construct(BundleReaderInterface $reader, $bufferSize)`
`38`	`38`	`{`
Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,8 @@ interface BundleEntryReaderInterface extends BundleReaderInterface`
`46`	`46`	`* (i.e. array or \ArrayAccess) or cannot be found`
`47`	`47`	`* in the requested locale.`
`48`	`48`	`*`
`49`		`- * @return mixed Returns an array or {@link \ArrayAccess} instance for`
`50`		`- * complex data and a scalar value for simple data.`
	`49`	`+ * @return mixed returns an array or {@link \ArrayAccess} instance for`
	`50`	`+ * complex data and a scalar value for simple data`
`51`	`51`	`*`
`52`	`52`	`* @throws MissingResourceException If the indices cannot be accessed`
`53`	`53`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,8 @@ interface BundleReaderInterface`
`26`	`26`	`* @param string $path The path to the resource bundle`
`27`	`27`	`* @param string $locale The locale to read`
`28`	`28`	`*`
`29`		`- * @return mixed Returns an array or {@link \ArrayAccess} instance for`
`30`		`- * complex data, a scalar value otherwise.`
	`29`	`+ * @return mixed returns an array or {@link \ArrayAccess} instance for`
	`30`	`+ * complex data, a scalar value otherwise`
`31`	`31`	`*/`
`32`	`32`	`public function read($path, $locale);`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -169,8 +169,8 @@ public function __construct($locale, $datetype, $timetype, $timezone = null, $ca`
`169`	`169`	`* @param int $datetype Type of date formatting, one of the format type constants`
`170`	`170`	`* @param int $timetype Type of time formatting, one of the format type constants`
`171`	`171`	`* @param string $timezone Timezone identifier`
`172`		`- * @param int $calendar Calendar to use for formatting or parsing; default is Gregorian`
`173`		`- * One of the calendar constants.`
	`172`	`+ * @param int $calendar calendar to use for formatting or parsing; default is Gregorian`
	`173`	`+ * One of the calendar constants`
`174`	`174`	`* @param string $pattern Optional pattern to use when formatting`
`175`	`175`	`*`
`176`	`176`	`* @return self`
`@@ -519,7 +519,7 @@ public function setPattern($pattern)`
`519`	`519`	`/**`
`520`	`520`	`* Set the formatter's timezone identifier.`
`521`	`521`	`*`
`522`		`- * @param string $timeZoneId The time zone ID string of the time zone to use`
	`522`	`+ * @param string $timeZoneId The time zone ID string of the time zone to use.`
`523`	`523`	`* If NULL or the empty string, the default time zone for the`
`524`	`524`	`* runtime is used.`
`525`	`525`	`*`
Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,7 @@ class NumberFormatter`
`260`	`260`	`* Constructor.`
`261`	`261`	`*`
`262`	`262`	`* @param string $locale The locale code. The only currently supported locale is "en" (or null using the default locale, i.e. "en")`
`263`		`- * @param int $style Style of the formatting, one of the format style constants`
	`263`	`+ * @param int $style Style of the formatting, one of the format style constants.`
`264`	`264`	`* The only supported styles are NumberFormatter::DECIMAL`
`265`	`265`	`* and NumberFormatter::CURRENCY.`
`266`	`266`	`* @param string $pattern Not supported. A pattern string in case $style is NumberFormat::PATTERN_DECIMAL or`
`@@ -297,7 +297,7 @@ public function __construct($locale = 'en', $style = null, $pattern = null)`
`297`	`297`	`* Static constructor.`
`298`	`298`	`*`
`299`	`299`	`* @param string $locale The locale code. The only supported locale is "en" (or null using the default locale, i.e. "en")`
`300`		`- * @param int $style Style of the formatting, one of the format style constants`
	`300`	`+ * @param int $style Style of the formatting, one of the format style constants.`
`301`	`301`	`* The only currently supported styles are NumberFormatter::DECIMAL`
`302`	`302`	`* and NumberFormatter::CURRENCY.`
`303`	`303`	`* @param string $pattern Not supported. A pattern string in case $style is NumberFormat::PATTERN_DECIMAL or`
`@@ -357,8 +357,8 @@ public function formatCurrency($value, $currency)`
`357`	`357`	`/**`
`358`	`358`	`* Format a number.`
`359`	`359`	`*`
`360`		`- * @param int\|float $value The value to format`
`361`		`- * @param int $type Type of the formatting, one of the format type constants`
	`360`	`+ * @param int\|float $value the value to format`
	`361`	`+ * @param int $type Type of the formatting, one of the format type constants.`
`362`	`362`	`* Only type NumberFormatter::TYPE_DEFAULT is currently supported.`
`363`	`363`	`*`
`364`	`364`	`* @return bool\|string The formatted value or false on error`
`@@ -518,9 +518,9 @@ public function parseCurrency($value, &$currency, &$position = null)`
`518`	`518`	`/**`
`519`	`519`	`* Parse a number.`
`520`	`520`	`*`
`521`		`- * @param string $value The value to parse`
`522`		`- * @param int $type Type of the formatting, one of the format type constants. NumberFormatter::TYPE_DOUBLE by default`
`523`		`- * @param int $position Offset to begin the parsing on return this value will hold the offset at which the parsing ended`
	`521`	`+ * @param string $value the value to parse`
	`522`	`+ * @param int $type Type of the formatting, one of the format type constants. NumberFormatter::TYPE_DOUBLE by default.`
	`523`	`+ * @param int $position offset to begin the parsing on return this value will hold the offset at which the parsing ended`
`524`	`524`	`*`
`525`	`525`	`* @return int\|float\|false The parsed value of false on error`
`526`	`526`	`*`
`@@ -568,10 +568,10 @@ public function parse($value, $type = self::TYPE_DOUBLE, &$position = 0)`
`568`	`568`	`/**`
`569`	`569`	`* Set an attribute.`
`570`	`570`	`*`
`571`		`- * @param int $attr An attribute specifier, one of the numeric attribute constants`
	`571`	`+ * @param int $attr An attribute specifier, one of the numeric attribute constants.`
`572`	`572`	`* The only currently supported attributes are NumberFormatter::FRACTION_DIGITS,`
`573`	`573`	`* NumberFormatter::GROUPING_USED and NumberFormatter::ROUNDING_MODE.`
`574`		`- * @param int $value The attribute value`
	`574`	`+ * @param int $value the attribute value`
`575`	`575`	`*`
`576`	`576`	`* @return bool true on success or false on failure`
`577`	`577`	`*`
Original file line number	Diff line number	Diff line change
`@@ -84,8 +84,8 @@ public static function compare($version1, $version2, $operator, $precision = nul`
`84`	`84`	`* @param int\|null $precision The number of components to include. Pass`
`85`	`85`	`* NULL to return the version unchanged.`
`86`	`86`	`*`
`87`		`- * @return string\|null The normalized ICU version or NULL if it couldn't be`
`88`		`- * normalized.`
	`87`	`+ * @return string\|null the normalized ICU version or NULL if it couldn't be`
	`88`	`+ * normalized`
`89`	`89`	`*/`
`90`	`90`	`public static function normalize($version, $precision)`
`91`	`91`	`{`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,8 @@ class SvnCommit`
`26`	`26`	`/**`
`27`	`27`	`* Creates a commit from the given "svn info" data.`
`28`	`28`	`*`
`29`		`- * @param \SimpleXMLElement $svnInfo The XML result from the "svn info"`
`30`		`- * command.`
	`29`	`+ * @param \SimpleXMLElement $svnInfo the XML result from the "svn info"`
	`30`	`+ * command`
`31`	`31`	`*/`
`32`	`32`	`public function __construct(\SimpleXMLElement $svnInfo)`
`33`	`33`	`{`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ class SvnRepository`
`44`	`44`	`*`
`45`	`45`	`* @return static`
`46`	`46`	`*`
`47`		`- * @throws RuntimeException If an error occurs during the download.`
	`47`	`+ * @throws RuntimeException if an error occurs during the download`
`48`	`48`	`*/`
`49`	`49`	`public static function download($url, $targetDir)`
`50`	`50`	`{`
`@@ -119,7 +119,7 @@ public function getLastCommit()`
`119`	`119`	`*`
`120`	`120`	`* @return \SimpleXMLElement The XML result from the "svn info" command`
`121`	`121`	`*`
`122`		`- * @throws RuntimeException If the "svn info" command failed.`
	`122`	`+ * @throws RuntimeException if the "svn info" command failed`
`123`	`123`	`*/`
`124`	`124`	`private function getSvnInfo()`
`125`	`125`	`{`