Skip to content

Commit c6ed032

Browse files
fabpotfabpot
committed
Merge branch '2.7' into 2.8
* 2.7: [CS] Apply phpdoc_annotation_without_dot
2 parents a64a5fe + c0b0a31 commit c6ed032

File tree

11 files changed

+37
-37
lines changed

11 files changed

+37
-37
lines changed

‎Data/Bundle/Compiler/GenrbCompiler.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class GenrbCompiler implements BundleCompilerInterface
3434
* @param string $envVars Optional. Environment variables to be loaded when
3535
* running "genrb".
3636
*
37-
* @throws RuntimeException If the "genrb" cannot be found.
37+
* @throws RuntimeException if the "genrb" cannot be found
3838
*/
3939
public function __construct($genrb = 'genrb', $envVars = '')
4040
{

‎Data/Bundle/Reader/BufferedBundleReader.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ class BufferedBundleReader implements BundleReaderInterface
3131
* Buffers a given reader.
3232
*
3333
* @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
3636
*/
3737
public function __construct(BundleReaderInterface $reader, $bufferSize)
3838
{

‎Data/Bundle/Reader/BundleEntryReaderInterface.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ interface BundleEntryReaderInterface extends BundleReaderInterface
4646
* (i.e. array or \ArrayAccess) or cannot be found
4747
* in the requested locale.
4848
*
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
5151
*
5252
* @throws MissingResourceException If the indices cannot be accessed
5353
*/

‎Data/Bundle/Reader/BundleReaderInterface.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ interface BundleReaderInterface
2626
* @param string $path The path to the resource bundle
2727
* @param string $locale The locale to read
2828
*
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
3131
*/
3232
public function read($path, $locale);
3333
}

‎Data/Bundle/Writer/TextBundleWriter.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ public function write($path, $locale, $data, $fallback = true)
4646
* @param resource $file The file handle to write to
4747
* @param string $bundleName The name of the bundle
4848
* @param mixed $value The value of the node
49-
* @param bool $fallback Whether the resource bundle should be merged
50-
* with the fallback locale.
49+
* @param bool $fallback whether the resource bundle should be merged
50+
* with the fallback locale
5151
*
5252
* @see http://source.icu-project.org/repos/icu/icuhtml/trunk/design/bnf_rb.txt
5353
*/
@@ -66,8 +66,8 @@ private function writeResourceBundle($file, $bundleName, $value, $fallback)
6666
* @param resource $file The file handle to write to
6767
* @param mixed $value The value of the node
6868
* @param int $indentation The number of levels to indent
69-
* @param bool $requireBraces Whether to require braces to be printed
70-
* around the value.
69+
* @param bool $requireBraces whether to require braces to be printed
70+
* around the value
7171
*
7272
* @see http://source.icu-project.org/repos/icu/icuhtml/trunk/design/bnf_rb.txt
7373
*/
@@ -153,8 +153,8 @@ private function writeIntVector($file, array $value, $indentation)
153153
*
154154
* @param resource $file The file handle to write to
155155
* @param string $value The value of the node
156-
* @param bool $requireBraces Whether to require braces to be printed
157-
* around the value.
156+
* @param bool $requireBraces whether to require braces to be printed
157+
* around the value
158158
*
159159
* @see http://source.icu-project.org/repos/icu/icuhtml/trunk/design/bnf_rb.txt
160160
*/
@@ -199,11 +199,11 @@ private function writeArray($file, array $value, $indentation)
199199
* @param resource $file The file handle to write to
200200
* @param array|\Traversable $value The value of the node
201201
* @param int $indentation The number of levels to indent
202-
* @param bool $fallback Whether the table should be merged
203-
* with the fallback locale.
202+
* @param bool $fallback whether the table should be merged
203+
* with the fallback locale
204204
*
205-
* @throws UnexpectedTypeException When $value is not an array and not a
206-
* \Traversable instance.
205+
* @throws UnexpectedTypeException when $value is not an array and not a
206+
* \Traversable instance
207207
*/
208208
private function writeTable($file, $value, $indentation, $fallback = true)
209209
{

‎DateFormatter/IntlDateFormatter.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,8 @@ public function __construct($locale, $datetype, $timetype, $timezone = null, $ca
169169
* @param int $datetype Type of date formatting, one of the format type constants
170170
* @param int $timetype Type of time formatting, one of the format type constants
171171
* @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
174174
* @param string $pattern Optional pattern to use when formatting
175175
*
176176
* @return self
@@ -526,7 +526,7 @@ public function setPattern($pattern)
526526
/**
527527
* Set the formatter's timezone identifier.
528528
*
529-
* @param string $timeZoneId The time zone ID string of the time zone to use
529+
* @param string $timeZoneId The time zone ID string of the time zone to use.
530530
* If NULL or the empty string, the default time zone for the
531531
* runtime is used.
532532
*

‎NumberFormatter/NumberFormatter.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ class NumberFormatter
260260
* Constructor.
261261
*
262262
* @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.
264264
* The only supported styles are NumberFormatter::DECIMAL
265265
* and NumberFormatter::CURRENCY.
266266
* @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)
297297
* Static constructor.
298298
*
299299
* @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.
301301
* The only currently supported styles are NumberFormatter::DECIMAL
302302
* and NumberFormatter::CURRENCY.
303303
* @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)
357357
/**
358358
* Format a number.
359359
*
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.
362362
* Only type NumberFormatter::TYPE_DEFAULT is currently supported.
363363
*
364364
* @return bool|string The formatted value or false on error
@@ -518,9 +518,9 @@ public function parseCurrency($value, &$currency, &$position = null)
518518
/**
519519
* Parse a number.
520520
*
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
524524
*
525525
* @return int|float|false The parsed value of false on error
526526
*
@@ -568,10 +568,10 @@ public function parse($value, $type = self::TYPE_DOUBLE, &$position = 0)
568568
/**
569569
* Set an attribute.
570570
*
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.
572572
* The only currently supported attributes are NumberFormatter::FRACTION_DIGITS,
573573
* NumberFormatter::GROUPING_USED and NumberFormatter::ROUNDING_MODE.
574-
* @param int $value The attribute value
574+
* @param int $value the attribute value
575575
*
576576
* @return bool true on success or false on failure
577577
*

‎Util/IcuVersion.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ public static function compare($version1, $version2, $operator, $precision = nul
8484
* @param int|null $precision The number of components to include. Pass
8585
* NULL to return the version unchanged.
8686
*
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
8989
*/
9090
public static function normalize($version, $precision)
9191
{

‎Util/SvnCommit.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ class SvnCommit
2626
/**
2727
* Creates a commit from the given "svn info" data.
2828
*
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
3131
*/
3232
public function __construct(\SimpleXMLElement $svnInfo)
3333
{

‎Util/SvnRepository.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class SvnRepository
4444
*
4545
* @return static
4646
*
47-
* @throws RuntimeException If an error occurs during the download.
47+
* @throws RuntimeException if an error occurs during the download
4848
*/
4949
public static function download($url, $targetDir)
5050
{
@@ -119,7 +119,7 @@ public function getLastCommit()
119119
*
120120
* @return \SimpleXMLElement The XML result from the "svn info" command
121121
*
122-
* @throws RuntimeException If the "svn info" command failed.
122+
* @throws RuntimeException if the "svn info" command failed
123123
*/
124124
private function getSvnInfo()
125125
{

0 commit comments

Comments
 (0)