Merge pull request #8 from yediyuz/rename

Rename package key
yediyuz · Mar 10, 2024 · a36eb94 · a36eb94
2 parents 44358dd + cc06952
commit a36eb94
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 23 deletions.
diff --git a/config/cloudflare_cache.php → config/cloudflare-cache.php b/config/cloudflare_cache.php → config/cloudflare-cache.php
diff --git a/src/CloudflareCache.php b/src/CloudflareCache.php
@@ -9,9 +9,9 @@
 
 class CloudflareCache implements CloudflareCacheInterface
 {
-    public const TAGS_ATTR = 'cloudflare_cache_tags';
+    public const TAGS_ATTR = 'cloudflare-cache-tags';
 
-    public const TTL_ATTR = 'cloudflare_cache_ttl';
+    public const TTL_ATTR = 'cloudflare-cache-ttl';
 
     public function __construct(private readonly CloudflareServiceInterface $service)
     {
@@ -23,7 +23,7 @@ public function __construct(private readonly CloudflareServiceInterface $service
      */
     public static function getIgnoredMiddlewares(): array
     {
-        return Arr::where(config('cloudflare_cache.ignored_middlewares', []), static fn ($middleware) => class_exists($middleware));
+        return Arr::where(config('cloudflare-cache.ignored_middlewares', []), static fn ($middleware) => class_exists($middleware));
     }
 
     /**
@@ -95,7 +95,7 @@ public function purgeByUrls(array $urls): bool|string
 
     public function isEnabled(): bool
     {
-        if (config('cloudflare_cache.debug')) {
+        if (config('cloudflare-cache.debug')) {
             return true;
         }
 

diff --git a/src/CloudflareCacheServiceProvider.php b/src/CloudflareCacheServiceProvider.php
@@ -18,7 +18,7 @@ class CloudflareCacheServiceProvider extends PackageServiceProvider
 {
     public function configurePackage(Package $package): void
     {
-        $package->name('cloudflare_cache')
+        $package->name('cloudflare-cache')
                 ->hasConfigFile()
                 ->hasCommand(CloudflareCacheCommand::class);
     }
@@ -37,16 +37,16 @@ public function packageRegistered(): void
 
     public function registerClient(): static
     {
-        $this->app->bind('cloudflare_cache.client', function ($app): Factory {
+        $this->app->bind('cloudflare-cache.client', function ($app): Factory {
             return $app[Factory::class];
         });
 
         $this->app->singleton(CloudflareServiceInterface::class, function ($app): CloudflareService {
             return new CloudflareService(
-                $app->make('cloudflare_cache.client'),
-                config('cloudflare_cache.api_email'),
-                config('cloudflare_cache.api_key'),
-                config('cloudflare_cache.identifier'),
+                $app->make('cloudflare-cache.client'),
+                config('cloudflare-cache.api_email'),
+                config('cloudflare-cache.api_key'),
+                config('cloudflare-cache.identifier'),
             );
         });
 
@@ -61,6 +61,6 @@ public function registerCloudflareCache(): void
             );
         });
 
-        $this->app->alias(CloudflareCacheInterface::class, 'cloudflare_cache');
+        $this->app->alias(CloudflareCacheInterface::class, 'cloudflare-cache');
     }
 }
diff --git a/src/CloudflarePagesMiddleware.php b/src/CloudflarePagesMiddleware.php
@@ -48,7 +48,7 @@ protected function getCacheTTL(Request $request): int
             return $request->attributes->get(CloudflareCache::TTL_ATTR);
         }
 
-        return config('cloudflare_cache.default_cache_ttl') ?? 600;
+        return config('cloudflare-cache.cache_ttl') ?? 600;
     }
 
     public function shouldCacheResponse(Request $request, Response $response): bool

diff --git a/src/Commands/CloudflareCacheCommand.php b/src/Commands/CloudflareCacheCommand.php
@@ -7,7 +7,7 @@
 
 class CloudflareCacheCommand extends Command
 {
-    public $signature = 'laravel-cloudflare-cache';
+    public $signature = 'cloudflare-cache';
 
     public $description = 'My command';
 

diff --git a/src/Facades/CloudflareCache.php b/src/Facades/CloudflareCache.php
@@ -19,6 +19,6 @@ class CloudflareCache extends Facade
 {
     protected static function getFacadeAccessor(): string
     {
-        return 'cloudflare_cache';
+        return 'cloudflare-cache';
     }
 }
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -29,9 +29,9 @@ public function getEnvironmentSetUp($app): void
         config()->set('app.key', 'base64:' . base64_encode(Encrypter::generateKey(config()['app.cipher'])));
         config()->set('database.default', 'testing');
 
-        config()->set('cloudflare_cache.api_email', '');
-        config()->set('cloudflare_cache.api_key', '');
-        config()->set('cloudflare_cache.identifier', '');
+        config()->set('cloudflare-cache.api_email', '');
+        config()->set('cloudflare-cache.api_key', '');
+        config()->set('cloudflare-cache.identifier', '');
     }
 
     protected function registerTestRoutes(): void
@@ -67,7 +67,7 @@ protected function registerTestRoutes(): void
         };
 
         Route::middleware('web')
-             ->name('cloudflare_cache.')
+             ->name('cloudflare-cache.')
              ->group(function () use ($routes) {
                  $routes();
              });

diff --git a/tests/Unit/CloudflarePagesMiddlewareTest.php b/tests/Unit/CloudflarePagesMiddlewareTest.php
@@ -3,7 +3,7 @@
 declare(strict_types=1);
 
 test('cache bulunmayan sayfalarda session cookie mevcut olmalıdır', function () {
-    $response = $this->get(route('cloudflare_cache.home'));
+    $response = $this->get(route('cloudflare-cache.home'));
 
     $response->assertCookie('XSRF-TOKEN');
     $response->assertCookie('laravel_session');
@@ -16,8 +16,8 @@
     $response->assertCookieMissing('XSRF-TOKEN');
     $response->assertCookieMissing('laravel_session');
 })->with([
-    'cloudflare_cache.content_without_tags',
-    'cloudflare_cache.content_in_args',
-    'cloudflare_cache.content_in_array',
-    'cloudflare_cache.content_in_closure',
+    'cloudflare-cache.content_without_tags',
+    'cloudflare-cache.content_in_args',
+    'cloudflare-cache.content_in_array',
+    'cloudflare-cache.content_in_closure',
 ]);