diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.8' into 3.4 

* 2.8:
  fixed CS
  [CS] Enable phpdoc_types_order
This commit is contained in:
Fabien Potencier 2018-10-11 06:05:17 -07:00
parent 68e54f01cc 70f0ed6a6a
commit 80670fc0a7
10 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.php_cs.dist
View File

@ -16,6 +16,8 @@ return PhpCsFixer\Config::create()
'protected_to_private' => false,
// Part of @Symfony:risky in PHP-CS-Fixer 2.13.0. To be removed from the config file once upgrading
'native_function_invocation' => array('include' => array('@compiler_optimized'), 'scope' => 'namespaced'),
// Part of future @Symfony ruleset in PHP-CS-Fixer To be removed from the config file once upgrading
'phpdoc_types_order' => array('null_adjustment' => 'always_last', 'sort_algorithm' => 'none'),
))
->setRiskyAllowed(true)
->setFinder(

4
src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php
View File

@ -41,8 +41,8 @@ class ContainerAwareEventManager extends EventManager
*
* @param string $eventName The name of the event to dispatch. The name of the event is
* the name of the method that is invoked on listeners.
* @param EventArgs $eventArgs The event arguments to pass to the event handlers/listeners.
* If not supplied, the single empty EventArgs instance is used.
* @param EventArgs $eventArgs the event arguments to pass to the event handlers/listeners.
* If not supplied, the single empty EventArgs instance is used
*
* @return bool
*/

4
src/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php
View File

@ -56,9 +56,9 @@ class ContainerAwareEventDispatcher extends EventDispatcher
* @param string $eventName Event for which the listener is added
* @param array $callback The service ID of the listener service & the method
* name that has to be called
* @param int $priority The higher this value, the earlier an event listener
* @param int $priority the higher this value, the earlier an event listener
* will be triggered in the chain.
* Defaults to 0.
* Defaults to 0
*
* @throws \InvalidArgumentException
*/

4
src/Symfony/Component/Form/FormConfigBuilderInterface.php
View File

@ -257,10 +257,10 @@ interface FormConfigBuilderInterface extends FormConfigInterface
*
* Should be set to true only for root forms.
*
* @param bool $initialize True to initialize the form automatically,
* @param bool $initialize true to initialize the form automatically,
* false to suppress automatic initialization.
* In the second case, you need to call
* {@link FormInterface::initialize()} manually.
* {@link FormInterface::initialize()} manually
*
* @return $this The configuration object
*/

4
src/Symfony/Component/Form/FormInterface.php
View File

@ -127,9 +127,9 @@ interface FormInterface extends \ArrayAccess, \Traversable, \Countable
/**
* Returns the normalized data of the field.
*
* @return mixed When the field is not submitted, the default data is returned.
* @return mixed when the field is not submitted, the default data is returned.
* When the field is submitted, the normalized submitted data is
* returned if the field is valid, null otherwise.
* returned if the field is valid, null otherwise
*/
public function getNormData();

12
src/Symfony/Component/Form/FormRendererEngineInterface.php
View File

@ -38,10 +38,10 @@ interface FormRendererEngineInterface
* The type of the resource is decided by the implementation. The resource
* is later passed to {@link renderBlock()} by the rendering algorithm.
*
* @param FormView $view The view for determining the used themes.
* @param FormView $view the view for determining the used themes.
* First the themes attached directly to the
* view with {@link setTheme()} are considered,
* then the ones of its parent etc.
* then the ones of its parent etc
* @param string $blockName The name of the block to render
*
* @return mixed the renderer resource or false, if none was found
@ -70,10 +70,10 @@ interface FormRendererEngineInterface
* The type of the resource is decided by the implementation. The resource
* is later passed to {@link renderBlock()} by the rendering algorithm.
*
* @param FormView $view The view for determining the used themes.
* @param FormView $view the view for determining the used themes.
* First the themes attached directly to
* the view with {@link setTheme()} are
* considered, then the ones of its parent etc.
* considered, then the ones of its parent etc
* @param array $blockNameHierarchy The block name hierarchy, with the root block
* at the beginning
* @param int $hierarchyLevel The level in the hierarchy at which to start
@ -108,10 +108,10 @@ interface FormRendererEngineInterface
* The type of the resource is decided by the implementation. The resource
* is later passed to {@link renderBlock()} by the rendering algorithm.
*
* @param FormView $view The view for determining the used themes.
* @param FormView $view the view for determining the used themes.
* First the themes attached directly to
* the view with {@link setTheme()} are
* considered, then the ones of its parent etc.
* considered, then the ones of its parent etc
* @param array $blockNameHierarchy The block name hierarchy, with the root block
* at the beginning
* @param int $hierarchyLevel The level in the hierarchy at which to start

4
src/Symfony/Component/Form/Util/OrderedHashMapIterator.php
View File

@ -62,11 +62,11 @@ class OrderedHashMapIterator implements \Iterator
* keys
* @param array $orderedKeys The keys of the map in the order in which
* they should be iterated
* @param array $managedCursors An array from which to reference the
* @param array $managedCursors an array from which to reference the
* iterator's cursor as long as it is alive.
* This array is managed by the corresponding
* {@link OrderedHashMap} instance to support
* recognizing the deletion of elements.
* recognizing the deletion of elements
*/
public function __construct(array &$elements, array &$orderedKeys, array &$managedCursors)
{

2
src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeFileSessionHandler.php
View File

@ -19,7 +19,7 @@ namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
class NativeFileSessionHandler extends NativeSessionHandler
{
/**
* @param string $savePath Path of directory to save session files
* @param string $savePath path of directory to save session files
* Default null will leave setting as defined by PHP.
* '/path', 'N;/path', or 'N;octal-mode;/path
*

4
src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php
View File

@ -506,9 +506,9 @@ class IntlDateFormatter
/**
* 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.
* runtime is used
*
* @return bool true on success or false on failure
*

16
src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
View File

@ -242,9 +242,9 @@ class NumberFormatter
/**
* @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.
* and NumberFormatter::CURRENCY
* @param string $pattern Not supported. A pattern string in case $style is NumberFormat::PATTERN_DECIMAL or
* NumberFormat::PATTERN_RULEBASED. It must conform to the syntax
* described in the ICU DecimalFormat or ICU RuleBasedNumberFormat documentation
@ -279,9 +279,9 @@ class NumberFormatter
* 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.
* and NumberFormatter::CURRENCY
* @param string $pattern Not supported. A pattern string in case $style is NumberFormat::PATTERN_DECIMAL or
* NumberFormat::PATTERN_RULEBASED. It must conform to the syntax
* described in the ICU DecimalFormat or ICU RuleBasedNumberFormat documentation
@ -340,8 +340,8 @@ class NumberFormatter
* Format a number.
*
* @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.
* @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
*
@ -547,9 +547,9 @@ class NumberFormatter
/**
* 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.
* NumberFormatter::GROUPING_USED and NumberFormatter::ROUNDING_MODE
* @param int $value The attribute value
*
* @return bool true on success or false on failure