1
0
mirror of https://github.com/flarum/core.git synced 2025-08-28 18:40:46 +02:00

chore: improve concern implementation readability

This commit is contained in:
Sami Mazouz
2023-08-11 09:28:33 +01:00
parent 5120e357bb
commit f0eebc53ec
2 changed files with 47 additions and 16 deletions

View File

@@ -68,10 +68,6 @@ class Application extends IlluminateContainer implements LaravelApplication
{ {
IlluminateContainer::setInstance($this); IlluminateContainer::setInstance($this);
/**
* Needed for the laravel framework code.
* Use container inside flarum instead.
*/
$this->instance('app', $this); $this->instance('app', $this);
$this->alias('app', IlluminateContainer::class); $this->alias('app', IlluminateContainer::class);

View File

@@ -13,8 +13,10 @@ use Illuminate\Support\Str;
trait InteractsWithLaravel trait InteractsWithLaravel
{ {
protected array $terminatingCallbacks = []; protected array $terminatingCallbacks = [];
protected ?bool $isRunningInConsole = null;
/**
* @deprecated Not actually used/has no meaning in Flarum.
*/
public function terminating($callback): static public function terminating($callback): static
{ {
$this->terminatingCallbacks[] = $callback; $this->terminatingCallbacks[] = $callback;
@@ -22,6 +24,9 @@ trait InteractsWithLaravel
return $this; return $this;
} }
/**
* @deprecated Not actually used/has no meaning in Flarum.
*/
public function terminate(): void public function terminate(): void
{ {
$index = 0; $index = 0;
@@ -48,7 +53,9 @@ trait InteractsWithLaravel
return $this->joinPaths($this->paths->storage, $path); return $this->joinPaths($this->paths->storage, $path);
} }
/** Not actually used/has no meaning in Flarum. */ /**
* @deprecated Not actually used/has no meaning in Flarum.
*/
public function bootstrapPath($path = ''): string public function bootstrapPath($path = ''): string
{ {
return $this->joinPaths( return $this->joinPaths(
@@ -56,7 +63,9 @@ trait InteractsWithLaravel
); );
} }
/** Not actually used/has no meaning in Flarum. */ /**
* @deprecated Not actually used/has no meaning in Flarum.
*/
public function configPath($path = ''): string public function configPath($path = ''): string
{ {
return $this->joinPaths( return $this->joinPaths(
@@ -64,7 +73,9 @@ trait InteractsWithLaravel
); );
} }
/** Not actually used/has no meaning in Flarum. */ /**
* @deprecated Not actually used/has no meaning in Flarum.
*/
public function databasePath($path = ''): string public function databasePath($path = ''): string
{ {
return $this->joinPaths( return $this->joinPaths(
@@ -72,7 +83,9 @@ trait InteractsWithLaravel
); );
} }
/** Not actually used/has no meaning in Flarum. */ /**
* @deprecated Not actually used/has no meaning in Flarum.
*/
public function langPath($path = ''): string public function langPath($path = ''): string
{ {
return $this->joinPaths( return $this->joinPaths(
@@ -80,7 +93,9 @@ trait InteractsWithLaravel
); );
} }
/** Not actually used/has no meaning in Flarum. */ /**
* @deprecated Not actually used/has no meaning in Flarum.
*/
public function resourcePath($path = ''): string public function resourcePath($path = ''): string
{ {
return $this->joinPaths( return $this->joinPaths(
@@ -88,7 +103,7 @@ trait InteractsWithLaravel
); );
} }
public function environment(...$environments) public function environment(...$environments): bool|string
{ {
if (count($environments) > 0) { if (count($environments) > 0) {
$patterns = is_array($environments[0]) ? $environments[0] : $environments; $patterns = is_array($environments[0]) ? $environments[0] : $environments;
@@ -101,11 +116,7 @@ trait InteractsWithLaravel
public function runningInConsole(): bool public function runningInConsole(): bool
{ {
if ($this->isRunningInConsole === null) { return \PHP_SAPI === 'cli' || \PHP_SAPI === 'phpdbg';
$this->isRunningInConsole = \PHP_SAPI === 'cli' || \PHP_SAPI === 'phpdbg';
}
return $this->isRunningInConsole;
} }
public function runningUnitTests(): bool public function runningUnitTests(): bool
@@ -118,28 +129,43 @@ trait InteractsWithLaravel
return $this->config('debug', true); return $this->config('debug', true);
} }
/**
* @deprecated Not actually used/has no meaning in Flarum.
*/
public function maintenanceMode() public function maintenanceMode()
{ {
// TODO: Implement maintenanceMode() method. // TODO: Implement maintenanceMode() method.
return null; return null;
} }
/**
* @deprecated Not actually used/has no meaning in Flarum.
*/
public function isDownForMaintenance(): bool public function isDownForMaintenance(): bool
{ {
// TODO: Implement isDownForMaintenance() method. // TODO: Implement isDownForMaintenance() method.
return false; return false;
} }
/**
* @deprecated Not actually used/has no meaning in Flarum.
*/
public function registerConfiguredProviders() public function registerConfiguredProviders()
{ {
// //
} }
/**
* @deprecated Not actually used/has no meaning in Flarum.
*/
public function registerDeferredProvider($provider, $service = null) public function registerDeferredProvider($provider, $service = null)
{ {
// //
} }
/**
* @deprecated Not actually used/has no meaning in Flarum.
*/
public function bootstrapWith(array $bootstrappers) public function bootstrapWith(array $bootstrappers)
{ {
// //
@@ -162,11 +188,17 @@ trait InteractsWithLaravel
return Arr::where($this->serviceProviders, fn ($value) => $value instanceof $name); return Arr::where($this->serviceProviders, fn ($value) => $value instanceof $name);
} }
/**
* @deprecated Not actually used/has no meaning in Flarum.
*/
public function hasBeenBootstrapped() public function hasBeenBootstrapped()
{ {
// //
} }
/**
* @deprecated Not actually used/has no meaning in Flarum.
*/
public function loadDeferredProviders() public function loadDeferredProviders()
{ {
// //
@@ -177,6 +209,9 @@ trait InteractsWithLaravel
$this->make(LocaleManager::class)->setLocale($locale); $this->make(LocaleManager::class)->setLocale($locale);
} }
/**
* @deprecated Not actually used/has no meaning in Flarum.
*/
public function shouldSkipMiddleware() public function shouldSkipMiddleware()
{ {
// //