Merge branch '1.1'

gpslab · Feb 12, 2019 · c514a44 · c514a44
2 parents 304c19d + 390f59b
commit c514a44
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 20 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,17 +2,9 @@ language: php
 
 sudo: false
 
-php:
-    - 7.2
-    - 7.1
-    - 7.0
-    - 5.6
-    - 5.5
-    - 5.4
-    - hhvm
-
 notifications:
-    email: deploy@peter-gribanov.ru
+    email:
+        - deploy@peter-gribanov.ru
 
 branches:
   except:
@@ -21,6 +13,11 @@ branches:
 matrix:
     fast_finish: true
     include:
+        - php: 7.2
+        - php: 7.1
+        - php: 7.0
+        - php: 5.6
+        - php: 5.5
         - php: 5.4
           env: SYMFONY_VERSION=2.7.*
         - php: 5.4
@@ -35,18 +32,24 @@ matrix:
           env: SYMFONY_VERSION=3.3.*
         - php: 5.5
           env: SYMFONY_VERSION=3.4.*
-    allow_failures:
+        - php: 7.1
+          env: SYMFONY_VERSION=4.0.* PHPUNIT_VERSION=5.7.*
+        - php: 7.1
+          env: SYMFONY_VERSION=4.1.* PHPUNIT_VERSION=5.7.*
+        - php: 7.1
+          env: SYMFONY_VERSION=4.2.* PHPUNIT_VERSION=5.7.*
         - php: hhvm
+          sudo: required
+          dist: trusty
+          group: edge
 
 before_install:
-    - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then phpenv config-rm xdebug.ini; fi;
-    - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then echo "memory_limit=2G" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;
+    - if [ "$TRAVIS_PHP_VERSION" = "hhvm" ]; then echo 'xdebug.enable = on' >> /etc/hhvm/php.ini; fi
     - if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi;
-    - composer self-update
-    - mkdir build
 
 before_script:
     - if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --dev --no-update; fi;
+    - if [ "$PHPUNIT_VERSION" != "" ]; then composer require "phpunit/phpunit:${PHPUNIT_VERSION}" --dev --no-update; fi;
     - composer install --prefer-dist --no-interaction --no-scripts --no-progress
 
 script:

diff --git a/composer.json b/composer.json
@@ -20,11 +20,11 @@
         "gpslab/compressor": "~1.0"
     },
     "require-dev": {
-        "symfony/http-kernel": "~2.3|~3.0",
-        "symfony/dependency-injection": "~2.3|~3.0",
-        "symfony/expression-language": "~2.3|~3.0",
-        "symfony/console": "~2.3|~3.0",
-        "symfony/stopwatch": "~2.3|~3.0",
+        "symfony/http-kernel": "~2.3|~3.0|~4.0",
+        "symfony/dependency-injection": "~2.3|~3.0|~4.0",
+        "symfony/expression-language": "~2.3|~3.0|~4.0",
+        "symfony/console": "~2.3|~3.0|~4.0",
+        "symfony/stopwatch": "~2.3|~3.0|~4.0",
         "composer/composer" : "~1.3",
         "phpunit/phpunit": "~4.8",
         "scrutinizer/ocular": "~1.3",