Merge pull request #78 from daun/chore/namespaces

daun · web-flow · commit ccb4a5900bc6 · 2026-03-18T22:46:23.000+01:00
Refactor to strict namespaces
diff --git a/src/Facades/Log.php b/src/Facades/Log.php
@@ -16,7 +16,7 @@
  * @method static void debug(\Stringable|string $message, mixed[] $context = [])
  * @method static void log(mixed $level, \Stringable|string $message, mixed[] $context = [])
  *
- * @see \Daun\StatamicMux\Support\Logging\LoggerInterface
+ * @see LoggerInterface
  */
 class Log extends Facade
 {
diff --git a/src/Facades/Mux.php b/src/Facades/Mux.php
@@ -26,7 +26,7 @@
  * @method static array getDefaultPlaybackModifiers()
  * @method static void hook(string $name, \Closure $hook)
  *
- * @see \Daun\StatamicMux\Mux\MuxService
+ * @see MuxService
  */
 class Mux extends Facade
 {
diff --git a/src/GraphQL/MuxMirrorType.php b/src/GraphQL/MuxMirrorType.php
@@ -7,10 +7,11 @@
 use Daun\StatamicMux\Facades\Mux;
 use Daun\StatamicMux\Mux\Enums\MuxPlaybackPolicy;
 use Illuminate\Support\Facades\Validator;
+use Rebing\GraphQL\Support\Type;
 use Statamic\Facades\GraphQL;
 use Statamic\GraphQL\Types\JsonArgument;
 
-class MuxMirrorType extends \Rebing\GraphQL\Support\Type
+class MuxMirrorType extends Type
 {
     const NAME = 'MuxMirror';
 
diff --git a/src/GraphQL/MuxPlaybackIdType.php b/src/GraphQL/MuxPlaybackIdType.php
@@ -3,9 +3,10 @@
 namespace Daun\StatamicMux\GraphQL;
 
 use Daun\StatamicMux\Data\MuxPlaybackId;
+use Rebing\GraphQL\Support\Type;
 use Statamic\Facades\GraphQL;
 
-class MuxPlaybackIdType extends \Rebing\GraphQL\Support\Type
+class MuxPlaybackIdType extends Type
 {
     const NAME = 'MuxPlaybackId';
 
diff --git a/src/Mux/Actions/CreateProxyVersion.php b/src/Mux/Actions/CreateProxyVersion.php
@@ -7,6 +7,7 @@
 use Daun\StatamicMux\Mux\MuxApi;
 use Daun\StatamicMux\Mux\MuxService;
 use Illuminate\Foundation\Application;
+use MuxPhp\Models\StaticRendition;
 use Statamic\Assets\Asset;
 
 class CreateProxyVersion
@@ -112,7 +113,7 @@ protected function createClipFromAsset(Asset $asset, float $start, float $length
                 'end_time' => $start + $length,
             ]),
             'static_renditions' => [
-                ['resolution' => \MuxPhp\Models\StaticRendition::RESOLUTION_HIGHEST],
+                ['resolution' => StaticRendition::RESOLUTION_HIGHEST],
             ],
             'passthrough' => $this->getPassthroughData($muxId),
         ];
diff --git a/src/Mux/MuxApi.php b/src/Mux/MuxApi.php
@@ -14,6 +14,8 @@
 use MuxPhp\Api\URLSigningKeysApi;
 use MuxPhp\ApiException;
 use MuxPhp\Configuration;
+use MuxPhp\Models\Asset;
+use MuxPhp\Models\AssetStaticRenditions;
 use MuxPhp\Models\CreateAssetRequest;
 use MuxPhp\Models\CreatePlaybackIDRequest;
 use MuxPhp\Models\CreateUploadRequest;
@@ -233,7 +235,7 @@ public function assetIsReady(string $muxId): bool
         try {
             $response = $this->assets()->getAsset($muxId)->getData();
             $status = $response?->getStatus();
-            $expected = \MuxPhp\Models\Asset::STATUS_READY;
+            $expected = Asset::STATUS_READY;
 
             Log::debug(
                 'Checking Mux asset status: '.($status === $expected ? 'ready' : 'not ready'),
@@ -264,7 +266,7 @@ public function assetRenditionsAreReady(string $muxId): bool
             $files = $response?->getStaticRenditions()?->getFiles() ?? [];
 
             $ready = array_reduce($files, function ($carry, $file) {
-                return $carry && $file->getStatus() === \MuxPhp\Models\AssetStaticRenditions::STATUS_READY;
+                return $carry && $file->getStatus() === AssetStaticRenditions::STATUS_READY;
             }, count($files) > 0);
 
             Log::debug(
diff --git a/src/Support/Logging/Processors/ContextScrubber.php b/src/Support/Logging/Processors/ContextScrubber.php
@@ -2,6 +2,7 @@
 
 namespace Daun\StatamicMux\Support\Logging\Processors;
 
+use Monolog\Logger;
 use RedactSensitive\RedactSensitiveProcessor;
 
 final class ContextScrubber
@@ -14,7 +15,7 @@ final class ContextScrubber
     ];
 
     /**
-     * @param  \Monolog\Logger  $logger
+     * @param  Logger  $logger
      */
     public function __invoke($logger): void
     {
diff --git a/tests/Concerns/InteractsWithAntlersViews.php b/tests/Concerns/InteractsWithAntlersViews.php
@@ -2,6 +2,7 @@
 
 namespace Tests\Concerns;
 
+use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Facades\View as ViewFacade;
 use Illuminate\Testing\TestView;
 
@@ -10,7 +11,7 @@ trait InteractsWithAntlersViews
     /**
      * Render the contents of the given Antlers template string.
      *
-     * @param  \Illuminate\Contracts\Support\Arrayable|array  $data
+     * @param  Arrayable|array  $data
      */
     protected function antlers(string $template, $data = []): TestView
     {
diff --git a/tests/Feature/AssetsControllerTest.php b/tests/Feature/AssetsControllerTest.php
@@ -5,6 +5,7 @@
 use Illuminate\Support\Facades\Auth;
 use Statamic\Facades\Stache;
 use Statamic\Facades\User;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 beforeEach(function () {
     config([
@@ -68,7 +69,7 @@
     $id = base64_encode('test_container_assets::nonexistent.mp4');
 
     $this->app->make(AssetsController::class)->thumbnail($id);
-})->throws(Symfony\Component\HttpKernel\Exception\NotFoundHttpException::class);
+})->throws(NotFoundHttpException::class);
 
 test('returns 404 for invalid base64 id', function () {
     $this->app->make(AssetsController::class)->thumbnail('!!!invalid!!!');
@@ -79,7 +80,7 @@
     $id = base64_encode($asset->id());
 
     $this->app->make(AssetsController::class)->thumbnail($id);
-})->throws(Symfony\Component\HttpKernel\Exception\NotFoundHttpException::class);
+})->throws(NotFoundHttpException::class);
 
 test('returns 404 when thumbnail service returns null', function () {
     $service = Mockery::mock(ThumbnailService::class);
@@ -90,7 +91,7 @@
     $id = base64_encode($asset->id());
 
     $this->app->make(AssetsController::class)->thumbnail($id);
-})->throws(Symfony\Component\HttpKernel\Exception\NotFoundHttpException::class);
+})->throws(NotFoundHttpException::class);
 
 test('returns 404 for empty id', function () {
     $this->app->make(AssetsController::class)->thumbnail(base64_encode(''));
diff --git a/tests/Feature/Commands/PruneCommandTest.php b/tests/Feature/Commands/PruneCommandTest.php
@@ -79,7 +79,7 @@
         ->assertSuccessful();
 
     Queue::assertPushed(DeleteMuxAssetJob::class, function ($job) {
-        $class = new \ReflectionClass($job);
+        $class = new ReflectionClass($job);
         $asset = $class->getProperty('asset')->getValue($job);
 
         return $asset === 'orphan-mux-id';
diff --git a/tests/Feature/Commands/UploadCommandTest.php b/tests/Feature/Commands/UploadCommandTest.php
@@ -94,7 +94,7 @@
         ->assertSuccessful();
 
     Queue::assertPushed(CreateMuxAssetJob::class, function ($job) use ($video) {
-        $class = new \ReflectionClass($job);
+        $class = new ReflectionClass($job);
         $asset = $class->getProperty('asset')->getValue($job);
         $force = $class->getProperty('force')->getValue($job);
 
@@ -170,7 +170,7 @@
         ->assertSuccessful();
 
     Queue::assertPushed(CreateMuxAssetJob::class, function ($job) use ($video) {
-        $class = new \ReflectionClass($job);
+        $class = new ReflectionClass($job);
         $asset = $class->getProperty('asset')->getValue($job);
         $force = $class->getProperty('force')->getValue($job);
 
@@ -387,7 +387,7 @@
 
     // Verify 1 job with force=false (new video)
     Queue::assertPushed(CreateMuxAssetJob::class, function ($job) use ($newVideo) {
-        $class = new \ReflectionClass($job);
+        $class = new ReflectionClass($job);
         $asset = $class->getProperty('asset')->getValue($job);
         $force = $class->getProperty('force')->getValue($job);
 
@@ -396,7 +396,7 @@
 
     // Verify 2 jobs with force=true (existing videos)
     Queue::assertPushed(CreateMuxAssetJob::class, function ($job) use ($existingVideo, $reuploadVideo) {
-        $class = new \ReflectionClass($job);
+        $class = new ReflectionClass($job);
         $asset = $class->getProperty('asset')->getValue($job);
         $force = $class->getProperty('force')->getValue($job);
 
diff --git a/tests/Feature/Logging/LoggerTest.php b/tests/Feature/Logging/LoggerTest.php
@@ -69,7 +69,7 @@ function makeLogManager()
     $logger = makeLogManager()->resolveStack();
 
     // $laravelLogger is Illuminate\Log\Logger
-    $ref = new \ReflectionClass($logger);
+    $ref = new ReflectionClass($logger);
     $prop = $ref->getProperty('logger');
     $monolog = $prop->getValue($logger);
 
diff --git a/tests/Feature/MuxApiTest.php b/tests/Feature/MuxApiTest.php
@@ -9,6 +9,7 @@
 use MuxPhp\Api\LiveStreamsApi;
 use MuxPhp\Api\PlaybackIDApi;
 use MuxPhp\Api\URLSigningKeysApi;
+use MuxPhp\Models\Asset;
 
 beforeEach(function () {
     $this->app->bind(MuxClient::class, fn () => $this->guzzler->getClient());
@@ -107,6 +108,6 @@
 
     $this->guzzler->assertHistoryCount(1);
 
-    expect($muxAsset)->toBeInstanceOf(\MuxPhp\Models\Asset::class);
+    expect($muxAsset)->toBeInstanceOf(Asset::class);
     expect($muxAsset->getId())->toBe('SqQnqz6s5MBuXGvJaUWdXuXM93J9Q2yv');
 });
diff --git a/tests/Feature/MuxServiceTest.php b/tests/Feature/MuxServiceTest.php
@@ -5,6 +5,8 @@
 use Daun\StatamicMux\Mux\MuxClient;
 use Daun\StatamicMux\Mux\MuxService;
 use Daun\StatamicMux\Support\MirrorField;
+use Illuminate\Support\Collection;
+use MuxPhp\Models\Asset;
 use Statamic\Facades\Stache;
 
 beforeEach(function () {
@@ -174,11 +176,11 @@
 
     $this->guzzler->assertHistoryCount(1);
 
-    expect($muxAssets)->toBeInstanceOf(\Illuminate\Support\Collection::class);
+    expect($muxAssets)->toBeInstanceOf(Collection::class);
     expect($muxAssets)->toHaveLength(2);
-    expect($muxAssets[0])->toBeInstanceOf(\MuxPhp\Models\Asset::class);
+    expect($muxAssets[0])->toBeInstanceOf(Asset::class);
     expect($muxAssets[0]->getId())->toBe('8jd7M77xQgf2NzuocJRPYdSdEfY5dLlcRwFARtgQqU4');
-    expect($muxAssets[1])->toBeInstanceOf(\MuxPhp\Models\Asset::class);
+    expect($muxAssets[1])->toBeInstanceOf(Asset::class);
     expect($muxAssets[1]->getId())->toBe('lJ4bGGsp7ZlPf02nMg015W02iHQLN9XnuuLRBsPS00xqd68');
 });
 
@@ -297,8 +299,8 @@
 
     $this->guzzler->assertHistoryCount(3);
 
-    expect($muxAssets)->toBeInstanceOf(\Illuminate\Support\Collection::class);
+    expect($muxAssets)->toBeInstanceOf(Collection::class);
     expect($muxAssets)->toHaveLength(2);
-    expect($muxAssets[0])->toBeInstanceOf(\MuxPhp\Models\Asset::class);
+    expect($muxAssets[0])->toBeInstanceOf(Asset::class);
     expect($muxAssets[0]->getId())->toBe('8jd7M77xQgf2NzuocJRPYdSdEfY5dLlcRwFARtgQqU4');
 });
diff --git a/tests/Feature/MuxUrlsTest.php b/tests/Feature/MuxUrlsTest.php
@@ -31,13 +31,13 @@
 });
 
 test('token throws when missing key id', function () {
-    expect(fn () => $this->urls->token('playback-id', MuxAudience::Gif))->not->toThrow(\Exception::class);
+    expect(fn () => $this->urls->token('playback-id', MuxAudience::Gif))->not->toThrow(Exception::class);
 
     config(['mux.signing_key.key_id' => null]);
     config(['mux.signing_key.private_key' => null]);
     $urls = $this->app->make(MuxUrls::class);
 
-    expect(fn () => $urls->token('playback-id', MuxAudience::Gif))->toThrow(\Exception::class);
+    expect(fn () => $urls->token('playback-id', MuxAudience::Gif))->toThrow(Exception::class);
 });
 
 test('token returns string', function () {
diff --git a/tests/Feature/ThumbnailTest.php b/tests/Feature/ThumbnailTest.php
@@ -7,6 +7,7 @@
 use Statamic\Http\Resources\CP\Assets\Asset as AssetResource;
 
 beforeEach(function () {
+    config(['app.key' => 'base64:'.base64_encode(random_bytes(32))]);
     config(['statamic.assets.video_thumbnails' => false]);
 
     $this->app->instance('statamic.hooks', collect());
diff --git a/tests/Pest.php b/tests/Pest.php
@@ -1,5 +1,7 @@
 <?php
 
+use Tests\TestCase;
+
 /*
 |--------------------------------------------------------------------------
 | Test Case
@@ -11,7 +13,7 @@
 |
 */
 
-uses(Tests\TestCase::class)->in('Feature');
+uses(TestCase::class)->in('Feature');
 
 uses(PHPUnit\Framework\TestCase::class)->in('Unit');
 

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`* @method static void debug(\Stringable\|string $message, mixed[] $context = [])`
`17`	`17`	`* @method static void log(mixed $level, \Stringable\|string $message, mixed[] $context = [])`
`18`	`18`	`*`
`19`		`- * @see \Daun\StatamicMux\Support\Logging\LoggerInterface`
	`19`	`+ * @see LoggerInterface`
`20`	`20`	`*/`
`21`	`21`	`class Log extends Facade`
`22`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`* @method static array getDefaultPlaybackModifiers()`
`27`	`27`	`* @method static void hook(string $name, \Closure $hook)`
`28`	`28`	`*`
`29`		`- * @see \Daun\StatamicMux\Mux\MuxService`
	`29`	`+ * @see MuxService`
`30`	`30`	`*/`
`31`	`31`	`class Mux extends Facade`
`32`	`32`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,10 @@`
`3`	`3`	`namespace Daun\StatamicMux\GraphQL;`
`4`	`4`
`5`	`5`	`use Daun\StatamicMux\Data\MuxPlaybackId;`
	`6`	`+use Rebing\GraphQL\Support\Type;`
`6`	`7`	`use Statamic\Facades\GraphQL;`
`7`	`8`
`8`		`-class MuxPlaybackIdType extends \Rebing\GraphQL\Support\Type`
	`9`	`+class MuxPlaybackIdType extends Type`
`9`	`10`	`{`
`10`	`11`	`const NAME = 'MuxPlaybackId';`
`11`	`12`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace Tests\Concerns;`
`4`	`4`
	`5`	`+use Illuminate\Contracts\Support\Arrayable;`
`5`	`6`	`use Illuminate\Support\Facades\View as ViewFacade;`
`6`	`7`	`use Illuminate\Testing\TestView;`
`7`	`8`
`@@ -10,7 +11,7 @@ trait InteractsWithAntlersViews`
`10`	`11`	`/**`
`11`	`12`	`* Render the contents of the given Antlers template string.`
`12`	`13`	`*`
`13`		`- * @param \Illuminate\Contracts\Support\Arrayable\|array $data`
	`14`	`+ * @param Arrayable\|array $data`
`14`	`15`	`*/`
`15`	`16`	`protected function antlers(string $template, $data = []): TestView`
`16`	`17`	`{`