diff --git a/.php_cs.dist b/.php_cs.dist index c3210d84d8..ebeb4150d8 100644 --- a/.php_cs.dist +++ b/.php_cs.dist @@ -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( diff --git a/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php b/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php index 20aaae85a1..cff62ebed9 100644 --- a/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php +++ b/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php @@ -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 */ diff --git a/src/Symfony/Component/Dotenv/Tests/DotenvTest.php b/src/Symfony/Component/Dotenv/Tests/DotenvTest.php index 81e1b25a4c..3ea80d68c8 100644 --- a/src/Symfony/Component/Dotenv/Tests/DotenvTest.php +++ b/src/Symfony/Component/Dotenv/Tests/DotenvTest.php @@ -171,7 +171,7 @@ class DotenvTest extends TestCase file_put_contents($path1, 'FOO=BAR'); file_put_contents($path2, 'BAR=BAZ'); - (new DotEnv())->load($path1, $path2); + (new Dotenv())->load($path1, $path2); $foo = getenv('FOO'); $bar = getenv('BAR'); @@ -234,7 +234,7 @@ class DotenvTest extends TestCase { $originalValue = $_SERVER['argc']; - $dotenv = new DotEnv(); + $dotenv = new Dotenv(); $dotenv->populate(array('argc' => 'new_value')); $this->assertSame($originalValue, $_SERVER['argc']); @@ -245,7 +245,7 @@ class DotenvTest extends TestCase putenv('TEST_ENV_VAR=original_value'); $_SERVER['TEST_ENV_VAR'] = 'original_value'; - $dotenv = new DotEnv(); + $dotenv = new Dotenv(); $dotenv->populate(array('TEST_ENV_VAR' => 'new_value')); $this->assertSame('original_value', getenv('TEST_ENV_VAR')); @@ -255,7 +255,7 @@ class DotenvTest extends TestCase { $_SERVER['HTTP_TEST_ENV_VAR'] = 'http_value'; - $dotenv = new DotEnv(); + $dotenv = new Dotenv(); $dotenv->populate(array('HTTP_TEST_ENV_VAR' => 'env_value')); $this->assertSame('env_value', getenv('HTTP_TEST_ENV_VAR')); @@ -289,7 +289,7 @@ class DotenvTest extends TestCase unset($_SERVER['DATABASE_URL']); putenv('DATABASE_URL'); - $dotenv = new DotEnv(); + $dotenv = new Dotenv(); $dotenv->populate(array('APP_DEBUG' => '1', 'DATABASE_URL' => 'mysql://root@localhost/db')); $this->assertSame('APP_DEBUG,DATABASE_URL', getenv('SYMFONY_DOTENV_VARS')); @@ -306,7 +306,7 @@ class DotenvTest extends TestCase unset($_SERVER['DATABASE_URL']); putenv('DATABASE_URL'); - $dotenv = new DotEnv(); + $dotenv = new Dotenv(); $dotenv->populate(array('APP_DEBUG' => '0', 'DATABASE_URL' => 'mysql://root@localhost/db')); $dotenv->populate(array('DATABASE_URL' => 'sqlite:///somedb.sqlite')); @@ -322,7 +322,7 @@ class DotenvTest extends TestCase putenv('BAZ=baz'); putenv('DOCUMENT_ROOT=/var/www'); - $dotenv = new DotEnv(); + $dotenv = new Dotenv(); $dotenv->populate(array('FOO' => 'foo1', 'BAR' => 'bar1', 'BAZ' => 'baz1', 'DOCUMENT_ROOT' => '/boot')); $this->assertSame('foo1', getenv('FOO')); diff --git a/src/Symfony/Component/Form/FormConfigBuilderInterface.php b/src/Symfony/Component/Form/FormConfigBuilderInterface.php index f422840a82..8c95590f93 100644 --- a/src/Symfony/Component/Form/FormConfigBuilderInterface.php +++ b/src/Symfony/Component/Form/FormConfigBuilderInterface.php @@ -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 */ diff --git a/src/Symfony/Component/Form/FormInterface.php b/src/Symfony/Component/Form/FormInterface.php index a0e9b636c5..5e29cd1f58 100644 --- a/src/Symfony/Component/Form/FormInterface.php +++ b/src/Symfony/Component/Form/FormInterface.php @@ -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(); diff --git a/src/Symfony/Component/Form/FormRendererEngineInterface.php b/src/Symfony/Component/Form/FormRendererEngineInterface.php index a6906538f9..26a02f3422 100644 --- a/src/Symfony/Component/Form/FormRendererEngineInterface.php +++ b/src/Symfony/Component/Form/FormRendererEngineInterface.php @@ -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 diff --git a/src/Symfony/Component/Form/Util/OrderedHashMapIterator.php b/src/Symfony/Component/Form/Util/OrderedHashMapIterator.php index 3de636392d..757dc74359 100644 --- a/src/Symfony/Component/Form/Util/OrderedHashMapIterator.php +++ b/src/Symfony/Component/Form/Util/OrderedHashMapIterator.php @@ -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) { diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeFileSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeFileSessionHandler.php index f962965a82..89d5f2744e 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeFileSessionHandler.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeFileSessionHandler.php @@ -19,7 +19,7 @@ namespace Symfony\Component\HttpFoundation\Session\Storage\Handler; class NativeFileSessionHandler extends \SessionHandler { /** - * @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 * diff --git a/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php b/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php index d303d6b33a..e713701fc7 100644 --- a/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php +++ b/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php @@ -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 * diff --git a/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php b/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php index 8b37414f96..a6d3b6ea57 100644 --- a/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php +++ b/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php @@ -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