Merge pull request #10 from silasjoisten/feature/php-70

php7.0 compatible
silasjoisten · May 15, 2018 · cc65ca4 · cc65ca4
2 parents c8d9f49 + 3894efa
commit cc65ca4
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 6,569 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,6 +11,8 @@ stages:
 matrix:
   fast_finish: true
   include:
+    - stage: test
+      php: 7.0
     - stage: test
       php: 7.1
     - stage: test

diff --git a/UPRADE.md b/UPRADE.md
@@ -0,0 +1,4 @@
+UPRADE 2.x
+======
+
+Removed Type hints to support PHP 7.0
diff --git a/composer.json b/composer.json
@@ -12,8 +12,7 @@
     "require": {
         "php": "^7.0",
         "sonata-project/admin-bundle": "^3.35",
-        "sonata-project/media-bundle": "^3.12",
-        "symfony/flex": "^1.0"
+        "sonata-project/media-bundle": "^3.12"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^2.11",