Made lib compatible to Laminas and PHP 8.0

fabiang · Jan 13, 2021 · 96353e5 · 96353e5
1 parent bc736d7
commit 96353e5
Show file tree

Hide file tree

Showing 17 changed files with 3,398 additions and 1,124 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 /vendor/
 /tests/logs/*
 !/tests/logs/.gitkeep
+.phpunit.result.cache
diff --git a/.travis.yml b/.travis.yml
@@ -10,16 +10,15 @@ cache:
     - $HOME/.composer/cache
 
 env:
+  global:
+    - XDEBUG_MODE=coverage
   matrix:
     - PREFER_LOWEST=""
     - PREFER_LOWEST="--prefer-lowest"
 
 php:
-  - 7.1
-  - 7.0
-  - 5.6
-  - nightly
-  - hhvm
+  - 7.4
+  - 8.0
 
 before_install:
   - composer self-up

diff --git a/README.md b/README.md
@@ -8,8 +8,7 @@ to add own relations between them and your entities.
 
 [![Latest Stable Version](https://poser.pugx.org/fabiang/doctrine-dynamic/version)](https://packagist.org/packages/fabiang/doctrine-dynamic)
 [![License](https://poser.pugx.org/fabiang/doctrine-dynamic/license)](https://packagist.org/packages/fabiang/doctrine-dynamic)
-[![Dependency Status](https://gemnasium.com/badges/github.com/fabiang/doctrine-dynamic.svg)](https://gemnasium.com/github.com/fabiang/doctrine-dynamic)
-[![Build Status](https://travis-ci.org/fabiang/doctrine-dynamic.svg?branch=master)](https://travis-ci.org/fabiang/doctrine-dynamic)
+[![Build Status](https://travis-ci.com/fabiang/doctrine-dynamic.svg?branch=master)](https://travis-ci.com/fabiang/doctrine-dynamic)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/fabiang/doctrine-dynamic/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/fabiang/doctrine-dynamic/?branch=master)
 [![Code Coverage](https://scrutinizer-ci.com/g/fabiang/doctrine-dynamic/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/fabiang/doctrine-dynamic/?branch=master)
 
@@ -32,7 +31,7 @@ $ composer require fabiang/doctrine-dynamic
 
 ## Framework integration
 
-* [Zend Framework 2 & 3](https://github.com/fabiang/doctrine-dynamic-zf)
+* [Laminas (also Zend Framework 2 & 3)](https://github.com/fabiang/doctrine-dynamic-laminas)
 
 ## Usage
 

diff --git a/behat.yml b/behat.yml
@@ -1,9 +1,9 @@
 default:
   suites:
     doctrinedynamic:
-      paths: [ %paths.base%/tests/features/ ]
-      contexts: 
+      paths: [ "%paths.base%/tests/features/" ]
+      contexts:
         - Fabiang\DoctrineDynamic\Behat\FeatureContext:
-          - { "Fabiang\\DoctrineDynamic\\Behat\\NamespaceOne\\Entity": %paths.base%/tests/entities/NamespaceOne/, "Fabiang\\DoctrineDynamic\\Behat\\NamespaceTwo\\Entity": %paths.base%/tests/entities/NamespaceTwo/ }
+          - { "Fabiang\\DoctrineDynamic\\Behat\\NamespaceOne\\Entity": "%paths.base%/tests/entities/NamespaceOne/", "Fabiang\\DoctrineDynamic\\Behat\\NamespaceTwo\\Entity": "%paths.base%/tests/entities/NamespaceTwo/" }
   testers:
     strict: true
diff --git a/composer.json b/composer.json
@@ -23,15 +23,17 @@
     },
     "minimum-stability": "stable",
     "require": {
-        "php": "^5.6 || ^7.0",
-        "doctrine/common": "^2.5",
+        "php": "^7.4 || ^8.0",
+        "doctrine/common": "^3.0",
         "doctrine/orm": "^2.5",
-        "zendframework/zend-hydrator": "^1.0 || ^2.0",
-        "zendframework/zend-stdlib": "^2.4 || ^3.0"
+        "laminas/laminas-hydrator": "^3.0 || ^4.0",
+        "laminas/laminas-stdlib": "^3.0"
     },
     "require-dev": {
-        "behat/behat": "^3.2.2",
-        "phpunit/php-invoker": "^1.1",
-        "phpunit/phpunit": "^5.7.2"
+        "behat/behat": "^3.8",
+        "dms/phpunit-arraysubset-asserts": "^0.2.1",
+        "phpspec/prophecy-phpunit": "^2.0",
+        "phpunit/php-invoker": "^3.1",
+        "phpunit/phpunit": "^9.5"
     }
 }