Skip to content

Commit 447ff09

Browse files
committed
PHPUnit 8+ added
1 parent 78d2a4a commit 447ff09

15 files changed

+34
-25
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
vendor
22
composer.lock
33
composer.phar
4-
.php_cs.cache
4+
.php_cs.cache
5+
.phpunit.result.cache

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"psr/simple-cache": "1.0.*"
2626
},
2727
"require-dev": {
28-
"phpunit/phpunit": "^5.7",
28+
"phpunit/phpunit": "^8.5",
2929
"mockery/mockery": "^1.2",
3030
"friendsofphp/php-cs-fixer": "^2.15",
3131
"jakub-onderka/php-parallel-lint": "^1.0",

phpunit.xml.dist

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
convertWarningsToExceptions="true"
99
processIsolation="false"
1010
stopOnFailure="false"
11-
syntaxCheck="false"
1211
bootstrap="tests/bootstrap.php"
1312
>
1413
<testsuites>

tests/Unit/CacheDecoratorTest.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,17 @@
33
namespace Test\Skautis;
44

55
use Mockery\MockInterface;
6+
use PHPUnit\Framework\TestCase;
67
use Skautis\User;
78
use Skautis\Wsdl\Decorator\Cache\CacheDecorator;
89
use Skautis\Wsdl\WebServiceInterface;
910
use Symfony\Component\Cache\Adapter\ArrayAdapter;
1011
use Symfony\Component\Cache\Psr16Cache;
1112

12-
class CacheDecoratorTest extends \PHPUnit_Framework_TestCase
13+
class CacheDecoratorTest extends TestCase
1314
{
1415

15-
protected function tearDown()
16+
protected function tearDown(): void
1617
{
1718
\Mockery::close();
1819
}

tests/Unit/ConfigTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
namespace Test\Skautis;
44

5+
use PHPUnit\Framework\TestCase;
56
use Skautis\Config;
67

7-
class ConfigTest extends \PHPUnit_Framework_TestCase
8+
class ConfigTest extends TestCase
89
{
910

1011
public function testDefaultConfiguration(): void

tests/Unit/HelpersTest.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22

33
namespace Test\Skautis;
44

5+
use PHPUnit\Framework\TestCase;
56
use Skautis\Helpers;
67
use Skautis\User;
78

8-
class HelpersTest extends \PHPUnit_Framework_TestCase
9+
class HelpersTest extends TestCase
910
{
1011

11-
protected function tearDown()
12+
protected function tearDown(): void
1213
{
1314
\Mockery::close();
1415
}

tests/Unit/SessionAdapterTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22

33
namespace Test\Skautis;
44

5+
use PHPUnit\Framework\TestCase;
56
use Skautis\SessionAdapter\AdapterInterface;
67
use Skautis\SessionAdapter\SessionAdapter;
78
use Skautis\SessionAdapter\FakeAdapter;
89

9-
class SessionAdapterTest extends \PHPUnit_Framework_TestCase
10+
class SessionAdapterTest extends TestCase
1011
{
1112

1213

tests/Unit/SkautisQueryTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
namespace Test\Skautis;
44

5+
use PHPUnit\Framework\TestCase;
56
use Skautis\SkautisQuery;
67

7-
class SkautisQueryTest extends \PHPUnit_Framework_TestCase
8+
class SkautisQueryTest extends TestCase
89
{
910
public function testQuery()
1011
{

tests/Unit/SkautisTest.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
namespace Test\Skautis;
44

5-
use PHPUnit_Framework_TestCase;
5+
use PHPUnit\Framework\TestCase;
66
use Skautis\Config;
77
use Skautis\DynamicPropertiesDisabledException;
88
use Skautis\Skautis;
99
use Skautis\User;
1010
use Skautis\Wsdl\WebServiceName;
1111
use Skautis\Wsdl\WsdlManager;
1212

13-
class SkautisTest extends PHPUnit_Framework_TestCase
13+
class SkautisTest extends TestCase
1414
{
1515

16-
protected function tearDown()
16+
protected function tearDown(): void
1717
{
1818
\Mockery::close();
1919
}
@@ -104,6 +104,7 @@ public function testGetRegisterURL(): void {
104104

105105
public function testEventSetter(): void
106106
{
107+
$this->markTestSkipped();
107108
//@TODO
108109
}
109110
}

tests/Unit/UserTest.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22

33
namespace Test\Skautis;
44

5+
use PHPUnit\Framework\TestCase;
56
use Skautis\User;
67
use Skautis\Wsdl\WsdlManager;
78
use Skautis\Wsdl\WebService;
89

9-
class UserTest extends \PHPUnit_Framework_TestCase
10+
class UserTest extends TestCase
1011
{
1112

12-
protected function tearDown()
13+
protected function tearDown(): void
1314
{
1415
\Mockery::close();
1516
}

0 commit comments

Comments
 (0)