Skip to content

Commit 96353e5

Browse files
committed
Made lib compatible to Laminas and PHP 8.0
1 parent bc736d7 commit 96353e5

17 files changed

+3398
-1124
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
/vendor/
22
/tests/logs/*
33
!/tests/logs/.gitkeep
4+
.phpunit.result.cache

.travis.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,15 @@ cache:
1010
- $HOME/.composer/cache
1111

1212
env:
13+
global:
14+
- XDEBUG_MODE=coverage
1315
matrix:
1416
- PREFER_LOWEST=""
1517
- PREFER_LOWEST="--prefer-lowest"
1618

1719
php:
18-
- 7.1
19-
- 7.0
20-
- 5.6
21-
- nightly
22-
- hhvm
20+
- 7.4
21+
- 8.0
2322

2423
before_install:
2524
- composer self-up

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ to add own relations between them and your entities.
88

99
[![Latest Stable Version](https://poser.pugx.org/fabiang/doctrine-dynamic/version)](https://packagist.org/packages/fabiang/doctrine-dynamic)
1010
[![License](https://poser.pugx.org/fabiang/doctrine-dynamic/license)](https://packagist.org/packages/fabiang/doctrine-dynamic)
11-
[![Dependency Status](https://gemnasium.com/badges/github.com/fabiang/doctrine-dynamic.svg)](https://gemnasium.com/github.com/fabiang/doctrine-dynamic)
12-
[![Build Status](https://travis-ci.org/fabiang/doctrine-dynamic.svg?branch=master)](https://travis-ci.org/fabiang/doctrine-dynamic)
11+
[![Build Status](https://travis-ci.com/fabiang/doctrine-dynamic.svg?branch=master)](https://travis-ci.com/fabiang/doctrine-dynamic)
1312
[![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)
1413
[![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)
1514

@@ -32,7 +31,7 @@ $ composer require fabiang/doctrine-dynamic
3231

3332
## Framework integration
3433

35-
* [Zend Framework 2 & 3](https://github.com/fabiang/doctrine-dynamic-zf)
34+
* [Laminas (also Zend Framework 2 & 3)](https://github.com/fabiang/doctrine-dynamic-laminas)
3635

3736
## Usage
3837

behat.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
default:
22
suites:
33
doctrinedynamic:
4-
paths: [ %paths.base%/tests/features/ ]
5-
contexts:
4+
paths: [ "%paths.base%/tests/features/" ]
5+
contexts:
66
- Fabiang\DoctrineDynamic\Behat\FeatureContext:
7-
- { "Fabiang\\DoctrineDynamic\\Behat\\NamespaceOne\\Entity": %paths.base%/tests/entities/NamespaceOne/, "Fabiang\\DoctrineDynamic\\Behat\\NamespaceTwo\\Entity": %paths.base%/tests/entities/NamespaceTwo/ }
7+
- { "Fabiang\\DoctrineDynamic\\Behat\\NamespaceOne\\Entity": "%paths.base%/tests/entities/NamespaceOne/", "Fabiang\\DoctrineDynamic\\Behat\\NamespaceTwo\\Entity": "%paths.base%/tests/entities/NamespaceTwo/" }
88
testers:
99
strict: true

composer.json

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,17 @@
2323
},
2424
"minimum-stability": "stable",
2525
"require": {
26-
"php": "^5.6 || ^7.0",
27-
"doctrine/common": "^2.5",
26+
"php": "^7.4 || ^8.0",
27+
"doctrine/common": "^3.0",
2828
"doctrine/orm": "^2.5",
29-
"zendframework/zend-hydrator": "^1.0 || ^2.0",
30-
"zendframework/zend-stdlib": "^2.4 || ^3.0"
29+
"laminas/laminas-hydrator": "^3.0 || ^4.0",
30+
"laminas/laminas-stdlib": "^3.0"
3131
},
3232
"require-dev": {
33-
"behat/behat": "^3.2.2",
34-
"phpunit/php-invoker": "^1.1",
35-
"phpunit/phpunit": "^5.7.2"
33+
"behat/behat": "^3.8",
34+
"dms/phpunit-arraysubset-asserts": "^0.2.1",
35+
"phpspec/prophecy-phpunit": "^2.0",
36+
"phpunit/php-invoker": "^3.1",
37+
"phpunit/phpunit": "^9.5"
3638
}
3739
}

0 commit comments

Comments
 (0)