Skip to content

Commit 1636083

Browse files
committed
minor #5 Compatibility with PHPUnit 6 (Lctrs)
This PR was squashed before being merged into the 2.1.x-dev branch (closes #5). Discussion ---------- Compatibility with PHPUnit 6 Commits ------- e71829e Compatibility with PHPUnit 6
2 parents 1b850cb + e71829e commit 1636083

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,13 @@ matrix:
2323
before_install:
2424
- if [[ "$TRAVIS_PHP_VERSION" != "hhvm" && "$xdebug" != "yes" ]]; then phpenv config-rm xdebug.ini; fi
2525
- composer self-update
26+
- composer require 'phpunit/phpunit:^4.8.35|^5.4.3|^6.0' --dev --no-update
2627

2728
install:
2829
- if [ "$deps" = "low" ]; then composer update --prefer-lowest --prefer-stable; else composer install; fi
2930

3031
script:
3132
- vendor/bin/phpspec run
32-
- if [[ "$xdebug" = "yes" ]]; then phpunit --coverage-clover=coverage.clover; else phpunit; fi
33+
- if [[ "$xdebug" = "yes" ]]; then vendor/bin/phpunit --coverage-clover=coverage.clover; else vendor/bin/phpunit; fi
3334
- if [[ "$xdebug" = "yes" ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi
3435
- if [[ "$xdebug" = "yes" ]]; then php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"require": {
1515
"php": ">=5.3.0",
1616
"php-xapi/model": "^1.0 || ^2.0",
17-
"php-xapi/serializer": "^2.0",
17+
"php-xapi/serializer": "^2.1.1",
1818
"symfony/serializer": "~2.8|~3.0"
1919
},
2020
"require-dev": {

tests/SerializerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Xabbuh\XApi\Serializer\Symfony\Tests;
1313

14-
use Symfony\Component\Serializer\SerializerInterface;
14+
use PHPUnit\Framework\TestCase;
1515
use Xabbuh\XApi\Model\Account;
1616
use Xabbuh\XApi\Model\Activity;
1717
use Xabbuh\XApi\Model\Actor;
@@ -28,7 +28,7 @@
2828
use Xabbuh\XApi\Model\Verb;
2929
use Xabbuh\XApi\Serializer\Symfony\Serializer;
3030

31-
class SerializerTest extends \PHPUnit_Framework_TestCase
31+
class SerializerTest extends TestCase
3232
{
3333
private $serializer;
3434

0 commit comments

Comments
 (0)