Apply fixes from StyleCI

FriendsOfFlarum · Nov 21, 2024 · 41e63d3 · 41e63d3
1 parent 0d1ba3d
commit 41e63d3
Show file tree

Hide file tree

Showing 9 changed files with 107 additions and 44 deletions.
diff --git a/extend.php b/extend.php
@@ -3,16 +3,16 @@
 /*
  * This file is part of blomstra/s3-assets.
  *
- * Copyright (c) 2022 Blomstra Ltd.
+ * Copyright (c) FriendsOfFlarum
  *
  * For the full copyright and license information, please view the LICENSE.md
  * file that was distributed with this source code.
  */
 
 namespace FoF\S3Assets;
 
-use FoF\S3Assets\Extend\Drivers;
 use Flarum\Extend;
+use FoF\S3Assets\Extend\Drivers;
 
 return [
     (new Extend\Frontend('admin'))

diff --git a/src/Console/MoveAssetsCommand.php b/src/Console/MoveAssetsCommand.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of blomstra/s3-assets.
+ *
+ * Copyright (c) FriendsOfFlarum
+ *
+ * For the full copyright and license information, please view the LICENSE.md
+ * file that was distributed with this source code.
+ */
+
 namespace FoF\S3Assets\Console;
 
 use Flarum\Console\AbstractCommand;
@@ -21,7 +30,7 @@ class MoveAssetsCommand extends AbstractCommand
      */
     protected $container;
 
-    /** 
+    /**
      * @var Factory
      */
     protected $factory;
@@ -37,16 +46,15 @@ class MoveAssetsCommand extends AbstractCommand
     protected $url;
 
     /**
-    * @var Paths
-    */
+     * @var Paths
+     */
     protected $paths;
 
     /**
      * @var AssetsPublishCommand
      */
     protected $publishCommand;
 
-
     public function __construct(Container $container, Factory $factory, Paths $paths, AssetsPublishCommand $publishCommand)
     {
         $this->container = $container;
@@ -78,13 +86,13 @@ protected function fire()
 
         // Move avatars
         $this->info('Moving avatars...');
-        $this->moveFilesToDisk($localFilesystem, $this->paths->public . '/assets/avatars', $this->avatarDisk);
+        $this->moveFilesToDisk($localFilesystem, $this->paths->public.'/assets/avatars', $this->avatarDisk);
 
         // Move profile covers
         if (Arr::has($this->getFlarumDisks(), 'sycho-profile-cover')) {
             $this->info('Moving profile covers...');
             $coversDisk = $this->factory->disk('sycho-profile-cover');
-            $this->moveFilesToDisk($localFilesystem, $this->paths->public . '/assets/covers', $coversDisk);
+            $this->moveFilesToDisk($localFilesystem, $this->paths->public.'/assets/covers', $coversDisk);
         }
 
         $this->publishCommand->run(
@@ -107,7 +115,7 @@ protected function moveFilesToDisk(Filesystem $localFilesystem, string $localPat
     {
         foreach ($localFilesystem->allFiles($localPath) as $file) {
             /** @var \Symfony\Component\Finder\SplFileInfo $file */
-            $this->info('Moving ' . $file->getPathname());
+            $this->info('Moving '.$file->getPathname());
             $written = $disk->put($file->getRelativePathname(), $file->getContents());
 
             if ($written) {

diff --git a/src/Content/AdminPayload.php b/src/Content/AdminPayload.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of blomstra/s3-assets.
+ *
+ * Copyright (c) FriendsOfFlarum
+ *
+ * For the full copyright and license information, please view the LICENSE.md
+ * file that was distributed with this source code.
+ */
+
 namespace FoF\S3Assets\Content;
 
 use Flarum\Frontend\Document;

diff --git a/src/Driver/Config.php b/src/Driver/Config.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of blomstra/s3-assets.
+ *
+ * Copyright (c) FriendsOfFlarum
+ *
+ * For the full copyright and license information, please view the LICENSE.md
+ * file that was distributed with this source code.
+ */
+
 namespace FoF\S3Assets\Driver;
 
 use Flarum\Settings\SettingsRepositoryInterface;
@@ -8,21 +17,22 @@
 class Config
 {
     public function __construct(protected SettingsRepositoryInterface $settings)
-    {}
+    {
+    }
 
     public function valid(): bool
     {
         $validator = resolve(Factory::class)->make($this->config(), [
-            'driver' => 'required|in:s3',
-            'key' => 'required|string',
-            'secret' => 'required|string',
-            'region' => 'required|string',
-            'bucket' => 'required|string',
-            'url' => 'url',
-            'endpoint' => 'required|url',
+            'driver'                  => 'required|in:s3',
+            'key'                     => 'required|string',
+            'secret'                  => 'required|string',
+            'region'                  => 'required|string',
+            'bucket'                  => 'required|string',
+            'url'                     => 'url',
+            'endpoint'                => 'required|url',
             'use_path_style_endpoint' => 'required|bool',
-            'options.ACL' => 'required|string',
-            'set_by_environment' => 'required|bool',
+            'options.ACL'             => 'required|string',
+            'set_by_environment'      => 'required|bool',
         ]);
 
         return $validator->passes();
@@ -33,28 +43,28 @@ public function config(): array
         $bucket = env('AWS_BUCKET', $this->settings->get('fof-upload.awsS3Bucket'));
         $region = env('AWS_DEFAULT_REGION', $this->settings->get('fof-upload.awsS3Region'));
         $cdnUrl = env('AWS_URL', $this->settings->get('fof-upload.cdnUrl'));
-        $pathStyle = (bool) (env('AWS_PATH_STYLE_ENDPOINT', $this->settings->get('fof-upload.awsS3UsePathStyleEndpoint')));
+        $pathStyle = (bool) env('AWS_PATH_STYLE_ENDPOINT', $this->settings->get('fof-upload.awsS3UsePathStyleEndpoint'));
 
-        if (! $cdnUrl) {
+        if (!$cdnUrl) {
             $cdnUrl = sprintf('https://%s.s3.%s.amazonaws.com', $bucket, $region);
             $pathStyle = false;
         }
 
         $setByEnv = (env('AWS_ACCESS_KEY_ID') || env('AWS_SECRET_ACCESS_KEY') || env('AWS_ENDPOINT'));
 
         return [
-            'driver' => 's3',
-            'key' => env('AWS_ACCESS_KEY_ID', $this->settings->get('fof-upload.awsS3Key')),
-            'secret' => env('AWS_SECRET_ACCESS_KEY', $this->settings->get('fof-upload.awsS3Secret')),
-            'region' => $region,
-            'bucket' => $bucket,
-            'url' => $cdnUrl,
-            'endpoint' => env('AWS_ENDPOINT', $this->settings->get('fof-upload.awsS3Endpoint')),
+            'driver'                  => 's3',
+            'key'                     => env('AWS_ACCESS_KEY_ID', $this->settings->get('fof-upload.awsS3Key')),
+            'secret'                  => env('AWS_SECRET_ACCESS_KEY', $this->settings->get('fof-upload.awsS3Secret')),
+            'region'                  => $region,
+            'bucket'                  => $bucket,
+            'url'                     => $cdnUrl,
+            'endpoint'                => env('AWS_ENDPOINT', $this->settings->get('fof-upload.awsS3Endpoint')),
             'use_path_style_endpoint' => $pathStyle,
-            'set_by_environment' => $setByEnv,
-            'options' => [
+            'set_by_environment'      => $setByEnv,
+            'options'                 => [
                 'ACL' => env('AWS_ACL', $this->settings->get('fof-upload.awsS3ACL')),
-            ]
+            ],
         ];
     }
 }
diff --git a/src/Driver/S3Driver.php b/src/Driver/S3Driver.php
@@ -1,12 +1,21 @@
 <?php
 
+/*
+ * This file is part of blomstra/s3-assets.
+ *
+ * Copyright (c) FriendsOfFlarum
+ *
+ * For the full copyright and license information, please view the LICENSE.md
+ * file that was distributed with this source code.
+ */
+
 namespace FoF\S3Assets\Driver;
 
-use FoF\S3Assets\Driver\Config as DriverConfig;
 use Flarum\Filesystem\DriverInterface;
 use Flarum\Foundation\Config;
 use Flarum\Foundation\Paths;
 use Flarum\Settings\SettingsRepositoryInterface;
+use FoF\S3Assets\Driver\Config as DriverConfig;
 use Illuminate\Contracts\Container\Container;
 use Illuminate\Contracts\Filesystem\Cloud;
 use Illuminate\Filesystem\FilesystemManager;

diff --git a/src/Extend/Drivers.php b/src/Extend/Drivers.php
@@ -1,14 +1,23 @@
 <?php
 
+/*
+ * This file is part of blomstra/s3-assets.
+ *
+ * Copyright (c) FriendsOfFlarum
+ *
+ * For the full copyright and license information, please view the LICENSE.md
+ * file that was distributed with this source code.
+ */
+
 namespace FoF\S3Assets\Extend;
 
-use FoF\S3Assets\Driver\Config;
-use FoF\S3Assets\Driver\S3Driver;
 use Flarum\Extend\ExtenderInterface;
 use Flarum\Extend\Filesystem;
 use Flarum\Extension\Extension;
 use Flarum\Foundation\Paths;
 use Flarum\Http\UrlGenerator;
+use FoF\S3Assets\Driver\Config;
+use FoF\S3Assets\Driver\S3Driver;
 use Illuminate\Contracts\Container\Container;
 
 class Drivers implements ExtenderInterface
@@ -18,7 +27,7 @@ public function extend(Container $container, Extension $extension = null)
         /** @var Config $config */
         $config = $container->make(Config::class);
 
-        if (! $config->valid()) {
+        if (!$config->valid()) {
             return;
         }
 
@@ -27,11 +36,11 @@ public function extend(Container $container, Extension $extension = null)
             ->driver('local', S3Driver::class)
             ->disk('flarum-assets', fn (Paths $paths, UrlGenerator $url) => [
                 'root' => '/assets',
-                'url' => $config->config()['url'] . '/assets'
+                'url'  => $config->config()['url'].'/assets',
             ])
             ->disk('flarum-avatars', fn (Paths $paths, UrlGenerator $url) => [
                 'root' => '/avatars',
-                'url' => $config->config()['url'] . '/avatars'
+                'url'  => $config->config()['url'].'/avatars',
             ])
             ->extend($container, $extension);
     }

diff --git a/src/Frontend/Versioner.php b/src/Frontend/Versioner.php
@@ -1,8 +1,16 @@
 <?php
 
+/*
+ * This file is part of blomstra/s3-assets.
+ *
+ * Copyright (c) FriendsOfFlarum
+ *
+ * For the full copyright and license information, please view the LICENSE.md
+ * file that was distributed with this source code.
+ */
+
 namespace FoF\S3Assets\Frontend;
 
-use Flarum\Frontend\Compiler\RevisionCompiler;
 use Flarum\Frontend\Compiler\VersionerInterface;
 use Flarum\Settings\SettingsRepositoryInterface;
 use Illuminate\Support\Arr;

diff --git a/src/Provider/S3DiskProvider.php b/src/Provider/S3DiskProvider.php
@@ -1,12 +1,20 @@
 <?php
 
+/*
+ * This file is part of blomstra/s3-assets.
+ *
+ * Copyright (c) FriendsOfFlarum
+ *
+ * For the full copyright and license information, please view the LICENSE.md
+ * file that was distributed with this source code.
+ */
+
 namespace FoF\S3Assets\Provider;
 
-use FoF\S3Assets\Driver\Config;
-use FoF\S3Assets\Frontend\Versioner;
-use Flarum\Filesystem\FilesystemManager;
 use Flarum\Foundation\AbstractServiceProvider;
 use Flarum\Frontend\Compiler\VersionerInterface;
+use FoF\S3Assets\Driver\Config;
+use FoF\S3Assets\Frontend\Versioner;
 
 class S3DiskProvider extends AbstractServiceProvider
 {

diff --git a/tests/integration/setup.php b/tests/integration/setup.php
@@ -1,10 +1,12 @@
 <?php
 
 /*
- * This file is part of Flarum.
+ * This file is part of blomstra/s3-assets.
  *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
+ * Copyright (c) FriendsOfFlarum
+ *
+ * For the full copyright and license information, please view the LICENSE.md
+ * file that was distributed with this source code.
  */
 
 use Flarum\Testing\integration\Setup\SetupScript;