restructuring

timacdonald · Jul 14, 2019 · c9fd44b · c9fd44b
1 parent 17c55e1
commit c9fd44b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 16 deletions.
diff --git a/src/Extension.php b/src/Extension.php
@@ -16,11 +16,9 @@ public function __construct(array $formatOverrides = [])
         $this->formatOverrides = $formatOverrides;
     }
 
-    public function parse(Request $request, string $defaultFormat = 'html'): string
+    public function parse(Request $request): ?string
     {
-        return $this->urlExtension($request)
-            ?? $this->acceptHeaderExtension($request)
-            ?? $defaultFormat;
+        return $this->urlExtension($request) ?? $this->acceptHeaderExtension($request);
     }
 
     private function acceptHeaderExtension(Request $request) : ?string

diff --git a/src/Response.php b/src/Response.php
@@ -69,7 +69,7 @@ private function responseMethod(Request $request): string
 
     private function extension(Request $request): string
     {
-        return (new Extension($this->formatOverrides))->parse($request, $this->defaultFormat);
+        return (new Extension($this->formatOverrides))->parse($request) ?? $this->defaultFormat;
     }
 
     /**

diff --git a/src/ResponseMethod.php b/src/ResponseMethod.php
-Original file line number
+Diff line change
@@ Expand Up / @@ -69,7 +69,7 @@ private function responseMethod(Request $request): string @@
         private function extension(Request $request): string
         {
-            return (new Extension($this->formatOverrides))->parse($request, $this->defaultFormat);
+            return (new Extension($this->formatOverrides))->parse($request) ?? $this->defaultFormat;
         }
         /**
@@ Expand Down @@