Merge pull request #5 from PedroTroller/fix/php-cs-fixer-dependancy

Fix cs fixer dep

.php_cs

@@ -9,6 +9,7 @@ return Symfony\CS\Config\Config::create()
     ->fixers(array(
         'align_double_arrow',
         'align_equals',
+        'assign_and_return',
         'concat_with_spaces',
         'line_break_between_statements',
         'logical_not_operators_with_spaces',
@@ -22,5 +23,6 @@ return Symfony\CS\Config\Config::create()
     ->addCustomFixer(new PedroTroller\CS\Fixer\Contrib\LineBreakBetweenStatementsFixer())
     ->addCustomFixer(new PedroTroller\CS\Fixer\Contrib\PhpspecFixer())
     ->addCustomFixer(new PedroTroller\CS\Fixer\Contrib\SingleCommentExpandedFixer())
+    ->addCustomFixer(new PedroTroller\CS\Fixer\Contrib\AssignAndReturnFixer())
     ->finder($finder)
 ;

.travis.yml

@@ -12,6 +12,21 @@ cache:
     directories:
         - $HOME/.composer/cache
 
+matrix:
+    include:
+        - php: 5.3
+          env: 'COMPOSER_FLAGS="--prefer-lowest --prefer-stable"'
+        - php: 5.4
+          env: 'COMPOSER_FLAGS="--prefer-lowest --prefer-stable"'
+        - php: 5.5
+          env: 'COMPOSER_FLAGS="--prefer-lowest --prefer-stable"'
+        - php: 5.6
+          env: 'COMPOSER_FLAGS="--prefer-lowest --prefer-stable"'
+        - php: 7.0
+          env: 'COMPOSER_FLAGS="--prefer-lowest --prefer-stable"'
+        - php: hhvm
+          env: 'COMPOSER_FLAGS="--prefer-lowest --prefer-stable"'
+
 branches:
     only:
         - master
@@ -20,5 +35,4 @@ before_script:
     - composer install
 
 script:
-    - bin/phpspec run -fpretty
-    - bin/php-cs-fixer --diff --dry-run -v fix
+    - make test

Makefile

@@ -0,0 +1,6 @@
+test:
+	bin/phpspec run -fpretty
+	bin/php-cs-fixer --diff --dry-run -v fix
+
+fix:
+	bin/php-cs-fixer --diff -v fix

composer.json

@@ -1,9 +1,10 @@
 {
     "name": "pedrotroller/php-cs-custom-fixer",
+    "description": "PHP-CS-FIXER : my custom fixers",
     "license": "MIT",
     "require": {
         "php": ">5.3.6",
-        "fabpot/php-cs-fixer": "^1.11"
+        "friendsofphp/php-cs-fixer": "^1.11"
     },
     "require-dev": {
         "phpspec/phpspec": "^2.4"
@@ -12,11 +13,12 @@
         "psr-0": { "PedroTroller\\CS": "src/" }
     },
     "config": {
-        "bin-dir": "bin"
+        "bin-dir": "bin",
+        "sort-packages": true
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0.x-dev"
+            "dev-master": "1.4.x-dev"
         }
     }
 }