Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 4236bd1

Browse files
fabpotfabpot
committed
Merge branch '2.3' into 2.4
* 2.3: made {@inheritdoc} annotations consistent across the board fixed types in phpdocs made phpdoc types consistent with those defined in Hack Add support Thai translations made types consistent with those defined in Hack removed extra/unsupported arguments [HttpKernel] fixed an error message [TwigBundle] removed undefined argument [Translation] Make IcuDatFileLoader/IcuResFileLoader::load invalid resource compatible with HHVM. Conflicts: src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service.php src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php src/Symfony/Component/Config/Definition/ReferenceDumper.php src/Symfony/Component/Console/Helper/DescriptorHelper.php src/Symfony/Component/Debug/ErrorHandler.php src/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php src/Symfony/Component/HttpFoundation/Response.php src/Symfony/Component/HttpFoundation/StreamedResponse.php src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php src/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php src/Symfony/Component/HttpKernel/Kernel.php src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php src/Symfony/Component/Stopwatch/StopwatchPeriod.php src/Symfony/Component/Translation/TranslatorInterface.php src/Symfony/Component/Validator/ConstraintValidatorFactory.php
2 parents ef20f1f + f662f0a commit 4236bd1

21 files changed

Lines changed: 69 additions & 69 deletions

‎Application.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -270,25 +270,25 @@ public function getHelp()
270270
/**
271271
* Sets whether to catch exceptions or not during commands execution.
272272
*
273-
* @param Boolean $boolean Whether to catch exceptions or not during commands execution
273+
* @param bool $boolean Whether to catch exceptions or not during commands execution
274274
*
275275
* @api
276276
*/
277277
public function setCatchExceptions($boolean)
278278
{
279-
$this->catchExceptions = (Boolean) $boolean;
279+
$this->catchExceptions = (bool) $boolean;
280280
}
281281

282282
/**
283283
* Sets whether to automatically exit after a command execution or not.
284284
*
285-
* @param Boolean $boolean Whether to automatically exit after a command execution or not
285+
* @param bool $boolean Whether to automatically exit after a command execution or not
286286
*
287287
* @api
288288
*/
289289
public function setAutoExit($boolean)
290290
{
291-
$this->autoExit = (Boolean) $boolean;
291+
$this->autoExit = (bool) $boolean;
292292
}
293293

