CS: unalign =
This commit is contained in:
parent
db243627e5
commit
d5742c18b0
|
@ -95,7 +95,7 @@ class DoctrineTokenProvider implements TokenProviderInterface
|
||||||
$paramValues = array('value' => $tokenValue,
|
$paramValues = array('value' => $tokenValue,
|
||||||
'lastUsed' => $lastUsed,
|
'lastUsed' => $lastUsed,
|
||||||
'series' => $series,);
|
'series' => $series,);
|
||||||
$paramTypes = array('value' => \PDO::PARAM_STR,
|
$paramTypes = array('value' => \PDO::PARAM_STR,
|
||||||
'lastUsed' => DoctrineType::DATETIME,
|
'lastUsed' => DoctrineType::DATETIME,
|
||||||
'series' => \PDO::PARAM_STR,);
|
'series' => \PDO::PARAM_STR,);
|
||||||
$updated = $this->conn->executeUpdate($sql, $paramValues, $paramTypes);
|
$updated = $this->conn->executeUpdate($sql, $paramValues, $paramTypes);
|
||||||
|
|
|
@ -56,7 +56,7 @@ class TransChoiceTokenParser extends TransTokenParser
|
||||||
if ($stream->test('into')) {
|
if ($stream->test('into')) {
|
||||||
// {% transchoice count into "fr" %}
|
// {% transchoice count into "fr" %}
|
||||||
$stream->next();
|
$stream->next();
|
||||||
$locale = $this->parser->getExpressionParser()->parseExpression();
|
$locale = $this->parser->getExpressionParser()->parseExpression();
|
||||||
}
|
}
|
||||||
|
|
||||||
$stream->expect(\Twig_Token::BLOCK_END_TYPE);
|
$stream->expect(\Twig_Token::BLOCK_END_TYPE);
|
||||||
|
|
|
@ -53,7 +53,7 @@ class TransTokenParser extends \Twig_TokenParser
|
||||||
if ($stream->test('into')) {
|
if ($stream->test('into')) {
|
||||||
// {% trans into "fr" %}
|
// {% trans into "fr" %}
|
||||||
$stream->next();
|
$stream->next();
|
||||||
$locale = $this->parser->getExpressionParser()->parseExpression();
|
$locale = $this->parser->getExpressionParser()->parseExpression();
|
||||||
} elseif (!$stream->test(\Twig_Token::BLOCK_END_TYPE)) {
|
} elseif (!$stream->test(\Twig_Token::BLOCK_END_TYPE)) {
|
||||||
throw new \Twig_Error_Syntax('Unexpected token. Twig was looking for the "with", "from", or "into" keyword.', $stream->getCurrent()->getLine(), $stream->getFilename());
|
throw new \Twig_Error_Syntax('Unexpected token. Twig was looking for the "with", "from", or "into" keyword.', $stream->getCurrent()->getLine(), $stream->getFilename());
|
||||||
}
|
}
|
||||||
|
|
|
@ -110,7 +110,7 @@ EOF
|
||||||
|
|
||||||
protected function renderException(OutputInterface $output, $template, \Twig_Error $exception, $file = null)
|
protected function renderException(OutputInterface $output, $template, \Twig_Error $exception, $file = null)
|
||||||
{
|
{
|
||||||
$line = $exception->getTemplateLine();
|
$line = $exception->getTemplateLine();
|
||||||
$lines = $this->getContext($template, $line);
|
$lines = $this->getContext($template, $line);
|
||||||
|
|
||||||
if ($file) {
|
if ($file) {
|
||||||
|
|
|
@ -94,14 +94,14 @@ class UriSigner
|
||||||
ksort($params);
|
ksort($params);
|
||||||
$url['query'] = http_build_query($params);
|
$url['query'] = http_build_query($params);
|
||||||
|
|
||||||
$scheme = isset($url['scheme']) ? $url['scheme'].'://' : '';
|
$scheme = isset($url['scheme']) ? $url['scheme'].'://' : '';
|
||||||
$host = isset($url['host']) ? $url['host'] : '';
|
$host = isset($url['host']) ? $url['host'] : '';
|
||||||
$port = isset($url['port']) ? ':'.$url['port'] : '';
|
$port = isset($url['port']) ? ':'.$url['port'] : '';
|
||||||
$user = isset($url['user']) ? $url['user'] : '';
|
$user = isset($url['user']) ? $url['user'] : '';
|
||||||
$pass = isset($url['pass']) ? ':'.$url['pass'] : '';
|
$pass = isset($url['pass']) ? ':'.$url['pass'] : '';
|
||||||
$pass = ($user || $pass) ? "$pass@" : '';
|
$pass = ($user || $pass) ? "$pass@" : '';
|
||||||
$path = isset($url['path']) ? $url['path'] : '';
|
$path = isset($url['path']) ? $url['path'] : '';
|
||||||
$query = isset($url['query']) && $url['query'] ? '?'.$url['query'] : '';
|
$query = isset($url['query']) && $url['query'] ? '?'.$url['query'] : '';
|
||||||
$fragment = isset($url['fragment']) ? '#'.$url['fragment'] : '';
|
$fragment = isset($url['fragment']) ? '#'.$url['fragment'] : '';
|
||||||
|
|
||||||
return $scheme.$user.$pass.$host.$port.$path.$query.$fragment;
|
return $scheme.$user.$pass.$host.$port.$path.$query.$fragment;
|
||||||
|
|
|
@ -48,7 +48,7 @@ class ProcessUtils
|
||||||
}
|
}
|
||||||
|
|
||||||
$escapedArgument = '';
|
$escapedArgument = '';
|
||||||
$quote = false;
|
$quote = false;
|
||||||
foreach (preg_split('/(")/i', $argument, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE) as $part) {
|
foreach (preg_split('/(")/i', $argument, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE) as $part) {
|
||||||
if ('"' === $part) {
|
if ('"' === $part) {
|
||||||
$escapedArgument .= '\\"';
|
$escapedArgument .= '\\"';
|
||||||
|
|
Reference in New Issue