Skip to content

Commit

Permalink
Merge d0d3312 into 7f0b1d0
Browse files Browse the repository at this point in the history
  • Loading branch information
rieschl authored Oct 22, 2020
2 parents 7f0b1d0 + d0d3312 commit b6d52ae
Show file tree
Hide file tree
Showing 39 changed files with 1,809 additions and 1,650 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@
/laminas-mkdoc-theme/
/phpunit.xml
/vendor/
.phpunit.result.cache
33 changes: 7 additions & 26 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,47 +19,28 @@ services:
matrix:
fast_finish: true
include:
- php: 5.6
env:
- DEPS=lowest
- php: 5.6
env:
- DEPS=latest
- php: 7
env:
- DEPS=lowest
- php: 7
env:
- DEPS=latest
- php: 7.1
env:
- DEPS=lowest
- php: 7.1
- php: 7.3
env:
- DEPS=latest
- CS_CHECK=true
- TEST_COVERAGE=true
- php: 7.2
env:
- DEPS=lowest
- php: 7.2
env:
- DEPS=latest
- php: 7.3
env:
- DEPS=lowest
- php: 7.3
- php: 7.4
env:
- DEPS=latest
- php: 7.4
- php: nightly
env:
- DEPS=latest
- COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"
- SKIP_MONGODB=true # ext-mongodb does not build on php8 yet (https://github.com/mongodb/mongo-php-driver/issues/1161)

before_install:
- if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
- pecl channel-update pecl.php.net
- pecl -q upgrade mongodb
- $(php -m | grep -q mongodb) || echo "extension=mongodb.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
- if [[ $SKIP_MONGODB != 'true' ]]; then pecl -q upgrade mongodb ; fi
- if [[ $SKIP_MONGODB != 'true' ]]; then $(php -m | grep -q mongodb) || echo "extension=mongodb.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini ; fi
- psql -c 'create database laminas_session_test;' -U postgres
- mysql -e 'CREATE DATABASE laminas_session_test;'

Expand Down
12 changes: 5 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
}
},
"require": {
"php": "^5.6 || ^7.0",
"laminas/laminas-eventmanager": "^2.6.2 || ^3.0",
"php": "^7.3 || ~8.0.0",
"laminas/laminas-eventmanager": "^3.0",
"laminas/laminas-stdlib": "^3.2.1",
"laminas/laminas-zendframework-bridge": "^1.0"
},
Expand All @@ -36,11 +36,12 @@
"laminas/laminas-coding-standard": "~1.0.0",
"laminas/laminas-db": "^2.7",
"laminas/laminas-http": "^2.5.4",
"laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
"laminas/laminas-servicemanager": "^3.0.3",
"laminas/laminas-validator": "^2.6",
"mongodb/mongodb": "^1.0.1",
"php-mock/php-mock-phpunit": "^1.1.2 || ^2.0",
"phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20"
"phpspec/prophecy-phpunit": "^2.0",
"phpunit/phpunit": "^9.3"
},
"suggest": {
"laminas/laminas-cache": "Laminas\\Cache component",
Expand All @@ -56,9 +57,6 @@
}
},
"autoload-dev": {
"files": [
"test/autoload.php"
],
"psr-4": {
"LaminasTest\\Session\\": "test/"
}
Expand Down
18 changes: 9 additions & 9 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@
</exclude>
</groups>

<filter>
<whitelist processUncoveredFilesFromWhitelist="true">
<coverage>
<include>
<directory suffix=".php">./src</directory>
<exclude>
<file>src/compatibility/autoload.php</file>
<file>src/Validator/AbstractValidatorChainEM2.php</file>
</exclude>
</whitelist>
</filter>
</include>
<exclude>
<file>src/compatibility/autoload.php</file>
<file>src/Validator/AbstractValidatorChainEM2.php</file>
</exclude>
</coverage>

<php>
<ini name="date.timezone" value="UTC"/>
<ini name="date.timezone" value="UTC" />

<!-- OB_ENABLED should be enabled for some tests to check if all
functionality works as expected. Such tests include those for
Expand Down
55 changes: 0 additions & 55 deletions src/Validator/AbstractValidatorChainEM2.php

This file was deleted.

55 changes: 0 additions & 55 deletions src/Validator/AbstractValidatorChainEM3.php

This file was deleted.

63 changes: 0 additions & 63 deletions src/Validator/ValidatorChainTrait.php

This file was deleted.

Loading

0 comments on commit b6d52ae

Please sign in to comment.