Finalise fake implementation

Author: slashequip

src/SegmentServiceContract.php renamed to src/Contracts/SegmentServiceContract.php

@@ -1,9 +1,8 @@
 <?php
 
-namespace SlashEquip\LaravelSegment;
+namespace SlashEquip\LaravelSegment\Contracts;
 
-use SlashEquip\LaravelSegment\Contracts\CanBeIdentifiedForSegment;
-use SlashEquip\LaravelSegment\Contracts\CanBeSentToSegment;
+use SlashEquip\LaravelSegment\PendingUserSegment;
 
 interface SegmentServiceContract
 {

src/Facades/Fakes/SegmentFake.php

@@ -7,8 +7,8 @@
 use PHPUnit\Framework\Assert as PHPUnit;
 use SlashEquip\LaravelSegment\Contracts\CanBeIdentifiedForSegment;
 use SlashEquip\LaravelSegment\Contracts\CanBeSentToSegment;
+use SlashEquip\LaravelSegment\Contracts\SegmentServiceContract;
 use SlashEquip\LaravelSegment\PendingUserSegment;
-use SlashEquip\LaravelSegment\SegmentServiceContract;
 use SlashEquip\LaravelSegment\SimpleSegmentEvent;
 use SlashEquip\LaravelSegment\SimpleSegmentIdentify;
 

src/Facades/Segment.php

@@ -5,9 +5,9 @@
 use Illuminate\Support\Facades\Facade;
 use SlashEquip\LaravelSegment\Contracts\CanBeIdentifiedForSegment;
 use SlashEquip\LaravelSegment\Contracts\CanBeSentToSegment;
+use SlashEquip\LaravelSegment\Contracts\SegmentServiceContract;
 use SlashEquip\LaravelSegment\Facades\Fakes\SegmentFake;
 use SlashEquip\LaravelSegment\PendingUserSegment;
-use SlashEquip\LaravelSegment\SegmentService;
 
 /**
  * @method static void setGlobalUser(CanBeIdentifiedForSegment $globalUser)
@@ -17,17 +17,15 @@
  * @method static PendingUserSegment forUser(CanBeIdentifiedForSegment $user)
  * @method static void push(CanBeSentToSegment $segment)
  * @method static void terminate()
- */
-
-/**
+ *
  * @see \SlashEquip\LaravelSegment\SegmentService
- * @see \SlashEquip\LaravelSegment\Facades\Fakes\SegmentFake
+ * @see SegmentFake
  */
 class Segment extends Facade
 {
     protected static function getFacadeAccessor(): string
     {
-        return SegmentService::class;
+        return SegmentServiceContract::class;
     }
 
     public static function fake(): SegmentFake

src/LaravelSegmentServiceProvider.php

@@ -4,16 +4,12 @@
 
 use Illuminate\Support\Facades\Queue;
 use Illuminate\Support\ServiceProvider;
+use SlashEquip\LaravelSegment\Contracts\SegmentServiceContract;
 use SlashEquip\LaravelSegment\Facades\Segment;
 
 class LaravelSegmentServiceProvider extends ServiceProvider
 {
-    /**
-     * Bootstrap any package services.
-     *
-     * @return void
-     */
-    public function boot()
+    public function boot(): void
     {
         // Setup config publishing
         $this->publishes([
@@ -35,12 +31,7 @@ public function boot()
         });
     }
 
-    /**
-     * Register any application services.
-     *
-     * @return void
-     */
-    public function register()
+    public function register(): void
     {
         // Register config.
         $this->mergeConfigFrom(
@@ -49,7 +40,7 @@ public function register()
         );
 
         // Register the Segment service.
-        $this->app->singleton(SegmentService::class, function ($app) {
+        $this->app->singleton(SegmentServiceContract::class, function ($app) {
             return new SegmentService($app->make('config')['segment']);
         });
     }

src/PendingUserSegment.php

@@ -3,6 +3,7 @@
 namespace SlashEquip\LaravelSegment;
 
 use SlashEquip\LaravelSegment\Contracts\CanBeIdentifiedForSegment;
+use SlashEquip\LaravelSegment\Contracts\SegmentServiceContract;
 
 class PendingUserSegment
 {

src/SegmentService.php

@@ -6,6 +6,7 @@
 use Illuminate\Support\Facades\Http;
 use SlashEquip\LaravelSegment\Contracts\CanBeIdentifiedForSegment;
 use SlashEquip\LaravelSegment\Contracts\CanBeSentToSegment;
+use SlashEquip\LaravelSegment\Contracts\SegmentServiceContract;
 use SlashEquip\LaravelSegment\Enums\SegmentPayloadType;
 use SlashEquip\LaravelSegment\ValueObjects\SegmentPayload;
 use Throwable;

tests/Unit/SegmentServiceTest.php

@@ -4,12 +4,14 @@
 use Illuminate\Queue\Events\JobProcessed;
 use Illuminate\Queue\Jobs\Job;
 use Illuminate\Support\Facades\Http;
+use SlashEquip\LaravelSegment\Contracts\SegmentServiceContract;
 use SlashEquip\LaravelSegment\Facades\Segment;
 use SlashEquip\LaravelSegment\SegmentService;
 use SlashEquip\LaravelSegment\Tests\Stubs\SegmentTestUser;
 
 it('can be resolved from the container', function () {
-    $this->assertInstanceOf(SegmentService::class, app(SegmentService::class));
+    expect(app(SegmentServiceContract::class))
+        ->toBeInstanceOf(SegmentService::class);
 });
 
 it('can track a user using the track method with global user and context', function () {
@@ -103,7 +105,7 @@
 
 it('terminates the segment service on job processed', function () {
     // Given we are spying on the service
-    $service = $this->spy(SegmentService::class);
+    $service = test()->spy(SegmentServiceContract::class);
 
     // When we fire the job processed event
     event(new JobProcessed('default', Mockery::mock(Job::class)));
@@ -115,10 +117,10 @@
 
 it('terminates the segment service on app terminate', function () {
     // Given we are spying on the service
-    $service = $this->spy(SegmentService::class);
+    $service = test()->spy(SegmentServiceContract::class);
 
     // When we terminate the app
-    $this->app->terminate();
+    test()->app()->terminate();
 
     // Then we have called the terminate method
     $service->shouldHaveReceived('terminate')