diff --git a/php-packages/testing/.editorconfig b/php-packages/testing/.editorconfig index 658a43499..a61a3ab36 100644 --- a/php-packages/testing/.editorconfig +++ b/php-packages/testing/.editorconfig @@ -15,5 +15,5 @@ indent_size = 2 [*.{diff,md}] trim_trailing_whitespace = false -[*.{php,xml}] +[*.{php,xml,json}] indent_size = 4 diff --git a/php-packages/testing/composer.json b/php-packages/testing/composer.json index 721bbcad1..eb29a6161 100644 --- a/php-packages/testing/composer.json +++ b/php-packages/testing/composer.json @@ -1,10 +1,14 @@ { "name": "flarum/testing", "description": "Automated testing infrastructure for Flarum core and extensions.", - "keywords": ["forum", "discussion"], + "keywords": [ + "forum", + "discussion" + ], "homepage": "https://flarum.org/", "license": "MIT", "require": { + "ext-json": "*", "mockery/mockery": "^1.4", "phpunit/phpunit": "^9.0" }, diff --git a/php-packages/testing/src/integration/Extension/ExtensionManagerIncludeCurrent.php b/php-packages/testing/src/integration/Extension/ExtensionManagerIncludeCurrent.php index bd127308f..c7a4169f3 100644 --- a/php-packages/testing/src/integration/Extension/ExtensionManagerIncludeCurrent.php +++ b/php-packages/testing/src/integration/Extension/ExtensionManagerIncludeCurrent.php @@ -16,7 +16,7 @@ use Illuminate\Support\Arr; class ExtensionManagerIncludeCurrent extends ExtensionManager { /** - * @return Collection + * @{@inheritDoc} */ public function getExtensions() {