mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge pull request #3606 from Nicofuma/ticket/13838

Browse Source 
[ticket/13838] Check braces for control structures
This commit is contained in:
Joas Schilling
2015-05-16 13:39:45 +02:00
parent 1c0c9c1bca 62e13e945c
commit e52bc2d022
9 changed files with 167 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
phpBB/includes/acp/acp_board.php
View File

@@ -514,7 +514,8 @@ class acp_board
if ($config_name == 'guest_style')
{
if (isset($cfg_array[$config_name])) {
if (isset($cfg_array[$config_name]))
{
$this->guest_style_set($cfg_array[$config_name]);
}
continue;

6
phpBB/phpbb/auth/provider/oauth/token_storage.php
View File

@@ -117,7 +117,8 @@ class token_storage implements TokenStorageInterface
{
$service = $this->get_service_name_for_db($service);
if ($this->cachedToken) {
if ($this->cachedToken)
{
return true;
}
@@ -232,7 +233,8 @@ class token_storage implements TokenStorageInterface
{
$service = $this->get_service_name_for_db($service);
if ($this->cachedToken instanceof TokenInterface) {
if ($this->cachedToken instanceof TokenInterface)
{
return $this->cachedToken;
}

3
phpBB/phpbb/template/twig/loader.php
View File

@@ -97,7 +97,8 @@ class loader extends \Twig_Loader_Filesystem
// If this is in the cache we can skip the entire process below
// as it should have already been validated
if (isset($this->cache[$name])) {
if (isset($this->cache[$name]))
{
return $this->cache[$name];
}

3
phpBB/phpbb/template/twig/node/definenode.php
View File

@@ -31,7 +31,8 @@ class definenode extends \Twig_Node
{
$compiler->addDebugInfo($this);
if ($this->getAttribute('capture')) {
if ($this->getAttribute('capture'))
{
$compiler
->write("ob_start();\n")
->subcompile($this->getNode('value'))

6
phpBB/phpbb/template/twig/node/includephp.php
View File

@@ -47,7 +47,8 @@ class includephp extends \Twig_Node
return;
}
if ($this->getAttribute('ignore_missing')) {
if ($this->getAttribute('ignore_missing'))
{
$compiler
->write("try {\n")
->indent()
@@ -76,7 +77,8 @@ class includephp extends \Twig_Node
->write("}\n")
;
if ($this->getAttribute('ignore_missing')) {
if ($this->getAttribute('ignore_missing'))
{
$compiler
->outdent()
->write("} catch (\Twig_Error_Loader \$e) {\n")

7
phpBB/phpbb/template/twig/tokenparser/defineparser.php
View File

@@ -33,7 +33,8 @@ class defineparser extends \Twig_TokenParser
$name = $this->parser->getExpressionParser()->parseExpression();
$capture = false;
if ($stream->test(\Twig_Token::OPERATOR_TYPE, '=')) {
if ($stream->test(\Twig_Token::OPERATOR_TYPE, '='))
{
$stream->next();
$value = $this->parser->getExpressionParser()->parseExpression();
@@ -45,7 +46,9 @@ class defineparser extends \Twig_TokenParser
}
$stream->expect(\Twig_Token::BLOCK_END_TYPE);
} else {
}
else
{
$capture = true;
$stream->expect(\Twig_Token::BLOCK_END_TYPE);

3
phpBB/phpbb/template/twig/tokenparser/includephp.php
View File

@@ -31,7 +31,8 @@ class includephp extends \Twig_TokenParser
$stream = $this->parser->getStream();
$ignoreMissing = false;
if ($stream->test(\Twig_Token::NAME_TYPE, 'ignore')) {
if ($stream->test(\Twig_Token::NAME_TYPE, 'ignore'))
{
$stream->next();
$stream->expect(\Twig_Token::NAME_TYPE, 'missing');