8000 Merge branch '2.8' into 3.4 · symfony/symfony@80670fc · GitHub
[go: up one dir, main page]
Skip to content

Commit 80670fc

Browse files
fabpotfabpot
committed
Merge branch '2.8' into 3.4
* 2.8: fixed CS [CS] Enable phpdoc_types_order
2 parents 68e54f0 + 70f0ed6 commit 80670fc

File tree

10 files changed

+29
-27
lines changed

10 files changed

+29
-27
lines changed

‎.php_cs.dist

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ return PhpCsFixer\Config::create()
1616
'protected_to_private' => false,
1717
// Part of @Symfony:risky in PHP-CS-Fixer 2.13.0. To be removed from the config file once upgrading
1818
'native_function_invocation' => array('include' => array('@compiler_optimized'), 'scope' => 'namespaced'),
19+
// Part of future @Symfony ruleset in PHP-CS-Fixer To be removed from the config file once upgrading
20+
'phpdoc_types_order' => array('null_adjustment' => 'always_last', 'sort_algorithm' => 'none'),
1921
))
2022
->setRiskyAllowed(true)
2123
->setFinder(

‎src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ public function __construct(ContainerInterface $container)
4141
*
4242
* @param string $eventName The name of the event to dispatch. The name of the event is
4343
* the name of the method that is invoked on listeners.
44-
* @param EventArgs $eventArgs The event arguments to pass to the event handlers/listeners.
45-
* If not supplied, the single empty EventArgs instance is used.
44+
* @param EventArgs $eventArgs the event arguments to pass to the event handlers/listeners.
45+
* If not supplied, the single empty EventArgs instance is used
4646
*
4747
* @return bool
4848
*/

‎src/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ public function __construct(ContainerInterface $container)
5656
* @param string $eventName Event for which the listener is added
5757
* @param array $callback The service ID of the listener service & the method
5858
* name that has to be called
59-
* @param int $priority The higher this value, the earlier an event listener
59+
* @param int $priority the higher this value, the earlier an event listener
6060
* will be triggered in the chain.
61-
* Defaults to 0.
61+
* Defaults to 0
6262
*
6363
* @throws \InvalidArgumentException
6464
*/

‎src/Symfony/Component/Form/FormConfigBuilderInterface.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,10 +257,10 @@ public function setRequestHandler(RequestHandlerInterface $requestHandler);
257257
*
258258
* Should be set to true only for root forms.
259259
*
260-
* @param bool $initialize True to initialize the form automatically,
260+
* @param bool $initialize true to initialize the form automatically,
261261
* false to suppress automatic initialization.
262262
* In the second case, you need to call
263-
* {@link FormInterface::initialize()} manually.
263+
* {@link FormInterface::initialize()} manually
264264
*
265265
* @return $this The configuration object
266266
*/

‎src/Symfony/Component/Form/FormInterface.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,9 @@ public function getData();
127127
/**
128128
* Returns the normalized data of the field.
129129
*
130-
* @return mixed When the field is not submitted, the default data is returned.
130+
* @return mixed when the field is not submitted, the default data is returned.
131131
* When the field is submitted, the normalized submitted data is
132-
* returned if the field is valid, null otherwise.
132+
* returned if the field is valid, null otherwise
133133
*/
134134
public function getNormData();
135135

‎src/Symfony/Component/Form/FormRendererEngineInterface.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ public function setTheme(FormView $view, $themes /*, $useDefaultThemes = true */
3838
* The type of the resource is decided by the implementation. The resource
3939
* is later passed to {@link renderBlock()} by the rendering algorithm.
4040
*
41-
* @param FormView $view The view for determining the used themes.
41+
* @param FormView $view the view for determining the used themes.
4242
* First the themes attached directly to the
4343
* view with {@link setTheme()} are considered,
44-
* then the ones of its parent etc.
44+
* then the ones of its parent etc
4545
* @param string $blockName The name of the block to render
4646
*
4747
* @return mixed the renderer resource or false, if none was found
@@ -70,10 +70,10 @@ public function getResourceForBlockName(FormView $view, $blockName);
7070
* The type of the resource is decided by the implementation. The resource
7171
* is later passed to {@link renderBlock()} by the rendering algorithm.
7272
*
73-
* @param FormView $view The view for determining the used themes.
73+
* @param FormView $view the view for determining the used themes.
7474
* First the themes attached directly to
7575
* the view with {@link setTheme()} are
76-
* considered, then the ones of its parent etc.
76+
* considered, then the ones of its parent etc
7777
* @param array $blockNameHierarchy The block name hierarchy, with the root block
7878
* at the beginning
7979
* @param int $hierarchyLevel The level in the hierarchy at which to start
@@ -108,10 +108,10 @@ public function getResourceForBlockNameHierarchy(FormView $view, array $blockNam
108108
* The type of the resource is decided by the implementation. The resource
109109
* is later passed to {@link renderBlock()} by the rendering algorithm.
110110
*
111-
* @param FormView $view The view for determining the used themes.
111+
* @param FormView $view the view for determining the used themes.
112112
* First the themes attached directly to
113113
* the view with {@link setTheme()} are
114-
* considered, then the ones of its parent etc.
114+
* considered, then the ones of its parent etc
115115
* @param array $blockNameHierarchy The block name hierarchy, with the root block
116116
* at the beginning
117117
* @param int $hierarchyLevel The level in the hierarchy at which to start

‎src/Symfony/Component/Form/Util/OrderedHashMapIterator.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@ class OrderedHashMapIterator implements \Iterator
6262
* keys
6363
* @param array $orderedKeys The keys of the map in the order in which
6464
* they should be iterated
65-
* @param array $managedCursors An array from which to reference the
65+
* @param array $managedCursors an array from which to reference the
6666
* iterator's cursor as long as it is alive.
6767
* This array is managed by the corresponding
6868
* {@link OrderedHashMap} instance to support
69-
* recognizing the deletion of elements.
69+
* recognizing the deletion of elements
7070
*/
7171
public function __construct(array &$elements, array &$orderedKeys, array &$managedCursors)
7272
{

‎src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeFileSessionHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
class NativeFileSessionHandler extends NativeSessionHandler
2020
{
2121
/**
22-
* @param string $savePath Path of directory to save session files
22+
* @param string $savePath path of directory to save session files
2323
* Default null will leave setting as defined by PHP.
2424
* '/path', 'N;/path', or 'N;octal-mode;/path
2525
*

‎src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -506,9 +506,9 @@ public function setPattern($pattern)
506506
/**
507507
* Set the formatter's timezone identifier.
508508
*
509-
* @param string $timeZoneId The time zone ID string of the time zone to use.
509+
* @param string $timeZoneId the time zone ID string of the time zone to use.
510510
* If NULL or the empty string, the default time zone for the
511-
* runtime is used.
511+
* runtime is used
512512
*
513513
* @return bool true on success or false on failure
514514
*

‎src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -242,9 +242,9 @@ class NumberFormatter
242242

243243
/**
244244
* @param string $locale The locale code. The only currently supported locale is "en" (or null using the default locale, i.e. "en")
245-
* @param int $style Style of the formatting, one of the format style constants.
245+
* @param int $style style of the formatting, one of the format style constants.
246246
* The only supported styles are NumberFormatter::DECIMAL
247-
* and NumberFormatter::CURRENCY.
247+
* and NumberFormatter::CURRENCY
248248
* @param string $pattern Not supported. A pattern string in case $style is NumberFormat::PATTERN_DECIMAL or
249249
* NumberFormat::PATTERN_RULEBASED. It must conform to the syntax
250250
* described in the ICU DecimalFormat or ICU RuleBasedNumberFormat documentation
@@ -279,9 +279,9 @@ public function __construct($locale = 'en', $style = null, $pattern = null)
279279
* Static constructor.
280280
*
281281
* @param string $locale The locale code. The only supported locale is "en" (or null using the default locale, i.e. "en")
282-
* @param int $style Style of the formatting, one of the format style constants.
282+
* @param int $style style of the formatting, one of the format style constants.
283283
* The only currently supported styles are NumberFormatter::DECIMAL
284-
* and NumberFormatter::CURRENCY.
284+
* and NumberFormatter::CURRENCY
285285
* @param string $pattern Not supported. A pattern string in case $style is NumberFormat::PATTERN_DECIMAL or
286286
* NumberFormat::PATTERN_RULEBASED. It must conform to the syntax
287287
* described in the ICU DecimalFormat or ICU RuleBasedNumberFormat documentation
@@ -340,8 +340,8 @@ public function formatCurrency($value, $currency)
340340
* Format a number.
341341
*
342342
* @param int|float $value The value to format
343-
* @param int $type Type of the formatting, one of the format type constants.
344-
* Only type NumberFormatter::TYPE_DEFAULT is currently supported.
343+
* @param int $type type of the formatting, one of the format type constants.
344+
* Only type NumberFormatter::TYPE_DEFAULT is currently supported
345345
*
346346
* @return bool|string The formatted value or false on error
347347
*
@@ -547,9 +547,9 @@ public function parse($value, $type = self::TYPE_DOUBLE, &$position = 0)
547547
/**
548548
* Set an attribute.
549549
*
550-
* @param int $attr An attribute specifier, one of the numeric attribute constants.
550+
* @param int $attr an attribute specifier, one of the numeric attribute constants.
551551
* The only currently supported attributes are NumberFormatter::FRACTION_DIGITS,
552-
* NumberFormatter::GROUPING_USED and NumberFormatter::ROUNDING_MODE.
552+
* NumberFormatter::GROUPING_USED and NumberFormatter::ROUNDING_MODE
553553
* @param int $value The attribute value
554554
*
555555
* @return bool true on success or false on failure

0 commit comments

Comments
 (0)
0