mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-06 08:27:42 +02:00
Code Issues Releases Wiki Activity

Revert "fix(regression): caught errors"

Browse Source 
This reverts commit c94c140484.
This commit is contained in:
Sami Mazouz
2023-05-31 09:47:30 +01:00
parent c94c140484
commit 04fe2616a4
26 changed files with 30 additions and 68385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/akismet/composer.json
View File

@@ -19,8 +19,8 @@
} }
], ],
"require": { "require": {
"flarum/core": "^2.0", "flarum/core": "^1.8",
"flarum/approval": "^2.0" "flarum/approval": "^1.7"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {

4
extensions/approval/composer.json
View File

@@ -19,8 +19,8 @@
} }
], ],
"require": { "require": {
"flarum/core": "^2.0", "flarum/core": "^1.8",
"flarum/flags": "^2.0" "flarum/flags": "^1.7"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {

2
extensions/bbcode/composer.json
View File

@@ -19,7 +19,7 @@
} }
], ],
"require": { "require": {
"flarum/core": "^2.0" "flarum/core": "^1.8"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {

2
extensions/embed/composer.json
View File

@@ -19,7 +19,7 @@
} }
], ],
"require": { "require": {
"flarum/core": "^2.0" "flarum/core": "^1.8"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {

2
extensions/emoji/composer.json
View File

@@ -19,7 +19,7 @@
} }
], ],
"require": { "require": {
"flarum/core": "^2.0" "flarum/core": "^1.8"
}, },
"extra": { "extra": {
"branch-alias": { "branch-alias": {

2
extensions/flags/composer.json
View File

@@ -19,7 +19,7 @@
} }
], ],
"require": { "require": {
"flarum/core": "^2.0" "flarum/core": "^1.8"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {

2
extensions/lang-english/composer.json
View File

@@ -7,7 +7,7 @@
], ],
"license": "MIT", "license": "MIT",
"require": { "require": {
"flarum/core": "^2.0" "flarum/core": "^1.8"
}, },
"extra": { "extra": {
"branch-alias": { "branch-alias": {

2
extensions/likes/composer.json
View File

@@ -19,7 +19,7 @@
} }
], ],
"require": { "require": {
"flarum/core": "^2.0" "flarum/core": "^1.8"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {

2
extensions/lock/composer.json
View File

@@ -19,7 +19,7 @@
} }
], ],
"require": { "require": {
"flarum/core": "^2.0" "flarum/core": "^1.8"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {

2
extensions/markdown/composer.json
View File

@@ -19,7 +19,7 @@
} }
], ],
"require": { "require": {
"flarum/core": "^2.0" "flarum/core": "^1.8"
}, },
"extra": { "extra": {
"branch-alias": { "branch-alias": {

2
extensions/mentions/composer.json
View File

@@ -19,7 +19,7 @@
} }
], ],
"require": { "require": {
"flarum/core": "^2.0" "flarum/core": "^1.8"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {

2
extensions/nicknames/composer.json
View File

@@ -19,7 +19,7 @@
} }
], ],
"require": { "require": {
"flarum/core": "^2.0" "flarum/core": "^1.8"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {

2
extensions/nicknames/src/NicknameDriver.php
View File

@@ -16,6 +16,6 @@ class NicknameDriver implements DriverInterface
{ {
public function displayName(User $user): string public function displayName(User $user): string
{ {
return $user->nickname ?: $user->username; return $user->nickname ?? $user->username;
} }
} }

2
extensions/package-manager/composer.json
View File

@@ -22,7 +22,7 @@
"source": "https://github.com/flarum/package-manager" "source": "https://github.com/flarum/package-manager"
}, },
"require": { "require": {
"flarum/core": "^2.0", "flarum/core": "^1.8",
"composer/composer": "^2.3" "composer/composer": "^2.3"
}, },
"require-dev": { "require-dev": {

2
extensions/pusher/composer.json
View File

@@ -19,7 +19,7 @@
} }
], ],
"require": { "require": {
"flarum/core": "^2.0", "flarum/core": "^1.8",
"pusher/pusher-php-server": "^2.2" "pusher/pusher-php-server": "^2.2"
}, },
"require-dev": { "require-dev": {

2
extensions/statistics/composer.json
View File

@@ -19,7 +19,7 @@
} }
], ],
"require": { "require": {
"flarum/core": "^2.0" "flarum/core": "^1.8"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {

2
extensions/sticky/composer.json
View File

@@ -19,7 +19,7 @@
} }
], ],
"require": { "require": {
"flarum/core": "^2.0" "flarum/core": "^1.8"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {

2
extensions/subscriptions/composer.json
View File

@@ -19,7 +19,7 @@
} }
], ],
"require": { "require": {
"flarum/core": "^2.0" "flarum/core": "^1.8"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {

2
extensions/suspend/composer.json
View File

@@ -19,7 +19,7 @@
} }
], ],
"require": { "require": {
"flarum/core": "^2.0" "flarum/core": "^1.8"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {

2
extensions/tags/composer.json
View File

@@ -19,7 +19,7 @@
} }
], ],
"require": { "require": {
"flarum/core": "^2.0" "flarum/core": "^1.8"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {

30694
framework/core/js/dist/admin.js generated vendored
View File

File diff suppressed because one or more lines are too long

2
framework/core/js/dist/admin.js.map generated vendored
View File

File diff suppressed because one or more lines are too long

37669
framework/core/js/dist/forum.js generated vendored
View File

File diff suppressed because one or more lines are too long

2
framework/core/js/dist/forum.js.map generated vendored
View File

File diff suppressed because one or more lines are too long

2
framework/core/src/Discussion/Discussion.php
View File

@@ -88,7 +88,7 @@ class Discussion extends AbstractModel
/** /**
* The user for which the state relationship should be loaded. * The user for which the state relationship should be loaded.
*/ */
protected static ?User $stateUser = null; protected static ?User $stateUser;
public static function boot() public static function boot()
{ {

2
framework/core/src/Search/GambitManager.php
View File

@@ -50,7 +50,7 @@ class GambitManager
protected function applyGambits(SearchState $search, string $query): string protected function applyGambits(SearchState $search, string $query): string
{ {
$bits = array_filter($this->explode($query)); $bits = $this->explode($query);
if (! $bits) { if (! $bits) {
return ''; return '';