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

Commit

Permalink
Merge branch 'release/1.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
ssfinney committed Mar 23, 2018
2 parents 55b6b9e + a71f276 commit deb04d0
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 33 deletions.
13 changes: 5 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,26 +1,23 @@
language: php

php:
- 5.5.9
- 5.5
- 5.6
- 7.0
- 7.1
- 7.2

env:
global:
- setup=basic

matrix:
include:
- php: 7.0
env: setup=lowest
- php: 7.0
env: setup=stable
- php: 7.1
env: setup=lowest
- php: 7.1
env: setup=stable
- php: 7.2
env: setup=lowest
- php: 7.2
env: setup=stable

sudo: false

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.5.0
1.0.0
15 changes: 8 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,18 @@
],
"require": {
"php": ">=5.5.0",
"illuminate/console": "~5.1.10|5.2.*|5.3.*|5.4.*|5.5.*",
"illuminate/log": "~5.1.10|5.2.*|5.3.*|5.4.*|5.5.*",
"illuminate/support": "~5.1.10|5.2.*|5.3.*|5.4.*|5.5.*",
"illuminate/console": "~5.1.10|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*",
"illuminate/log": "~5.1.10|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*",
"illuminate/support": "~5.1.10|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*",
"nesbot/carbon": "~1.19"
},
"require-dev": {
"mockery/mockery": "^0.9.1",
"phpunit/phpunit": "~4.0|~5.0",
"mockery/mockery": "^1",
"phpunit/phpunit": "~7.0",
"psy/psysh": "^0.5.1",
"satooshi/php-coveralls": "^0.6.1|^1",
"symfony/var-dumper": "~2.7|~3.0"
"satooshi/php-coveralls": "^1",
"symfony/thanks": "^1.0",
"symfony/var-dumper": "~3.0"
},
"autoload": {
"psr-4": {
Expand Down
4 changes: 0 additions & 4 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,6 @@
</whitelist>
</filter>

<listeners>
<listener class="\Mockery\Adapter\Phpunit\TestListener"></listener>
</listeners>

<logging>
<log type="coverage-html"
target="./build/coverage"
Expand Down
19 changes: 6 additions & 13 deletions tests/TestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,26 @@
use ArrayAccess;
use Countable;
use Iterator;
use Mockery;
use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
use Mockery\MockInterface;
use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase as PHPUnitTestCase;

/**
* Class TestCase
*
* @package Tests\Spinen\BrowserFilter
*/
abstract class TestCase extends PHPUnit_Framework_TestCase
abstract class TestCase extends PHPUnitTestCase
{
public function tearDown()
{
if (class_exists('Mockery')) {
Mockery::close();
}

parent::tearDown();
}
use MockeryPHPUnitIntegration;

/**
* Helper to allow mocking of iterator classes.
*
* @link https://gist.github.com/VladaHejda/8299871
*
* @param MockInterface $mock
* @param array $items
* @param array $items
*
* @return void
*/
Expand Down Expand Up @@ -80,7 +73,7 @@ protected function mockArrayIterator(MockInterface $mock, array $items)

$mock->shouldReceive('next')
->andReturnUsing(function () use (& $counter) {
++ $counter;
++$counter;
});
}

Expand Down

0 comments on commit deb04d0

Please sign in to comment.