diff --git a/.php_cs b/.php_cs index 5a2dd57..0ea0c2a 100644 --- a/.php_cs +++ b/.php_cs @@ -13,5 +13,6 @@ return PhpCsFixer\Config::create() PhpCsFixer\Finder::create() ->in(__DIR__ . '/src') ->in(__DIR__ . '/tests') - )->setRiskyAllowed(true) - ->setUsingCache(false); \ No newline at end of file + ) + ->setRiskyAllowed(true) + ->setUsingCache(false); diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d9dcaff..889f720 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,7 +6,7 @@ code base clean, unified and future proof. ## Branch -You should only open pull requests against the develop branch. +You should only open pull requests against the master branch. ## Unit-Tests @@ -28,13 +28,7 @@ Please allow me time to review your pull requests. I will give my best to review ## Coding Standards -When contributing code to PHP-ML, you must follow its coding standards. To make a long story short, here is the golden tool: - -``` -tools/php-cs-fixer.sh -``` - -This script run PHP Coding Standards Fixer with `--level=symfony` param. +When contributing code to PHP-ML, you must follow its coding standards. It's as easy as executing `php-cs-fixer` (v2) in root directory. More about PHP-CS-Fixer: [http://cs.sensiolabs.org/](http://cs.sensiolabs.org/) diff --git a/tools/php-cs-fixer.sh b/tools/php-cs-fixer.sh deleted file mode 100755 index 6eb37cb..0000000 --- a/tools/php-cs-fixer.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -echo "Fixing src/ folder" -php-cs-fixer fix src/ - -echo "Fixing tests/ folder" -php-cs-fixer fix tests/