1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00

Merge branch '3.1.x'

* 3.1.x:
  [ticket/13790] Update phpcs

Conflicts:
	phpBB/composer.json
	phpBB/composer.lock
This commit is contained in:
Nils Adermann
2015-05-30 10:58:40 +02:00
22 changed files with 283 additions and 312 deletions

View File

@@ -14,7 +14,6 @@
namespace phpbb\template\twig\node;
class definenode extends \Twig_Node
{
public function __construct($capture, \Twig_NodeInterface $name, \Twig_NodeInterface $value, $lineno, $tag = null)

View File

@@ -13,7 +13,6 @@
namespace phpbb\template\twig\node;
class event extends \Twig_Node
{
/**

View File

@@ -13,7 +13,6 @@
namespace phpbb\template\twig\node\expression\binary;
class equalequal extends \Twig_Node_Expression_Binary
{
public function operator(\Twig_Compiler $compiler)

View File

@@ -13,7 +13,6 @@
namespace phpbb\template\twig\node\expression\binary;
class notequalequal extends \Twig_Node_Expression_Binary
{
public function operator(\Twig_Compiler $compiler)

View File

@@ -13,7 +13,6 @@
namespace phpbb\template\twig\node;
class includenode extends \Twig_Node_Include
{
/**

View File

@@ -14,7 +14,6 @@
namespace phpbb\template\twig\node;
class includephp extends \Twig_Node
{
/** @var \Twig_Environment */

View File

@@ -13,7 +13,6 @@
namespace phpbb\template\twig\node;
class php extends \Twig_Node
{
/** @var \Twig_Environment */

View File

@@ -14,7 +14,6 @@
namespace phpbb\template\twig\tokenparser;
class defineparser extends \Twig_TokenParser
{
/**

View File

@@ -13,7 +13,6 @@
namespace phpbb\template\twig\tokenparser;
class event extends \Twig_TokenParser
{
/**

View File

@@ -13,7 +13,6 @@
namespace phpbb\template\twig\tokenparser;
class includejs extends \Twig_TokenParser
{
/**

View File

@@ -14,7 +14,6 @@
namespace phpbb\template\twig\tokenparser;
class includeparser extends \Twig_TokenParser_Include
{
/**

View File

@@ -14,7 +14,6 @@
namespace phpbb\template\twig\tokenparser;
class includephp extends \Twig_TokenParser
{
/**

View File

@@ -13,7 +13,6 @@
namespace phpbb\template\twig\tokenparser;
class php extends \Twig_TokenParser
{
/**