Skip to content

Commit 3daf10d

Browse files
fabpotfabpot
committed
Merge branch '2.5'
* 2.5: added missing use statements added missing use statement added missing use statement fixed CS [Process] fixed some volatile tests [HttpKernel] fixed a volatile test [HttpFoundation] fixed some volatile tests [Tests] PHPUnit Optimizations Use getPathname() instead of string casting to get BinaryFileReponse file path Conflicts: src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/full.php src/Symfony/Component/Debug/Tests/Exception/FlattenExceptionTest.php src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php src/Symfony/Component/Process/Process.php src/Symfony/Component/Stopwatch/Stopwatch.php src/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php src/Symfony/Component/Validator/Tests/Constraints/GreaterThanOrEqualValidatorTest.php src/Symfony/Component/Yaml/Parser.php src/Symfony/Component/Yaml/Tests/InlineTest.php
2 parents 0f682ba + c1c5657 commit 3daf10d

19 files changed

+71
-69
lines changed

‎Formatter/OutputFormatterStyle.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class OutputFormatterStyle implements OutputFormatterStyleInterface
2828
'blue' => array('set' => 34, 'unset' => 39),
2929
'magenta' => array('set' => 35, 'unset' => 39),
3030
'cyan' => array('set' => 36, 'unset' => 39),
31-
'white' => array('set' => 37, 'unset' => 39)
31+
'white' => array('set' => 37, 'unset' => 39),
3232
);
3333
private static $availableBackgroundColors = array(
3434
'black' => array('set' => 40, 'unset' => 49),
@@ -38,14 +38,14 @@ class OutputFormatterStyle implements OutputFormatterStyleInterface
3838
'blue' => array('set' => 44, 'unset' => 49),
3939
'magenta' => array('set' => 45, 'unset' => 49),
4040
'cyan' => array('set' => 46, 'unset' => 49),
41-
'white' => array('set' => 47, 'unset' => 49)
41+
'white' => array('set' => 47, 'unset' => 49),
4242
);
4343
private static $availableOptions = array(
4444
'bold' => array('set' => 1, 'unset' => 22),
4545
'underscore' => array('set' => 4, 'unset' => 24),
4646
'blink' => array('set' => 5, 'unset' => 25),
4747
'reverse' => array('set' => 7, 'unset' => 27),
48-
'conceal' => array('set' => 8, 'unset' => 28)
48+
'conceal' => array('set' => 8, 'unset' => 28),
4949
);
5050

5151
private $foreground;

‎Helper/DialogHelper.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,8 @@ public function ask(OutputInterface $output, $question, $default = null, array $
153153

154154
// Pop the last character off the end of our string
155155
$ret = substr($ret, 0, $i);
156-
} elseif ("\033" === $c) { // Did we read an escape sequence?
156+
} elseif ("\033" === $c) {
157+
// Did we read an escape sequence?
157158
$c .= fread($inputStream, 2);
158159

159160
// A = Up Arrow. B = Down Arrow

‎Helper/ProcessHelper.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ public function wrapCallback(OutputInterface $output, Process $process, $callbac
112112
$formatter = $this->getHelperSet()->get('debug_formatter');
113113

114114
$that = $this;
115+
115116
return function ($type, $buffer) use ($output, $process, $callback, $formatter, $that) {
116117
$output->write($formatter->progress(spl_object_hash($process), $that->escapeString($buffer), Process::ERR === $type));
117118

‎Helper/QuestionHelper.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,8 @@ private function autocomplete(OutputInterface $output, Question $question, $inpu
208208

209209
// Pop the last character off the end of our string
210210
$ret = substr($ret, 0, $i);
211-
} elseif ("\033" === $c) { // Did we read an escape sequence?
211+
} elseif ("\033" === $c) {
212+
// Did we read an escape sequence?
212213
$c .= fread($inputStream, 2);
213214

214215
// A = Up Arrow. B = Down Arrow

‎Input/ArgvInput.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ private function parseArgument($token)
169169
// if input is expecting another argument, add it
170170
if ($this->definition->hasArgument($c)) {
171171
$arg = $this->definition->getArgument($c);
172-
$this->arguments[$arg->getName()] = $arg->isArray()? array($token) : $token;
172+
$this->arguments[$arg->getName()] = $arg->isArray() ? array($token) : $token;
173173

174174
// if last argument isArray(), append token to last argument
175175
} elseif ($this->definition->hasArgument($c - 1) && $this->definition->getArgument($c - 1)->isArray()) {
@@ -336,7 +336,7 @@ public function __toString()
336336
$self = $this;
337337
$tokens = array_map(function ($token) use ($self) {
338338
if (preg_match('{^(-[^=]+=)(.+)}', $token, $match)) {
339-
return $match[1] . $self->escapeToken($match[2]);
339+
return $match[1].$self->escapeToken($match[2]);
340340
}
341341

342342
if ($token && $token[0] !== '-') {

‎Input/ArrayInput.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public function __toString()
120120
$params = array();
121121
foreach ($this->parameters as $param => $val) {
122122
if ($param && '-' === $param[0]) {
123-
$params[] = $param . ('' != $val ? '='.$this->escapeToken($val) : '');
123+
$params[] = $param.('' != $val ? '='.$this->escapeToken($val) : '');
124124
} else {
125125
$params[] = $this->escapeToken($val);
126126
}

‎Logger/ConsoleLogger.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class ConsoleLogger extends AbstractLogger
4343
LogLevel::WARNING => OutputInterface::VERBOSITY_NORMAL,
4444
LogLevel::NOTICE => OutputInterface::VERBOSITY_VERBOSE,
4545
LogLevel::INFO => OutputInterface::VERBOSITY_VERY_VERBOSE,
46-
LogLevel::DEBUG => OutputInterface::VERBOSITY_DEBUG
46+
LogLevel::DEBUG => OutputInterface::VERBOSITY_DEBUG,
4747
);
4848
/**
4949
* @var array
@@ -56,7 +56,7 @@ class ConsoleLogger extends AbstractLogger
5656
LogLevel::WARNING => self::INFO,
5757
LogLevel::NOTICE => self::INFO,
5858
LogLevel::INFO => self::INFO,
59-
LogLevel::DEBUG => self::INFO
59+
LogLevel::DEBUG => self::INFO,
6060
);
6161

6262
/**

‎Output/NullOutput.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public function getVerbosity()
7474
{
7575
return self::VERBOSITY_QUIET;
7676
}
77-
77+
7878
public function isQuiet()
7979
{
8080
return true;

‎Tests/ApplicationTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ public function provideAmbiguousAbbreviations()
270270
return array(
271271
array('f', 'Command "f" is not defined.'),
272272
array('a', 'Command "a" is ambiguous (afoobar, afoobar1 and 1 more).'),
273-
array('foo:b', 'Command "foo:b" is ambiguous (foo:bar, foo:bar1 and 1 more).')
273+
array('foo:b', 'Command "foo:b" is ambiguous (foo:bar, foo:bar1 and 1 more).'),
274274
);
275275
}
276276

@@ -317,7 +317,7 @@ public function provideInvalidCommandNamesSingle()
317317
{
318318
return array(
319319
array('foo3:baR'),
320-
array('foO3:bar')
320+
array('foO3:bar'),
321321
);
322322
}
323323

‎Tests/Command/CommandTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public function provideInvalidCommandNames()
111111
{
112112
return array(
113113
array(''),
114-
array('foo:')
114+
array('foo:'),
115115
);
116116
}
117117

0 commit comments

Comments
 (0)