diff --git a/extensions/akismet/.gitignore b/extensions/akismet/.gitignore index 4ebb168a05..e60e512061 100644 --- a/extensions/akismet/.gitignore +++ b/extensions/akismet/.gitignore @@ -4,6 +4,7 @@ composer.phar .DS_Store Thumbs.db +tests/.phpunit.cache tests/.phpunit.result.cache /tests/integration/tmp .vagrant diff --git a/extensions/akismet/tests/phpunit.integration.xml b/extensions/akismet/tests/phpunit.integration.xml index 7319d929ae..e3e14eab99 100644 --- a/extensions/akismet/tests/phpunit.integration.xml +++ b/extensions/akismet/tests/phpunit.integration.xml @@ -1,22 +1,20 @@ - + ../src/ - + ./integration diff --git a/extensions/akismet/tests/phpunit.unit.xml b/extensions/akismet/tests/phpunit.unit.xml index 66262dd9ff..67367a782d 100644 --- a/extensions/akismet/tests/phpunit.unit.xml +++ b/extensions/akismet/tests/phpunit.unit.xml @@ -1,28 +1,23 @@ - + ../src/ - + ./unit - - - diff --git a/extensions/approval/.gitignore b/extensions/approval/.gitignore index 4ebb168a05..e60e512061 100644 --- a/extensions/approval/.gitignore +++ b/extensions/approval/.gitignore @@ -4,6 +4,7 @@ composer.phar .DS_Store Thumbs.db +tests/.phpunit.cache tests/.phpunit.result.cache /tests/integration/tmp .vagrant diff --git a/extensions/approval/tests/integration/InteractsWithUnapprovedContent.php b/extensions/approval/tests/integration/InteractsWithUnapprovedContent.php index bcf7498878..6b6b70d310 100644 --- a/extensions/approval/tests/integration/InteractsWithUnapprovedContent.php +++ b/extensions/approval/tests/integration/InteractsWithUnapprovedContent.php @@ -64,7 +64,7 @@ protected function prepareUnapprovedDatabaseContent() /** * null: Guest, 2: Normal User. */ - public function unallowedUsers(): array + public static function unallowedUsers(): array { return [[null], [2]]; } @@ -72,7 +72,7 @@ public function unallowedUsers(): array /** * 1: Admin, 3: Permission Given, 4: Discussions Author. */ - public function allowedUsers(): array + public static function allowedUsers(): array { return [[1], [3], [4]]; } diff --git a/extensions/approval/tests/phpunit.integration.xml b/extensions/approval/tests/phpunit.integration.xml index 7319d929ae..e3e14eab99 100644 --- a/extensions/approval/tests/phpunit.integration.xml +++ b/extensions/approval/tests/phpunit.integration.xml @@ -1,22 +1,20 @@ - + ../src/ - + ./integration diff --git a/extensions/approval/tests/phpunit.unit.xml b/extensions/approval/tests/phpunit.unit.xml index 66262dd9ff..67367a782d 100644 --- a/extensions/approval/tests/phpunit.unit.xml +++ b/extensions/approval/tests/phpunit.unit.xml @@ -1,28 +1,23 @@ - + ../src/ - + ./unit - - - diff --git a/extensions/bbcode/.gitignore b/extensions/bbcode/.gitignore index 4ebb168a05..e60e512061 100644 --- a/extensions/bbcode/.gitignore +++ b/extensions/bbcode/.gitignore @@ -4,6 +4,7 @@ composer.phar .DS_Store Thumbs.db +tests/.phpunit.cache tests/.phpunit.result.cache /tests/integration/tmp .vagrant diff --git a/extensions/embed/.gitignore b/extensions/embed/.gitignore index 4ebb168a05..e60e512061 100644 --- a/extensions/embed/.gitignore +++ b/extensions/embed/.gitignore @@ -4,6 +4,7 @@ composer.phar .DS_Store Thumbs.db +tests/.phpunit.cache tests/.phpunit.result.cache /tests/integration/tmp .vagrant diff --git a/extensions/emoji/.gitignore b/extensions/emoji/.gitignore index 4ebb168a05..e60e512061 100644 --- a/extensions/emoji/.gitignore +++ b/extensions/emoji/.gitignore @@ -4,6 +4,7 @@ composer.phar .DS_Store Thumbs.db +tests/.phpunit.cache tests/.phpunit.result.cache /tests/integration/tmp .vagrant diff --git a/extensions/flags/.gitignore b/extensions/flags/.gitignore index 4ebb168a05..e60e512061 100644 --- a/extensions/flags/.gitignore +++ b/extensions/flags/.gitignore @@ -4,6 +4,7 @@ composer.phar .DS_Store Thumbs.db +tests/.phpunit.cache tests/.phpunit.result.cache /tests/integration/tmp .vagrant diff --git a/extensions/flags/tests/phpunit.integration.xml b/extensions/flags/tests/phpunit.integration.xml index 7319d929ae..e3e14eab99 100644 --- a/extensions/flags/tests/phpunit.integration.xml +++ b/extensions/flags/tests/phpunit.integration.xml @@ -1,22 +1,20 @@ - + ../src/ - + ./integration diff --git a/extensions/flags/tests/phpunit.unit.xml b/extensions/flags/tests/phpunit.unit.xml index 66262dd9ff..67367a782d 100644 --- a/extensions/flags/tests/phpunit.unit.xml +++ b/extensions/flags/tests/phpunit.unit.xml @@ -1,28 +1,23 @@ - + ../src/ - + ./unit - - - diff --git a/extensions/lang-english/.gitignore b/extensions/lang-english/.gitignore index 4ebb168a05..e60e512061 100644 --- a/extensions/lang-english/.gitignore +++ b/extensions/lang-english/.gitignore @@ -4,6 +4,7 @@ composer.phar .DS_Store Thumbs.db +tests/.phpunit.cache tests/.phpunit.result.cache /tests/integration/tmp .vagrant diff --git a/extensions/likes/.gitignore b/extensions/likes/.gitignore index 4ebb168a05..e60e512061 100644 --- a/extensions/likes/.gitignore +++ b/extensions/likes/.gitignore @@ -4,6 +4,7 @@ composer.phar .DS_Store Thumbs.db +tests/.phpunit.cache tests/.phpunit.result.cache /tests/integration/tmp .vagrant diff --git a/extensions/likes/tests/phpunit.integration.xml b/extensions/likes/tests/phpunit.integration.xml index 7319d929ae..e3e14eab99 100644 --- a/extensions/likes/tests/phpunit.integration.xml +++ b/extensions/likes/tests/phpunit.integration.xml @@ -1,22 +1,20 @@ - + ../src/ - + ./integration diff --git a/extensions/likes/tests/phpunit.unit.xml b/extensions/likes/tests/phpunit.unit.xml index 66262dd9ff..67367a782d 100644 --- a/extensions/likes/tests/phpunit.unit.xml +++ b/extensions/likes/tests/phpunit.unit.xml @@ -1,28 +1,23 @@ - + ../src/ - + ./unit - - - diff --git a/extensions/lock/.gitignore b/extensions/lock/.gitignore index 4ebb168a05..e60e512061 100644 --- a/extensions/lock/.gitignore +++ b/extensions/lock/.gitignore @@ -4,6 +4,7 @@ composer.phar .DS_Store Thumbs.db +tests/.phpunit.cache tests/.phpunit.result.cache /tests/integration/tmp .vagrant diff --git a/extensions/markdown/.gitignore b/extensions/markdown/.gitignore index 4ebb168a05..e60e512061 100644 --- a/extensions/markdown/.gitignore +++ b/extensions/markdown/.gitignore @@ -4,6 +4,7 @@ composer.phar .DS_Store Thumbs.db +tests/.phpunit.cache tests/.phpunit.result.cache /tests/integration/tmp .vagrant diff --git a/extensions/mentions/.gitignore b/extensions/mentions/.gitignore index 4ebb168a05..e60e512061 100644 --- a/extensions/mentions/.gitignore +++ b/extensions/mentions/.gitignore @@ -4,6 +4,7 @@ composer.phar .DS_Store Thumbs.db +tests/.phpunit.cache tests/.phpunit.result.cache /tests/integration/tmp .vagrant diff --git a/extensions/mentions/tests/phpunit.integration.xml b/extensions/mentions/tests/phpunit.integration.xml index 7319d929ae..e3e14eab99 100644 --- a/extensions/mentions/tests/phpunit.integration.xml +++ b/extensions/mentions/tests/phpunit.integration.xml @@ -1,22 +1,20 @@ - + ../src/ - + ./integration diff --git a/extensions/mentions/tests/phpunit.unit.xml b/extensions/mentions/tests/phpunit.unit.xml index 66262dd9ff..67367a782d 100644 --- a/extensions/mentions/tests/phpunit.unit.xml +++ b/extensions/mentions/tests/phpunit.unit.xml @@ -1,28 +1,23 @@ - + ../src/ - + ./unit - - - diff --git a/extensions/nicknames/.gitignore b/extensions/nicknames/.gitignore index 4ebb168a05..e60e512061 100644 --- a/extensions/nicknames/.gitignore +++ b/extensions/nicknames/.gitignore @@ -4,6 +4,7 @@ composer.phar .DS_Store Thumbs.db +tests/.phpunit.cache tests/.phpunit.result.cache /tests/integration/tmp .vagrant diff --git a/extensions/nicknames/tests/integration/api/EditUserTest.php b/extensions/nicknames/tests/integration/api/EditUserTest.php index 88a1c106c7..65156c0c64 100644 --- a/extensions/nicknames/tests/integration/api/EditUserTest.php +++ b/extensions/nicknames/tests/integration/api/EditUserTest.php @@ -16,7 +16,7 @@ use Flarum\User\User; use PHPUnit\Framework\Attributes\Test; -class UpdateTest extends TestCase +class EditUserTest extends TestCase { use RetrievesAuthorizedUsers; diff --git a/extensions/nicknames/tests/phpunit.integration.xml b/extensions/nicknames/tests/phpunit.integration.xml index 7319d929ae..e3e14eab99 100644 --- a/extensions/nicknames/tests/phpunit.integration.xml +++ b/extensions/nicknames/tests/phpunit.integration.xml @@ -1,22 +1,20 @@ - + ../src/ - + ./integration diff --git a/extensions/nicknames/tests/phpunit.unit.xml b/extensions/nicknames/tests/phpunit.unit.xml index 66262dd9ff..67367a782d 100644 --- a/extensions/nicknames/tests/phpunit.unit.xml +++ b/extensions/nicknames/tests/phpunit.unit.xml @@ -1,28 +1,23 @@ - + ../src/ - + ./unit - - - diff --git a/extensions/package-manager/.gitignore b/extensions/package-manager/.gitignore index 4ebb168a05..e60e512061 100755 --- a/extensions/package-manager/.gitignore +++ b/extensions/package-manager/.gitignore @@ -4,6 +4,7 @@ composer.phar .DS_Store Thumbs.db +tests/.phpunit.cache tests/.phpunit.result.cache /tests/integration/tmp .vagrant diff --git a/extensions/package-manager/tests/phpunit.integration.xml b/extensions/package-manager/tests/phpunit.integration.xml index 89f91a4d15..b637aadabd 100644 --- a/extensions/package-manager/tests/phpunit.integration.xml +++ b/extensions/package-manager/tests/phpunit.integration.xml @@ -1,21 +1,19 @@ - + ../src/ - + ./integration diff --git a/extensions/package-manager/tests/phpunit.unit.xml b/extensions/package-manager/tests/phpunit.unit.xml index d3a4a3e3d3..eb33f60fe2 100644 --- a/extensions/package-manager/tests/phpunit.unit.xml +++ b/extensions/package-manager/tests/phpunit.unit.xml @@ -1,27 +1,22 @@ - + ../src/ - + ./unit - - - diff --git a/extensions/pusher/.gitignore b/extensions/pusher/.gitignore index 4ebb168a05..e60e512061 100644 --- a/extensions/pusher/.gitignore +++ b/extensions/pusher/.gitignore @@ -4,6 +4,7 @@ composer.phar .DS_Store Thumbs.db +tests/.phpunit.cache tests/.phpunit.result.cache /tests/integration/tmp .vagrant diff --git a/extensions/statistics/.gitignore b/extensions/statistics/.gitignore index 4ebb168a05..e60e512061 100644 --- a/extensions/statistics/.gitignore +++ b/extensions/statistics/.gitignore @@ -4,6 +4,7 @@ composer.phar .DS_Store Thumbs.db +tests/.phpunit.cache tests/.phpunit.result.cache /tests/integration/tmp .vagrant diff --git a/extensions/statistics/tests/phpunit.integration.xml b/extensions/statistics/tests/phpunit.integration.xml index 7319d929ae..e3e14eab99 100644 --- a/extensions/statistics/tests/phpunit.integration.xml +++ b/extensions/statistics/tests/phpunit.integration.xml @@ -1,22 +1,20 @@ - + ../src/ - + ./integration diff --git a/extensions/statistics/tests/phpunit.unit.xml b/extensions/statistics/tests/phpunit.unit.xml index 66262dd9ff..67367a782d 100644 --- a/extensions/statistics/tests/phpunit.unit.xml +++ b/extensions/statistics/tests/phpunit.unit.xml @@ -1,28 +1,23 @@ - + ../src/ - + ./unit - - - diff --git a/extensions/sticky/.gitignore b/extensions/sticky/.gitignore index 4ebb168a05..e60e512061 100644 --- a/extensions/sticky/.gitignore +++ b/extensions/sticky/.gitignore @@ -4,6 +4,7 @@ composer.phar .DS_Store Thumbs.db +tests/.phpunit.cache tests/.phpunit.result.cache /tests/integration/tmp .vagrant diff --git a/extensions/sticky/tests/phpunit.integration.xml b/extensions/sticky/tests/phpunit.integration.xml index 7319d929ae..e3e14eab99 100644 --- a/extensions/sticky/tests/phpunit.integration.xml +++ b/extensions/sticky/tests/phpunit.integration.xml @@ -1,22 +1,20 @@ - + ../src/ - + ./integration diff --git a/extensions/sticky/tests/phpunit.unit.xml b/extensions/sticky/tests/phpunit.unit.xml index 66262dd9ff..67367a782d 100644 --- a/extensions/sticky/tests/phpunit.unit.xml +++ b/extensions/sticky/tests/phpunit.unit.xml @@ -1,28 +1,23 @@ - + ../src/ - + ./unit - - - diff --git a/extensions/subscriptions/.gitignore b/extensions/subscriptions/.gitignore index 4ebb168a05..e60e512061 100644 --- a/extensions/subscriptions/.gitignore +++ b/extensions/subscriptions/.gitignore @@ -4,6 +4,7 @@ composer.phar .DS_Store Thumbs.db +tests/.phpunit.cache tests/.phpunit.result.cache /tests/integration/tmp .vagrant diff --git a/extensions/subscriptions/tests/phpunit.integration.xml b/extensions/subscriptions/tests/phpunit.integration.xml index 7319d929ae..e3e14eab99 100644 --- a/extensions/subscriptions/tests/phpunit.integration.xml +++ b/extensions/subscriptions/tests/phpunit.integration.xml @@ -1,22 +1,20 @@ - + ../src/ - + ./integration diff --git a/extensions/subscriptions/tests/phpunit.unit.xml b/extensions/subscriptions/tests/phpunit.unit.xml index 66262dd9ff..67367a782d 100644 --- a/extensions/subscriptions/tests/phpunit.unit.xml +++ b/extensions/subscriptions/tests/phpunit.unit.xml @@ -1,28 +1,23 @@ - + ../src/ - + ./unit - - - diff --git a/extensions/suspend/.gitignore b/extensions/suspend/.gitignore index 4ebb168a05..e60e512061 100644 --- a/extensions/suspend/.gitignore +++ b/extensions/suspend/.gitignore @@ -4,6 +4,7 @@ composer.phar .DS_Store Thumbs.db +tests/.phpunit.cache tests/.phpunit.result.cache /tests/integration/tmp .vagrant diff --git a/extensions/suspend/tests/phpunit.integration.xml b/extensions/suspend/tests/phpunit.integration.xml index 7319d929ae..e3e14eab99 100644 --- a/extensions/suspend/tests/phpunit.integration.xml +++ b/extensions/suspend/tests/phpunit.integration.xml @@ -1,22 +1,20 @@ - + ../src/ - + ./integration diff --git a/extensions/suspend/tests/phpunit.unit.xml b/extensions/suspend/tests/phpunit.unit.xml index 66262dd9ff..67367a782d 100644 --- a/extensions/suspend/tests/phpunit.unit.xml +++ b/extensions/suspend/tests/phpunit.unit.xml @@ -1,28 +1,23 @@ - + ../src/ - + ./unit - - - diff --git a/extensions/tags/.gitignore b/extensions/tags/.gitignore index 4ebb168a05..e60e512061 100644 --- a/extensions/tags/.gitignore +++ b/extensions/tags/.gitignore @@ -4,6 +4,7 @@ composer.phar .DS_Store Thumbs.db +tests/.phpunit.cache tests/.phpunit.result.cache /tests/integration/tmp .vagrant diff --git a/extensions/tags/tests/phpunit.integration.xml b/extensions/tags/tests/phpunit.integration.xml index 7319d929ae..e3e14eab99 100644 --- a/extensions/tags/tests/phpunit.integration.xml +++ b/extensions/tags/tests/phpunit.integration.xml @@ -1,22 +1,20 @@ - + ../src/ - + ./integration diff --git a/extensions/tags/tests/phpunit.unit.xml b/extensions/tags/tests/phpunit.unit.xml index 66262dd9ff..67367a782d 100644 --- a/extensions/tags/tests/phpunit.unit.xml +++ b/extensions/tags/tests/phpunit.unit.xml @@ -1,28 +1,23 @@ - + ../src/ - + ./unit - - - diff --git a/framework/core/.gitignore b/framework/core/.gitignore index 4ebb168a05..e60e512061 100644 --- a/framework/core/.gitignore +++ b/framework/core/.gitignore @@ -4,6 +4,7 @@ composer.phar .DS_Store Thumbs.db +tests/.phpunit.cache tests/.phpunit.result.cache /tests/integration/tmp .vagrant diff --git a/framework/core/tests/phpunit.integration.xml b/framework/core/tests/phpunit.integration.xml index 7319d929ae..e3e14eab99 100644 --- a/framework/core/tests/phpunit.integration.xml +++ b/framework/core/tests/phpunit.integration.xml @@ -1,22 +1,20 @@ - + ../src/ - + ./integration diff --git a/framework/core/tests/phpunit.unit.xml b/framework/core/tests/phpunit.unit.xml index 66262dd9ff..67367a782d 100644 --- a/framework/core/tests/phpunit.unit.xml +++ b/framework/core/tests/phpunit.unit.xml @@ -1,28 +1,23 @@ - + ../src/ - + ./unit - - - diff --git a/php-packages/phpstan/.gitignore b/php-packages/phpstan/.gitignore index 30e01fbd26..87a995b349 100644 --- a/php-packages/phpstan/.gitignore +++ b/php-packages/phpstan/.gitignore @@ -3,6 +3,7 @@ composer.lock composer.phar .DS_Store Thumbs.db +tests/.phpunit.cache tests/.phpunit.result.cache /tests/integration/tmp .vagrant diff --git a/php-packages/testing/tests/tests/phpunit.integration.xml b/php-packages/testing/tests/tests/phpunit.integration.xml index f9fbdf591a..5f2ed2eb9b 100644 --- a/php-packages/testing/tests/tests/phpunit.integration.xml +++ b/php-packages/testing/tests/tests/phpunit.integration.xml @@ -1,22 +1,20 @@ - + ../src/ - + ./integration diff --git a/php-packages/testing/tests/tests/phpunit.unit.xml b/php-packages/testing/tests/tests/phpunit.unit.xml index 66262dd9ff..67367a782d 100644 --- a/php-packages/testing/tests/tests/phpunit.unit.xml +++ b/php-packages/testing/tests/tests/phpunit.unit.xml @@ -1,28 +1,23 @@ - + ../src/ - + ./unit - - -