mirror of
https://github.com/flarum/framework.git
synced 2025-02-21 09:11:40 +08:00
Requirement and formatting fixes (#5)
Add ext-json to composer requirements Update editorconfig to match core Update phpdoc to not reference missing import
This commit is contained in:
parent
f410f69b36
commit
3506991d3e
@ -15,5 +15,5 @@ indent_size = 2
|
||||
[*.{diff,md}]
|
||||
trim_trailing_whitespace = false
|
||||
|
||||
[*.{php,xml}]
|
||||
[*.{php,xml,json}]
|
||||
indent_size = 4
|
||||
|
@ -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"
|
||||
},
|
||||
|
@ -16,7 +16,7 @@ use Illuminate\Support\Arr;
|
||||
class ExtensionManagerIncludeCurrent extends ExtensionManager
|
||||
{
|
||||
/**
|
||||
* @return Collection
|
||||
* @{@inheritDoc}
|
||||
*/
|
||||
public function getExtensions()
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user