diff --git a/Gruntfile.js b/Gruntfile.js index e18273a..cdfb832 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -34,7 +34,8 @@ module.exports = function (grunt) { }, phpcs: { options: { - standard: 'PSR2' + standard: 'PSR2', + bin: 'vendor/bin/phpcs' }, php: { src: ['*.php', 'classes/*.php', 'controllers/*.php'] diff --git a/classes/VideoDownload.php b/classes/VideoDownload.php index c22733b..5ed0dff 100644 --- a/classes/VideoDownload.php +++ b/classes/VideoDownload.php @@ -112,7 +112,6 @@ class VideoDownload } else { return $process->getOutput(); } - } public function getFilename($url, $format = null) diff --git a/composer.json b/composer.json index 19d785c..76d8d59 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,8 @@ "rudloff/rtmpdump-bin": "~2.3" }, "require-dev": { - "symfony/var-dumper": "~3.1.0" + "symfony/var-dumper": "~3.1.0", + "squizlabs/php_codesniffer": "~2.6.2" }, "extra": { "paas": { diff --git a/composer.lock b/composer.lock index cbf63e2..0e3044d 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": "4bfdfea4d20ddb73ec05b99edcbf25dd", - "content-hash": "7b3b4261846c3cccdcd9e1324ff06f76", + "hash": "02a1907213fdf20eb40d889fd36604fb", + "content-hash": "64b38a6176e111451464302572ac8987", "packages": [ { "name": "container-interop/container-interop", @@ -702,6 +702,84 @@ } ], "packages-dev": [ + { + "name": "squizlabs/php_codesniffer", + "version": "2.6.2", + "source": { + "type": "git", + "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", + "reference": "4edb770cb853def6e60c93abb088ad5ac2010c83" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/4edb770cb853def6e60c93abb088ad5ac2010c83", + "reference": "4edb770cb853def6e60c93abb088ad5ac2010c83", + "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-07-13 23:29:13" + }, { "name": "symfony/polyfill-mbstring", "version": "v1.2.0",