feat: update patch

composer.json

@@ -100,7 +100,6 @@
     "extra": {
         "patches": {
             "fof/upload": [
-                "patches/fof-upload-src-templates-markdownimagetemplate-php.patch",
                 "patches/fof-upload-src-adapters-manager-php.patch"
             ],
             "askvortsov/flarum-pwa": [
@@ -114,9 +113,6 @@
                 "4": "patches/flarum-core-js-package-json.patch",
                 "Get User Ip from CDN": "patches/core-1.patch"
             },
-            "fof/webhooks": [
-                "patches/fof-webhooks-override-opis-closure-serializableclosure-php.patch"
-            ],
             "fof/sitemap": {
                 "Remove User in Sitemap": "patches/fof-sitemap-1.patch"
             },
@@ -135,4 +131,4 @@
     "require-dev": {
         "symplify/vendor-patches": "^11.2"
     }
-}
+}

patches/fof-upload-src-adapters-manager-php.patch

@@ -1,40 +1,22 @@
 --- /dev/null
 +++ ../src/Adapters/Manager.php
-@@ -13,6 +13,7 @@
- namespace FoF\Upload\Adapters;
-
- use Aws\S3\S3Client;
-+use Flarum\Foundation\Application;
- use Flarum\Foundation\Paths;
- use Flarum\Foundation\ValidationException;
- use Flarum\Settings\SettingsRepositoryInterface;
-@@ -49,12 +50,18 @@
-      */
-     protected $settings;
-
--    public function __construct(Dispatcher $events, Paths $paths, Util $util, SettingsRepositoryInterface $settings)
-+    /**
-+     * @var Application
-+     */
-+    protected $app;
-+
-+    public function __construct(Dispatcher $events, Paths $paths, Util $util, SettingsRepositoryInterface $settings, Application $app)
-     {
-         $this->events = $events;
-         $this->paths = $paths;
-         $this->util = $util;
-         $this->settings = $settings;
-+        $this->app = $app;
+@@ -39,7 +39,8 @@
+         protected Paths $paths,
+         protected Util $util,
+         protected SettingsRepositoryInterface $settings,
+-        protected UrlGenerator $url
++        protected UrlGenerator $url,
++        protected Application $app,
+     ) {
      }
 
-     public function adapters(): Collection
-@@ -125,7 +132,8 @@
-         return new Adapters\AwsS3(
-             new AwsS3Adapter(
-                 new S3Client($s3Config),
--                $this->settings->get('fof-upload.awsS3Bucket')
-+                $this->settings->get('fof-upload.awsS3Bucket'),
-+                $this->app->config('fof_upload_prefix', ''),
-             )
+@@ -107,7 +108,8 @@
+
+         $leagueAdapter = new AwsS3Adapter(
+             new S3Client($s3Config),
+-            $this->settings->get('fof-upload.awsS3Bucket')
++            $this->settings->get('fof-upload.awsS3Bucket'),
++            $this->app->config('fof_upload_prefix', ''),
          );
-     }
+
+         return new Adapters\AwsS3($leagueAdapter, $this->settings, $this->url);