added author Daniel Klabbers

* Update Application version string to beta 10
* Add beta.10 changelog

.github/FUNDING.yml

@@ -1,3 +0,0 @@
-github: flarum
-open_collective: flarum
-tidelift: packagist/flarum/core

.github/stale.yml

@@ -1,26 +0,0 @@
-daysUntilStale: 90
-daysUntilClose: 30
-
-staleLabel: stale
-
-exemptLabels:
-- org/keep
-- type/bug
-- type/regression
-- critical
-- security
-exemptAssignees: true
-exemptMilestones: true
-exemptProjects: true
-
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs. We do this
-  to keep the amount of open issues to a manageable minimum.
-
-  In any case, thanks for taking an interest in this software and contributing
-  by opening the issue in the first place!
-
-closeComment: >
-  We are closing this issue as it seems to have grown stale. If you still
-  encounter this problem with the latest version, feel free to re-open it.

CHANGELOG.md

@@ -1,38 +1,5 @@
 # Changelog
 
-## [0.1.0-beta.11.1](https://github.com/flarum/core/compare/v0.1.0-beta.11...v0.1.0-beta.11.1)
-
-### Fixed
-
-- Saving custom css in admin failed (#1946)
-
-## [0.1.0-beta.11](https://github.com/flarum/core/compare/v0.1.0-beta.10...v0.1.0-beta.11)
-
-### Added
-- Comments have an additional class `Post--by-actor` when posted by the user (#1927)
-
-### Changed
-- Improved support for URL identification during installation (#1861)
-- KeyboardNavigatable now has a callback ability (#1922)
-- Links are no longer opened with target `_blank` but in the same window (#859)
-- Links now have `nofollow ugc` by default as their `rel` attribute (#859, #1884)
-- Improved performance of the full text gambit when searching for users (#1877)
-- The Queue implementation is now available under its Illuminate contract
-
-### Fixed
-- No error handling was possible in the console/cli (#1789)
-- Enable scrollbars in log in modals so it fits for GitHub (#1716)
-- Reduce log in modal for SSO so it fits for Facebook (#1727)
-- Deleting discussions permanently did not delete its posts (#1909)
-- Fixed the queue:restart command (#1932)
-- Deleted posts were visible to all visitors (#1827)
-- Old avatars weren't being deleted when replaced (#1918)
-- The search performance regression was reverted (#1764)
-- No profile background could be set for remote images (#445)
-- Back button sends to home even though it could actually go back (#1942)
-- Debug button no longer visible (#1687)
-- Modals on smaller screens use the whole width of the page
-
 ## [0.1.0-beta.10](https://github.com/flarum/core/compare/v0.1.0-beta.9...v0.1.0-beta.10)
 
 ### Added

LICENSE

@@ -1,7 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019-2020 Stichting Flarum (Flarum Foundation)
-Copyright (c) 2014-2019 Toby Zerner (toby.zerner@gmail.com)
+Copyright (c) Toby Zerner
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -27,7 +27,7 @@ Thank you for considering contributing to Flarum! Please read the **[Contributin
 
 ## Security Vulnerabilities
 
-If you discover a security vulnerability within Flarum, please send an e-mail to [security@flarum.org](mailto:security@flarum.org). All security vulnerabilities will be promptly addressed. More details can be found in our [security policy](https://github.com/flarum/core/security/policy).
+If you discover a security vulnerability within Flarum, please send an e-mail to [security@flarum.org](mailto:security@flarum.org). All security vulnerabilities will be promptly addressed.
 
 ## License
 

composer.json

@@ -46,10 +46,6 @@
         "illuminate/validation": "5.7.*",
         "illuminate/view": "5.7.*",
         "intervention/image": "^2.3.0",
-        "laminas/laminas-diactoros": "^1.8.4",
-        "laminas/laminas-httphandlerrunner": "^1.0",
-        "laminas/laminas-stratigility": "^3.0",
-        "laminas/laminas-zendframework-bridge": "^1.0",
         "league/flysystem": "^1.0.11",
         "matthiasmullie/minify": "^1.3",
         "middlewares/base-path": "^1.1",
@@ -64,10 +60,12 @@
         "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"
+        "tobscure/json-api": "^0.3.0",
+        "zendframework/zend-diactoros": "^1.8.4",
+        "zendframework/zend-httphandlerrunner": "^1.0",
+        "zendframework/zend-stratigility": "^3.0"
     },
     "require-dev": {
         "mockery/mockery": "^1.0",

js/package.json

@@ -15,7 +15,7 @@
     "moment": "^2.22.2",
     "punycode": "^2.1.1",
     "spin.js": "^3.1.0",
-    "webpack": "^4.41.2",
+    "webpack": "^4.26.0",
     "webpack-cli": "^3.1.2",
     "webpack-merge": "^4.1.4"
   },

js/src/admin/components/MailPage.js

@@ -29,13 +29,12 @@ export default class MailPage extends Page {
         {}
       );
 
-      for (const driver in this.driverFields) {
-        for (const field in this.driverFields[driver]) {
-          this.fields.push(field);
-          this.values[field] = m.prop(settings[field]);
+      Object.keys(this.driverFields).flatMap(key => this.driverFields[key]).forEach(
+        key => {
+          this.fields.push(key);
+          this.values[key] = m.prop(settings[key]);
         }
-      }
-
+      );
       this.loading = false;
       m.redraw();
     });
@@ -88,9 +87,9 @@ export default class MailPage extends Page {
               className: 'MailPage-MailSettings',
               children: [
                 <div className="MailPage-MailSettings-input">
-                  {Object.keys(this.driverFields[this.values.mail_driver()]).map(field => [
+                  {this.driverFields[this.values.mail_driver()].flatMap(field => [
                     <label>{app.translator.trans(`core.admin.email.${field}_label`)}</label>,
-                    this.renderField(field),
+                    <input className="FormControl" value={this.values[field]() || ''} oninput={m.withAttr('value', this.values[field])} />
                   ])}
                 </div>
               ]
@@ -109,18 +108,6 @@ export default class MailPage extends Page {
     );
   }
 
-  renderField(name) {
-    const driver = this.values.mail_driver();
-    const field = this.driverFields[driver][name];
-    const prop = this.values[name];
-
-    if (typeof field === 'string') {
-      return <input className="FormControl" value={prop() || ''} oninput={m.withAttr('value', prop)}/>;
-    } else {
-      return <Select value={prop()} options={field} onchange={prop} />;
-    }
-  }
-
   changed() {
     return this.fields.some(key => this.values[key]() !== app.data.settings[key]);
   }

js/src/common/Application.js

@@ -1,9 +1,7 @@
 import ItemList from './utils/ItemList';
 import Alert from './components/Alert';
-import Button from './components/Button';
 import ModalManager from './components/ModalManager';
 import AlertManager from './components/AlertManager';
-import RequestErrorModal from './components/RequestErrorModal';
 import Translator from './Translator';
 import Store from './Store';
 import Session from './Session';
@@ -143,7 +141,7 @@ export default class Application {
   bootExtensions(extensions) {
     Object.keys(extensions).forEach(name => {
       const extension = extensions[name];
-
+      
       const extenders = flattenDeep(extension.extend);
 
       for (const extender of extenders) {
@@ -330,14 +328,9 @@ export default class Application {
           children = app.translator.trans('core.lib.error.generic_message');
       }
 
-      const isDebug = app.forum.attribute('debug');
-
       error.alert = new Alert({
         type: 'error',
-        children,
-        controls: isDebug && [
-          <Button className="Button Button--link" onclick={this.showDebug.bind(this, error)}>Debug</Button>
-        ]
+        children
       });
 
       try {
@@ -352,16 +345,6 @@ export default class Application {
     return deferred.promise;
   }
 
-  /**
-   * @param {RequestError} error
-   * @private
-   */
-  showDebug(error) {
-    this.alerts.dismiss(this.requestError.alert);
-
-    this.modal.show(new RequestErrorModal({error}));
-  }
-
   /**
    * Construct a URL to the route with the given name.
    *

js/src/common/compat.js

@@ -37,7 +37,6 @@ import Placeholder from './components/Placeholder';
 import Separator from './components/Separator';
 import Dropdown from './components/Dropdown';
 import SplitDropdown from './components/SplitDropdown';
-import RequestErrorModal from './components/RequestErrorModal';
 import FieldSet from './components/FieldSet';
 import Select from './components/Select';
 import Navigation from './components/Navigation';
@@ -101,7 +100,6 @@ export default {
   'components/Separator': Separator,
   'components/Dropdown': Dropdown,
   'components/SplitDropdown': SplitDropdown,
-  'components/RequestErrorModal': RequestErrorModal,
   'components/FieldSet': FieldSet,
   'components/Select': Select,
   'components/Navigation': Navigation,

js/src/common/components/RequestErrorModal.js

@@ -1,30 +0,0 @@
-import Modal from './Modal';
-
-export default class RequestErrorModal extends Modal {
-  className() {
-    return 'RequestErrorModal Modal--large';
-  }
-
-  title() {
-    return this.props.error.xhr
-      ? this.props.error.xhr.status+' '+this.props.error.xhr.statusText
-      : '';
-  }
-
-  content() {
-    let responseText;
-
-    try {
-      responseText = JSON.stringify(JSON.parse(this.props.error.responseText), null, 2);
-    } catch (e) {
-      responseText = this.props.error.responseText;
-    }
-
-    return <div className="Modal-body">
-      <pre>
-        {this.props.error.options.method} {this.props.error.options.url}<br/><br/>
-        {responseText}
-      </pre>
-    </div>;
-  }
-}

js/src/common/models/User.js

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

js/src/common/utils/string.js

@@ -16,10 +16,6 @@ export function truncate(string, length, start = 0) {
  * Create a slug out of the given string. Non-alphanumeric characters are
  * converted to hyphens.
  *
- * NOTE: This method does not use the comparably sophisticated transliteration
- * mechanism that is employed in the backend. Therefore, it should only be used
- * to *suggest* slugs that can be overridden by the user.
- *
  * @param {String} string
  * @return {String}
  */

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 = 580;
+      const width = 600;
       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=yes,resizable=no');
+        'status=no,scrollbars=no,resizable=no');
     };
 
     super.initProps(props);

js/src/forum/components/Post.js

@@ -39,7 +39,7 @@ export default class Post extends Component {
   view() {
     const attrs = this.attrs();
 
-    attrs.className = this.classes(attrs.className).join(' ');
+    attrs.className = 'Post ' + (this.loading ? 'Post--loading ' : '') + (attrs.className || '');
 
     return (
       <article {...attrs}>
@@ -98,26 +98,6 @@ export default class Post extends Component {
     return [];
   }
 
-  /**
-   * Get the post's classes.
-   * 
-   * @param string classes
-   * @returns {string[]}
-   */
-  classes(existing) {
-    let classes = (existing || '').split(' ').concat(['Post']);
-
-    if (this.loading) {
-      classes.push('Post--loading');
-    }
-
-    if (this.props.post.user() === app.session.user) {
-      classes.push('Post--by-actor');
-    }
-
-    return classes;
-  }
-
   /**
    * Build an item list for the post's actions.
    *

js/src/forum/components/ReplyComposer.js

@@ -102,7 +102,7 @@ export default class ReplyComposer extends ComposerBody {
           app.alerts.show(
             alert = new Alert({
               type: 'success',
-              children: app.translator.trans('core.forum.composer_reply.posted_message'),
+              message: app.translator.trans('core.forum.composer_reply.posted_message'),
               controls: [viewButton]
             })
           );

js/src/forum/components/UserPage.js

@@ -88,13 +88,8 @@ export default class UserPage extends Page {
   loadUser(username) {
     const lowercaseUsername = username.toLowerCase();
 
-    // Load the preloaded user object, if any, into the global app store
-    // We don't use the output of the method because it returns raw JSON
-    // instead of the parsed models
-    app.preloadedApiDocument();
-
     app.store.all('users').some(user => {
-      if ((user.username().toLowerCase() === lowercaseUsername || user.id() === username) && user.joinTime()) {
+      if (user.username().toLowerCase() === lowercaseUsername && user.joinTime()) {
         this.show(user);
         return true;
       }

js/src/forum/utils/History.js

@@ -92,7 +92,7 @@ export default class History {
 
     this.stack.pop();
 
-    m.route(this.getCurrent().url);
+    this.canGoBack() ? m.route(this.getCurrent().url) : this.home();
   }
 
   /**

js/src/forum/utils/KeyboardNavigatable.js

@@ -7,24 +7,10 @@
  */
 export default class KeyboardNavigatable {
   constructor() {
-    /**
-     * Callback to be executed for a specified input.
-     *
-     * @callback KeyboardNavigatable~keyCallback
-     * @param {KeyboardEvent} event
-     * @returns {boolean}
-     */
     this.callbacks = {};
 
-    /**
-     * Callback that determines whether keyboard input should be handled.
-     * By default, always handle keyboard navigation.
-     *
-     * @callback whenCallback
-     * @param {KeyboardEvent} event
-     * @returns {boolean}
-     */
-    this.whenCallback = event => true;
+    // By default, always handle keyboard navigation.
+    this.whenCallback = () => true;
   }
 
   /**
@@ -33,7 +19,7 @@ export default class KeyboardNavigatable {
    * This will be triggered by the Up key.
    *
    * @public
-   * @param {KeyboardNavigatable~keyCallback} callback
+   * @param {Function} callback
    * @return {KeyboardNavigatable}
    */
   onUp(callback) {
@@ -51,7 +37,7 @@ export default class KeyboardNavigatable {
    * This will be triggered by the Down key.
    *
    * @public
-   * @param {KeyboardNavigatable~keyCallback} callback
+   * @param {Function} callback
    * @return {KeyboardNavigatable}
    */
   onDown(callback) {
@@ -69,7 +55,7 @@ export default class KeyboardNavigatable {
    * This will be triggered by the Return and Tab keys..
    *
    * @public
-   * @param {KeyboardNavigatable~keyCallback} callback
+   * @param {Function} callback
    * @return {KeyboardNavigatable}
    */
   onSelect(callback) {
@@ -87,7 +73,7 @@ export default class KeyboardNavigatable {
    * This will be triggered by the Escape key.
    *
    * @public
-   * @param {KeyboardNavigatable~keyCallback} callback
+   * @param {Function} callback
    * @return {KeyboardNavigatable}
    */
   onCancel(callback) {
@@ -95,7 +81,7 @@ export default class KeyboardNavigatable {
       e.stopPropagation();
       e.preventDefault();
       callback(e);
-    };
+    }
 
     return this;
   }
@@ -106,7 +92,7 @@ export default class KeyboardNavigatable {
    * This will be triggered by the Backspace key.
    *
    * @public
-   * @param {KeyboardNavigatable~keyCallback} callback
+   * @param {Function} callback
    * @return {KeyboardNavigatable}
    */
   onRemove(callback) {
@@ -124,7 +110,7 @@ export default class KeyboardNavigatable {
    * Provide a callback that determines whether keyboard input should be handled.
    *
    * @public
-   * @param {KeyboardNavigatable~whenCallback} callback
+   * @param {Function} callback
    * @return {KeyboardNavigatable}
    */
   when(callback) {
@@ -152,7 +138,7 @@ export default class KeyboardNavigatable {
    */
   navigate(event) {
     // This callback determines whether keyboard should be handled or ignored.
-    if (!this.whenCallback(event)) return;
+    if (!this.whenCallback()) return;
 
     const keyCallback = this.callbacks[event.which];
     if (keyCallback) {

less/common/Modal.less

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

migrations/2015_02_24_000000_create_access_tokens_table.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Flarum\Database\Migration;

migrations/2015_02_24_000000_create_api_keys_table.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Flarum\Database\Migration;

migrations/2015_02_24_000000_create_config_table.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Flarum\Database\Migration;

migrations/2015_02_24_000000_create_discussions_table.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Flarum\Database\Migration;

migrations/2015_02_24_000000_create_email_tokens_table.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Flarum\Database\Migration;

migrations/2015_02_24_000000_create_groups_table.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Flarum\Database\Migration;

migrations/2015_02_24_000000_create_notifications_table.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Flarum\Database\Migration;

migrations/2015_02_24_000000_create_password_tokens_table.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Flarum\Database\Migration;

migrations/2015_02_24_000000_create_permissions_table.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Flarum\Database\Migration;

migrations/2015_02_24_000000_create_posts_table.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Illuminate\Database\Schema\Blueprint;

migrations/2015_02_24_000000_create_users_discussions_table.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Flarum\Database\Migration;

migrations/2015_02_24_000000_create_users_groups_table.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Flarum\Database\Migration;

migrations/2015_02_24_000000_create_users_table.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Flarum\Database\Migration;

migrations/2015_09_15_000000_create_auth_tokens_table.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Flarum\Database\Migration;

migrations/2015_09_20_224327_add_hide_to_discussions.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Flarum\Database\Migration;

migrations/2015_09_22_030432_rename_notification_read_time.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Flarum\Database\Migration;

migrations/2015_10_07_130531_rename_config_to_settings.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Flarum\Database\Migration;

migrations/2015_10_24_194000_add_ip_address_to_posts.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Flarum\Database\Migration;

migrations/2015_12_05_042721_change_access_tokens_columns.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Illuminate\Database\Schema\Blueprint;

migrations/2015_12_17_194247_change_settings_value_column_to_text.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Illuminate\Database\Schema\Blueprint;

migrations/2016_02_04_095452_add_slug_to_discussions.php

@@ -3,13 +3,15 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
+use Flarum\Util\Str;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Schema\Builder;
-use Illuminate\Support\Str;
 
 return [
     'up' => function (Builder $schema) {

migrations/2017_04_07_114138_add_is_private_to_discussions.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Flarum\Database\Migration;

migrations/2017_04_07_114138_add_is_private_to_posts.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Flarum\Database\Migration;

migrations/2018_01_11_093900_change_access_tokens_columns.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Illuminate\Database\Schema\Blueprint;

migrations/2018_01_11_094000_change_access_tokens_add_foreign_keys.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Illuminate\Database\Schema\Blueprint;

migrations/2018_01_11_095000_change_api_keys_columns.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Illuminate\Database\Schema\Blueprint;

migrations/2018_01_11_101800_rename_auth_tokens_to_registration_tokens.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Flarum\Database\Migration;

migrations/2018_01_11_102000_change_registration_tokens_rename_id_to_token.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Flarum\Database\Migration;

migrations/2018_01_11_102100_change_registration_tokens_created_at_to_datetime.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Illuminate\Database\Schema\Builder;

migrations/2018_01_11_120604_change_posts_table_to_innodb.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Illuminate\Database\Schema\Builder;

migrations/2018_01_11_155200_change_discussions_rename_columns.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Flarum\Database\Migration;

migrations/2018_01_11_155300_change_discussions_add_foreign_keys.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Illuminate\Database\Query\Expression;

migrations/2018_01_15_071700_rename_users_discussions_to_discussion_user.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Flarum\Database\Migration;

migrations/2018_01_15_071800_change_discussion_user_rename_columns.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Flarum\Database\Migration;

migrations/2018_01_15_071900_change_discussion_user_add_foreign_keys.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Illuminate\Database\Schema\Blueprint;

migrations/2018_01_15_072600_change_email_tokens_rename_id_to_token.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Flarum\Database\Migration;

migrations/2018_01_15_072700_change_email_tokens_add_foreign_keys.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Illuminate\Database\Schema\Blueprint;

migrations/2018_01_15_072800_change_email_tokens_created_at_to_datetime.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Illuminate\Database\Schema\Builder;

migrations/2018_01_18_130400_rename_permissions_to_group_permission.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Flarum\Database\Migration;

migrations/2018_01_18_130500_change_group_permission_add_foreign_keys.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Illuminate\Database\Schema\Blueprint;

migrations/2018_01_18_130600_rename_users_groups_to_group_user.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Flarum\Database\Migration;

migrations/2018_01_18_130700_change_group_user_add_foreign_keys.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Illuminate\Database\Schema\Blueprint;

migrations/2018_01_18_133000_change_notifications_columns.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Carbon\Carbon;

migrations/2018_01_18_133100_change_notifications_add_foreign_keys.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Illuminate\Database\Schema\Blueprint;

migrations/2018_01_18_134400_change_password_tokens_rename_id_to_token.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Flarum\Database\Migration;

migrations/2018_01_18_134500_change_password_tokens_add_foreign_keys.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Illuminate\Database\Schema\Blueprint;

migrations/2018_01_18_134600_change_password_tokens_created_at_to_datetime.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Illuminate\Database\Schema\Builder;

migrations/2018_01_18_135000_change_posts_rename_columns.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Flarum\Database\Migration;

migrations/2018_01_18_135100_change_posts_add_foreign_keys.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Illuminate\Database\Query\Expression;

migrations/2018_01_30_112238_add_fulltext_index_to_discussions_title.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Illuminate\Database\Schema\Builder;

migrations/2018_01_30_220100_create_post_user_table.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Flarum\Database\Migration;

migrations/2018_01_30_222900_change_users_rename_columns.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Flarum\Database\Migration;

migrations/2018_07_21_000000_seed_default_groups.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Flarum\Group\Group;

migrations/2018_07_21_000100_seed_default_group_permissions.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Flarum\Group\Group;

migrations/2018_09_15_041340_add_users_indicies.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Illuminate\Database\Schema\Blueprint;

migrations/2018_09_15_041828_add_discussions_indicies.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Illuminate\Database\Schema\Blueprint;

migrations/2018_09_15_043337_add_notifications_indices.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Illuminate\Database\Schema\Blueprint;

migrations/2018_09_15_043621_add_posts_indices.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Illuminate\Database\Schema\Blueprint;

migrations/2018_09_22_004100_change_registration_tokens_columns.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Illuminate\Database\Schema\Blueprint;

migrations/2018_09_22_004200_create_login_providers_table.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Flarum\Database\Migration;

migrations/2018_10_08_144700_add_shim_prefix_to_group_icons.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Illuminate\Database\Schema\Builder;

migrations/2019_06_24_145100_change_posts_content_column_to_mediumtext.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Illuminate\Database\Schema\Blueprint;

migrations/2019_09_28_222800_create_notification_preferences_table.php

@@ -1,28 +0,0 @@
-<?php
-
-/*
- * This file is part of Flarum.
- *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
- */
-
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Schema\Builder;
-
-return [
-    'up' => function (Builder $schema) {
-        $schema->create('notification_preferences', function (Blueprint $table) {
-            $table->integer('user_id')->unsigned();
-            $table->string('type');
-            $table->string('channel');
-            $table->boolean('enabled')->default(false);
-
-            $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
-        });
-    },
-
-    'down' => function (Builder $schema) {
-        $schema->drop('notification_preferences');
-    }
-];

migrations/2019_09_28_222800_create_users_table_preferences_columns.php

@@ -1,27 +0,0 @@
-<?php
-
-/*
- * This file is part of Flarum.
- *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
- */
-
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Schema\Builder;
-
-return [
-    'up' => function (Builder $schema) {
-        $schema->table('users', function (Blueprint $table) {
-            $table->boolean('disclose_online')->default(false);
-            $table->string('locale')->nullable();
-        });
-    },
-
-    'down' => function (Builder $schema) {
-        $schema->table('users', function (Blueprint $table) {
-            $table->dropColumn('disclose_online');
-            $table->dropColumn('locale');
-        });
-    }
-];

migrations/2019_09_28_222801_migrate_users_table_preferences_columns.php

@@ -1,52 +0,0 @@
-<?php
-
-/*
- * This file is part of Flarum.
- *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
- */
-
-use Illuminate\Database\Schema\Builder;
-use Illuminate\Support\Str;
-
-return [
-    'up' => function (Builder $builder) {
-        $db = $builder->getConnection();
-
-        $db->table('users')
-            ->select(['id', 'preferences'])
-            ->whereNotNull('preferences')
-            ->orderBy('id')
-            ->each(function ($user) use ($db) {
-                collect(json_decode($user->preferences ?? '{}'))
-                    ->each(function ($value, $key) use ($user, $db) {
-                        if (in_array($key, ['discloseOnline', 'followAfterReply'])) {
-                            $db->table('users')
-                                ->where('id', $user->id)
-                                ->update([Str::snake($key) => (bool) $value]);
-                        }
-                        if ($key === 'locale') {
-                            $db->table('users')
-                                ->where('id', $user->id)
-                                ->update(['locale' => $value]);
-                        }
-                        if (preg_match('/^notify_(?<type>[^_]+)_(?<channel>.*)$/', $key, $matches)) {
-                            $db->table('notification_preferences')
-                                ->insert([
-                                    'user_id' => $user->id,
-                                    'type' => $matches['type'],
-                                    'channel' => $matches['channel'],
-                                    'enabled' => (bool) $value
-                                ]);
-                        }
-                    });
-            });
-    },
-
-    'down' => function (Builder $builder) {
-        $db = $builder->getConnection();
-
-        $db->table('notification_preferences')->truncate();
-    }
-];

migrations/2019_09_28_222810_change_users_drop_preferences.php

@@ -1,25 +0,0 @@
-<?php
-
-/*
- * This file is part of Flarum.
- *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
- */
-
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Schema\Builder;
-
-return [
-    'up' => function (Builder $schema) {
-        $schema->table('users', function (Blueprint $table) {
-            $table->dropColumn('preferences');
-        });
-    },
-
-    'down' => function (Builder $schema) {
-        $schema->table('users', function (Blueprint $table) {
-            $table->binary('preferences')->nullable();
-        });
-    }
-];

migrations/2019_10_12_195349_change_posts_add_discussion_foreign_key.php

@@ -1,34 +0,0 @@
-<?php
-
-/*
- * This file is part of Flarum.
- *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
- */
-
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Schema\Builder;
-
-return [
-    'up' => function (Builder $schema) {
-        // Delete rows with non-existent entities so that we will be able to create
-        // foreign keys without any issues.
-        $connection = $schema->getConnection();
-        $connection->table('posts')
-            ->whereNotExists(function ($query) {
-                $query->selectRaw(1)->from('discussions')->whereColumn('id', 'discussion_id');
-            })
-            ->delete();
-
-        $schema->table('posts', function (Blueprint $table) {
-            $table->foreign('discussion_id')->references('id')->on('discussions')->onDelete('cascade');
-        });
-    },
-
-    'down' => function (Builder $schema) {
-        $schema->table('posts', function (Blueprint $table) {
-            $table->dropForeign(['discussion_id']);
-        });
-    }
-];

src/Admin/AdminServiceProvider.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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\Admin;
@@ -29,7 +31,7 @@ use Flarum\Http\RouteHandlerFactory;
 use Flarum\Http\UrlGenerator;
 use Flarum\Locale\LocaleManager;
 use Flarum\Settings\Event\Saved;
-use Laminas\Stratigility\MiddlewarePipe;
+use Zend\Stratigility\MiddlewarePipe;
 
 class AdminServiceProvider extends AbstractServiceProvider
 {
@@ -49,19 +51,7 @@ class AdminServiceProvider extends AbstractServiceProvider
             return $routes;
         });
 
-        $this->app->singleton('flarum.admin.middleware', function () {
-            return [
-                HttpMiddleware\ParseJsonBody::class,
-                HttpMiddleware\StartSession::class,
-                HttpMiddleware\RememberFromCookie::class,
-                HttpMiddleware\AuthenticateWithSession::class,
-                HttpMiddleware\CheckCsrfToken::class,
-                HttpMiddleware\SetLocale::class,
-                Middleware\RequireAdministrateAbility::class,
-            ];
-        });
-
-        $this->app->singleton('flarum.admin.handler', function (Application $app) {
+        $this->app->singleton('flarum.admin.middleware', function (Application $app) {
             $pipe = new MiddlewarePipe;
 
             // All requests should first be piped through our global error handler
@@ -71,17 +61,23 @@ class AdminServiceProvider extends AbstractServiceProvider
                 $app->tagged(Reporter::class)
             ));
 
-            foreach ($this->app->make('flarum.admin.middleware') as $middleware) {
-                $pipe->pipe($this->app->make($middleware));
-            }
+            $pipe->pipe($app->make(HttpMiddleware\ParseJsonBody::class));
+            $pipe->pipe($app->make(HttpMiddleware\StartSession::class));
+            $pipe->pipe($app->make(HttpMiddleware\RememberFromCookie::class));
+            $pipe->pipe($app->make(HttpMiddleware\AuthenticateWithSession::class));
+            $pipe->pipe($app->make(HttpMiddleware\CheckCsrfToken::class));
+            $pipe->pipe($app->make(HttpMiddleware\SetLocale::class));
+            $pipe->pipe($app->make(Middleware\RequireAdministrateAbility::class));
 
             event(new ConfigureMiddleware($pipe, 'admin'));
 
-            $pipe->pipe(new HttpMiddleware\DispatchRoute($this->app->make('flarum.admin.routes')));
-
             return $pipe;
         });
 
+        $this->app->afterResolving('flarum.admin.middleware', function (MiddlewarePipe $pipe) {
+            $pipe->pipe(new HttpMiddleware\DispatchRoute($this->app->make('flarum.admin.routes')));
+        });
+
         $this->app->bind('flarum.assets.admin', function () {
             /** @var \Flarum\Frontend\Assets $assets */
             $assets = $this->app->make('flarum.assets.factory')('admin');

src/Admin/Content/AdminPayload.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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\Admin\Content;

src/Admin/Middleware/RequireAdministrateAbility.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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\Admin\Middleware;

src/Admin/routes.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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.
  */
 
 use Flarum\Http\RouteCollection;

src/Api/ApiKey.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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\Api;

src/Api/ApiServiceProvider.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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\Api;
@@ -25,7 +27,7 @@ use Flarum\Http\Middleware as HttpMiddleware;
 use Flarum\Http\RouteCollection;
 use Flarum\Http\RouteHandlerFactory;
 use Flarum\Http\UrlGenerator;
-use Laminas\Stratigility\MiddlewarePipe;
+use Zend\Stratigility\MiddlewarePipe;
 
 class ApiServiceProvider extends AbstractServiceProvider
 {
@@ -45,20 +47,7 @@ class ApiServiceProvider extends AbstractServiceProvider
             return $routes;
         });
 
-        $this->app->singleton('flarum.api.middleware', function () {
-            return [
-                HttpMiddleware\ParseJsonBody::class,
-                Middleware\FakeHttpMethods::class,
-                HttpMiddleware\StartSession::class,
-                HttpMiddleware\RememberFromCookie::class,
-                HttpMiddleware\AuthenticateWithSession::class,
-                HttpMiddleware\AuthenticateWithHeader::class,
-                HttpMiddleware\CheckCsrfToken::class,
-                HttpMiddleware\SetLocale::class,
-            ];
-        });
-
-        $this->app->singleton('flarum.api.handler', function (Application $app) {
+        $this->app->singleton('flarum.api.middleware', function (Application $app) {
             $pipe = new MiddlewarePipe;
 
             $pipe->pipe(new HttpMiddleware\HandleErrors(
@@ -67,16 +56,23 @@ class ApiServiceProvider extends AbstractServiceProvider
                 $app->tagged(Reporter::class)
             ));
 
-            foreach ($this->app->make('flarum.api.middleware') as $middleware) {
-                $pipe->pipe($this->app->make($middleware));
-            }
+            $pipe->pipe($app->make(HttpMiddleware\ParseJsonBody::class));
+            $pipe->pipe($app->make(Middleware\FakeHttpMethods::class));
+            $pipe->pipe($app->make(HttpMiddleware\StartSession::class));
+            $pipe->pipe($app->make(HttpMiddleware\RememberFromCookie::class));
+            $pipe->pipe($app->make(HttpMiddleware\AuthenticateWithSession::class));
+            $pipe->pipe($app->make(HttpMiddleware\AuthenticateWithHeader::class));
+            $pipe->pipe($app->make(HttpMiddleware\CheckCsrfToken::class));
+            $pipe->pipe($app->make(HttpMiddleware\SetLocale::class));
 
             event(new ConfigureMiddleware($pipe, 'api'));
 
-            $pipe->pipe(new HttpMiddleware\DispatchRoute($this->app->make('flarum.api.routes')));
-
             return $pipe;
         });
+
+        $this->app->afterResolving('flarum.api.middleware', function (MiddlewarePipe $pipe) {
+            $pipe->pipe(new HttpMiddleware\DispatchRoute($this->app->make('flarum.api.routes')));
+        });
     }
 
     /**

src/Api/Client.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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\Api;
@@ -15,10 +17,10 @@ use Flarum\Foundation\ErrorHandling\Registry;
 use Flarum\User\User;
 use Illuminate\Contracts\Container\Container;
 use InvalidArgumentException;
-use Laminas\Diactoros\ServerRequestFactory;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 use Throwable;
+use Zend\Diactoros\ServerRequestFactory;
 
 class Client
 {

src/Api/Controller/AbstractCreateController.php

@@ -3,8 +3,10 @@
 /*
  * This file is part of Flarum.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * (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\Api\Controller;