Merge branch '4.1'
* 4.1: Class should be case sensitive fixed CS [CS] Enable phpdoc_types_order
This commit is contained in:
commit
dd67a450f7
@ -16,6 +16,8 @@ return PhpCsFixer\Config::create()
|
|||||||
'protected_to_private' => false,
|
'protected_to_private' => false,
|
||||||
// Part of @Symfony:risky in PHP-CS-Fixer 2.13.0. To be removed from the config file once upgrading
|
// 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'),
|
'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)
|
->setRiskyAllowed(true)
|
||||||
->setFinder(
|
->setFinder(
|
||||||
|
@ -41,8 +41,8 @@ class ContainerAwareEventManager extends EventManager
|
|||||||
*
|
*
|
||||||
* @param string $eventName The name of the event to dispatch. The name of the event is
|
* @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.
|
* the name of the method that is invoked on listeners.
|
||||||
* @param EventArgs $eventArgs The event arguments to pass to the event handlers/listeners.
|
* @param EventArgs $eventArgs the event arguments to pass to the event handlers/listeners.
|
||||||
* If not supplied, the single empty EventArgs instance is used.
|
* If not supplied, the single empty EventArgs instance is used
|
||||||
*
|
*
|
||||||
* @return bool
|
* @return bool
|
||||||
*/
|
*/
|
||||||
|
@ -171,7 +171,7 @@ class DotenvTest extends TestCase
|
|||||||
file_put_contents($path1, 'FOO=BAR');
|
file_put_contents($path1, 'FOO=BAR');
|
||||||
file_put_contents($path2, 'BAR=BAZ');
|
file_put_contents($path2, 'BAR=BAZ');
|
||||||
|
|
||||||
(new DotEnv())->load($path1, $path2);
|
(new Dotenv())->load($path1, $path2);
|
||||||
|
|
||||||
$foo = getenv('FOO');
|
$foo = getenv('FOO');
|
||||||
$bar = getenv('BAR');
|
$bar = getenv('BAR');
|
||||||
@ -234,7 +234,7 @@ class DotenvTest extends TestCase
|
|||||||
{
|
{
|
||||||
$originalValue = $_SERVER['argc'];
|
$originalValue = $_SERVER['argc'];
|
||||||
|
|
||||||
$dotenv = new DotEnv();
|
$dotenv = new Dotenv();
|
||||||
$dotenv->populate(array('argc' => 'new_value'));
|
$dotenv->populate(array('argc' => 'new_value'));
|
||||||
|
|
||||||
$this->assertSame($originalValue, $_SERVER['argc']);
|
$this->assertSame($originalValue, $_SERVER['argc']);
|
||||||
@ -245,7 +245,7 @@ class DotenvTest extends TestCase
|
|||||||
putenv('TEST_ENV_VAR=original_value');
|
putenv('TEST_ENV_VAR=original_value');
|
||||||
$_SERVER['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'));
|
$dotenv->populate(array('TEST_ENV_VAR' => 'new_value'));
|
||||||
|
|
||||||
$this->assertSame('original_value', getenv('TEST_ENV_VAR'));
|
$this->assertSame('original_value', getenv('TEST_ENV_VAR'));
|
||||||
@ -255,7 +255,7 @@ class DotenvTest extends TestCase
|
|||||||
{
|
{
|
||||||
$_SERVER['HTTP_TEST_ENV_VAR'] = 'http_value';
|
$_SERVER['HTTP_TEST_ENV_VAR'] = 'http_value';
|
||||||
|
|
||||||
$dotenv = new DotEnv();
|
$dotenv = new Dotenv();
|
||||||
$dotenv->populate(array('HTTP_TEST_ENV_VAR' => 'env_value'));
|
$dotenv->populate(array('HTTP_TEST_ENV_VAR' => 'env_value'));
|
||||||
|
|
||||||
$this->assertSame('env_value', getenv('HTTP_TEST_ENV_VAR'));
|
$this->assertSame('env_value', getenv('HTTP_TEST_ENV_VAR'));
|
||||||
@ -289,7 +289,7 @@ class DotenvTest extends TestCase
|
|||||||
unset($_SERVER['DATABASE_URL']);
|
unset($_SERVER['DATABASE_URL']);
|
||||||
putenv('DATABASE_URL');
|
putenv('DATABASE_URL');
|
||||||
|
|
||||||
$dotenv = new DotEnv();
|
$dotenv = new Dotenv();
|
||||||
$dotenv->populate(array('APP_DEBUG' => '1', 'DATABASE_URL' => 'mysql://root@localhost/db'));
|
$dotenv->populate(array('APP_DEBUG' => '1', 'DATABASE_URL' => 'mysql://root@localhost/db'));
|
||||||
|
|
||||||
$this->assertSame('APP_DEBUG,DATABASE_URL', getenv('SYMFONY_DOTENV_VARS'));
|
$this->assertSame('APP_DEBUG,DATABASE_URL', getenv('SYMFONY_DOTENV_VARS'));
|
||||||
@ -306,7 +306,7 @@ class DotenvTest extends TestCase
|
|||||||
unset($_SERVER['DATABASE_URL']);
|
unset($_SERVER['DATABASE_URL']);
|
||||||
putenv('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('APP_DEBUG' => '0', 'DATABASE_URL' => 'mysql://root@localhost/db'));
|
||||||
$dotenv->populate(array('DATABASE_URL' => 'sqlite:///somedb.sqlite'));
|
$dotenv->populate(array('DATABASE_URL' => 'sqlite:///somedb.sqlite'));
|
||||||
|
|
||||||
@ -322,7 +322,7 @@ class DotenvTest extends TestCase
|
|||||||
putenv('BAZ=baz');
|
putenv('BAZ=baz');
|
||||||
putenv('DOCUMENT_ROOT=/var/www');
|
putenv('DOCUMENT_ROOT=/var/www');
|
||||||
|
|
||||||
$dotenv = new DotEnv();
|
$dotenv = new Dotenv();
|
||||||
$dotenv->populate(array('FOO' => 'foo1', 'BAR' => 'bar1', 'BAZ' => 'baz1', 'DOCUMENT_ROOT' => '/boot'));
|
$dotenv->populate(array('FOO' => 'foo1', 'BAR' => 'bar1', 'BAZ' => 'baz1', 'DOCUMENT_ROOT' => '/boot'));
|
||||||
|
|
||||||
$this->assertSame('foo1', getenv('FOO'));
|
$this->assertSame('foo1', getenv('FOO'));
|
||||||
|
@ -257,10 +257,10 @@ interface FormConfigBuilderInterface extends FormConfigInterface
|
|||||||
*
|
*
|
||||||
* Should be set to true only for root forms.
|
* 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.
|
* false to suppress automatic initialization.
|
||||||
* In the second case, you need to call
|
* In the second case, you need to call
|
||||||
* {@link FormInterface::initialize()} manually.
|
* {@link FormInterface::initialize()} manually
|
||||||
*
|
*
|
||||||
* @return $this The configuration object
|
* @return $this The configuration object
|
||||||
*/
|
*/
|
||||||
|
@ -127,9 +127,9 @@ interface FormInterface extends \ArrayAccess, \Traversable, \Countable
|
|||||||
/**
|
/**
|
||||||
* Returns the normalized data of the field.
|
* 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
|
* 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();
|
public function getNormData();
|
||||||
|
|
||||||
|
@ -38,10 +38,10 @@ interface FormRendererEngineInterface
|
|||||||
* The type of the resource is decided by the implementation. The resource
|
* The type of the resource is decided by the implementation. The resource
|
||||||
* is later passed to {@link renderBlock()} by the rendering algorithm.
|
* 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
|
* First the themes attached directly to the
|
||||||
* view with {@link setTheme()} are considered,
|
* 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
|
* @param string $blockName The name of the block to render
|
||||||
*
|
*
|
||||||
* @return mixed the renderer resource or false, if none was found
|
* @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
|
* The type of the resource is decided by the implementation. The resource
|
||||||
* is later passed to {@link renderBlock()} by the rendering algorithm.
|
* 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
|
* First the themes attached directly to
|
||||||
* the view with {@link setTheme()} are
|
* 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
|
* @param array $blockNameHierarchy The block name hierarchy, with the root block
|
||||||
* at the beginning
|
* at the beginning
|
||||||
* @param int $hierarchyLevel The level in the hierarchy at which to start
|
* @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
|
* The type of the resource is decided by the implementation. The resource
|
||||||
* is later passed to {@link renderBlock()} by the rendering algorithm.
|
* 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
|
* First the themes attached directly to
|
||||||
* the view with {@link setTheme()} are
|
* 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
|
* @param array $blockNameHierarchy The block name hierarchy, with the root block
|
||||||
* at the beginning
|
* at the beginning
|
||||||
* @param int $hierarchyLevel The level in the hierarchy at which to start
|
* @param int $hierarchyLevel The level in the hierarchy at which to start
|
||||||
|
@ -62,11 +62,11 @@ class OrderedHashMapIterator implements \Iterator
|
|||||||
* keys
|
* keys
|
||||||
* @param array $orderedKeys The keys of the map in the order in which
|
* @param array $orderedKeys The keys of the map in the order in which
|
||||||
* they should be iterated
|
* 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.
|
* iterator's cursor as long as it is alive.
|
||||||
* This array is managed by the corresponding
|
* This array is managed by the corresponding
|
||||||
* {@link OrderedHashMap} instance to support
|
* {@link OrderedHashMap} instance to support
|
||||||
* recognizing the deletion of elements.
|
* recognizing the deletion of elements
|
||||||
*/
|
*/
|
||||||
public function __construct(array &$elements, array &$orderedKeys, array &$managedCursors)
|
public function __construct(array &$elements, array &$orderedKeys, array &$managedCursors)
|
||||||
{
|
{
|
||||||
|
@ -19,7 +19,7 @@ namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
|
|||||||
class NativeFileSessionHandler extends \SessionHandler
|
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.
|
* Default null will leave setting as defined by PHP.
|
||||||
* '/path', 'N;/path', or 'N;octal-mode;/path
|
* '/path', 'N;/path', or 'N;octal-mode;/path
|
||||||
*
|
*
|
||||||
|
@ -506,9 +506,9 @@ class IntlDateFormatter
|
|||||||
/**
|
/**
|
||||||
* Set the formatter's timezone identifier.
|
* 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
|
* 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
|
* @return bool true on success or false on failure
|
||||||
*
|
*
|
||||||
|
@ -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 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
|
* 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
|
* @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
|
* NumberFormat::PATTERN_RULEBASED. It must conform to the syntax
|
||||||
* described in the ICU DecimalFormat or ICU RuleBasedNumberFormat documentation
|
* described in the ICU DecimalFormat or ICU RuleBasedNumberFormat documentation
|
||||||
@ -279,9 +279,9 @@ class NumberFormatter
|
|||||||
* Static constructor.
|
* Static constructor.
|
||||||
*
|
*
|
||||||
* @param string $locale The locale code. The only supported locale is "en" (or null using the default locale, i.e. "en")
|
* @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
|
* 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
|
* @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
|
* NumberFormat::PATTERN_RULEBASED. It must conform to the syntax
|
||||||
* described in the ICU DecimalFormat or ICU RuleBasedNumberFormat documentation
|
* described in the ICU DecimalFormat or ICU RuleBasedNumberFormat documentation
|
||||||
@ -340,8 +340,8 @@ class NumberFormatter
|
|||||||
* Format a number.
|
* Format a number.
|
||||||
*
|
*
|
||||||
* @param int|float $value The value to format
|
* @param int|float $value The value to format
|
||||||
* @param int $type Type of the formatting, one of the format type constants.
|
* @param int $type type of the formatting, one of the format type constants.
|
||||||
* Only type NumberFormatter::TYPE_DEFAULT is currently supported.
|
* Only type NumberFormatter::TYPE_DEFAULT is currently supported
|
||||||
*
|
*
|
||||||
* @return bool|string The formatted value or false on error
|
* @return bool|string The formatted value or false on error
|
||||||
*
|
*
|
||||||
@ -547,9 +547,9 @@ class NumberFormatter
|
|||||||
/**
|
/**
|
||||||
* Set an attribute.
|
* 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,
|
* 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
|
* @param int $value The attribute value
|
||||||
*
|
*
|
||||||
* @return bool true on success or false on failure
|
* @return bool true on success or false on failure
|
||||||
|
Reference in New Issue
Block a user