Merge 30d17fe into 119e93c

laravie · Jan 27, 2020 · 5b1e0f8 · 5b1e0f8
2 parents 119e93c + 30d17fe
commit 5b1e0f8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,9 +2,9 @@ dist: bionic
 language: php
 
 php:
-  - 7.1
   - 7.2
   - 7.3
+  - 7.4
 
 env:
   global:
@@ -31,11 +31,7 @@ after_script:
 
 matrix:
   include:
-    - php: 7.4
-      env: setup=basic
-    - php: 7.4
-      env: setup=stable
-    - php: 7.1
+    - php: 7.2
       env: setup=coveralls coverage=yes
   allow_failures:
     - php: nightly

diff --git a/composer.json b/composer.json
@@ -20,24 +20,24 @@
         }
     },
     "require": {
-        "php": ">=7.1",
-        "laravie/codex-common": "^1.2"
+        "php": ">=7.2",
+        "laravie/codex-common": "dev-master as 1.3.0"
     },
     "require-dev": {
         "laravie/codex-filter": "^1.0",
-        "mockery/mockery": "^1.3",
+        "mockery/mockery": "^1.3.1",
         "php-http/curl-client": "^2.0",
         "php-http/multipart-stream-builder": "^1.0",
-        "phpunit/phpunit": "^7.5 || ^8.4"
+        "phpunit/phpunit": "^8.4 || ^9.0"
     },
     "suggest": {
         "laravie/codex-filter": "Content filtering for Laravie Codex (^1.0)",
         "php-http/multipart-stream-builder": "Allow to send multipart form request (^1.0)",
-        "phpunit/phpunit": "Allow to use Codex Faker request during testing (^7.5 || ^8.0)"
+        "phpunit/phpunit": "Allow to use Codex Faker request during testing (^8.4 || ^9.0)"
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.1-dev"
+            "dev-master": "5.2-dev"
         }
     },
     "config": {