wip

Author: Illia Sakovich

src/Managers/DynamicRendererManager.php renamed to src/Managers/RendererManager.php

@@ -2,15 +2,15 @@
 
 namespace Coderello\DynamicRendering\Managers;
 
-use Coderello\DynamicRendering\Renderers\PrerenderDynamicRenderer;
-use Coderello\DynamicRendering\Renderers\DynamicRenderer;
-use Coderello\DynamicRendering\Renderers\RendertronDynamicRenderer;
+use Coderello\DynamicRendering\Renderers\PrerenderRenderer;
+use Coderello\DynamicRendering\Renderers\Renderer;
+use Coderello\DynamicRendering\Renderers\RendertronRenderer;
 use Coderello\DynamicRendering\Support\RenderingResult;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Manager;
 
-class DynamicRendererManager extends Manager implements DynamicRenderer
+class RendererManager extends Manager implements Renderer
 {
     public function getDefaultDriver(): string
     {
@@ -28,16 +28,16 @@ private function getRendererConfig(string $renderer): array
         return $this->getConfigValue('dynamic-rendering.renderers.'.$renderer, []);
     }
 
-    public function createPrerenderDriver(): PrerenderDynamicRenderer
+    public function createPrerenderDriver(): PrerenderRenderer
     {
-        return new PrerenderDynamicRenderer(
+        return new PrerenderRenderer(
             $this->getRendererConfig('prerender')
         );
     }
 
-    public function createRendertronDriver(): RendertronDynamicRenderer
+    public function createRendertronDriver(): RendertronRenderer
     {
-        return new RendertronDynamicRenderer(
+        return new RendertronRenderer(
             $this->getRendererConfig('rendertron')
         );
     }
@@ -52,7 +52,7 @@ public function isRendering(Request $request): bool
         return $this->driver()->isRendering($request);
     }
 
-    public function driver($driver = null): DynamicRenderer
+    public function driver($driver = null): Renderer
     {
         return parent::driver($driver);
     }

src/Middleware/DynamicRenderingMiddleware.php

@@ -4,7 +4,6 @@
 
 use Closure;
 use Coderello\DynamicRendering\Facades\DynamicRenderer;
-use Coderello\DynamicRendering\Renderers\DynamicRenderer;
 use Coderello\DynamicRendering\Support\RenderingCriteriaChecker;
 use Illuminate\Contracts\Container\Container;
 use Illuminate\Http\Request;

src/Providers/DynamicRenderingServiceProvider.php

@@ -2,9 +2,9 @@
 
 namespace Coderello\DynamicRendering\Providers;
 
-use Coderello\DynamicRendering\Managers\DynamicRendererManager;
+use Coderello\DynamicRendering\Managers\RendererManager;
 use Coderello\DynamicRendering\Middleware\DynamicRenderingMiddleware;
-use Coderello\DynamicRendering\Renderers\DynamicRenderer;
+use Coderello\DynamicRendering\Renderers\Renderer;
 use Illuminate\Contracts\Http\Kernel;
 use Illuminate\Support\ServiceProvider;
 
@@ -52,7 +52,7 @@ protected function registerConfig()
     protected function registerBindings()
     {
         $this->app->singleton('dynamic.renderer', function ($app) {
-            return new DynamicRendererManager($app);
+            return new RendererManager($app);
         });
     }
 

src/Renderers/PrerenderDynamicRenderer.php renamed to src/Renderers/PrerenderRenderer.php

@@ -8,7 +8,7 @@
 use Illuminate\Http\Request;
 use Illuminate\Support\Str;
 
-class PrerenderDynamicRenderer implements DynamicRenderer
+class PrerenderRenderer implements Renderer
 {
     /**
      * @var string|null

src/Renderers/DynamicRenderer.php renamed to src/Renderers/Renderer.php

@@ -5,7 +5,7 @@
 use Coderello\DynamicRendering\Support\RenderingResult;
 use Illuminate\Http\Request;
 
-interface DynamicRenderer
+interface Renderer
 {
     public function render(string $url): RenderingResult;
 

src/Renderers/RendertronDynamicRenderer.php renamed to src/Renderers/RendertronRenderer.php

@@ -8,7 +8,7 @@
 use Illuminate\Http\Request;
 use Illuminate\Support\Str;
 
-class RendertronDynamicRenderer implements DynamicRenderer
+class RendertronRenderer implements Renderer
 {
     /**
      * @var string|null

src/RenderingCriteria/IsNotRenderer.php

@@ -2,7 +2,7 @@
 
 namespace Coderello\DynamicRendering\RenderingCriteria;
 
-use Coderello\DynamicRendering\Facades\DynamicRendering;
+use Coderello\DynamicRendering\Facades\DynamicRenderer;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Http\Request;
 use Illuminate\Support\Str;
@@ -12,6 +12,6 @@ class IsNotRenderer implements RenderingCriterion
 {
     public function matches(Request $request): bool
     {
-        return ! DynamicRendering::isRendering($request);
+        return ! DynamicRenderer::isRendering($request);
     }
 }

src/Support/RenderingCriteriaChecker.php

@@ -49,4 +49,4 @@ public function matchesAll(Request $request): bool
 
         return true;
     }
-}
+}

tests/DynamicRendererTest.php

@@ -3,7 +3,7 @@
 namespace Coderello\DynamicRendering\Tests;
 
 use Coderello\DynamicRendering\Facades\DynamicRenderer;
-use Coderello\DynamicRendering\Renderers\PrerenderDynamicRenderer;
+use Coderello\DynamicRendering\Renderers\PrerenderRenderer;
 use Symfony\Component\Process\Process;
 
 class DynamicRenderingTest extends AbstractTestCase