Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@
/build/
/phpunit.xml
.php_cs.cache
/humbug/
/humbug-log*
/infection-log.txt
9 changes: 6 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: php
php:
- 7.0
- 7.1
- 7.2
cache:
directories:
- $HOME/.composer/cache
Expand All @@ -11,9 +11,12 @@ env:
- PREFER_LOWEST=""
before_script:
- composer update --prefer-dist $PREFER_LOWEST
- git clone https://github.com/padraic/humbug.git && cd humbug && composer install && cd ..
- wget https://github.com/infection/infection/releases/download/0.7.1/infection.phar
- wget https://github.com/infection/infection/releases/download/0.7.1/infection.phar.pubkey
- chmod +x infection.phar
- mkdir -p build/logs
script:
- "./vendor/bin/phpunit"
- ./humbug/bin/humbug
- ./infection.phar
after_script:
- if [ -z "$PREFER_LOWEST" ]; then ./vendor/bin/coveralls -v; fi
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"http-interop/http-middleware": "^0.4"
},
"require-dev": {
"phpunit/phpunit": "^5.7.14",
"phpunit/phpunit": "^7.0.2",
"satooshi/php-coveralls": "^1.0",
"zendframework/zend-diactoros": "^1.4"
},
Expand Down
12 changes: 0 additions & 12 deletions humbug.json.dist

This file was deleted.

11 changes: 11 additions & 0 deletions infection.json.dist
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"timeout": 30,
"source": {
"directories": [
"src"
]
},
"logs": {
"text": "infection-log.txt"
}
}
2 changes: 1 addition & 1 deletion tests/AbstractMiddlewareTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
use Psr\Http\Message\ServerRequestInterface;
use Zend\Diactoros\Response\TextResponse;

abstract class AbstractMiddlewareTest extends \PHPUnit_Framework_TestCase
abstract class AbstractMiddlewareTest extends TestCase
{
protected function getDelegate() : DelegateInterface
{
Expand Down
3 changes: 2 additions & 1 deletion tests/OriginFetchers/HostHeaderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@

namespace TheCodingMachine\Middlewares\OriginFetchers;

use PHPUnit\Framework\TestCase;
use TheCodingMachine\Middlewares\CsrfHeaderCheckMiddlewareException;
use Zend\Diactoros\ServerRequest;

class HostHeaderTest extends \PHPUnit_Framework_TestCase
class HostHeaderTest extends TestCase
{
public function testFetchHost()
{
Expand Down
2 changes: 1 addition & 1 deletion tests/SafeRequests/CompositeIsSafeTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
use PHPUnit\Framework\TestCase;
use Psr\Http\Message\ServerRequestInterface;

class CompositeIsSafeTest extends \PHPUnit_Framework_TestCase
class CompositeIsSafeTest extends TestCase
{
private function getChecker(bool $result): IsSafeHttpRequestInterface
{
Expand Down
2 changes: 1 addition & 1 deletion tests/SafeRequests/IsBypassedCheckTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
use PHPUnit\Framework\TestCase;
use Zend\Diactoros\ServerRequest;

class IsBypassedCheckTest extends \PHPUnit_Framework_TestCase
class IsBypassedCheckTest extends TestCase
{
public function testBypassCheck()
{
Expand Down
2 changes: 1 addition & 1 deletion tests/SafeRequests/IsSafeHttpMethodTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
/**
* @covers \TheCodingMachine\Middlewares\SafeRequests\IsSafeHttpMethod
*/
final class IsSafeHttpMethodTest extends \PHPUnit_Framework_TestCase
final class IsSafeHttpMethodTest extends TestCase
{
/**
* @dataProvider httpMethodsProvider
Expand Down
2 changes: 1 addition & 1 deletion tests/SafeRequests/IsSafeHttpRouteTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
/**
* @covers \TheCodingMachine\Middlewares\SafeRequests\IsSafeHttpRoute
*/
final class IsSafeHttpRouteTest extends \PHPUnit_Framework_TestCase
final class IsSafeHttpRouteTest extends TestCase
{
/**
* @dataProvider routesProvider
Expand Down