Merge pull request #73 from bushbaby/test-laminas-cache-in-php8

Test laminas cache in php8
bushbaby · May 27, 2021 · 237298a · 237298a
2 parents 9c4209e + 4be8821
commit 237298a
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,28 +7,26 @@ matrix:
       env:
         - DEPENDENCIES=""
         - COMPOSER1=true
-        - LAMINAS_CACHE=true
     - php: 7.3
       env:
         - DEPENDENCIES="--prefer-lowest --prefer-stable"
         - COMPOSER1=true
-        - LAMINAS_CACHE=true
     - php: 7.4
       env:
         - DEPENDENCIES=""
         - EXECUTE_CS_CHECK=true
         - TEST_COVERAGE=true
-        - LAMINAS_CACHE=true
     - php: 7.4
       env:
         - DEPENDENCIES="--prefer-lowest --prefer-stable"
-        - LAMINAS_CACHE=true
     - php: 8.0
       env:
         - DEPENDENCIES=""
+        - ENABLE_MERGE_PLUGIN=true
     - php: 8.0
       env:
         - DEPENDENCIES="--prefer-lowest --prefer-stable"
+        - ENABLE_MERGE_PLUGIN=true
 
 cache:
   directories:
@@ -38,7 +36,8 @@ cache:
 before_script:
   - if [[ $COMPOSER1 == 'true' ]]; then composer self-update --1; fi
   - if [[ $EXECUTE_CS_CHECK == 'true' ]]; then composer require --dev bushbaby/php-cs-fixer-config:^1.0.5; fi
-  - if [[ $LAMINAS_CACHE == 'true' ]]; then composer require --dev laminas/laminas-cache; fi
+  - if [[ $ENABLE_MERGE_PLUGIN == 'true' ]]; then composer require --dev wikimedia/composer-merge-plugin; fi
+  - composer require --dev laminas/laminas-cache
   - composer update $DEPENDENCIES
   - mkdir -p test/_build/logs
   - mkdir -p .php-cs-fixer

diff --git a/composer.json b/composer.json
@@ -22,6 +22,12 @@
         "psr/container": "^1.0"
     },
     "require-dev": {
+        "laminas/laminas-code": "^3.3.1 || ^4.0.0",
+        "laminas/laminas-config": "^3.1",
+        "laminas/laminas-filter": "^2.9.1",
+        "laminas/laminas-modulemanager": "^2.7.3",
+        "laminas/laminas-mvc": "^3.0",
+        "laminas/laminas-servicemanager": "^3.3",
         "league/flysystem-aws-s3-v3": "~1.0",
         "league/flysystem-azure": "~1.0,>=1.0.2",
         "league/flysystem-cached-adapter": "~1.0",
@@ -36,13 +42,7 @@
         "php-coveralls/php-coveralls": "^2.1",
         "phpunit/phpunit": "^9.4.2",
         "spatie/flysystem-dropbox": "~1.0",
-        "superbalist/flysystem-google-storage": "^7.2",
-        "laminas/laminas-code": "^3.3.1 || ^4.0.0",
-        "laminas/laminas-config": "^3.1",
-        "laminas/laminas-filter": "^2.9.1",
-        "laminas/laminas-modulemanager": "^2.7.3",
-        "laminas/laminas-mvc": "^3.0",
-        "laminas/laminas-servicemanager": "^3.3"
+        "superbalist/flysystem-google-storage": "^7.2"
     },
     "suggest": {
         "laminas/laminas-cache": "laminas-cache component ^2.8, if you need laminas-cache support",
@@ -65,6 +65,12 @@
         "laminas": {
             "component": "BsbFlysystem",
             "config-provider": "BsbFlysystem\\ConfigProvider"
+        },
+        "merge-plugin": {
+            "include": [
+                "composer.php8.json"
+            ],
+            "replace": true
         }
     },
     "config": {

diff --git a/composer.php8.json b/composer.php8.json
@@ -0,0 +1,11 @@
+{
+  "replace": {
+    "laminas/laminas-cache-storage-adapter-apc": "*",
+    "laminas/laminas-cache-storage-adapter-dba": "*",
+    "laminas/laminas-cache-storage-adapter-memcached": "*",
+    "laminas/laminas-cache-storage-adapter-mongodb": "*",
+    "laminas/laminas-cache-storage-adapter-wincache": "*",
+    "laminas/laminas-cache-storage-adapter-xcache": "*",
+    "laminas/laminas-cache-storage-adapter-zend-server": "*"
+  }
+}