Skip to content

Commit 22693f3

Browse files
minor symfony#14438 CS: unalign = (keradus)
This PR was merged into the 2.3 branch. Discussion ---------- CS: unalign = | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | ? | Fixed tickets | N/A | License | MIT | Doc PR | N/A Update before upcoming changes on PHP CS Fixer 1.8 To keep fabbot.io happy ;) Commits ------- d5742c1 CS: unalign =
2 parents 5206603 + d5742c1 commit 22693f3

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public function updateToken($series, $tokenValue, \DateTime $lastUsed)
9595
$paramValues = array('value' => $tokenValue,
9696
'lastUsed' => $lastUsed,
9797
'series' => $series,);
98-
$paramTypes = array('value' => \PDO::PARAM_STR,
98+
$paramTypes = array('value' => \PDO::PARAM_STR,
9999
'lastUsed' => DoctrineType::DATETIME,
100100
'series' => \PDO::PARAM_STR,);
101101
$updated = $this->conn->executeUpdate($sql, $paramValues, $paramTypes);

src/Symfony/Bridge/Twig/TokenParser/TransChoiceTokenParser.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public function parse(\Twig_Token $token)
5656
if ($stream->test('into')) {
5757
// {% transchoice count into "fr" %}
5858
$stream->next();
59-
$locale = $this->parser->getExpressionParser()->parseExpression();
59+
$locale = $this->parser->getExpressionParser()->parseExpression();
6060
}
6161

6262
$stream->expect(\Twig_Token::BLOCK_END_TYPE);

src/Symfony/Bridge/Twig/TokenParser/TransTokenParser.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public function parse(\Twig_Token $token)
5353
if ($stream->test('into')) {
5454
// {% trans into "fr" %}
5555
$stream->next();
56-
$locale = $this->parser->getExpressionParser()->parseExpression();
56+
$locale = $this->parser->getExpressionParser()->parseExpression();
5757
} elseif (!$stream->test(\Twig_Token::BLOCK_END_TYPE)) {
5858
throw new \Twig_Error_Syntax('Unexpected token. Twig was looking for the "with", "from", or "into" keyword.', $stream->getCurrent()->getLine(), $stream->getFilename());
5959
}

src/Symfony/Bundle/TwigBundle/Command/LintCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ protected function validateTemplate(\Twig_Environment $twig, OutputInterface $ou
110110

111111
protected function renderException(OutputInterface $output, $template, \Twig_Error $exception, $file = null)
112112
{
113-
$line = $exception->getTemplateLine();
113+
$line = $exception->getTemplateLine();
114114
$lines = $this->getContext($template, $line);
115115

116116
if ($file) {

src/Symfony/Component/HttpKernel/UriSigner.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -94,14 +94,14 @@ private function buildUrl(array $url, array $params = array())
9494
ksort($params);
9595
$url['query'] = http_build_query($params);
9696

97-
$scheme = isset($url['scheme']) ? $url['scheme'].'://' : '';
98-
$host = isset($url['host']) ? $url['host'] : '';
99-
$port = isset($url['port']) ? ':'.$url['port'] : '';
100-
$user = isset($url['user']) ? $url['user'] : '';
101-
$pass = isset($url['pass']) ? ':'.$url['pass'] : '';
102-
$pass = ($user || $pass) ? "$pass@" : '';
103-
$path = isset($url['path']) ? $url['path'] : '';
104-
$query = isset($url['query']) && $url['query'] ? '?'.$url['query'] : '';
97+
$scheme = isset($url['scheme']) ? $url['scheme'].'://' : '';
98+
$host = isset($url['host']) ? $url['host'] : '';
99+
$port = isset($url['port']) ? ':'.$url['port'] : '';
100+
$user = isset($url['user']) ? $url['user'] : '';
101+
$pass = isset($url['pass']) ? ':'.$url['pass'] : '';
102+
$pass = ($user || $pass) ? "$pass@" : '';
103+
$path = isset($url['path']) ? $url['path'] : '';
104+
$query = isset($url['query']) && $url['query'] ? '?'.$url['query'] : '';
105105
$fragment = isset($url['fragment']) ? '#'.$url['fragment'] : '';
106106

107107
return $scheme.$user.$pass.$host.$port.$path.$query.$fragment;

src/Symfony/Component/Process/ProcessUtils.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public static function escapeArgument($argument)
4848
}
4949

5050
$escapedArgument = '';
51-
$quote = false;
51+
$quote = false;
5252
foreach (preg_split('/(")/i', $argument, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE) as $part) {
5353
if ('"' === $part) {
5454
$escapedArgument .= '\\"';

0 commit comments

Comments
 (0)