Skip to content

Commit ed112a3

Browse files
committed
test with php 7.4
1 parent 913c276 commit ed112a3

File tree

6 files changed

+28
-35
lines changed

6 files changed

+28
-35
lines changed

.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ php:
66
- 7.1
77
- 7.2
88
- 7.3
9+
- 7.4
910

1011
env:
1112
- PACKAGE_VERSION=high
@@ -16,7 +17,7 @@ matrix:
1617
include:
1718
- php: 5.6
1819
env: PACKAGE_VERSION=low
19-
- php: 7.3
20+
- php: 7.4
2021
env:
2122
- PACKAGE_VERSION=high
2223
- MINIMUM_STABILITY=dev
@@ -27,7 +28,7 @@ before_script:
2728
- if [[ "$PACKAGE_VERSION" == "high" ]]; then composer update --prefer-source; fi
2829
- if [[ "$PACKAGE_VERSION" == "low" ]]; then composer update --prefer-lowest --prefer-source; fi
2930

30-
script: php vendor/bin/phpunit -c tests/phpunit.xml.dist
31+
script: php vendor/bin/phpunit
3132

3233
notifications:
3334
irc: "irc.freenode.org#jackalope"

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
Changelog
22
=========
33

4+
1.4.1
5+
-----
6+
7+
* Support Symfony 5
8+
* Test with PHP 7.3 and 7.4
9+
410
1.4.0
511
-----
612

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@
2727
}
2828
],
2929
"require": {
30-
"php": "^5.6|^7.0",
30+
"php": "^5.6 || ^7.0",
3131
"phpcr/phpcr": "~2.1.0",
32-
"symfony/console": "~2.3|~3.0|^4.0|^5.0"
32+
"symfony/console": "^2.3|^3.0|^4.0|^5.0"
3333
},
3434
"require-dev": {
3535
"ramsey/uuid": "^3.5",
36-
"phpunit/phpunit": "^5.7"
36+
"phpunit/phpunit": "^5.7 || ^6.0 || ^7.0"
3737
},
3838
"suggest": {
39-
"ramsey/uuid": "A PHP 5.4+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID)."
39+
"ramsey/uuid": "A library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID)."
4040
},
4141
"conflict": {
4242
"jackalope/jackalope-jackrabbit": "<1.2.1"

phpunit.xml.dist

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/7.4/phpunit.xsd"
4+
bootstrap="tests/bootstrap.php"
5+
colors="true"
6+
convertErrorsToExceptions="true"
7+
convertNoticesToExceptions="true"
8+
convertWarningsToExceptions="true">
9+
10+
<testsuites>
11+
<testsuite name="PHPCR Util Test Suite">
12+
<directory>./tests</directory>
13+
</testsuite>
14+
</testsuites>
15+
</phpunit>

tests/bootstrap.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,6 @@
77
*
88
* @link http://phpcr.github.io/
99
*/
10-
if (!class_exists('PHPUnit_Framework_TestCase') ||
11-
version_compare(PHPUnit_Runner_Version::id(), '3.5') < 0
12-
) {
13-
die('PHPUnit framework is required, at least 3.5 version');
14-
}
15-
16-
if (!class_exists('PHPUnit_Framework_MockObject_MockBuilder')) {
17-
die('PHPUnit MockObject plugin is required, at least 1.0.8 version');
18-
}
1910

2011
// $file2 for run tests if phpcr-utils lib inside of vendor directory.
2112
$file = __DIR__.'/../vendor/autoload.php';

tests/phpunit.xml.dist

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)