Use composer.json instead of composer.lock

Use recommended `anonymous`, see https://developer.mozilla.org/en-US/docs/Web/API/HTMLImageElement/crossOrigin

.github/workflows/test.yml

@@ -43,7 +43,21 @@ jobs:
     name: 'PHP ${{ matrix.php }} / ${{ matrix.db }} ${{ matrix.prefixStr }}'
 
     steps:
-      - uses: actions/checkout@master
+      - name: Checkout repository
+        uses: actions/checkout@v1
+
+      - name: Get Composer Cache Directory
+        id: composer-cache
+        run: |
+          echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - uses: actions/cache@v1
+        id: cache
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+          restore-keys: |
+            ${{ runner.os }}-composer-
 
       - name: Select PHP version
         run: sudo update-alternatives --set php $(which php${{ matrix.php }})
@@ -52,6 +66,7 @@ jobs:
         run: mysql -uroot -proot -e 'CREATE DATABASE flarum_test;' --port 13306
 
       - name: Install Composer dependencies
+        if: steps.cache.outputs.cache-hit != 'true'
         run: composer install
 
       - name: Setup Composer tests

composer.json

@@ -60,6 +60,7 @@
         "s9e/text-formatter": "^1.2.0",
         "symfony/config": "^3.3",
         "symfony/console": "^4.2",
+        "symfony/event-dispatcher": "^4.3.2",
         "symfony/translation": "^3.3",
         "symfony/yaml": "^3.3",
         "tobscure/json-api": "^0.3.0",

js/src/common/models/User.js

@@ -91,6 +91,7 @@ Object.assign(User.prototype, {
       user.freshness = new Date();
       m.redraw();
     };
+    image.crossOrigin = 'anonymous';
     image.src = this.avatarUrl();
   },
 

js/src/forum/components/LogInButton.js

@@ -13,7 +13,7 @@ export default class LogInButton extends Button {
     props.className = (props.className || '') + ' LogInButton';
 
     props.onclick = function() {
-      const width = 600;
+      const width = 580;
       const height = 400;
       const $window = $(window);
 
@@ -22,7 +22,7 @@ export default class LogInButton extends Button {
         `height=${height},` +
         `top=${$window.height() / 2 - height / 2},` +
         `left=${$window.width() / 2 - width / 2},` +
-        'status=no,scrollbars=no,resizable=no');
+        'status=no,scrollbars=yes,resizable=no');
     };
 
     super.initProps(props);

less/common/Modal.less

