Merge branch 'master' into GH-39

Author: beberlei

.travis.yml

@@ -1,7 +1,16 @@
 language: php
 before_script:
+  - composer self-update
   - composer install --dev --prefer-dist
-script: phpunit; php vendor/bin/behat --format progress
+script: php vendor/bin/phpunit; php vendor/bin/behat --format progress
 php:
   - 5.4
   - 5.5
+  - 5.6
+  - 7.0
+
+matrix:
+    fast_finish: true
+    allow_failures:
+        - php: hhvm
+        - php: 7

README.md

@@ -35,6 +35,15 @@ It outputs a diff to the screen and you can apply it to your code by piping it t
 
     php refactor.phar <refactoring> <arg1>...<argN> | patch -p1
 
+### Editor Plugins
+
+There are third-party plugins available for using PHP refactorings within
+different text editors.  These separately maintained projects can be found at
+the links below:
+
+* vim : https://github.com/vim-php/vim-php-refactoring
+* emacs : https://github.com/keelerm84/php-refactor-mode.el
+
 ## Why?
 
 Users of PHPStorm (or Netbeans) might wonder why this project exists, all the

composer.json

@@ -11,16 +11,18 @@
         "nikic/php-parser": "@stable",
         "beberlei/assert": "@stable",
         "andrewsville/php-token-reflection": "@stable",
-        "symfony/finder": "@stable",
-        "symfony/console": "@stable"
+        "symfony/finder": "~2.4@stable",
+        "symfony/console": "~2.4@stable",
+        "tomphp/patch-builder": "~0.1"
     },
 
     "require-dev": {
         "php": ">=5.4",
-        "behat/behat": "@stable",
+        "behat/behat": "~2.5@stable",
         "mikey179/vfsStream": "@stable",
         "phake/phake": "@stable",
-        "symfony/process": "@stable"
+        "symfony/process": "@stable",
+        "phpunit/phpunit": "~4.6@stable"
     },
 
     "autoload": {
@@ -31,7 +33,5 @@
         }
     },
 
-    "bin": ["src/bin/refactor"],
-
-    "minimum-stability": "dev"
+    "bin": ["src/bin/refactor"]
 }