294294
/**
@@ -633,7 +633,7 @@ public static function getAbbreviations($names)
633633
* Returns a text representation of the Application.
634634
*
635635
* @param string $namespace An optional namespace name
636-
* @param boolean $raw Whether to return raw command list
636+
* @param bool $raw Whether to return raw command list
637637
*
638638
* @return string A string representing the Application
639639
*
@@ -652,7 +652,7 @@ public function asText($namespace = null, $raw = false)
652652
* Returns an XML representation of the Application.
653653
*
654654
* @param string $namespace An optional namespace name
655-
* @param Boolean $asDom Whether to return a DOM or an XML string
655+
* @param bool $asDom Whether to return a DOM or an XML string
656656
*
657657
* @return string|\DOMDocument An XML string representing the Application
658658
*

‎Command/Command.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ public function setCode($code)
276276
*
277277
* This method is not part of public API and should not be used directly.
278278
*
279-
* @param Boolean $mergeArgs Whether to merge or not the Application definition arguments to Command definition arguments
279+
* @param bool $mergeArgs Whether to merge or not the Application definition arguments to Command definition arguments
280280
*/
281281
public function mergeApplicationDefinition($mergeArgs = true)
282282
{
@@ -351,7 +351,7 @@ public function getNativeDefinition()
351351
* Adds an argument.
352352
*
353353
* @param string $name The argument name
354-
* @param integer $mode The argument mode: InputArgument::REQUIRED or InputArgument::OPTIONAL
354+
* @param int $mode The argument mode: InputArgument::REQUIRED or InputArgument::OPTIONAL
355355
* @param string $description A description text
356356
* @param mixed $default The default value (for InputArgument::OPTIONAL mode only)
357357
*
@@ -371,7 +371,7 @@ public function addArgument($name, $mode = null, $description = '', $default = n
371371
*
372372
* @param string $name The option name
373373
* @param string $shortcut The shortcut (can be null)
374-
* @param integer $mode The option mode: One of the InputOption::VALUE_* constants
374+
* @param int $mode The option mode: One of the InputOption::VALUE_* constants
375375
* @param string $description A description text
376376
* @param mixed $default The default value (must be null for InputOption::VALUE_REQUIRED or InputOption::VALUE_NONE)
377377
*
@@ -584,7 +584,7 @@ public function asText()
584584
/**
585585
* Returns an XML representation of the command.
586586
*
587-
* @param Boolean $asDom Whether to return a DOM or an XML string
587+
* @param bool $asDom Whether to return a DOM or an XML string
588588
*
589589
* @return string|\DOMDocument An XML string representing the command
590590
*

‎Event/ConsoleTerminateEvent.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function __construct(Command $command, InputInterface $input, OutputInter
3939
/**
4040
* Sets the exit code.
4141
*
42-
* @param integer $exitCode The command exit code
42+
* @param int $exitCode The command exit code
4343
*/
4444
public function setExitCode($exitCode)
4545
{

‎Formatter/OutputFormatter.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ public static function escape($text)
3939
/**
4040
* Initializes console output formatter.
4141
*
42-
* @param Boolean $decorated Whether this formatter should actually decorate strings
42+
* @param bool $decorated Whether this formatter should actually decorate strings
4343
* @param OutputFormatterStyleInterface[] $styles Array of "name => FormatterStyle" instances
4444
*
4545
* @api
4646
*/
4747
public function __construct($decorated = false, array $styles = array())
4848
{
49-
$this->decorated = (Boolean) $decorated;
49+
$this->decorated = (bool) $decorated;
5050

5151
$this->setStyle('error', new OutputFormatterStyle('white', 'red'));
5252
$this->setStyle('info', new OutputFormatterStyle('green'));
@@ -63,13 +63,13 @@ public function __construct($decorated = false, array $styles = array())
6363
/**
6464
* Sets the decorated flag.
6565
*
66-
* @param Boolean $decorated Whether to decorate the messages or not
66+
* @param bool $decorated Whether to decorate the messages or not
6767
*
6868
* @api
6969
*/
7070
public function setDecorated($decorated)
7171
{
72-
$this->decorated = (Boolean) $decorated;
72+
$this->decorated = (bool) $decorated;
7373
}
7474

7575
/**

‎Formatter/OutputFormatterInterface.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ interface OutputFormatterInterface
2323
/**
2424
* Sets the decorated flag.
2525
*
26-
* @param Boolean $decorated Whether to decorate the messages or not
26+
* @param bool $decorated Whether to decorate the messages or not
2727
*
2828
* @api
2929
*/

‎Helper/DialogHelper.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ class DialogHelper extends InputAwareHelper
3131
* @param OutputInterface $output An Output instance
3232
* @param string|array $question The question to ask
3333
* @param array $choices List of choices to pick from
34-
* @param Boolean|string $default The default answer if the user enters nothing
35-
* @param Boolean|integer $attempts Max number of times to ask before giving up (false by default, which means infinite)
34+
* @param bool|string $default The default answer if the user enters nothing
35+
* @param bool|int $attempts Max number of times to ask before giving up (false by default, which means infinite)
3636
* @param string $errorMessage Message which will be shown if invalid value from choice list would be picked
37-
* @param Boolean $multiselect Select more than one value separated by comma
37+
* @param bool $multiselect Select more than one value separated by comma
3838
*
3939
* @return integer|string|array The selected value or values (the key of the choices array)
4040
*
@@ -227,7 +227,7 @@ public function ask(OutputInterface $output, $question, $default = null, array $
227227
*
228228
* @param OutputInterface $output An Output instance
229229
* @param string|array $question The question to ask
230-
* @param Boolean $default The default answer if the user enters nothing
230+
* @param bool $default The default answer if the user enters nothing
231231
*
232232
* @return Boolean true if the user has confirmed, false otherwise
233233
*/
@@ -250,7 +250,7 @@ public function askConfirmation(OutputInterface $output, $question, $default = t
250250
*
251251
* @param OutputInterface $output An Output instance
252252
* @param string|array $question The question
253-
* @param Boolean $fallback In case the response can not be hidden, whether to fallback on non-hidden question or not
253+
* @param bool $fallback In case the response can not be hidden, whether to fallback on non-hidden question or not
254254
*
255255
* @return string The answer
256256
*
@@ -325,7 +325,7 @@ public function askHiddenResponse(OutputInterface $output, $question, $fallback
325325
* @param OutputInterface $output An Output instance
326326
* @param string|array $question The question to ask
327327
* @param callable $validator A PHP callback
328-
* @param integer $attempts Max number of times to ask before giving up (false by default, which means infinite)
328+
* @param int $attempts Max number of times to ask before giving up (false by default, which means infinite)
329329
* @param string $default The default answer if none is given by the user
330330
* @param array $autocomplete List of values to autocomplete
331331
*
@@ -354,8 +354,8 @@ public function askAndValidate(OutputInterface $output, $question, $validator, $
354354
* @param OutputInterface $output An Output instance
355355
* @param string|array $question The question to ask
356356
* @param callable $validator A PHP callback
357-
* @param integer $attempts Max number of times to ask before giving up (false by default, which means infinite)
358-
* @param Boolean $fallback In case the response can not be hidden, whether to fallback on non-hidden question or not
357+
* @param int $attempts Max number of times to ask before giving up (false by default, which means infinite)
358+
* @param bool $fallback In case the response can not be hidden, whether to fallback on non-hidden question or not
359359
*
360360
* @return string The response
361361
*
@@ -397,7 +397,7 @@ public function getInputStream()
397397
}
398398

399399
/**
400-
* {@inheritDoc}
400+
* {@inheritdoc}
401401
*/
402402
public function getName()
403403
{
@@ -448,7 +448,7 @@ private function hasSttyAvailable()
448448
* @param callable $interviewer A callable that will ask for a question and return the result
449449
* @param OutputInterface $output An Output instance
450450
* @param callable $validator A PHP callback
451-
* @param integer $attempts Max number of times to ask before giving up ; false will ask infinitely
451+
* @param int $attempts Max number of times to ask before giving up ; false will ask infinitely
452452
*
453453
* @return string The validated response
454454
*

‎Helper/FormatterHelper.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function formatSection($section, $message, $style = 'info')
3939
*
4040
* @param string|array $messages The message to write in the block
4141
* @param string $style The style to apply to the whole block
42-
* @param Boolean $large Whether to return a large block
42+
* @param bool $large Whether to return a large block
4343
*
4444
* @return string The formatter message
4545
*/
@@ -71,7 +71,7 @@ public function formatBlock($messages, $style, $large = false)
7171
}
7272

7373
/**
74-
* {@inheritDoc}
74+
* {@inheritdoc}
7575
*/
7676
public function getName()
7777
{

‎Helper/ProgressHelper.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ public function setRedrawFrequency($freq)
178178
* Starts the progress output.
179179
*
180180
* @param OutputInterface $output An Output instance
181-
* @param integer|null $max Maximum steps
181+
* @param int|null $max Maximum steps
182182
*/
183183
public function start(OutputInterface $output, $max = null)
184184
{
@@ -220,8 +220,8 @@ public function start(OutputInterface $output, $max = null)
220220
/**
221221
* Advances the progress output X steps.
222222
*
223-
* @param integer $step Number of steps to advance
224-
* @param Boolean $redraw Whether to redraw or not
223+
* @param int $step Number of steps to advance
224+
* @param bool $redraw Whether to redraw or not
225225
*
226226
* @throws \LogicException
227227
*/
@@ -233,8 +233,8 @@ public function advance($step = 1, $redraw = false)
233233
/**
234234
* Sets the current progress.
235235
*
236-
* @param integer $current The current progress
237-
* @param Boolean $redraw Whether to redraw or not
236+
* @param int $current The current progress
237+
* @param bool $redraw Whether to redraw or not
238238
*
239239
* @throws \LogicException
240240
*/
@@ -267,7 +267,7 @@ public function setCurrent($current, $redraw = false)
267267
/**
268268
* Outputs the current progress string.
269269
*
270-
* @param Boolean $finish Forces the end result
270+
* @param bool $finish Forces the end result
271271
*
272272
* @throws \LogicException
273273
*/
@@ -340,7 +340,7 @@ private function initialize()
340340
/**
341341
* Generates the array map of format variables to values.
342342
*
343-
* @param Boolean $finish Forces the end result
343+
* @param bool $finish Forces the end result
344344
*
345345
* @return array Array of format vars and values
346346
*/
@@ -398,7 +398,7 @@ private function generate($finish = false)
398398
/**
399399
* Converts seconds into human-readable format.
400400
*
401-
* @param integer $secs Number of seconds
401+
* @param int $secs Number of seconds
402402
*
403403
* @return string Time in readable format
404404
*/
@@ -443,7 +443,7 @@ private function overwrite(OutputInterface $output, $message)
443443
}
444444

445445
/**
446-
* {@inheritDoc}
446+
* {@inheritdoc}
447447
*/
448448
public function getName()
449449
{

‎Helper/TableHelper.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ public function setBorderFormat($borderFormat)
313313
/**
314314
* Sets cell padding type.
315315
*
316-
* @param integer $padType STR_PAD_*
316+
* @param int $padType STR_PAD_*
317317
*
318318
* @return TableHelper
319319
*/
@@ -414,7 +414,7 @@ private function renderRow(array $row, $cellFormat)
414414
* Renders table cell with padding.
415415
*
416416
* @param array $row
417-
* @param integer $column
417+
* @param int $column
418418
* @param string $cellFormat
419419
*/
420420
private function renderCell(array $row, $column, $cellFormat)
@@ -457,7 +457,7 @@ private function getNumberOfColumns()
457457
/**
458458
* Gets column width.
459459
*
460-
* @param integer $column
460+
* @param int $column
461461
*
462462
* @return int
463463
*/
@@ -480,7 +480,7 @@ private function getColumnWidth($column)
480480
* Gets cell width.
481481
*
482482
* @param array $row
483-
* @param integer $column
483+
* @param int $column
484484
*
485485
* @return int
486486
*/
@@ -511,7 +511,7 @@ private function computeLengthWithoutDecoration($string)
511511
}
512512

513513
/**
514-
* {@inheritDoc}
514+
* {@inheritdoc}
515515
*/
516516
public function getName()
517517
{

‎Input/Input.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,11 @@ public function isInteractive()
9191
/**
9292
* Sets the input interactivity.
9393
*
94-
* @param Boolean $interactive If the input should be interactive
94+
* @param bool $interactive If the input should be interactive
9595
*/
9696
public function setInteractive($interactive)
9797
{
98-
$this->interactive = (Boolean) $interactive;
98+
$this->interactive = (bool) $interactive;
9999
}
100100

101101
/**
@@ -146,7 +146,7 @@ public function setArgument($name, $value)
146146
/**
147147
* Returns true if an InputArgument object exists by name or position.
148148
*
149-
* @param string|integer $name The InputArgument name or position
149+
* @param string|int $name The InputArgument name or position
150150
*
151151
* @return Boolean true if the InputArgument object exists, false otherwise
152152
*/
@@ -187,7 +187,7 @@ public function getOption($name)
187187
* Sets an option value by name.
188188
*
189189
* @param string $name The option name
190-
* @param string|boolean $value The option value
190+
* @param string|bool $value The option value
191191
*
192192
* @throws \InvalidArgumentException When option given doesn't exist
193193
*/

0 commit comments

Comments
 (0)