Skip to content
This repository was archived by the owner on Apr 8, 2024. It is now read-only.

Commit deb04d0

Browse files
committed
Merge branch 'release/1.0.0'
2 parents 55b6b9e + a71f276 commit deb04d0

File tree

5 files changed

+20
-33
lines changed

5 files changed

+20
-33
lines changed

.travis.yml

+5-8
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,23 @@
11
language: php
22

33
php:
4-
- 5.5.9
5-
- 5.5
6-
- 5.6
7-
- 7.0
84
- 7.1
5+
- 7.2
96

107
env:
118
global:
129
- setup=basic
1310

1411
matrix:
1512
include:
16-
- php: 7.0
17-
env: setup=lowest
18-
- php: 7.0
19-
env: setup=stable
2013
- php: 7.1
2114
env: setup=lowest
2215
- php: 7.1
2316
env: setup=stable
17+
- php: 7.2
18+
env: setup=lowest
19+
- php: 7.2
20+
env: setup=stable
2421

2522
sudo: false
2623

VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.5.0
1+
1.0.0

composer.json

+8-7
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,18 @@
1616
],
1717
"require": {
1818
"php": ">=5.5.0",
19-
"illuminate/console": "~5.1.10|5.2.*|5.3.*|5.4.*|5.5.*",
20-
"illuminate/log": "~5.1.10|5.2.*|5.3.*|5.4.*|5.5.*",
21-
"illuminate/support": "~5.1.10|5.2.*|5.3.*|5.4.*|5.5.*",
19+
"illuminate/console": "~5.1.10|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*",
20+
"illuminate/log": "~5.1.10|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*",
21+
"illuminate/support": "~5.1.10|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*",
2222
"nesbot/carbon": "~1.19"
2323
},
2424
"require-dev": {
25-
"mockery/mockery": "^0.9.1",
26-
"phpunit/phpunit": "~4.0|~5.0",
25+
"mockery/mockery": "^1",
26+
"phpunit/phpunit": "~7.0",
2727
"psy/psysh": "^0.5.1",
28-
"satooshi/php-coveralls": "^0.6.1|^1",
29-
"symfony/var-dumper": "~2.7|~3.0"
28+
"satooshi/php-coveralls": "^1",
29+
"symfony/thanks": "^1.0",
30+
"symfony/var-dumper": "~3.0"
3031
},
3132
"autoload": {
3233
"psr-4": {

phpunit.xml.dist

-4
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,6 @@
4141
</whitelist>
4242
</filter>
4343

44-
<listeners>
45-
<listener class="\Mockery\Adapter\Phpunit\TestListener"></listener>
46-
</listeners>
47-
4844
<logging>
4945
<log type="coverage-html"
5046
target="./build/coverage"

tests/TestCase.php

+6-13
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,26 @@
55
use ArrayAccess;
66
use Countable;
77
use Iterator;
8-
use Mockery;
8+
use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
99
use Mockery\MockInterface;
10-
use PHPUnit_Framework_TestCase;
10+
use PHPUnit\Framework\TestCase as PHPUnitTestCase;
1111

1212
/**
1313
* Class TestCase
1414
*
1515
* @package Tests\Spinen\BrowserFilter
1616
*/
17-
abstract class TestCase extends PHPUnit_Framework_TestCase
17+
abstract class TestCase extends PHPUnitTestCase
1818
{
19-
public function tearDown()
20-
{
21-
if (class_exists('Mockery')) {
22-
Mockery::close();
23-
}
24-
25-
parent::tearDown();
26-
}
19+
use MockeryPHPUnitIntegration;
2720

2821
/**
2922
* Helper to allow mocking of iterator classes.
3023
*
3124
* @link https://gist.github.com/VladaHejda/8299871
3225
*
3326
* @param MockInterface $mock
34-
* @param array $items
27+
* @param array $items
3528
*
3629
* @return void
3730
*/
@@ -80,7 +73,7 @@ protected function mockArrayIterator(MockInterface $mock, array $items)
8073

8174
$mock->shouldReceive('next')
8275
->andReturnUsing(function () use (& $counter) {
83-
++ $counter;
76+
++$counter;
8477
});
8578
}
8679

0 commit comments

Comments
 (0)