Merge branch 'master' into toolbar-tweaks

hummer2k · Aug 26, 2020 · 80610c1 · 80610c1
2 parents 20f0732 + 0508d3a
commit 80610c1
Show file tree

Hide file tree

Showing 3 changed files with 764 additions and 521 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,20 +5,15 @@ cache:
     - $HOME/.composer/cache/files
 
 php:
-  - 7.2
   - 7.3
   - 7.4
 
 matrix:
   include:
-    - php: 7.2
-      env: dependencies=lowest
     - php: 7.3
       env: dependencies=lowest
     - php: 7.4
       env: dependencies=lowest
-    - php: 7.2
-      env: dependencies=highest
     - php: 7.3
       env: dependencies=highest
     - php: 7.4

diff --git a/composer.json b/composer.json
@@ -21,17 +21,17 @@
         }
     ],
     "require": {
-        "php": "^7.2",
-        "laminas/laminas-mvc": "^3.0",
-        "laminas/laminas-servicemanager": "^3.4",
+        "php": "^7.3",
+        "laminas/laminas-config": "^3.0",
+        "laminas/laminas-dependency-plugin": "^0.2",
         "laminas/laminas-eventmanager": "^3.0",
+        "laminas/laminas-http": "^2.5",
         "laminas/laminas-modulemanager": "^2.7",
+        "laminas/laminas-mvc": "^3.0",
         "laminas/laminas-router": "^3.0",
+        "laminas/laminas-servicemanager": "^3.4",
         "laminas/laminas-stdlib": "^3.0",
-        "laminas/laminas-http": "^2.5",
-        "laminas/laminas-config": "^2.6",
-        "laminas/laminas-view": "^2.11.3",
-        "laminas/laminas-dependency-plugin": "^0.2"
+        "laminas/laminas-view": "^2.11.3"
     },
     "suggest": {
         "laminas/laminas-filter": "Filter configured params e.g. src, href attributes (basepath, cachebuster, ...)"