Merge branch 'release-1.4.0' into stable

geoffroy-aubry · Mar 20, 2015 · 65c2708 · 65c2708
2 parents aa654c8 + 7850980
commit 65c2708
Show file tree

Hide file tree

Showing 8 changed files with 2,306 additions and 425 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@
 /.project
 /build/
 *~
+.idea
 /vendor/
 composer.phar
-/.twgit_features_subject
+/.twgit*
diff --git a/.travis.yml b/.travis.yml
@@ -7,8 +7,8 @@ php:
 
 before_script:
   - cp phpunit-dist.xml phpunit.xml
-  - curl -s http://getcomposer.org/installer | php
-  - php composer.phar install --dev --no-interaction
+  - composer self-update
+  - composer install --dev --no-interaction
 
 script:
   - mkdir -p build/logs

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 Change log
 ==========
 
+## Version 1.4.0 (2015-03-20)
+
+Feature:
+
+  - [#4](https://github.com/geoffroy-aubry/Helpers/issues/4): Truncate too long paths when debugging.
+
 ## Version 1.3.2 (2013-11-08)
 
 Fixes:

diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
     },
     "require-dev": {
         "phpunit/phpunit":           ">=3.7",
-        "phpmd/phpmd":               "1.4.*",
+        "phpmd/phpmd":               "2.0.*",
         "squizlabs/php_codesniffer": "1.4.*",
         "satooshi/php-coveralls":    "dev-master",
         "apigen/apigen":             "2.8.0"