Merge remote-tracking branch 'origin/master'

framework/core/src/Console/ImportCommand.php

@@ -4,15 +4,12 @@ use Illuminate\Console\Command;
 use Illuminate\Foundation\Application;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputArgument;
-use Flarum\Core\Exceptions\ValidationFailureException;
-use Flarum\Core\Models\User;
-use Flarum\Core\Models\Discussion;
-use Flarum\Core\Models\DiscussionState;
-use Flarum\Core\Models\CommentPost;
+use Flarum\Core\Users\User;
+use Flarum\Core\Discussions\Discussion;
+use Flarum\Core\Discussions\DiscussionState;
+use Flarum\Core\Posts\CommentPost;
 use Flarum\Tags\Tag;
-use Flarum\Core\Events\PostWasPosted;
-use Flarum\Core\Events\UserWasRegistered;
-use Flarum\Core\Activity\JoinedActivity;
+use Flarum\Core\Posts\Events\PostWasPosted;
 use Symfony\Component\Console\Helper\ProgressBar;
 
 class ImportCommand extends Command
@@ -23,7 +20,7 @@ class ImportCommand extends Command
      *
      * @var string
      */
-    protected $name = 'flarum:import';
+    protected $name = 'import';
 
     /**
      * The console command description.

framework/core/src/Core.php

@@ -18,10 +18,6 @@ class Core
             return $default;
         }
 
-        if (is_null($value = app('flarum.db')->table('config')->where('key', $key)->pluck('value'))) {
-            $value = $default;
-        }
-
-        return $value;
+        return app('Flarum\Core\Settings\SettingsRepository')->get($key, $default);
     }
 }

framework/core/src/Core/CoreServiceProvider.php

@@ -1,5 +1,7 @@
 <?php namespace Flarum\Core;
 
+use Flarum\Core\Settings\MemoryCacheSettingsRepository;
+use Flarum\Core\Settings\DatabaseSettingsRepository;
 use Flarum\Core\Users\User;
 use Flarum\Support\ServiceProvider;
 use Flarum\Extend;
@@ -31,6 +33,14 @@ class CoreServiceProvider extends ServiceProvider
      */
     public function register()
     {
+        $this->app->singleton('Flarum\Core\Settings\SettingsRepository', function() {
+            return new MemoryCacheSettingsRepository(
+                new DatabaseSettingsRepository(
+                    $this->app->make('Illuminate\Database\ConnectionInterface')
+                )
+            );
+        });
+
         $this->app->singleton('flarum.forum', 'Flarum\Core\Forum');
 
         // TODO: probably use Illuminate's AggregateServiceProvider

framework/core/src/Core/Model.php

@@ -3,7 +3,6 @@
 use Illuminate\Contracts\Validation\Factory;
 use Illuminate\Database\Eloquent\Model as Eloquent;
 use Illuminate\Database\Eloquent\Relations\Relation;
-use Flarum\Core\Exceptions\ValidationFailureException;
 use LogicException;
 
 /**

framework/core/src/Core/Settings/DatabaseSettingsRepository.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Flarum\Core;
+namespace Flarum\Core\Settings;
 
 use Illuminate\Database\ConnectionInterface;
 
-class DatabaseSettingsRepository implements SettingsRepositoryInterface
+class DatabaseSettingsRepository implements SettingsRepository
 {
     protected $database;
 
@@ -13,6 +13,11 @@ class DatabaseSettingsRepository implements SettingsRepositoryInterface
         $this->database = $connection;
     }
 
+    public function all()
+    {
+        return $this->database->table('config')->lists('value', 'key');
+    }
+
     public function get($key, $default = null)
     {
         if (is_null($value = $this->database->table('config')->where('key', $key)->pluck('value'))) {

framework/core/src/Core/Settings/MemoryCacheSettingsRepository.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace Flarum\Core\Settings;
+
+class MemoryCacheSettingsRepository implements SettingsRepository
+{
+    protected $inner;
+
+    protected $isCached;
+
+    protected $cache = [];
+
+    public function __construct(SettingsRepository $inner)
+    {
+        $this->inner = $inner;
+    }
+
+    public function all()
+    {
+        if (!$this->isCached) {
+            $this->cache = $this->inner->all();
+            $this->isCached = true;
+        }
+
+        return $this->cache;
+    }
+
+    public function get($key, $default = null)
+    {
+        if (array_key_exists($key, $this->cache)) {
+            return $this->cache[$key];
+        } else if (!$this->isCached) {
+            return array_get($this->all(), $key, $default);
+        }
+
+        return $default;
+    }
+
+    public function set($key, $value)
+    {
+        $this->cache[$key] = $value;
+
+        $this->inner->set($key, $value);
+    }
+}

framework/core/src/Core/Settings/SettingsRepository.php

@@ -1,9 +1,11 @@
 <?php
 
-namespace Flarum\Core;
+namespace Flarum\Core\Settings;
 
-interface SettingsRepositoryInterface
+interface SettingsRepository
 {
+    public function all();
+
     public function get($key, $default = null);
 
     public function set($key, $value);

framework/core/src/Core/Users/Commands/RequestPasswordResetHandler.php

@@ -1,5 +1,6 @@
 <?php namespace Flarum\Core\Users\Commands;
 
+use Flarum\Core\Settings\SettingsRepository;
 use Flarum\Core\Users\PasswordToken;
 use Flarum\Core\Users\UserRepository;
 use Illuminate\Contracts\Mail\Mailer;
@@ -15,19 +16,31 @@ class RequestPasswordResetHandler
      */
     protected $users;
 
+    /**
+     * @var SettingsRepository
+     */
+    protected $settings;
+
     /**
      * @var Mailer
      */
     protected $mailer;
 
+    /**
+     * @var UrlGeneratorInterface
+     */
+    protected $url;
+
     /**
      * @param UserRepository $users
+     * @param SettingsRepository $settings
      * @param Mailer $mailer
      * @param UrlGeneratorInterface $url
      */
-    public function __construct(UserRepository $users, Mailer $mailer, UrlGeneratorInterface $url)
+    public function __construct(UserRepository $users, SettingsRepository $settings, Mailer $mailer, UrlGeneratorInterface $url)
     {
         $this->users = $users;
+        $this->settings = $settings;
         $this->mailer = $mailer;
         $this->url = $url;
     }
@@ -53,8 +66,8 @@ class RequestPasswordResetHandler
         // password route be part of core??
         $data = [
             'username' => $user->username,
-            'url' => Core::config('base_url').'/reset/'.$token->id,
-            'forumTitle' => Core::config('forum_title')
+            'url' => $this->settings->get('base_url').'/reset/'.$token->id,
+            'forumTitle' => $this->settings->get('forum_title'),
         ];
 
         $this->mailer->send(['text' => 'flarum::emails.resetPassword'], $data, function (Message $message) use ($user) {

framework/core/src/Core/Users/Listeners/EmailConfirmationMailer.php

@@ -1,5 +1,6 @@
 <?php namespace Flarum\Core\Users\Listeners;
 
+use Flarum\Core\Settings\SettingsRepository;
 use Flarum\Core\Users\Events\UserWasRegistered;
 use Flarum\Core\Users\Events\UserEmailChangeWasRequested;
 use Flarum\Core;
@@ -11,16 +12,23 @@ use Illuminate\Mail\Message;
 
 class EmailConfirmationMailer
 {
+    /**
+     * @var SettingsRepository
+     */
+    protected $settings;
+
     /**
      * @var Mailer
      */
     protected $mailer;
 
     /**
+     * @param SettingsRepository $settings
      * @param Mailer $mailer
      */
-    public function __construct(Mailer $mailer)
+    public function __construct(SettingsRepository $settings, Mailer $mailer)
     {
+        $this->settings = $settings;
         $this->mailer = $mailer;
     }
 
@@ -90,8 +98,8 @@ class EmailConfirmationMailer
         // email route be part of core??
         return [
             'username' => $user->username,
-            'url' => Core::config('base_url').'/confirm/'.$token->id,
-            'forumTitle' => Core::config('forum_title')
+            'url' => $this->settings->get('base_url').'/confirm/'.$token->id,
+            'forumTitle' => $this->settings->get('forum_title')
         ];
     }
 }

framework/core/src/Support/ClientAction.php

@@ -5,6 +5,7 @@ use Flarum\Assets\AssetManager;
 use Flarum\Assets\JsCompiler;
 use Flarum\Assets\LessCompiler;
 use Flarum\Core;
+use Flarum\Core\Settings\SettingsRepository;
 use Flarum\Core\Users\User;
 use Flarum\Locale\JsCompiler as LocaleJsCompiler;
 use Flarum\Locale\LocaleManager;
@@ -61,14 +62,20 @@ abstract class ClientAction extends HtmlAction
      */
     protected $locales;
 
+    /**
+     * @var SettingsRepository
+     */
+    protected $settings;
+
     /**
      * @param Client $apiClient
      * @param LocaleManager $locales
      */
-    public function __construct(Client $apiClient, LocaleManager $locales)
+    public function __construct(Client $apiClient, LocaleManager $locales, SettingsRepository $settings)
     {
         $this->apiClient = $apiClient;
         $this->locales = $locales;
+        $this->settings = $settings;
     }
 
     /**
@@ -156,7 +163,7 @@ abstract class ClientAction extends HtmlAction
             $assets->addLess("@$name: $value;");
         }
 
-        $assets->addLess(Core::config('custom_less'));
+        $assets->addLess($this->settings->get('custom_less'));
     }
 
     /**
@@ -168,10 +175,10 @@ abstract class ClientAction extends HtmlAction
     protected function getLessVariables()
     {
         return [
-            'fl-primary-color'   => Core::config('theme_primary_color', '#000'),
-            'fl-secondary-color' => Core::config('theme_secondary_color', '#000'),
-            'fl-dark-mode'       => Core::config('theme_dark_mode') ? 'true' : 'false',
-            'fl-colored-header'  => Core::config('theme_colored_header') ? 'true' : 'false'
+            'fl-primary-color'   => $this->settings->get('theme_primary_color', '#000'),
+            'fl-secondary-color' => $this->settings->get('theme_secondary_color', '#000'),
+            'fl-dark-mode'       => $this->settings->get('theme_dark_mode') ? 'true' : 'false',
+            'fl-colored-header'  => $this->settings->get('theme_colored_header') ? 'true' : 'false'
         ];
     }
 

framework/core/src/Support/Extensions/ExtensionsServiceProvider.php

@@ -11,13 +11,23 @@ class ExtensionsServiceProvider extends ServiceProvider
      * @return void
      */
     public function register()
+    {
+    }
+
+    /**
+     * Boot the service provider.
+     *
+     * @return void
+     */
+    public function boot()
     {
         // Extensions will not be registered if Flarum is not installed yet
         if (!Core::isInstalled()) {
             return;
         }
 
-        $extensions = json_decode(Core::config('extensions_enabled'), true);
+        $config = $this->app->make('Flarum\Core\Settings\SettingsRepository')->get('extensions_enabled');
+        $extensions = json_decode($config, true);
         $providers = [];
 
         foreach ($extensions as $extension) {