Merge branch 'refs/heads/v0.1.0-beta.12'

# Conflicts:
#	composer.json

framework/core/CHANGELOG.md

@@ -1,9 +1,33 @@
 # Changelog
 
+## [0.1.0-beta.12](https://github.com/flarum/core/compare/v0.1.0-beta.11.1...v0.1.0-beta.12)
+
+### Added
+- Full support for PHP 7.4 (#1980)
+- Mail settings: Configure region for the Mailgun driver (#1834, #1850)
+- Mail settings: Alert admins about incomplete settings (#1763, #1921)
+- New permission that allows users to post without throttling (#1255, #1938)
+- Basic transliteration of discussion "slugs" / pretty URLs (#194, #1975)
+- User profiles: Render basic content on server side (#1901)
+- New extender for configuring middleware (#1919, #1952, #1957, #1971)
+- New extender for configuring error handling (#1781, #1970)
+- Automated tests for PHP extenders to guarantee their backwards compatibility
+
+### Changed
+- Profile URLs for non-existing users properly return HTTP 404 (#1846, #1901)
+- Confirmation email subject no longer contains the forum title (#1613)
+- Improved error handling during Flarum's early boot phase (#1607)
+- Updated deprecated "Zend" libraries to their new "Laminas" equivalents (#1963)
+
+### Fixed
+- Update page did not work when installed in subdirectories (#1947)
+- Avatar upload did not work in IE11 / Edge (#1125, #1570)
+- Translation fallback was ignored for client-rendered pages (#1774, #1961)
+- The success alert when posting replies was invisible (#1976)
+
 ## [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)

framework/core/composer.json

@@ -5,17 +5,28 @@
     "homepage": "https://flarum.org/",
     "license": "MIT",
     "authors": [
-        {
-            "name": "Toby Zerner",
-            "email": "toby.zerner@gmail.com"
-        },
         {
             "name": "Franz Liedke",
             "email": "franz@develophp.org"
         },
         {
             "name": "Daniel Klabbers",
-            "email": "daniel@klabbers.email"
+            "email": "daniel@klabbers.email",
+            "homepage": "https://luceos.com"
+        },
+        {
+            "name": "David Sevilla Martin",
+            "email": "me+flarum@datitisev.me",
+            "homepage": "https://datitisev.me"
+        },
+        {
+            "name": "Clark Winkelmann",
+            "email": "clark.winkelmann@gmail.com",
+            "homepage": "https://clarkwinkelmann.com"
+        },
+        {
+            "name": "Matthew Kilgore",
+            "email": "matthew@kilgore.dev"
         }
     ],
     "support": {

framework/core/src/Api/Serializer/MailSettingsSerializer.php

@@ -36,7 +36,19 @@ class MailSettingsSerializer extends AbstractSerializer
 
     private function serializeDriver(DriverInterface $driver)
     {
-        return $driver->availableSettings();
+        $settings = $driver->availableSettings();
+
+        if (key($settings) === 0) {
+            // BACKWARDS COMPATIBILITY: Support a simple list of fields (without
+            // type or additional metadata).
+            // Turns ["f1", "f2"] into {"f1": "", "f2": ""}
+            // @deprecated since 0.1.0-beta.12
+            $settings = array_reduce($settings, function ($memo, $key) {
+                return [$key => ''] + $memo;
+            }, []);
+        }
+
+        return $settings;
     }
 
     public function getId($model)

framework/core/src/Foundation/Application.php

@@ -23,7 +23,7 @@ class Application extends Container implements ApplicationContract
      *
      * @var string
      */
-    const VERSION = '0.1.0-beta.11.1';
+    const VERSION = '0.1.0-beta.12';
 
     /**
      * The base path for the Flarum installation.

framework/core/src/Util/Str.php

@@ -0,0 +1,23 @@
+<?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.
+ */
+
+namespace Flarum\Util;
+
+use Illuminate\Support\Str as Laravel;
+
+class Str
+{
+    /**
+     * @deprecated
+     */
+    public static function slug($str)
+    {
+        return Laravel::slug($str);
+    }
+}