Revert "fix(regression): caught errors"

This reverts commit c94c140484.
2025-08-08 09:26:34 +02:00 · 2023-05-31 09:47:30 +01:00
parent c94c140484
commit 04fe2616a4
26 changed files with 30 additions and 68385 deletions
--- a/extensions/akismet/composer.json
+++ b/extensions/akismet/composer.json
@@ -19,8 +19,8 @@
        }
    ],
    "require": {
-        "flarum/core": "^2.0",
-        "flarum/approval": "^2.0"
+        "flarum/core": "^1.8",
+        "flarum/approval": "^1.7"
    },
    "autoload": {
        "psr-4": {
--- a/extensions/approval/composer.json
+++ b/extensions/approval/composer.json
@@ -19,8 +19,8 @@
        }
    ],
    "require": {
-        "flarum/core": "^2.0",
-        "flarum/flags": "^2.0"
+        "flarum/core": "^1.8",
+        "flarum/flags": "^1.7"
    },
    "autoload": {
        "psr-4": {
--- a/extensions/bbcode/composer.json
+++ b/extensions/bbcode/composer.json
@@ -19,7 +19,7 @@
        }
    ],
    "require": {
-        "flarum/core": "^2.0"
+        "flarum/core": "^1.8"
    },
    "autoload": {
        "psr-4": {
--- a/extensions/embed/composer.json
+++ b/extensions/embed/composer.json
@@ -19,7 +19,7 @@
        }
    ],
    "require": {
-        "flarum/core": "^2.0"
+        "flarum/core": "^1.8"
    },
    "autoload": {
        "psr-4": {
--- a/extensions/emoji/composer.json
+++ b/extensions/emoji/composer.json
@@ -19,7 +19,7 @@
        }
    ],
    "require": {
-        "flarum/core": "^2.0"
+        "flarum/core": "^1.8"
    },
    "extra": {
        "branch-alias": {
--- a/extensions/flags/composer.json
+++ b/extensions/flags/composer.json
@@ -19,7 +19,7 @@
        }
    ],
    "require": {
-        "flarum/core": "^2.0"
+        "flarum/core": "^1.8"
    },
    "autoload": {
        "psr-4": {
--- a/extensions/lang-english/composer.json
+++ b/extensions/lang-english/composer.json
@@ -7,7 +7,7 @@
    ],
    "license": "MIT",
    "require": {
-        "flarum/core": "^2.0"
+        "flarum/core": "^1.8"
    },
    "extra": {
        "branch-alias": {
--- a/extensions/likes/composer.json
+++ b/extensions/likes/composer.json
@@ -19,7 +19,7 @@
        }
    ],
    "require": {
-        "flarum/core": "^2.0"
+        "flarum/core": "^1.8"
    },
    "autoload": {
        "psr-4": {
--- a/extensions/lock/composer.json
+++ b/extensions/lock/composer.json
@@ -19,7 +19,7 @@
        }
    ],
    "require": {
-        "flarum/core": "^2.0"
+        "flarum/core": "^1.8"
    },
    "autoload": {
        "psr-4": {
--- a/extensions/markdown/composer.json
+++ b/extensions/markdown/composer.json
@@ -19,7 +19,7 @@
        }
    ],
    "require": {
-        "flarum/core": "^2.0"
+        "flarum/core": "^1.8"
    },
    "extra": {
        "branch-alias": {
--- a/extensions/mentions/composer.json
+++ b/extensions/mentions/composer.json
@@ -19,7 +19,7 @@
        }
    ],
    "require": {
-        "flarum/core": "^2.0"
+        "flarum/core": "^1.8"
    },
    "autoload": {
        "psr-4": {
--- a/extensions/nicknames/composer.json
+++ b/extensions/nicknames/composer.json
@@ -19,7 +19,7 @@
        }
    ],
    "require": {
-        "flarum/core": "^2.0"
+        "flarum/core": "^1.8"
    },
    "autoload": {
        "psr-4": {
--- a/extensions/nicknames/src/NicknameDriver.php
+++ b/extensions/nicknames/src/NicknameDriver.php
@@ -16,6 +16,6 @@ class NicknameDriver implements DriverInterface
 {
    public function displayName(User $user): string
    {
-        return $user->nickname ?: $user->username;
+        return $user->nickname ?? $user->username;
    }
 }
--- a/extensions/package-manager/composer.json
+++ b/extensions/package-manager/composer.json
@@ -22,7 +22,7 @@
        "source": "https://github.com/flarum/package-manager"
    },
    "require": {
-        "flarum/core": "^2.0",
+        "flarum/core": "^1.8",
        "composer/composer": "^2.3"
    },
    "require-dev": {
--- a/extensions/pusher/composer.json
+++ b/extensions/pusher/composer.json
@@ -19,7 +19,7 @@
        }
    ],
    "require": {
-        "flarum/core": "^2.0",
+        "flarum/core": "^1.8",
        "pusher/pusher-php-server": "^2.2"
    },
    "require-dev": {
--- a/extensions/statistics/composer.json
+++ b/extensions/statistics/composer.json
@@ -19,7 +19,7 @@
        }
    ],
    "require": {
-        "flarum/core": "^2.0"
+        "flarum/core": "^1.8"
    },
    "autoload": {
        "psr-4": {
--- a/extensions/sticky/composer.json
+++ b/extensions/sticky/composer.json
@@ -19,7 +19,7 @@
        }
    ],
    "require": {
-        "flarum/core": "^2.0"
+        "flarum/core": "^1.8"
    },
    "autoload": {
        "psr-4": {
--- a/extensions/subscriptions/composer.json
+++ b/extensions/subscriptions/composer.json
@@ -19,7 +19,7 @@
        }
    ],
    "require": {
-        "flarum/core": "^2.0"
+        "flarum/core": "^1.8"
    },
    "autoload": {
        "psr-4": {
--- a/extensions/suspend/composer.json
+++ b/extensions/suspend/composer.json
@@ -19,7 +19,7 @@
        }
    ],
    "require": {
-        "flarum/core": "^2.0"
+        "flarum/core": "^1.8"
    },
    "autoload": {
        "psr-4": {
--- a/extensions/tags/composer.json
+++ b/extensions/tags/composer.json
@@ -19,7 +19,7 @@
        }
    ],
    "require": {
-        "flarum/core": "^2.0"
+        "flarum/core": "^1.8"
    },
    "autoload": {
        "psr-4": {