@@ -156,6 +156,7 @@
     }
   }
   .Modal {
+    max-width: 100%;
     margin: 0;
     -webkit-transform: none !important;
             transform: none !important;

src/Console/Event/Configuring.php

@@ -33,7 +33,7 @@ class Configuring
     public $console;
 
     /**
-     * @param Application $app
+     * @param Application        $app
      * @param ConsoleApplication $console
      */
     public function __construct(Application $app, ConsoleApplication $console)

src/Console/Server.php

@@ -13,9 +13,14 @@ namespace Flarum\Console;
 
 use Flarum\Console\Event\Configuring;
 use Flarum\Foundation\Application;
+use Flarum\Foundation\ErrorHandling\Registry;
+use Flarum\Foundation\ErrorHandling\Reporter;
 use Flarum\Foundation\SiteInterface;
 use Illuminate\Contracts\Events\Dispatcher;
 use Symfony\Component\Console\Application as ConsoleApplication;
+use Symfony\Component\Console\ConsoleEvents;
+use Symfony\Component\Console\Event\ConsoleErrorEvent;
+use Symfony\Component\EventDispatcher\EventDispatcher;
 
 class Server
 {
@@ -45,7 +50,33 @@ class Server
     {
         $app = Application::getInstance();
 
+        $this->handleErrors($app, $console);
+
         $events = $app->make(Dispatcher::class);
+
         $events->fire(new Configuring($app, $console));
     }
+
+    private function handleErrors(Application $app, ConsoleApplication $console)
+    {
+        $dispatcher = new EventDispatcher();
+
+        $dispatcher->addListener(ConsoleEvents::ERROR, function (ConsoleErrorEvent $event) use ($app) {
+            /** @var Registry $registry */
+            $registry = $app->make(Registry::class);
+
+            $error = $registry->handle($event->getError());
+
+            /** @var Reporter[] $reporters */
+            $reporters = $app->tagged(Reporter::class);
+
+            if ($error->shouldBeReported()) {
+                foreach ($reporters as $reporter) {
+                    $reporter->report($error->getException());
+                }
+            }
+        });
+
+        $console->setDispatcher($dispatcher);
+    }
 }

src/Discussion/Search/Gambit/FulltextGambit.php

@@ -53,7 +53,7 @@ class FulltextGambit implements GambitInterface
         // discussions that have a relevant title or that contain relevant posts.
         $query
             ->addSelect('posts_ft.most_relevant_post_id')
-            ->leftJoin(
+            ->join(
                 new Expression('('.$subquery->toSql().') '.$grammar->wrapTable('posts_ft')),
                 'posts_ft.discussion_id', '=', 'discussions.id'
             )

src/Formatter/Formatter.php

@@ -139,8 +139,8 @@ class Formatter
         $dom = $configurator->tags['URL']->template->asDOM();
 
         foreach ($dom->getElementsByTagName('a') as $a) {
-            $a->setAttribute('target', '_blank');
-            $a->setAttribute('rel', 'nofollow');
+            $rel = $a->getAttribute('rel');
+            $a->setAttribute('rel', "$rel nofollow ugc");
         }
 
         $dom->saveChanges();

src/Install/BaseUrl.php

@@ -0,0 +1,72 @@
+<?php
+
+/*
+ * This file is part of Flarum.
+ *
+ * (c) Toby Zerner <toby.zerner@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Flarum\Install;
+
+use Psr\Http\Message\UriInterface;
+
+final class BaseUrl
+{
+    /** @var string */
+    private $normalized;
+
+    private function __construct(string $baseUrl)
+    {
+        $this->normalized = $this->normalize($baseUrl);
+    }
+
+    public static function fromString(string $baseUrl): self
+    {
+        return new self($baseUrl);
+    }
+
+    public static function fromUri(UriInterface $baseUrl): self
+    {
+        return new self((string) $baseUrl);
+    }
+
+    public function __toString(): string
+    {
+        return $this->normalized;
+    }
+
+    public function toEmail(string $mailbox): string
+    {
+        $host = preg_replace('/^www\./i', '', parse_url($this->normalized, PHP_URL_HOST));
+
+        return "$mailbox@$host";
+    }
+
+    private function normalize(string $baseUrl): string
+    {
+        // Empty base url is still valid
+        if (empty($baseUrl)) {
+            return '';
+        }
+
+        $normalizedBaseUrl = trim($baseUrl, '/');
+        if (! preg_match('#^https?://#i', $normalizedBaseUrl)) {
+            $normalizedBaseUrl = sprintf('http://%s', $normalizedBaseUrl);
+        }
+
+        $parseUrl = parse_url($normalizedBaseUrl);
+
+        $path = $parseUrl['path'] ?? null;
+        if (isset($parseUrl['path']) && strrpos($parseUrl['path'], '.php') !== false) {
+            $path = substr($parseUrl['path'], 0, strrpos($parseUrl['path'], '/'));
+        }
+
+        return rtrim(
+            sprintf('%s://%s%s', $parseUrl['scheme'], $parseUrl['host'], $path),
+            '/'
+        );
+    }
+}

src/Install/Console/FileDataProvider.php

@@ -13,6 +13,7 @@ namespace Flarum\Install\Console;
 
 use Exception;
 use Flarum\Install\AdminUser;
+use Flarum\Install\BaseUrl;
 use Flarum\Install\DatabaseConfig;
 use Flarum\Install\Installation;
 use Symfony\Component\Console\Input\InputInterface;
@@ -45,7 +46,7 @@ class FileDataProvider implements DataProviderInterface
 
             // Define configuration variables
             $this->debug = $configuration['debug'] ?? false;
-            $this->baseUrl = isset($configuration['baseUrl']) ? rtrim($configuration['baseUrl'], '/') : null;
+            $this->baseUrl = $configuration['baseUrl'] ?? 'http://flarum.local';
             $this->databaseConfiguration = $configuration['databaseConfiguration'] ?? [];
             $this->adminUser = $configuration['adminUser'] ?? [];
             $this->settings = $configuration['settings'] ?? [];
@@ -58,7 +59,7 @@ class FileDataProvider implements DataProviderInterface
     {
         return $installation
             ->debugMode($this->debug)
-            ->baseUrl($this->baseUrl ?? 'http://flarum.local')
+            ->baseUrl(BaseUrl::fromString($this->baseUrl))
             ->databaseConfig($this->getDatabaseConfiguration())
             ->adminUser($this->getAdminUser())
             ->settings($this->settings);

src/Install/Console/UserDataProvider.php

@@ -12,6 +12,7 @@
 namespace Flarum\Install\Console;
 
 use Flarum\Install\AdminUser;
+use Flarum\Install\BaseUrl;
 use Flarum\Install\DatabaseConfig;
 use Flarum\Install\Installation;
 use Illuminate\Support\Str;
@@ -28,6 +29,7 @@ class UserDataProvider implements DataProviderInterface
 
     protected $questionHelper;
 
+    /** @var BaseUrl */
     protected $baseUrl;
 
     public function __construct(InputInterface $input, OutputInterface $output, QuestionHelper $questionHelper)
@@ -49,7 +51,7 @@ class UserDataProvider implements DataProviderInterface
 
     private function getDatabaseConfiguration(): DatabaseConfig
     {
-        $host = $this->ask('Database host:');
+        $host = $this->ask('Database host (required):');
         $port = 3306;
 
         if (Str::contains($host, ':')) {
@@ -60,31 +62,33 @@ class UserDataProvider implements DataProviderInterface
             'mysql',
             $host,
             intval($port),
-            $this->ask('Database name:'),
-            $this->ask('Database user:'),
+            $this->ask('Database name (required):'),
+            $this->ask('Database user (required):'),
             $this->secret('Database password:'),
             $this->ask('Prefix:')
         );
     }
 
-    private function getBaseUrl()
+    private function getBaseUrl(): BaseUrl
     {
-        return $this->baseUrl = rtrim($this->ask('Base URL:'), '/');
+        $baseUrl = $this->ask('Base URL (Default: http://flarum.local):', 'http://flarum.local');
+
+        return $this->baseUrl = BaseUrl::fromString($baseUrl);
     }
 
     private function getAdminUser(): AdminUser
     {
         return new AdminUser(
-            $this->ask('Admin username:'),
+            $this->ask('Admin username (Default: admin):', 'admin'),
             $this->askForAdminPassword(),
-            $this->ask('Admin email address:')
+            $this->ask('Admin email address (required):')
         );
     }
 
     private function askForAdminPassword()
     {
         while (true) {
-            $password = $this->secret('Admin password:');
+            $password = $this->secret('Admin password (required >= 8 characters):');
 
             if (strlen($password) < 8) {
                 $this->validationError('Password must be at least 8 characters.');
@@ -105,11 +109,10 @@ class UserDataProvider implements DataProviderInterface
     private function getSettings()
     {
         $title = $this->ask('Forum title:');
-        $baseUrl = $this->baseUrl ?: 'http://localhost';
 
         return [
             'forum_title' => $title,
-            'mail_from' => 'noreply@'.preg_replace('/^www\./i', '', parse_url($baseUrl, PHP_URL_HOST)),
+            'mail_from' => $this->baseUrl->toEmail('noreply'),
             'welcome_title' => 'Welcome to '.$title,
         ];
     }

src/Install/Controller/InstallController.php

@@ -13,6 +13,7 @@ namespace Flarum\Install\Controller;
 
 use Flarum\Http\SessionAuthenticator;
 use Flarum\Install\AdminUser;
+use Flarum\Install\BaseUrl;
 use Flarum\Install\DatabaseConfig;
 use Flarum\Install\Installation;
 use Flarum\Install\StepFailed;
@@ -54,7 +55,7 @@ class InstallController implements RequestHandlerInterface
     public function handle(Request $request): ResponseInterface
     {
         $input = $request->getParsedBody();
-        $baseUrl = rtrim((string) $request->getUri(), '/');
+        $baseUrl = BaseUrl::fromUri($request->getUri());
 
         try {
             $pipeline = $this->installation
@@ -63,7 +64,7 @@ class InstallController implements RequestHandlerInterface
                 ->adminUser($this->makeAdminUser($input))
                 ->settings([
                     'forum_title' => Arr::get($input, 'forumTitle'),
-                    'mail_from' => 'noreply@'.preg_replace('/^www\./i', '', parse_url($baseUrl, PHP_URL_HOST)),
+                    'mail_from' => $baseUrl->toEmail('noreply'),
                     'welcome_title' => 'Welcome to '.Arr::get($input, 'forumTitle'),
                 ])
                 ->build();

src/Install/Installation.php

@@ -65,7 +65,7 @@ class Installation
         return $this;
     }
 
-    public function baseUrl($baseUrl)
+    public function baseUrl(BaseUrl $baseUrl)
     {
         $this->baseUrl = $baseUrl;
 

src/Install/Steps/StoreConfig.php

@@ -11,6 +11,7 @@
 
 namespace Flarum\Install\Steps;
 
+use Flarum\Install\BaseUrl;
 use Flarum\Install\DatabaseConfig;
 use Flarum\Install\ReversibleStep;
 use Flarum\Install\Step;
@@ -25,7 +26,7 @@ class StoreConfig implements Step, ReversibleStep
 
     private $configFile;
 
-    public function __construct($debugMode, DatabaseConfig $dbConfig, $baseUrl, $configFile)
+    public function __construct($debugMode, DatabaseConfig $dbConfig, BaseUrl $baseUrl, $configFile)
     {
         $this->debugMode = $debugMode;
         $this->dbConfig = $dbConfig;
@@ -57,7 +58,7 @@ class StoreConfig implements Step, ReversibleStep
         return [
             'debug'    => $this->debugMode,
             'database' => $this->dbConfig->toArray(),
-            'url'      => $this->baseUrl,
+            'url'      => (string) $this->baseUrl,
             'paths'    => $this->getPathsConfig(),
         ];
     }

src/Queue/QueueServiceProvider.php

@@ -13,10 +13,14 @@ namespace Flarum\Queue;
 
 use Flarum\Console\Event\Configuring;
 use Flarum\Foundation\AbstractServiceProvider;
+use Flarum\Foundation\ErrorHandling\Registry;
+use Flarum\Foundation\ErrorHandling\Reporter;
 use Illuminate\Contracts\Debug\ExceptionHandler as ExceptionHandling;
 use Illuminate\Contracts\Queue\Factory;
+use Illuminate\Contracts\Queue\Queue;
 use Illuminate\Queue\Connectors\ConnectorInterface;
 use Illuminate\Queue\Console as Commands;
+use Illuminate\Queue\Events\JobFailed;
 use Illuminate\Queue\Failed\NullFailedJobProvider;
 use Illuminate\Queue\Listener as QueueListener;
 use Illuminate\Queue\SyncQueue;
@@ -90,6 +94,8 @@ class QueueServiceProvider extends AbstractServiceProvider
             return new NullFailedJobProvider();
         });
 
+        $this->app->alias('flarum.queue.connection', Queue::class);
+
         $this->app->alias(ConnectorInterface::class, 'queue.connection');
         $this->app->alias(Factory::class, 'queue');
         $this->app->alias(Worker::class, 'queue.worker');
@@ -106,4 +112,23 @@ class QueueServiceProvider extends AbstractServiceProvider
             }
         });
     }
+
+    public function boot()
+    {
+        $this->app['events']->listen(JobFailed::class, function (JobFailed $event) {
+            /** @var Registry $registry */
+            $registry = $this->app->make(Registry::class);
+
+            $error = $registry->handle($event->exception);
+
+            /** @var Reporter[] $reporters */
+            $reporters = $this->app->tagged(Reporter::class);
+
+            if ($error->shouldBeReported()) {
+                foreach ($reporters as $reporter) {
+                    $reporter->report($error->getException());
+                }
+            }
+        });
+    }
 }

