aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2013-10-28 09:19:51 -0700
committerNils Adermann <naderman@naderman.de>2013-10-28 09:19:51 -0700
commit2afd47b938f5cf9b89a46f44d6e022c38695764d (patch)
treef2780fc3786fdb47210b4391e0fbfe97b03bcb0e /phpBB
parent77ee81c2f61beefe5c3166e61f712b58076fb727 (diff)
parent8c83acb28bb450adf978a0a6eff6bb9819dec1f7 (diff)
downloadforums-2afd47b938f5cf9b89a46f44d6e022c38695764d.tar
forums-2afd47b938f5cf9b89a46f44d6e022c38695764d.tar.gz
forums-2afd47b938f5cf9b89a46f44d6e022c38695764d.tar.bz2
forums-2afd47b938f5cf9b89a46f44d6e022c38695764d.tar.xz
forums-2afd47b938f5cf9b89a46f44d6e022c38695764d.zip
Merge pull request #1831 from bantu/task/code-sniffer
[task/code-sniffer] Setup PHP Code Sniffer
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/composer.json3
-rw-r--r--phpBB/composer.lock74
2 files changed, 74 insertions, 3 deletions
diff --git a/phpBB/composer.json b/phpBB/composer.json
index 455ad49aac..ddb264de17 100644
--- a/phpBB/composer.json
+++ b/phpBB/composer.json
@@ -14,6 +14,7 @@
"fabpot/goutte": "1.0.*",
"phpunit/dbunit": "1.2.*",
"phpunit/phpunit": "3.7.*",
- "phing/phing": "2.4.*"
+ "phing/phing": "2.4.*",
+ "squizlabs/php_codesniffer": "1.*"
}
}
diff --git a/phpBB/composer.lock b/phpBB/composer.lock
index eb57ddb4d9..5d1ba4efe1 100644
--- a/phpBB/composer.lock
+++ b/phpBB/composer.lock
@@ -3,7 +3,7 @@
"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"
],
- "hash": "0bc0fd0d784720629ae0ba6d4be6a577",
+ "hash": "7bcfe8f8ce4fa46cb53c276cf93dcd3e",
"packages": [
{
"name": "lusitanian/oauth",
@@ -302,7 +302,7 @@
"Symfony\\Component\\EventDispatcher\\": ""
}
},
- "notification-url": "http://packagist.org/downloads/",
+ "notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
@@ -1376,6 +1376,76 @@
"time": "2013-01-13 10:24:48"
},
{
+ "name": "squizlabs/php_codesniffer",
+ "version": "1.5.0RC4",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
+ "reference": "146a9b54e4adeaca0a3ae073e0a8a03570d6cc43"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/146a9b54e4adeaca0a3ae073e0a8a03570d6cc43",
+ "reference": "146a9b54e4adeaca0a3ae073e0a8a03570d6cc43",
+ "shasum": ""
+ },
+ "require": {
+ "ext-tokenizer": "*",
+ "php": ">=5.1.2"
+ },
+ "suggest": {
+ "phpunit/php-timer": "dev-master"
+ },
+ "bin": [
+ "scripts/phpcs"
+ ],
+ "type": "library",
+ "autoload": {
+ "classmap": [
+ "CodeSniffer.php",
+ "CodeSniffer/CLI.php",
+ "CodeSniffer/Exception.php",
+ "CodeSniffer/File.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",
+ "CodeSniffer/Standards/AbstractScopeSniff.php",
+ "CodeSniffer/Standards/AbstractVariableSniff.php",
+ "CodeSniffer/Standards/IncorrectPatternException.php",
+ "CodeSniffer/Standards/Generic/Sniffs/",
+ "CodeSniffer/Standards/MySource/Sniffs/",
+ "CodeSniffer/Standards/PEAR/Sniffs/",
+ "CodeSniffer/Standards/PSR1/Sniffs/",
+ "CodeSniffer/Standards/PSR2/Sniffs/",
+ "CodeSniffer/Standards/Squiz/Sniffs/",
+ "CodeSniffer/Standards/Zend/Sniffs/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Greg Sherwood",
+ "role": "lead"
+ }
+ ],
+ "description": "PHP_CodeSniffer tokenises 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": "2013-09-26 00:14:02"
+ },
+ {
"name": "symfony/browser-kit",
"version": "v2.3.4",
"target-dir": "Symfony/Component/BrowserKit",