mirror of
https://github.com/BookStackApp/BookStack.git
synced 2024-11-22 13:44:47 +08:00
Tweaked custom command registration, Added StyleCI fixes
Old command registration method was interfering with default commands, causing only a limited subset of commands to show overall. This change follows the method the frameworks uses when loading in from a directory to prevent issues with run/load order.
This commit is contained in:
parent
c6e196989e
commit
1bf59f434b
|
@ -64,7 +64,7 @@ class ExternalBaseUserProvider implements UserProvider
|
|||
* Update the "remember me" token for the given user in storage.
|
||||
*
|
||||
* @param Authenticatable $user
|
||||
* @param string $token
|
||||
* @param string $token
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
|
@ -94,7 +94,7 @@ class ExternalBaseUserProvider implements UserProvider
|
|||
* Validate a user against the given credentials.
|
||||
*
|
||||
* @param Authenticatable $user
|
||||
* @param array $credentials
|
||||
* @param array $credentials
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
|
|
|
@ -211,6 +211,7 @@ abstract class Entity extends Model implements Sluggable, Favouritable, Viewable
|
|||
/**
|
||||
* Check if this instance or class is a certain type of entity.
|
||||
* Examples of $type are 'page', 'book', 'chapter'.
|
||||
*
|
||||
* @deprecated Use instanceof instead.
|
||||
*/
|
||||
public static function isA(string $type): bool
|
||||
|
|
|
@ -11,4 +11,4 @@ use Illuminate\Database\Eloquent\Relations\MorphMany;
|
|||
interface Deletable
|
||||
{
|
||||
public function deletions(): MorphMany;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -3,6 +3,8 @@
|
|||
namespace BookStack\Theming;
|
||||
|
||||
use BookStack\Auth\Access\SocialAuthService;
|
||||
use Illuminate\Console\Application;
|
||||
use Illuminate\Console\Application as Artisan;
|
||||
use Illuminate\Contracts\Console\Kernel;
|
||||
use Symfony\Component\Console\Command\Command;
|
||||
|
||||
|
@ -50,9 +52,9 @@ class ThemeService
|
|||
*/
|
||||
public function registerCommand(Command $command)
|
||||
{
|
||||
/** @var \Illuminate\Foundation\Console\Kernel $consoleKernel */
|
||||
$consoleKernel = app()->make(Kernel::class);
|
||||
$consoleKernel->registerCommand($command);
|
||||
Artisan::starting(function(Application $application) use ($command) {
|
||||
$application->addCommands([$command]);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -210,7 +210,7 @@ class ThemeTest extends TestCase
|
|||
|
||||
public function test_register_command_allows_provided_command_to_be_usable_via_artisan()
|
||||
{
|
||||
Theme::registerCommand(new MyCustomCommand);
|
||||
Theme::registerCommand(new MyCustomCommand());
|
||||
|
||||
Artisan::call('bookstack:test-custom-command', []);
|
||||
$output = Artisan::output();
|
||||
|
@ -233,9 +233,12 @@ class ThemeTest extends TestCase
|
|||
}
|
||||
}
|
||||
|
||||
class MyCustomCommand extends Command {
|
||||
class MyCustomCommand extends Command
|
||||
{
|
||||
protected $signature = 'bookstack:test-custom-command';
|
||||
public function handle() {
|
||||
|
||||
public function handle()
|
||||
{
|
||||
$this->line('Command ran!');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user