Skip to content

Commit 62c0ca0

Browse files
committed
use namespaced mock objects
1 parent ed112a3 commit 62c0ca0

9 files changed

+27
-25
lines changed

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

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

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

55
use PHPCR\Query\QueryInterface;
66
use PHPCR\Util\Console\Command\WorkspaceQueryCommand;
7-
use PHPUnit_Framework_MockObject_MockObject;
7+
use PHPUnit\Framework\MockObject\MockObject;
88

99
class WorkspaceQueryCommandTest extends BaseCommandTest
1010
{
1111
/**
12-
* @var QueryInterface|PHPUnit_Framework_MockObject_MockObject
12+
* @var QueryInterface|MockObject
1313
*/
1414
protected $query;
1515

tests/PHPCR/Tests/Util/NodeHelperTest.php

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

55
use PHPCR\Tests\Stubs\MockNode;
66
use PHPCR\Util\NodeHelper;
7+
use PHPUnit\Framework\MockObject\MockObject;
78
use PHPUnit\Framework\TestCase;
8-
use PHPUnit_Framework_MockObject_MockObject;
99

1010
require_once __DIR__.'/../Stubs/MockNode.php';
1111

@@ -84,7 +84,7 @@ public function testGenerateAutoNodeNameInvalid($hint)
8484

8585
public function testIsSystemItem()
8686
{
87-
/** @var MockNode|PHPUnit_Framework_MockObject_MockObject $sys */
87+
/** @var MockNode|MockObject $sys */
8888
$sys = $this->createMock(MockNode::class);
8989

9090
$sys->expects($this->once())
@@ -108,7 +108,7 @@ public function testIsSystemItem()
108108

109109
$this->assertTrue(NodeHelper::isSystemItem($sys));
110110

111-
/** @var MockNode|PHPUnit_Framework_MockObject_MockObject $top */
111+
/** @var MockNode|MockObject $top */
112112
$top = $this->createMock(MockNode::class);
113113
$top->expects($this->once())
114114
->method('getDepth')
@@ -121,7 +121,7 @@ public function testIsSystemItem()
121121

122122
$this->assertFalse(NodeHelper::isSystemItem($top));
123123

124-
/** @var MockNode|PHPUnit_Framework_MockObject_MockObject $deep */
124+
/** @var MockNode|MockObject $deep */
125125
$deep = $this->createMock(MockNode::class);
126126
$deep->expects($this->once())
127127
->method('getDepth')

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
use PHPCR\Query\QOM\SameNodeJoinConditionInterface;
1212
use PHPCR\Query\QOM\SourceInterface;
1313
use PHPCR\Util\QOM\QueryBuilder;
14+
use PHPUnit\Framework\MockObject\MockObject;
1415
use PHPUnit\Framework\TestCase;
15-
use PHPUnit_Framework_MockObject_MockObject;
1616
use RuntimeException;
1717

1818
class QueryBuilderTest extends TestCase
1919
{
2020
/**
21-
* @var PHPUnit_Framework_MockObject_MockObject|QueryObjectModelFactoryInterface
21+
* @var MockObject|QueryObjectModelFactoryInterface
2222
*/
2323
protected $qf;
2424

@@ -330,7 +330,7 @@ public function testGetQuery()
330330
}
331331

332332
/**
333-
* @return QueryObjectModelInterface|PHPUnit_Framework_MockObject_MockObject
333+
* @return QueryObjectModelInterface|MockObject
334334
*/
335335
private function createQueryMock()
336336
{

0 commit comments

Comments
 (0)