src/Settings/DatabaseSettingsRepository.php

@@ -22,7 +22,7 @@ class DatabaseSettingsRepository implements SettingsRepositoryInterface
         $this->database = $connection;
     }
 
-    public function all()
+    public function all(): array
     {
         return $this->database->table('settings')->pluck('value', 'key')->all();
     }

src/Settings/MemoryCacheSettingsRepository.php

@@ -26,7 +26,7 @@ class MemoryCacheSettingsRepository implements SettingsRepositoryInterface
         $this->inner = $inner;
     }
 
-    public function all()
+    public function all(): array
     {
         if (! $this->isCached) {
             $this->cache = $this->inner->all();

src/Settings/SettingsRepositoryInterface.php

@@ -13,7 +13,7 @@ namespace Flarum\Settings;
 
 interface SettingsRepositoryInterface
 {
-    public function all();
+    public function all(): array;
 
     public function get($key, $default = null);
 

src/User/Search/Gambit/FulltextGambit.php

@@ -30,15 +30,25 @@ class FulltextGambit implements GambitInterface
         $this->users = $users;
     }
 
+    /**
+     * @param $searchValue
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    private function getUserSearchSubQuery($searchValue)
+    {
+        return $this->users
+            ->query()
+            ->select('id')
+            ->where('username', 'like', "{$searchValue}%");
+    }
+
     /**
      * {@inheritdoc}
      */
-    public function apply(AbstractSearch $search, $bit)
+    public function apply(AbstractSearch $search, $searchValue)
     {
-        $users = $this->users->getIdsForUsername($bit, $search->getActor());
-
-        $search->getQuery()->whereIn('id', $users);
-
-        $search->setDefaultSort(['id' => $users]);
+        $search->getQuery()
+            ->whereIn('id',
+                $this->getUserSearchSubQuery($searchValue));
     }
 }

tests/integration/api/Controller/ListDiscussionsControllerTest.php

@@ -76,7 +76,7 @@ class ListDiscussionsControllerTest extends ApiControllerTestCase
     /**
      * @test
      */
-    public function can_search_for_word_in_title_and_post()
+    public function can_search_for_word_in_post()
     {
         $this->database()->table('posts')->insert([
             ['id' => 2, 'discussion_id' => 2, 'created_at' => Carbon::now()->toDateTimeString(), 'user_id' => 2, 'type' => 'comment', 'content' => '<t><p>not in text</p></t>'],
@@ -98,7 +98,7 @@ class ListDiscussionsControllerTest extends ApiControllerTestCase
         }, $data['data']);
 
         // Order-independent comparison
-        $this->assertEquals(['2', '3'], $ids, 'IDs do not match', 0.0, 10, true);
+        $this->assertEquals(['3'], $ids, 'IDs do not match', 0.0, 10, true);
     }
 
     /**
@@ -126,7 +126,7 @@ class ListDiscussionsControllerTest extends ApiControllerTestCase
         }, $data['data']);
 
         // Order-independent comparison
-        $this->assertEquals(['2', '3'], $ids, 'IDs do not match', 0.0, 10, true);
+        $this->assertEquals(['3'], $ids, 'IDs do not match', 0.0, 10, true);
     }
 
     /**

tests/integration/setup.php

@@ -10,6 +10,7 @@
  */
 
 use Flarum\Install\AdminUser;
+use Flarum\Install\BaseUrl;
 use Flarum\Install\DatabaseConfig;
 use Flarum\Install\Installation;
 
@@ -48,7 +49,7 @@ $installation = new Installation(
 $pipeline = $installation
     ->configPath('config.php')
     ->debugMode(true)
-    ->baseUrl('http://localhost')
+    ->baseUrl(BaseUrl::fromString('http://localhost'))
     ->databaseConfig(new DatabaseConfig(
         'mysql',
         env('DB_HOST', 'localhost'),

tests/unit/Install/BaseUrlTest.php

@@ -0,0 +1,85 @@
+<?php
+
+/*
+ * This file is part of Flarum.
+ *
+ * (c) Toby Zerner <toby.zerner@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Flarum\Tests\unit;
+
+use Flarum\Install\BaseUrl;
+use PHPUnit\Framework\TestCase;
+use Zend\Diactoros\Uri;
+
+class BaseUrlTest extends TestCase
+{
+    /**
+     * @dataProvider urlProvider
+     */
+    public function test_base_url_simulating_cli_installer($uri, $expected)
+    {
+        $this->assertEquals($expected, BaseUrl::fromString($uri));
+    }
+
+    /**
+     * @dataProvider urlProvider
+     */
+    public function test_base_url_simulating_web_installer($uri, $expected)
+    {
+        $uri = new Uri($uri);
+
+        $this->assertEquals($expected, BaseUrl::fromUri($uri));
+    }
+
+    /**
+     * @dataProvider emailProvider
+     */
+    public function test_default_email_generation($uri, $expected)
+    {
+        $this->assertEquals(
+            $expected,
+            BaseUrl::fromString($uri)->toEmail('noreply')
+        );
+    }
+
+    public function urlProvider()
+    {
+        return [
+            ['',                                    ''],
+            ['flarum.org',                          'http://flarum.org'],
+            ['flarum.org/',                         'http://flarum.org'],
+            ['http://flarum.org',                   'http://flarum.org'],
+            ['http://flarum.org/',                  'http://flarum.org'],
+            ['https://flarum.org',                  'https://flarum.org'],
+            ['http://flarum.org/index.php',         'http://flarum.org'],
+            ['http://flarum.org/index.php/',        'http://flarum.org'],
+            ['http://flarum.org/flarum',            'http://flarum.org/flarum'],
+            ['http://flarum.org/flarum/index.php',  'http://flarum.org/flarum'],
+            ['http://flarum.org/flarum/index.php/', 'http://flarum.org/flarum'],
+            ['sub.flarum.org',                      'http://sub.flarum.org'],
+            ['http://sub.flarum.org',               'http://sub.flarum.org'],
+        ];
+    }
+
+    public function emailProvider()
+    {
+        return [
+            ['flarum.org',                          'noreply@flarum.org'],
+            ['flarum.org/',                         'noreply@flarum.org'],
+            ['http://flarum.org',                   'noreply@flarum.org'],
+            ['http://flarum.org/',                  'noreply@flarum.org'],
+            ['https://flarum.org',                  'noreply@flarum.org'],
+            ['http://flarum.org/index.php',         'noreply@flarum.org'],
+            ['http://flarum.org/index.php/',        'noreply@flarum.org'],
+            ['http://flarum.org/flarum',            'noreply@flarum.org'],
+            ['http://flarum.org/flarum/index.php',  'noreply@flarum.org'],
+            ['http://flarum.org/flarum/index.php/', 'noreply@flarum.org'],
+            ['sub.flarum.org',                      'noreply@sub.flarum.org'],
+            ['http://sub.flarum.org',               'noreply@sub.flarum.org'],
+        ];
+    }
+}