1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
|
From: Andreas Braun <git@alcaeus.org>
Date: Sun, 6 Aug 2017 16:55:52 +0200
Subject: Bump phpunit dependency to 6.3
Origin: upstream, https://github.com/doctrine/data-fixtures/commit/a24d3f43c3bec905da58936eef2d7e324d777abb
Bug-Debian: https://bugs.debian.org/882893
---
composer.json | 2 +-
tests/Doctrine/Tests/Common/DataFixtures/BaseTest.php | 4 ++--
.../Doctrine/Tests/Common/DataFixtures/Executor/PHPCRExecutorTest.php | 4 ++--
.../Tests/Common/DataFixtures/Sorter/TopologicalSorterTest.php | 3 ++-
tests/Doctrine/Tests/Common/DataFixtures/Sorter/VertexTest.php | 3 ++-
5 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/composer.json b/composer.json
index 612d2ca..b7fca41 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
"require-dev": {
"doctrine/orm": "^2.5.4",
"doctrine/dbal": "^2.5.4",
- "phpunit/phpunit": "^5.4.6"
+ "phpunit/phpunit": "^6.3"
},
"conflict": {
"doctrine/orm": "< 2.4"
diff --git a/tests/Doctrine/Tests/Common/DataFixtures/BaseTest.php b/tests/Doctrine/Tests/Common/DataFixtures/BaseTest.php
index 6903e76..5e9bcde 100644
--- a/tests/Doctrine/Tests/Common/DataFixtures/BaseTest.php
+++ b/tests/Doctrine/Tests/Common/DataFixtures/BaseTest.php
@@ -22,14 +22,14 @@ namespace Doctrine\Tests\Common\DataFixtures;
use Doctrine\DBAL\Driver;
use Doctrine\ORM\EntityManager;
use Doctrine\ORM\Tools\Setup;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
/**
* Base test class
*
* @author Jonathan H. Wage <jonwage@gmail.com>
*/
-abstract class BaseTest extends PHPUnit_Framework_TestCase
+abstract class BaseTest extends TestCase
{
/**
* EntityManager mock object together with
diff --git a/tests/Doctrine/Tests/Common/DataFixtures/Executor/PHPCRExecutorTest.php b/tests/Doctrine/Tests/Common/DataFixtures/Executor/PHPCRExecutorTest.php
index 8c507d4..2d2a29e 100644
--- a/tests/Doctrine/Tests/Common/DataFixtures/Executor/PHPCRExecutorTest.php
+++ b/tests/Doctrine/Tests/Common/DataFixtures/Executor/PHPCRExecutorTest.php
@@ -23,8 +23,8 @@ use Doctrine\Common\DataFixtures\Executor\PHPCRExecutor;
use Doctrine\Common\DataFixtures\FixtureInterface;
use Doctrine\Common\DataFixtures\Purger\PHPCRPurger;
use Doctrine\ODM\PHPCR\DocumentManager;
+use Doctrine\Tests\Common\DataFixtures\BaseTest;
use Exception;
-use PHPUnit_Framework_TestCase;
/**
* Tests for {@see \Doctrine\Common\DataFixtures\Executor\PHPCRExecutor}
@@ -33,7 +33,7 @@ use PHPUnit_Framework_TestCase;
*
* @covers \Doctrine\Common\DataFixtures\Executor\PHPCRExecutor
*/
-class PHPCRExecutorTest extends PHPUnit_Framework_TestCase
+class PHPCRExecutorTest extends BaseTest
{
public function testExecuteSingleFixtureWithNoPurge()
{
diff --git a/tests/Doctrine/Tests/Common/DataFixtures/Sorter/TopologicalSorterTest.php b/tests/Doctrine/Tests/Common/DataFixtures/Sorter/TopologicalSorterTest.php
index 5630294..21ee64a 100644
--- a/tests/Doctrine/Tests/Common/DataFixtures/Sorter/TopologicalSorterTest.php
+++ b/tests/Doctrine/Tests/Common/DataFixtures/Sorter/TopologicalSorterTest.php
@@ -23,6 +23,7 @@ namespace Doctrine\Test\DataFixtures\Sorter;
use Doctrine\Common\DataFixtures\Exception\CircularReferenceException;
use Doctrine\Common\DataFixtures\Sorter\TopologicalSorter;
use Doctrine\ORM\Mapping\ClassMetadata;
+use Doctrine\Tests\Common\DataFixtures\BaseTest;
/**
* TopologicalSorter tests.
@@ -35,7 +36,7 @@ use Doctrine\ORM\Mapping\ClassMetadata;
*
* @covers \Doctrine\Common\DataFixtures\Sorter\TopologicalSorter
*/
-class TopologicalSorterTest extends \PHPUnit_Framework_TestCase
+class TopologicalSorterTest extends BaseTest
{
public function testSuccessSortLinearDependency()
{
diff --git a/tests/Doctrine/Tests/Common/DataFixtures/Sorter/VertexTest.php b/tests/Doctrine/Tests/Common/DataFixtures/Sorter/VertexTest.php
index de2e9f8..bceab31 100644
--- a/tests/Doctrine/Tests/Common/DataFixtures/Sorter/VertexTest.php
+++ b/tests/Doctrine/Tests/Common/DataFixtures/Sorter/VertexTest.php
@@ -22,13 +22,14 @@ namespace Doctrine\Test\DataFixtures\Sorter;
use Doctrine\Common\DataFixtures\Sorter\Vertex;
use Doctrine\ORM\Mapping\ClassMetadata;
+use Doctrine\Tests\Common\DataFixtures\BaseTest;
/**
* @author Marco Pivetta <ocramius@gmail.com>
*
* @covers \Doctrine\Common\DataFixtures\Sorter\Vertex
*/
-class VertexTest extends \PHPUnit_Framework_TestCase
+class VertexTest extends BaseTest
{
public function testNode()
{
|
