mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-25 11:01:48 +02:00
Code Issues Releases Wiki Activity

Merge pull request #3560 from Nicofuma/ticket/13790

Browse Source 
[ticket/13790] Update phpcs
This commit is contained in:
Nils Adermann
2015-05-30 10:53:47 +02:00
parent b5fed65fe3 a462f14aa3
commit 01073ffcbf
23 changed files with 110 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/composer.json
View File

@@ -38,11 +38,11 @@
},
"require-dev": {
"fabpot/goutte": "1.0.*",
"phing/phing": "2.4.*",
"phpunit/dbunit": "1.3.*",
"phpunit/phpunit": "4.1.*",
"phing/phing": "2.4.*",
"sami/sami": "1.*",
"squizlabs/php_codesniffer": "1.*",
"squizlabs/php_codesniffer": "2.*",
"symfony/browser-kit": "2.3.*",
"symfony/css-selector": "2.3.*",
"symfony/debug": "2.3.*",

56
phpBB/composer.lock generated
View File

@@ -1,9 +1,10 @@
{
"_readme": [
"This file locks the dependencies of your project to a known state",
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "d93446768ea0665b7c55c01890153a67",
"hash": "17b51553237b78392baf2ec78bfdfbc0",
"packages": [
{
"name": "lusitanian/oauth",
@@ -652,12 +653,12 @@
"version": "v1.13.2",
"source": {
"type": "git",
"url": "https://github.com/fabpot/Twig.git",
"url": "https://github.com/twigphp/Twig.git",
"reference": "6d6a1009427d1f398c9d40904147bf9f723d5755"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/fabpot/Twig/zipball/6d6a1009427d1f398c9d40904147bf9f723d5755",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/6d6a1009427d1f398c9d40904147bf9f723d5755",
"reference": "6d6a1009427d1f398c9d40904147bf9f723d5755",
"shasum": ""
},
@@ -682,14 +683,11 @@
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com",
"homepage": "http://fabien.potencier.org",
"role": "Lead Developer"
"email": "fabien@symfony.com"
},
{
"name": "Armin Ronacher",
"email": "armin.ronacher@active-4.com",
"role": "Project Founder"
"email": "armin.ronacher@active-4.com"
}
],
"description": "Twig, the flexible, fast, and secure template language for PHP",
@@ -1914,41 +1912,45 @@
},
{
"name": "squizlabs/php_codesniffer",
"version": "1.5.2",
"version": "2.3.2",
"source": {
"type": "git",
"url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
"reference": "a76a39b317ce8106abe6264daa505e24e1731860"
"reference": "e96d8579fbed0c95ecf2a0501ec4f307a4aa6404"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/a76a39b317ce8106abe6264daa505e24e1731860",
"reference": "a76a39b317ce8106abe6264daa505e24e1731860",
"url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/e96d8579fbed0c95ecf2a0501ec4f307a4aa6404",
"reference": "e96d8579fbed0c95ecf2a0501ec4f307a4aa6404",
"shasum": ""
},
"require": {
"ext-tokenizer": "*",
"ext-xmlwriter": "*",
"php": ">=5.1.2"
},
"suggest": {
"phpunit/php-timer": "dev-master"
},
"bin": [
"scripts/phpcs"
"scripts/phpcs",
"scripts/phpcbf"
],
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.0.x-dev"
}
},
"autoload": {
"classmap": [
"CodeSniffer.php",
"CodeSniffer/CLI.php",
"CodeSniffer/Exception.php",
"CodeSniffer/File.php",
"CodeSniffer/Fixer.php",
"CodeSniffer/Report.php",
"CodeSniffer/Reporting.php",
"CodeSniffer/Sniff.php",
"CodeSniffer/Tokens.php",
"CodeSniffer/Reports/",
"CodeSniffer/CommentParser/",
"CodeSniffer/Tokenizers/",
"CodeSniffer/DocGenerators/",
"CodeSniffer/Standards/AbstractPatternSniff.php",
@@ -1974,13 +1976,13 @@
"role": "lead"
}
],
"description": "PHP_CodeSniffer tokenises PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
"description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
"homepage": "http://www.squizlabs.com/php-codesniffer",
"keywords": [
"phpcs",
"standards"
],
"time": "2014-02-04 23:49:58"
"time": "2015-04-28 23:28:20"
},
{
"name": "symfony/browser-kit",
@@ -2236,17 +2238,13 @@
"time": "2014-10-01 05:38:33"
}
],
"aliases": [
],
"aliases": [],
"minimum-stability": "stable",
"stability-flags": [
],
"stability-flags": [],
"prefer-stable": false,
"prefer-lowest": false,
"platform": {
"php": ">=5.3.3"
},
"platform-dev": [
]
"platform-dev": []
}

2
phpBB/includes/functions.php
View File

@@ -1159,7 +1159,7 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
/**
* This event is used for performing actions directly before marking forums,
* topics or posts as read.
*
*
* It is also possible to prevent the marking. For that, the $should_markread parameter
* should be set to FALSE.
*

2
phpBB/includes/functions_module.php
View File

@@ -976,7 +976,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
{
/**