fix(regression): caught errors

Signed-off-by: Sami Mazouz <sychocouldy@gmail.com>
2024-11-22 04:56:37 +08:00 · 2023-05-31 09:50:39 +01:00 · 2023-05-31 09:50:39 +01:00 · 082f04d3c3
commit 082f04d3c3
parent 04fe2616a4
26 changed files with 47 additions and 47 deletions
--- a/composer.json
+++ b/composer.json
@ -174,7 +174,7 @@
            "extensions/tags"
        ],
        "branch-alias": {
-            "dev-main": "1.x-dev"
+            "dev-main": "2.x-dev"
        },
        "phpstan": {
            "includes": [
--- a/extensions/akismet/composer.json
+++ b/extensions/akismet/composer.json
@ -19,8 +19,8 @@
        }
    ],
    "require": {
-        "flarum/core": "^1.8",
-        "flarum/approval": "^1.7"
+        "flarum/core": "^2.0",
+        "flarum/approval": "^2.0"
    },
    "autoload": {
        "psr-4": {
@ -29,7 +29,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-main": "1.x-dev"
+            "dev-main": "2.x-dev"
        },
        "flarum-extension": {
            "title": "Akismet",
--- a/extensions/approval/composer.json
+++ b/extensions/approval/composer.json
@ -19,8 +19,8 @@
        }
    ],
    "require": {
-        "flarum/core": "^1.8",
-        "flarum/flags": "^1.7"
+        "flarum/core": "^2.0",
+        "flarum/flags": "^2.0"
    },
    "autoload": {
        "psr-4": {
@ -29,7 +29,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-main": "1.x-dev"
+            "dev-main": "2.x-dev"
        },
        "flarum-extension": {
            "title": "Approval",
--- a/extensions/bbcode/composer.json
+++ b/extensions/bbcode/composer.json
@ -19,7 +19,7 @@
        }
    ],
    "require": {
-        "flarum/core": "^1.8"
+        "flarum/core": "^2.0"
    },
    "autoload": {
        "psr-4": {
@ -28,7 +28,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-main": "1.x-dev"
+            "dev-main": "2.x-dev"
        },
        "flarum-extension": {
            "title": "BBCode",
--- a/extensions/embed/composer.json
+++ b/extensions/embed/composer.json
@ -19,7 +19,7 @@
        }
    ],
    "require": {
-        "flarum/core": "^1.8"
+        "flarum/core": "^2.0"
    },
    "autoload": {
        "psr-4": {
@ -28,7 +28,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-main": "1.x-dev"
+            "dev-main": "2.x-dev"
        },
        "flarum-extension": {
            "title": "Embed",
--- a/extensions/emoji/composer.json
+++ b/extensions/emoji/composer.json
@ -19,11 +19,11 @@
        }
    ],
    "require": {
-        "flarum/core": "^1.8"
+        "flarum/core": "^2.0"
    },
    "extra": {
        "branch-alias": {
-            "dev-main": "1.x-dev"
+            "dev-main": "2.x-dev"
        },
        "flarum-extension": {
            "title": "Emoji",
--- a/extensions/flags/composer.json
+++ b/extensions/flags/composer.json
@ -19,7 +19,7 @@
        }
    ],
    "require": {
-        "flarum/core": "^1.8"
+        "flarum/core": "^2.0"
    },
    "autoload": {
        "psr-4": {
@ -28,7 +28,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-main": "1.x-dev"
+            "dev-main": "2.x-dev"
        },
        "flarum-extension": {
            "title": "Flags",
--- a/extensions/lang-english/composer.json
+++ b/extensions/lang-english/composer.json
@ -7,11 +7,11 @@
    ],
    "license": "MIT",
    "require": {
-        "flarum/core": "^1.8"
+        "flarum/core": "^2.0"
    },
    "extra": {
        "branch-alias": {
-            "dev-main": "1.x-dev"
+            "dev-main": "2.x-dev"
        },
        "flarum-extension": {
            "title": "English",
--- a/extensions/likes/composer.json
+++ b/extensions/likes/composer.json
@ -19,7 +19,7 @@
        }
    ],
    "require": {
-        "flarum/core": "^1.8"
+        "flarum/core": "^2.0"
    },
    "autoload": {
        "psr-4": {
@ -28,7 +28,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-main": "1.x-dev"
+            "dev-main": "2.x-dev"
        },
        "flarum-extension": {
            "title": "Likes",
--- a/extensions/lock/composer.json
+++ b/extensions/lock/composer.json
@ -19,7 +19,7 @@
        }
    ],
    "require": {
-        "flarum/core": "^1.8"
+        "flarum/core": "^2.0"
    },
    "autoload": {
        "psr-4": {
@ -28,7 +28,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-main": "1.x-dev"
+            "dev-main": "2.x-dev"
        },
        "flarum-extension": {
            "title": "Lock",
--- a/extensions/markdown/composer.json
+++ b/extensions/markdown/composer.json
@ -19,11 +19,11 @@
        }
    ],
    "require": {
-        "flarum/core": "^1.8"
+        "flarum/core": "^2.0"
    },
    "extra": {
        "branch-alias": {
-            "dev-main": "1.x-dev"
+            "dev-main": "2.x-dev"
        },
        "flarum-extension": {
            "title": "Markdown",
--- a/extensions/mentions/composer.json
+++ b/extensions/mentions/composer.json
@ -19,7 +19,7 @@
        }
    ],
    "require": {
-        "flarum/core": "^1.8"
+        "flarum/core": "^2.0"
    },
    "autoload": {
        "psr-4": {
@ -28,7 +28,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-main": "1.x-dev"
+            "dev-main": "2.x-dev"
        },
        "flarum-extension": {
            "title": "Mentions",
--- a/extensions/nicknames/composer.json
+++ b/extensions/nicknames/composer.json
@ -19,7 +19,7 @@
        }
    ],
    "require": {
-        "flarum/core": "^1.8"
+        "flarum/core": "^2.0"
    },
    "autoload": {
        "psr-4": {
@ -28,7 +28,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-main": "1.x-dev"
+            "dev-main": "2.x-dev"
        },
        "flarum-extension": {
            "title": "Nicknames",
@ -68,7 +68,7 @@
    },
    "require-dev": {
        "flarum/testing": "^1.0.0",
-        "flarum/core": "1.x-dev"
+        "flarum/core": "2.x-dev"
    },
    "scripts-descriptions": {
        "test": "Runs all tests.",
--- 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": "^1.8",
+        "flarum/core": "^2.0",
        "composer/composer": "^2.3"
    },
    "require-dev": {
--- a/extensions/pusher/composer.json
+++ b/extensions/pusher/composer.json
@ -19,7 +19,7 @@
        }
    ],
    "require": {
-        "flarum/core": "^1.8",
+        "flarum/core": "^2.0",
        "pusher/pusher-php-server": "^2.2"
    },
    "require-dev": {
@ -32,7 +32,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-main": "1.x-dev"
+            "dev-main": "2.x-dev"
        },
        "flarum-extension": {
            "title": "Pusher",
--- a/extensions/statistics/composer.json
+++ b/extensions/statistics/composer.json
@ -19,7 +19,7 @@
        }
    ],
    "require": {
-        "flarum/core": "^1.8"
+        "flarum/core": "^2.0"
    },
    "autoload": {
        "psr-4": {
@ -28,7 +28,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-main": "1.x-dev"
+            "dev-main": "2.x-dev"
        },
        "flarum-extension": {
            "title": "Statistics",
--- a/extensions/sticky/composer.json
+++ b/extensions/sticky/composer.json
@ -19,7 +19,7 @@
        }
    ],
    "require": {
-        "flarum/core": "^1.8"
+        "flarum/core": "^2.0"
    },
    "autoload": {
        "psr-4": {
@ -28,7 +28,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-main": "1.x-dev"
+            "dev-main": "2.x-dev"
        },
        "flarum-extension": {
            "title": "Sticky",
--- a/extensions/subscriptions/composer.json
+++ b/extensions/subscriptions/composer.json
@ -19,7 +19,7 @@
        }
    ],
    "require": {
-        "flarum/core": "^1.8"
+        "flarum/core": "^2.0"
    },
    "autoload": {
        "psr-4": {
@ -28,7 +28,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-main": "1.x-dev"
+            "dev-main": "2.x-dev"
        },
        "flarum-extension": {
            "title": "Subscriptions",
--- a/extensions/suspend/composer.json
+++ b/extensions/suspend/composer.json
@ -19,7 +19,7 @@
        }
    ],
    "require": {
-        "flarum/core": "^1.8"
+        "flarum/core": "^2.0"
    },
    "autoload": {
        "psr-4": {
@ -28,7 +28,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-main": "1.x-dev"
+            "dev-main": "2.x-dev"
        },
        "flarum-extension": {
            "title": "Suspend",
--- a/extensions/tags/composer.json
+++ b/extensions/tags/composer.json
@ -19,7 +19,7 @@
        }
    ],
    "require": {
-        "flarum/core": "^1.8"
+        "flarum/core": "^2.0"
    },
    "autoload": {
        "psr-4": {
@ -33,7 +33,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-main": "1.x-dev"
+            "dev-main": "2.x-dev"
        },
        "flarum-extension": {
            "title": "Tags",
--- a/framework/core/composer.json
+++ b/framework/core/composer.json
@ -109,7 +109,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-main": "1.x-dev"
+            "dev-main": "2.x-dev"
        },
        "flarum-cli": {
            "excludeScaffolding": [
--- a/framework/core/src/Discussion/Discussion.php
+++ b/framework/core/src/Discussion/Discussion.php
@ -88,7 +88,7 @@ class Discussion extends AbstractModel
    /**
     * The user for which the state relationship should be loaded.
     */
-    protected static ?User $stateUser;
+    protected static ?User $stateUser = null;

    public static function boot()
    {
--- a/framework/core/src/Search/GambitManager.php
+++ b/framework/core/src/Search/GambitManager.php
@ -50,7 +50,7 @@ class GambitManager

    protected function applyGambits(SearchState $search, string $query): string
    {
-        $bits = $this->explode($query);
+        $bits = array_filter($this->explode($query));

        if (! $bits) {
            return '';
--- a/php-packages/phpstan/composer.json
+++ b/php-packages/phpstan/composer.json
@ -19,7 +19,7 @@
            ]
        },
        "branch-alias": {
-            "dev-main": "1.x-dev"
+            "dev-main": "2.x-dev"
        }
    },
    "repositories": [{
--- a/php-packages/testing/composer.json
+++ b/php-packages/testing/composer.json
@ -27,7 +27,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-main": "1.x-dev"
+            "dev-main": "2.x-dev"
        }
    },
    "repositories": [{