Merge pull request #4 from moufmouf/symfony5_compat

Adding compatibility with Symfony 5
thecodingmachine · Dec 2, 2019 · aeeda8b · aeeda8b
2 parents ec3c559 + 1ba2b64
commit aeeda8b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -42,8 +42,8 @@ before_install:
 
 install:
   # To be removed when this issue will be resolved: https://github.com/composer/composer/issues/5355
-  - if [[ "$COMPOSER_FLAGS" == *"--prefer-lowest"* ]]; then composer update --prefer-dist --no-interaction --prefer-stable --quiet; fi
-  - composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction
+  - if [[ "$COMPOSER_FLAGS" == *"--prefer-lowest"* ]]; then COMPOSER_MEMORY_LIMIT=-1 composer update --prefer-dist --no-interaction --prefer-stable --quiet; fi
+  - COMPOSER_MEMORY_LIMIT=-1 composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction
   #- ./vendor/bin/simple-phpunit install
 
 script:

diff --git a/composer.json b/composer.json
@@ -21,13 +21,13 @@
     "thecodingmachine/graphqlite-bundle": "^4",
     "thecodingmachine/tdbm-bundle": "^5.1",
     "thecodingmachine/tdbm-graphql": "~4.0",
-    "symfony/framework-bundle": "^4.1.9"
+    "symfony/framework-bundle": "^4.1.9 | ^5"
   },
   "require-dev": {
-    "symfony/security-bundle": "^4.1.9",
-    "symfony/yaml": "^4.1.9",
+    "symfony/security-bundle": "^4.1.9 | ^5",
+    "symfony/yaml": "^4.1.9 | ^5",
     "phpunit/phpunit": "^8.0.4",
-    "phpstan/phpstan": "^0.11.4",
+    "phpstan/phpstan-shim": "^0.11.4",
     "php-coveralls/php-coveralls": "^2.1"
   },
   "scripts": {