Skip to content

Commit a239bde

Browse files
authored
Merge pull request #189 from phpcr/dep-update
test with php 7.4
2 parents 913c276 + 62c0ca0 commit a239bde

15 files changed

+55
-60
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/PHPCR/Tests/Util/Console/Command/BaseCommandTest.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
use PHPCR\Util\Console\Helper\PhpcrConsoleDumperHelper;
1313
use PHPCR\Util\Console\Helper\PhpcrHelper;
1414
use PHPCR\WorkspaceInterface;
15+
use PHPUnit\Framework\MockObject\MockObject;
1516
use PHPUnit\Framework\TestCase;
16-
use PHPUnit_Framework_MockObject_MockObject;
1717
use Symfony\Component\Console\Application;
1818
use Symfony\Component\Console\Helper\HelperSet;
1919
use Symfony\Component\Console\Tester\CommandTester;
@@ -25,37 +25,37 @@
2525
abstract class BaseCommandTest extends TestCase
2626
{
2727
/**
28-
* @var SessionInterface|PHPUnit_Framework_MockObject_MockObject
28+
* @var SessionInterface|MockObject
2929
* */
3030
public $session;
3131

3232
/**
33-
* @var WorkspaceInterface|PHPUnit_Framework_MockObject_MockObject
33+
* @var WorkspaceInterface|MockObject
3434
*/
3535
public $workspace;
3636

3737
/**
38-
* @var RepositoryInterface|PHPUnit_Framework_MockObject_MockObject
38+
* @var RepositoryInterface|MockObject
3939
*/
4040
public $repository;
4141

4242
/**
43-
* @var PhpcrConsoleDumperHelper|PHPUnit_Framework_MockObject_MockObject
43+
* @var PhpcrConsoleDumperHelper|MockObject
4444
*/
4545
public $dumperHelper;
4646

4747
/**
48-
* @var NodeInterface|PHPUnit_Framework_MockObject_MockObject
48+
* @var NodeInterface|MockObject
4949
*/
5050
public $node1;
5151

5252
/**
53-
* @var RowInterface|PHPUnit_Framework_MockObject_MockObject
53+
* @var RowInterface|MockObject
5454
*/
5555
public $row1;
5656

5757
/**
58-
* @var QueryManagerInterface|PHPUnit_Framework_MockObject_MockObject
58+
* @var QueryManagerInterface|MockObject
5959
*/
6060
public $queryManager;
6161

tests/PHPCR/Tests/Util/Console/Command/NodeDumpCommandTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@
77
use PHPCR\Util\Console\Command\NodeDumpCommand;
88
use PHPCR\Util\TreeWalker;
99
use PHPCR\Util\UUIDHelper;
10+
use PHPUnit\Framework\MockObject\MockObject;
1011

1112
class NodeDumpCommandTest extends BaseCommandTest
1213
{
13-
/** @var TreeWalker|\PHPUnit_Framework_MockObject_MockObject */
14+
/** @var TreeWalker|MockObject */
1415
protected $treeWalker;
1516

1617
public function setUp()

tests/PHPCR/Tests/Util/Console/Command/NodeTouchCommandTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@
88
use PHPCR\Tests\Stubs\MockNode;
99
use PHPCR\Util\Console\Command\NodeTouchCommand;
1010
use PHPCR\Util\Console\Helper\PhpcrHelper;
11+
use PHPUnit\Framework\MockObject\MockObject;
1112

1213
/**
1314
* Currently very minimal test for touch command.
1415
*/
1516
class NodeTouchCommandTest extends BaseCommandTest
1617
{
1718
/**
18-
* @var PhpcrHelper|\PHPUnit_Framework_MockObject_MockObject
19+
* @var PhpcrHelper|MockObject
1920
*/
2021
public $phpcrHelper;
2122

tests/PHPCR/Tests/Util/Console/Command/NodeTypeListCommandTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
use PHPCR\Tests\Stubs\MockNodeTypeManager;
66
use PHPCR\Util\Console\Command\NodeTypeListCommand;
7-
use PHPUnit_Framework_MockObject_MockObject;
7+
use PHPUnit\Framework\MockObject\MockObject;
88

99
class NodeTypeListCommandTest extends BaseCommandTest
1010
{
1111
/**
12-
* @var MockNodeTypeManager|PHPUnit_Framework_MockObject_MockObject
12+
* @var MockNodeTypeManager|MockObject
1313
*/
1414
private $nodeTypeManager;
1515

tests/PHPCR/Tests/Util/Console/Command/NodeTypeRegisterCommandTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
use PHPCR\Tests\Stubs\MockNodeTypeManager;
66
use PHPCR\Util\Console\Command\NodeTypeRegisterCommand;
7-
use PHPUnit_Framework_MockObject_MockObject;
7+
use PHPUnit\Framework\MockObject\MockObject;
88

99
class NodeTypeRegisterCommandTest extends BaseCommandTest
1010
{
1111
/**
12-
* @var MockNodeTypeManager|PHPUnit_Framework_MockObject_MockObject
12+
* @var MockNodeTypeManager|MockObject
1313
*/
1414
private $nodeTypeManager;
1515

tests/PHPCR/Tests/Util/Console/Command/NodesUpdateCommandTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
use InvalidArgumentException;
66
use PHPCR\Query\QueryInterface;
77
use PHPCR\Util\Console\Command\NodesUpdateCommand;
8-
use PHPUnit_Framework_MockObject_MockObject;
8+
use PHPUnit\Framework\MockObject\MockObject;
99

1010
class NodesUpdateCommandTest extends BaseCommandTest
1111
{
1212
/**
13-
* @var QueryInterface|PHPUnit_Framework_MockObject_MockObject
13+
* @var QueryInterface|MockObject
1414
*/
1515
private $query;
1616

0 commit comments

Comments
 (0)