From d1fecb61289fbc90cdedc6adeea748d17d0a4d3b Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 23 Dec 2016 18:32:07 -0800 Subject: [PATCH] Added php codesniffer --- composer.json | 3 +- composer.lock | 82 +++++++++++++++++++++++++++++++++++++++++++++++++-- gulpfile.js | 14 +++++++++ package.json | 1 + 4 files changed, 97 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index dbee121d07..1cd93cf35f 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,8 @@ "phpunit/phpunit": "~5.0", "symfony/css-selector": "3.1.*", "symfony/dom-crawler": "3.1.*", - "codeception/codeception": "^2.2" + "codeception/codeception": "^2.2", + "squizlabs/php_codesniffer": "*" }, "autoload": { "classmap": [ diff --git a/composer.lock b/composer.lock index ddff371e52..be4001e9a1 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "d0a835c340fd6b66d96439bdf5bf00d4", - "content-hash": "8017fc837d313178b3496ae375ee7c9b", + "hash": "a6f845a1b9e14f61c4e525868db1ec95", + "content-hash": "275081182145ff404e84b759d8f166b5", "packages": [ { "name": "aws/aws-sdk-php", @@ -5560,6 +5560,84 @@ "homepage": "https://github.com/sebastianbergmann/version", "time": "2016-10-03 07:35:21" }, + { + "name": "squizlabs/php_codesniffer", + "version": "2.7.1", + "source": { + "type": "git", + "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", + "reference": "9b324f3a1132459a7274a0ace2e1b766ba80930f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/9b324f3a1132459a7274a0ace2e1b766ba80930f", + "reference": "9b324f3a1132459a7274a0ace2e1b766ba80930f", + "shasum": "" + }, + "require": { + "ext-simplexml": "*", + "ext-tokenizer": "*", + "ext-xmlwriter": "*", + "php": ">=5.1.2" + }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, + "bin": [ + "scripts/phpcs", + "scripts/phpcbf" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.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/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 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": "2016-11-30 04:02:31" + }, { "name": "symfony/browser-kit", "version": "v3.2.1", diff --git a/gulpfile.js b/gulpfile.js index 69741dfadb..8a0243d610 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,5 +1,6 @@ var elixir = require('laravel-elixir'); require('laravel-elixir-codeception-standalone'); +require('laravel-elixir-phpcs'); /* |-------------------------------------------------------------------------- | Elixir Asset Management @@ -41,5 +42,18 @@ elixir(function(mix) { mix.codeception(null, { flags: '--report' }); + mix.phpcs([ + 'app/**/*.php', + 'tests/unit/*.php', + 'tests/functional/*.php', + 'tests/acceptance/*.php' + ], { + bin: 'vendor/bin/phpcs', + standard: 'PSR2' + }); + + }); + + diff --git a/package.json b/package.json index d18acfad26..2066ef5788 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "jquery": "^3.1.0", "laravel-elixir": "^6.0.0-11", "laravel-elixir-codeception-standalone": "^0.1.0", + "laravel-elixir-phpcs": "^0.6.1", "laravel-elixir-vue-2": "^0.2.0", "laravel-elixir-webpack-official": "^1.0.2", "lodash": "^4.16.2",