Skip to content

Commit 93e88d4

Browse files
committed
Mockery version Bump
- Fix when banned classes not set - Travis config
1 parent a177963 commit 93e88d4

File tree

5 files changed

+69
-4
lines changed

5 files changed

+69
-4
lines changed

.travis.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
git:
2+
submodules: false
3+
4+
language: php
5+
php:
6+
- 7.1
7+
8+
before_script:
9+
- travis_retry composer install --no-interaction --prefer-dist
10+
11+
script:
12+
- vendor/bin/tester tests/
13+
14+
cache:
15+
directories:
16+
- $HOME/.composer/cache
17+

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
}
1313
],
1414
"require": {
15-
"mockery/mockery": "0.9.*",
15+
"mockery/mockery": "1.2.*",
1616
"nette/di": "2.3.*"
1717
},
1818
"require-dev": {
19-
"nette/tester": "~1.6"
19+
"nette/tester": "2.1.0"
2020
},
2121
"autoload": {
2222
"classmap": [

src/Spamer/DependencyMocker/Mocker.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
class Mocker
99
{
1010
/** @var array */
11-
public static $bannedClasses;
11+
public static $bannedClasses = [];
1212

1313
/** @var \ReflectionClass */
1414
private static $reflectedClass;

tests/DependencyMocker/Mocker/CallPrivateFunction.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ class TestCallPrivateFunction extends \Tester\TestCase
2424
}
2525

2626
}
27-
(new TestCallPrivateFunction())->run();
27+
(new TestCallPrivateFunction())->run();
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
<?php
2+
3+
require_once __DIR__ . '/../../bootstrap.php';
4+
5+
class ClassToMock
6+
{
7+
8+
}
9+
10+
class TestDependenciesClass
11+
{
12+
13+
/**
14+
* @var \ClassToMock
15+
*/
16+
private $classToMock;
17+
18+
19+
public function __construct(
20+
ClassToMock $classToMock
21+
)
22+
{
23+
$this->classToMock = $classToMock;
24+
}
25+
26+
}
27+
28+
29+
30+
class TestMockDependencies extends \Tester\TestCase
31+
{
32+
public function testCall()
33+
{
34+
$mocked = \Spamer\DependencyMocker\Mocker::mockClassDependencies(TestDependenciesClass::class);
35+
36+
\Tester\Assert::true($mocked instanceof \Mockery\MockInterface);
37+
38+
$property = \Spamer\DependencyMocker\Mocker::getProperty(
39+
TestDependenciesClass::class,
40+
'classToMock',
41+
$mocked
42+
);
43+
44+
\Tester\Assert::true($property instanceof \Mockery\MockInterface);
45+
}
46+
47+
}
48+
(new TestMockDependencies())->run();

0 commit comments

Comments
 (0)