chore: rearrange sources

Signed-off-by: Fery Wardiyanto <ferywardiyanto@gmail.com>
creasico · Oct 13, 2022 · 10dcb36 · 10dcb36
1 parent 503e8ca
commit 10dcb36
Show file tree

Hide file tree

Showing 8 changed files with 370 additions and 252 deletions.
diff --git a/composer.json b/composer.json
@@ -48,10 +48,10 @@
     "extra": {
         "laravel": {
             "providers": [
-                "Creasi\\Laravel\\PackageServiceProvider"
+                "Creasi\\Laravel\\Package\\ServiceProvider"
             ],
             "aliases": {
-                "Package": "Creasi\\Laravel\\Facades\\Package"
+                "Package": "Creasi\\Laravel\\Package"
             }
         }
     },

diff --git a/composer.lock b/composer.lock
diff --git a/src/Facades/Package.php b/src/Facades/Package.php
diff --git a/src/Factories/PackageFactory.php b/src/Factories/PackageFactory.php
diff --git a/src/Package.php b/src/Package.php
@@ -2,10 +2,12 @@
 
 namespace Creasi\Laravel;
 
-class Package
+use Illuminate\Support\Facades\Facade;
+
+class Package extends Facade
 {
-    public function lorem(): string
+    protected static function getFacadeAccessor()
     {
-        return 'Lorem ipsum';
+        return 'creasi.package';
     }
 }
diff --git a/src/Package/ServiceProvider.php b/src/Package/ServiceProvider.php
@@ -18,12 +18,15 @@ public function register()
     {
         $this->mergeConfigFrom(self::LIB_PATH.'/config/package.php', 'creasi.package');
 
-        $this->app->bind(Package::class, function () {
-            return new Package();
+        $this->app->bind('creasi.package', function () {
+            return new class {
+                public function lorem()
+                {
+                    return 'Lorem ipsum';
+                }
+            };
         });
 
-        $this->app->alias(Package::class, 'creasi.package');
-
         if ($this->app->runningInConsole()) {
             $this->registerPublishables();
 

diff --git a/tests/PackageTest.php b/tests/PackageTest.php
@@ -11,8 +11,6 @@ public function it_should_be_true()
     {
         $package = $this->app->get('creasi.package');
 
-        $this->assertInstanceOf(Package::class, $package);
-
         $this->assertEquals('Lorem ipsum', $package->lorem());
     }
 }
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -14,11 +14,4 @@ protected function getPackageProviders($app)
             ServiceProvider::class,
         ];
     }
-
-    protected function getPackageAliases($app)
-    {
-        return [
-            'creasi.package' => Package::class,
-        ];
-    }
 }