Skip to content

Commit ae63b09

Browse files
committed
Fix test case incompatibilities, clean up ignores
1 parent 74cc4d4 commit ae63b09

File tree

5 files changed

+33
-25
lines changed

5 files changed

+33
-25
lines changed

.gitignore

+18-10
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,32 @@
1-
/bootstrap/compiled.php
1+
# Composer ignores
22
/vendor
33
composer.phar
4-
.DS_Store
5-
.idea
4+
composer.lock
5+
6+
# Framework ignores
67
.env
78
.env.*.php
89
.env.php
10+
selenium.php
11+
/bootstrap/compiled.php
12+
.phpunit.result.cache
13+
14+
# Hosting ignores
915
php_errors.log
1016
nginx-error.log
1117
nginx-access.log
1218
nginx-ssl.access.log
1319
nginx-ssl.error.log
14-
php-errors.log
1520
sftp-config.json
1621
.ftpconfig
17-
selenium.php
18-
composer.lock
19-
package-lock.json
20-
/node_modules
21-
_ide_helper.php
2222

23-
# for netbeans
23+
# Editor ignores
2424
nbproject
25+
.idea
26+
.vscode
27+
_ide_helper.php
28+
29+
# Other ignores
30+
.DS_Store
31+
package-lock.json
32+
/node_modules

phpunit.xml phpunit.xml.dist

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit backupGlobals="false"
3-
backupStaticAttributes="false"
4-
bootstrap="tests/bootstrap.php"
5-
colors="true"
6-
convertErrorsToExceptions="true"
7-
convertNoticesToExceptions="true"
8-
convertWarningsToExceptions="true"
9-
processIsolation="false"
10-
stopOnFailure="false"
11-
syntaxCheck="false"
2+
<phpunit
3+
backupGlobals="false"
4+
backupStaticAttributes="false"
5+
bootstrap="tests/bootstrap.php"
6+
colors="true"
7+
convertErrorsToExceptions="true"
8+
convertNoticesToExceptions="true"
9+
convertWarningsToExceptions="true"
10+
processIsolation="false"
11+
stopOnFailure="false"
1212
>
1313
<testsuites>
1414
<testsuite name="October CMS Test Suite">

tests/UiTestCase.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
class UiTestCase extends PHPUnit_Extensions_SeleniumTestCase
3+
class UiTestCase extends PHPUnit\Extensions\Selenium2TestCase
44
{
55
protected function setUp()
66
{

tests/unit/backend/classes/AuthManagerTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
class AuthManagerTest extends TestCase
66
{
7-
public function setUp()
7+
public function setUp(): void
88
{
99
$this->createApplication();
1010

@@ -23,7 +23,7 @@ public function setUp()
2323
]);
2424
}
2525

26-
public function tearDown()
26+
public function tearDown(): void
2727
{
2828
AuthManager::forgetInstance();
2929
}

tests/unit/system/classes/AutoDatasourceTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class AutoDatasourceTest extends PluginTestCase
3030
*/
3131
public $datasource;
3232

33-
public function setUp()
33+
public function setUp(): void
3434
{
3535
parent::setUp();
3636

@@ -73,7 +73,7 @@ public function setUp()
7373
]);
7474
}
7575

76-
public function tearDown()
76+
public function tearDown(): void
7777
{
7878
foreach ($this->fixtures as $fixture) {
7979
$fixture->delete();

0 commit comments

Comments
 (0)