fix: PHP 7.3 compatibility and yarn format

Author: imorland

framework/core/js/src/admin/components/AnnouncementItem.tsx

@@ -40,9 +40,7 @@ export default class AnnouncementItem extends Component<IAnnouncementItemAttrs>
             {a.avatarUrl ? (
               <img className="AnnouncementItem-avatar" src={a.avatarUrl} alt={a.authorName ?? ''} loading="lazy" />
             ) : (
-              <span className="AnnouncementItem-avatarFallback">
-                {icon('fas fa-user')}
-              </span>
+              <span className="AnnouncementItem-avatarFallback">{icon('fas fa-user')}</span>
             )}
             <div className="AnnouncementItem-bylineText">
               {a.authorName && <span className="AnnouncementItem-authorName">{a.authorName}</span>}

framework/core/js/src/admin/components/AnnouncementWidget.tsx

@@ -69,9 +69,7 @@ export default class AnnouncementsWidget extends DashboardWidget {
             {icon('fas fa-bullhorn')}
             {app.translator.trans('core.admin.announcements.title')}
             <Tooltip text={app.translator.trans('core.admin.announcements.about')}>
-              <span className="AnnouncementsWidget-info">
-                {icon('fas fa-info-circle')}
-              </span>
+              <span className="AnnouncementsWidget-info">{icon('fas fa-info-circle')}</span>
             </Tooltip>
           </h2>
           <div className="AnnouncementsWidget-controls">

framework/core/src/Announcements/AnnouncementsFetcher.php

@@ -18,19 +18,28 @@
 
 class AnnouncementsFetcher
 {
-    private Client $client;
-
-    public function __construct(
-        protected ApplicationInfoProvider $appInfo
-    ) {
-        $this->client = new Client(['timeout' => 10]);
-    }
     protected const API_BASE_URL = 'https://discuss.flarum.org/api/discussions';
     protected const TAG = 'blog';
     protected const LIMIT = 8;
     protected const FETCH_LIMIT = 20;
     protected const EXCERPT_LENGTH = 200;
 
+    /**
+     * @var ApplicationInfoProvider
+     */
+    protected $appInfo;
+
+    /**
+     * @var Client
+     */
+    private $client;
+
+    public function __construct(ApplicationInfoProvider $appInfo)
+    {
+        $this->appInfo = $appInfo;
+        $this->client = new Client(['timeout' => 10]);
+    }
+
     public function fetch(): array
     {
         $url = self::API_BASE_URL.'?'.http_build_query([
@@ -101,7 +110,9 @@ public function fetch(): array
             ];
         }
 
-        usort($items, fn (array $a, array $b) => $b['isSticky'] <=> $a['isSticky']);
+        usort($items, function (array $a, array $b) {
+            return $b['isSticky'] <=> $a['isSticky'];
+        });
 
         return array_slice($items, 0, self::LIMIT);
     }

framework/core/src/Api/Controller/ListAnnouncementsController.php

@@ -22,10 +22,20 @@ class ListAnnouncementsController implements RequestHandlerInterface
     public const CACHE_KEY = 'flarum.announcements';
     public const CACHE_TTL = 14 * 24 * 3600; // 14 days
 
-    public function __construct(
-        protected CacheRepository $cache,
-        protected AnnouncementsFetcher $fetcher
-    ) {
+    /**
+     * @var CacheRepository
+     */
+    protected $cache;
+
+    /**
+     * @var AnnouncementsFetcher
+     */
+    protected $fetcher;
+
+    public function __construct(CacheRepository $cache, AnnouncementsFetcher $fetcher)
+    {
+        $this->cache = $cache;
+        $this->fetcher = $fetcher;
     }
 
     public function handle(ServerRequestInterface $request): ResponseInterface
@@ -36,7 +46,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
             try {
                 $announcements = $this->fetcher->fetch();
                 $this->cache->put(self::CACHE_KEY, $announcements, self::CACHE_TTL);
-            } catch (\RuntimeException) {
+            } catch (\RuntimeException $_e) {
                 $announcements = $this->cache->get(self::CACHE_KEY, []);
             }
 
@@ -49,7 +59,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
             function () {
                 try {
                     return $this->fetcher->fetch();
-                } catch (\RuntimeException) {
+                } catch (\RuntimeException $_e) {
                     return null; // keep existing cached value
                 }
             }