Merge pull request #189 from phpcr/dep-update

test with php 7.4

Author: dbu

.travis.yml

@@ -6,6 +6,7 @@ php:
   - 7.1
   - 7.2
   - 7.3
+  - 7.4
 
 env:
   - PACKAGE_VERSION=high
@@ -16,7 +17,7 @@ matrix:
   include:
     - php: 5.6
       env: PACKAGE_VERSION=low
-    - php: 7.3
+    - php: 7.4
       env:
         - PACKAGE_VERSION=high
         - MINIMUM_STABILITY=dev
@@ -27,7 +28,7 @@ before_script:
   - if [[ "$PACKAGE_VERSION" == "high" ]]; then composer update --prefer-source; fi
   - if [[ "$PACKAGE_VERSION" == "low" ]]; then composer update --prefer-lowest --prefer-source; fi
 
-script: php vendor/bin/phpunit -c tests/phpunit.xml.dist
+script: php vendor/bin/phpunit
 
 notifications:
   irc: "irc.freenode.org#jackalope"

CHANGELOG.md

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+1.4.1
+-----
+
+* Support Symfony 5
+* Test with PHP 7.3 and 7.4
+
 1.4.0
 -----
 

composer.json

@@ -27,16 +27,16 @@
         }
     ],
     "require": {
-        "php": "^5.6|^7.0",
+        "php": "^5.6 || ^7.0",
         "phpcr/phpcr": "~2.1.0",
-        "symfony/console": "~2.3|~3.0|^4.0|^5.0"
+        "symfony/console": "^2.3|^3.0|^4.0|^5.0"
     },
     "require-dev": {
         "ramsey/uuid": "^3.5",
-        "phpunit/phpunit": "^5.7"
+        "phpunit/phpunit": "^5.7 || ^6.0 || ^7.0"
     },
     "suggest": {
-        "ramsey/uuid": "A PHP 5.4+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID)."
+        "ramsey/uuid": "A library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID)."
     },
     "conflict": {
         "jackalope/jackalope-jackrabbit": "<1.2.1"

phpunit.xml.dist

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/7.4/phpunit.xsd"
+         bootstrap="tests/bootstrap.php"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true">
+
+    <testsuites>
+        <testsuite name="PHPCR Util Test Suite">
+            <directory>./tests</directory>
+        </testsuite>
+    </testsuites>
+</phpunit>

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

@@ -12,8 +12,8 @@
 use PHPCR\Util\Console\Helper\PhpcrConsoleDumperHelper;
 use PHPCR\Util\Console\Helper\PhpcrHelper;
 use PHPCR\WorkspaceInterface;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
-use PHPUnit_Framework_MockObject_MockObject;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Helper\HelperSet;
 use Symfony\Component\Console\Tester\CommandTester;
@@ -25,37 +25,37 @@
 abstract class BaseCommandTest extends TestCase
 {
     /**
-     * @var SessionInterface|PHPUnit_Framework_MockObject_MockObject
+     * @var SessionInterface|MockObject
      * */
     public $session;
 
     /**
-     * @var WorkspaceInterface|PHPUnit_Framework_MockObject_MockObject
+     * @var WorkspaceInterface|MockObject
      */
     public $workspace;
 
     /**
-     * @var RepositoryInterface|PHPUnit_Framework_MockObject_MockObject
+     * @var RepositoryInterface|MockObject
      */
     public $repository;
 
     /**
-     * @var PhpcrConsoleDumperHelper|PHPUnit_Framework_MockObject_MockObject
+     * @var PhpcrConsoleDumperHelper|MockObject
      */
     public $dumperHelper;
 
     /**
-     * @var NodeInterface|PHPUnit_Framework_MockObject_MockObject
+     * @var NodeInterface|MockObject
      */
     public $node1;
 
     /**
-     * @var RowInterface|PHPUnit_Framework_MockObject_MockObject
+     * @var RowInterface|MockObject
      */
     public $row1;
 
     /**
-     * @var QueryManagerInterface|PHPUnit_Framework_MockObject_MockObject
+     * @var QueryManagerInterface|MockObject
      */
     public $queryManager;
 

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

@@ -7,10 +7,11 @@
 use PHPCR\Util\Console\Command\NodeDumpCommand;
 use PHPCR\Util\TreeWalker;
 use PHPCR\Util\UUIDHelper;
+use PHPUnit\Framework\MockObject\MockObject;
 
 class NodeDumpCommandTest extends BaseCommandTest
 {
-    /** @var TreeWalker|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var TreeWalker|MockObject */
     protected $treeWalker;
 
     public function setUp()

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

@@ -8,14 +8,15 @@
 use PHPCR\Tests\Stubs\MockNode;
 use PHPCR\Util\Console\Command\NodeTouchCommand;
 use PHPCR\Util\Console\Helper\PhpcrHelper;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * Currently very minimal test for touch command.
  */
 class NodeTouchCommandTest extends BaseCommandTest
 {
     /**
-     * @var PhpcrHelper|\PHPUnit_Framework_MockObject_MockObject
+     * @var PhpcrHelper|MockObject
      */
     public $phpcrHelper;
 

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

@@ -4,12 +4,12 @@
 
 use PHPCR\Tests\Stubs\MockNodeTypeManager;
 use PHPCR\Util\Console\Command\NodeTypeListCommand;
-use PHPUnit_Framework_MockObject_MockObject;
+use PHPUnit\Framework\MockObject\MockObject;
 
 class NodeTypeListCommandTest extends BaseCommandTest
 {
     /**
-     * @var MockNodeTypeManager|PHPUnit_Framework_MockObject_MockObject
+     * @var MockNodeTypeManager|MockObject
      */
     private $nodeTypeManager;
 

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

@@ -4,12 +4,12 @@
 
 use PHPCR\Tests\Stubs\MockNodeTypeManager;
 use PHPCR\Util\Console\Command\NodeTypeRegisterCommand;
-use PHPUnit_Framework_MockObject_MockObject;
+use PHPUnit\Framework\MockObject\MockObject;
 
 class NodeTypeRegisterCommandTest extends BaseCommandTest
 {
     /**
-     * @var MockNodeTypeManager|PHPUnit_Framework_MockObject_MockObject
+     * @var MockNodeTypeManager|MockObject
      */
     private $nodeTypeManager;
 

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

@@ -5,12 +5,12 @@
 use InvalidArgumentException;
 use PHPCR\Query\QueryInterface;
 use PHPCR\Util\Console\Command\NodesUpdateCommand;
-use PHPUnit_Framework_MockObject_MockObject;
+use PHPUnit\Framework\MockObject\MockObject;
 
 class NodesUpdateCommandTest extends BaseCommandTest
 {
     /**
-     * @var QueryInterface|PHPUnit_Framework_MockObject_MockObject
+     * @var QueryInterface|MockObject
      */
     private $query;
 

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

@@ -4,12 +4,12 @@
 
 use PHPCR\Query\QueryInterface;
 use PHPCR\Util\Console\Command\WorkspaceQueryCommand;
-use PHPUnit_Framework_MockObject_MockObject;
+use PHPUnit\Framework\MockObject\MockObject;
 
 class WorkspaceQueryCommandTest extends BaseCommandTest
 {
     /**
-     * @var QueryInterface|PHPUnit_Framework_MockObject_MockObject
+     * @var QueryInterface|MockObject
      */
     protected $query;
 

tests/PHPCR/Tests/Util/NodeHelperTest.php

@@ -4,8 +4,8 @@
 
 use PHPCR\Tests\Stubs\MockNode;
 use PHPCR\Util\NodeHelper;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
-use PHPUnit_Framework_MockObject_MockObject;
 
 require_once __DIR__.'/../Stubs/MockNode.php';
 
@@ -84,7 +84,7 @@ public function testGenerateAutoNodeNameInvalid($hint)
 
     public function testIsSystemItem()
     {
-        /** @var MockNode|PHPUnit_Framework_MockObject_MockObject $sys */
+        /** @var MockNode|MockObject $sys */
         $sys = $this->createMock(MockNode::class);
 
         $sys->expects($this->once())
@@ -108,7 +108,7 @@ public function testIsSystemItem()
 
         $this->assertTrue(NodeHelper::isSystemItem($sys));
 
-        /** @var MockNode|PHPUnit_Framework_MockObject_MockObject $top */
+        /** @var MockNode|MockObject $top */
         $top = $this->createMock(MockNode::class);
         $top->expects($this->once())
             ->method('getDepth')
@@ -121,7 +121,7 @@ public function testIsSystemItem()
 
         $this->assertFalse(NodeHelper::isSystemItem($top));
 
-        /** @var MockNode|PHPUnit_Framework_MockObject_MockObject $deep */
+        /** @var MockNode|MockObject $deep */
         $deep = $this->createMock(MockNode::class);
         $deep->expects($this->once())
             ->method('getDepth')

tests/PHPCR/Tests/Util/QOM/QueryBuilderTest.php

@@ -11,14 +11,14 @@
 use PHPCR\Query\QOM\SameNodeJoinConditionInterface;
 use PHPCR\Query\QOM\SourceInterface;
 use PHPCR\Util\QOM\QueryBuilder;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
-use PHPUnit_Framework_MockObject_MockObject;
 use RuntimeException;
 
 class QueryBuilderTest extends TestCase
 {
     /**
-     * @var PHPUnit_Framework_MockObject_MockObject|QueryObjectModelFactoryInterface
+     * @var MockObject|QueryObjectModelFactoryInterface
      */
     protected $qf;
 
@@ -330,7 +330,7 @@ public function testGetQuery()
     }
 
     /**
-     * @return QueryObjectModelInterface|PHPUnit_Framework_MockObject_MockObject
+     * @return QueryObjectModelInterface|MockObject
      */
     private function createQueryMock()
     {

tests/bootstrap.php

@@ -7,15 +7,6 @@
  *
  * @link http://phpcr.github.io/
  */
-if (!class_exists('PHPUnit_Framework_TestCase') ||
-    version_compare(PHPUnit_Runner_Version::id(), '3.5') < 0
-) {
-    die('PHPUnit framework is required, at least 3.5 version');
-}
-
-if (!class_exists('PHPUnit_Framework_MockObject_MockBuilder')) {
-    die('PHPUnit MockObject plugin is required, at least 1.0.8 version');
-}
 
 // $file2 for run tests if phpcr-utils lib inside of vendor directory.
 $file = __DIR__.'/../vendor/autoload.php';