TypeScript: Updated compile target, addressed issues

[bookstack] / app / Theming / ThemeService.php

diff --git a/app/Theming/ThemeService.php b/app/Theming/ThemeService.php
index f0f8f033c4d9c4542259906835cb1bf98d4651a3..4bdb6836b0224f6c279b036069ab39f9260c733b 100644 (file)
--- a/app/Theming/ThemeService.php
+++ b/app/Theming/ThemeService.php
@@ -2,19 +2,33 @@
 
 namespace BookStack\Theming;
 
 
 namespace BookStack\Theming;
 

-use BookStack\Auth\Access\SocialAuthService;
-use Illuminate\Contracts\Console\Kernel;
+use BookStack\Access\SocialDriverManager;
+use BookStack\Exceptions\ThemeException;
+use Illuminate\Console\Application;
+use Illuminate\Console\Application as Artisan;

 use Symfony\Component\Console\Command\Command;
 
 class ThemeService
 {
 use Symfony\Component\Console\Command\Command;
 
 class ThemeService
 {

-    protected $listeners = [];
+    /**
+     * @var array<string, callable[]>
+     */
+    protected array $listeners = [];
+
+    /**
+     * Get the currently configured theme.
+     * Returns an empty string if not configured.
+     */
+    public function getTheme(): string
+    {
+        return config('view.theme') ?? '';
+    }

 
     /**
      * Listen to a given custom theme event,
      * setting up the action to be ran when the event occurs.
      */
 
     /**
      * Listen to a given custom theme event,
      * setting up the action to be ran when the event occurs.
      */

-    public function listen(string $event, callable $action)
+    public function listen(string $event, callable $action): void

     {
         if (!isset($this->listeners[$event])) {
             $this->listeners[$event] = [];
     {
         if (!isset($this->listeners[$event])) {
             $this->listeners[$event] = [];


@@ -30,10 +44,8 @@ class ThemeService
      *
      * If a callback returns a non-null value, this method will
      * stop and return that value itself.
      *
      * If a callback returns a non-null value, this method will
      * stop and return that value itself.

-     *
-     * @return mixed

      */
      */

-    public function dispatch(string $event, ...$args)
+    public function dispatch(string $event, ...$args): mixed

     {
         foreach ($this->listeners[$event] ?? [] as $action) {
             $result = call_user_func_array($action, $args);
     {
         foreach ($this->listeners[$event] ?? [] as $action) {
             $result = call_user_func_array($action, $args);


@@ -45,33 +57,45 @@ class ThemeService
         return null;
     }
 
         return null;
     }
 

+    /**
+     * Check if there are listeners registered for the given event name.
+     */
+    public function hasListeners(string $event): bool
+    {
+        return count($this->listeners[$event] ?? []) > 0;
+    }
+

     /**
      * Register a new custom artisan command to be available.
      */
     /**
      * Register a new custom artisan command to be available.
      */

-    public function registerCommand(Command $command)
+    public function registerCommand(Command $command): void

     {
     {

-        /** @var \Illuminate\Foundation\Console\Kernel $consoleKernel */
-        $consoleKernel = app()->make(Kernel::class);
-        $consoleKernel->registerCommand($command);
+        Artisan::starting(function (Application $application) use ($command) {
+            $application->addCommands([$command]);
+        });

     }
 
     /**
      * Read any actions from the set theme path if the 'functions.php' file exists.
      */
     }
 
     /**
      * Read any actions from the set theme path if the 'functions.php' file exists.
      */

-    public function readThemeActions()
+    public function readThemeActions(): void

     {
         $themeActionsFile = theme_path('functions.php');
         if ($themeActionsFile && file_exists($themeActionsFile)) {
     {
         $themeActionsFile = theme_path('functions.php');
         if ($themeActionsFile && file_exists($themeActionsFile)) {

-            require $themeActionsFile;
+            try {
+                require $themeActionsFile;
+            } catch (\Error $exception) {
+                throw new ThemeException("Failed loading theme functions file at \"{$themeActionsFile}\" with error: {$exception->getMessage()}");
+            }

         }
     }
 
     /**
         }
     }
 
     /**

-     * @see SocialAuthService::addSocialDriver
+     * @see SocialDriverManager::addSocialDriver

      */
      */

-    public function addSocialDriver(string $driverName, array $config, string $socialiteHandler, callable $configureForRedirect = null)
+    public function addSocialDriver(string $driverName, array $config, string $socialiteHandler, ?callable $configureForRedirect = null): void

     {
     {

-        $socialAuthService = app()->make(SocialAuthService::class);
-        $socialAuthService->addSocialDriver($driverName, $config, $socialiteHandler, $configureForRedirect);
+        $driverManager = app()->make(SocialDriverManager::class);
+        $driverManager->addSocialDriver($driverName, $config, $socialiteHandler, $configureForRedirect);

     }
 }
     }
 }