Merge 8d2ed2b into b515bbc

.travis.yml

@@ -1,7 +1,5 @@
 language: php
 
-sudo: false
-
 env:
   global:
     - COVERALLS=0
@@ -11,14 +9,16 @@ matrix:
     include:
         - php: 5.3
           dist: precise
+          before_script:
         - php: 5.4
-          env: COVERALLS=1 PHPCS=1
+          dist: trusty
         - php: 5.5
+          dist: trusty
         - php: 5.6
+          env: COVERALLS=1 PHPCS=1
         - php: 7
         - php: hhvm
-        # - php: 5.4
-        # env: PHPCS=0 DEFAULT=1
+          dist: trusty
 
     allow_failures:
         # allow failure for Php > 5.6
@@ -27,11 +27,16 @@ matrix:
     fast_finish: true
 
 install:
-  composer install --prefer-source
+  # composer install --prefer-source
+  composer install
 
 script:
     - sh -c "if [ '$COVERALLS' = '1' ]; then ./vendor/bin/phpunit --coverage-clover clover.xml ; else ./vendor/bin/phpunit ; fi"
     - sh -c "if [ '$PHPCS' = '1' ]; then vendor/bin/phpcs -p --extensions=php --standard=PSR2 ./src ./tests ; fi"
 
+before_script:
+    - echo 'memory_limit = 256M' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
 after_script:
     - sh -c "if [ '$COVERALLS' = '1' ]; then vendor/bin/coveralls -vvv ; fi"
+
+

composer.json

@@ -31,10 +31,10 @@
         }
     },
     "require-dev": {
-        "mikey179/vfsStream": "^1.6",
+        "mikey179/vfsstream": "^1.6",
         "phpunit/phpcov": "^2.0",
         "phpunit/phpunit": "^4.8",
-        "satooshi/php-coveralls": "^1.0",
+        "php-coveralls/php-coveralls": "^1.0",
         "squizlabs/php_codesniffer": "^2.5"
     },
     "prefer-stable": true,