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 branch '3.1.x'

Browse Source 
* 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
parent 3f4206e012 01073ffcbf
commit f958d05aed
22 changed files with 283 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/composer.json
View File

@@ -50,7 +50,7 @@
"phpunit/dbunit": "1.3.*",
"phpunit/phpunit": "4.1.*",
"sami/sami": "1.*",
"squizlabs/php_codesniffer": "1.*",
"squizlabs/php_codesniffer": "2.*",
"symfony/browser-kit": "2.8.*@dev",
"symfony/css-selector": "2.8.*@dev",
"symfony/debug": "2.8.*@dev",

418
phpBB/composer.lock generated
View File

File diff suppressed because it is too large Load Diff

2
phpBB/includes/functions_module.php
View File

@@ -978,7 +978,7 @@ class p_master
*
* @param string $class module class (acp/mcp/ucp)
* @param string $name module name (class name of the module, or its basename
* phpbb_ext_foo_acp_bar_module, ucp_zebra or zebra)
* phpbb_ext_foo_acp_bar_module, ucp_zebra or zebra)
* @param string $mode mode, as passed through to the module
*
*/

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

@@ -13,7 +13,6 @@
namespace phpbb\auth\provider\oauth;
use OAuth\OAuth1\Token\StdOAuth1Token;
use OAuth\Common\Token\TokenInterface;
use OAuth\Common\Storage\TokenStorageInterface;

2
phpBB/phpbb/db/sql_insert_buffer.php
View File

@@ -107,7 +107,7 @@ class sql_insert_buffer
* first building a huge rowset. Or at least sizeof($rows) should be kept
* small.
*
* @param array $rows
* @param array $rows
*
* @return bool True when some data was flushed to the database.
* False otherwise.

4
phpBB/phpbb/notification/method/base.php
View File

@@ -60,7 +60,7 @@ abstract class base implements \phpbb\notification\method\method_interface
/**
* Notification Method Base Constructor
*
*
* @param \phpbb\user_loader $user_loader
* @param \phpbb\db\driver\driver_interface $db
* @param \phpbb\cache\driver\driver_interface $cache
@@ -85,7 +85,7 @@ abstract class base implements \phpbb\notification\method\method_interface
/**
* Set notification manager (required)
*
*
* @param \phpbb\notification\manager $notification_manager
*/
public function set_notification_manager(\phpbb\notification\manager $notification_manager)

1
phpBB/phpbb/template/twig/node/definenode.php
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)

1
phpBB/phpbb/template/twig/node/event.php
View File

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

1
phpBB/phpbb/template/twig/node/expression/binary/equalequal.php
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)

1
phpBB/phpbb/template/twig/node/expression/binary/notequalequal.php
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)

1
phpBB/phpbb/template/twig/node/includenode.php
View File

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

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

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

1
phpBB/phpbb/template/twig/node/php.php
View File

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

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

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

1
phpBB/phpbb/template/twig/tokenparser/event.php
View File

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

1
phpBB/phpbb/template/twig/tokenparser/includejs.php
View File

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

1
phpBB/phpbb/template/twig/tokenparser/includeparser.php
View File

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

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

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

1
phpBB/phpbb/template/twig/tokenparser/php.php
View File

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