adamwathan · June 11, 2022 19:55 · Feb 17, 2018 · Feb 17, 2018 · Feb 17, 2018 · Feb 17, 2018
diff --git a/1-add-macros.php b/1-add-macros.php
@@ -21,13 +21,13 @@ public function boot()
         });
 
         Request::macro('match', function ($responses, $defaultFormat = 'html') {
-            if ($this->route('_format') !== null) {
-                return value(array_get($responses, $this->route('_format'), function () {
-                    abort(404);
-                }));
+            if ($this->route('_format') === null) {
+                return value(array_get($responses, $this->format($defaultFormat)));
             }
 
-            return value(array_get($responses, $this->format($defaultFormat)));
+            return value(array_get($responses, $this->route('_format'), function () {
+                abort(404);
+            }));
         });
     }
 

diff --git a/1-add-macros.php b/1-add-macros.php
@@ -17,8 +17,7 @@ class AppServiceProvider extends ServiceProvider
     public function boot()
     {
         Route::macro('multiformat', function () {
-            $this->uri = $this->uri . '.{_format?}';
-            return $this;
+            return $this->setUri($this->uri() . '.{_format?}');
         });
 
         Request::macro('match', function ($responses, $defaultFormat = 'html') {

diff --git a/1-add-macros.php b/1-add-macros.php
@@ -18,7 +18,6 @@ public function boot()
     {
         Route::macro('multiformat', function () {
             $this->uri = $this->uri . '.{_format?}';
-
             return $this;
         });
 

diff --git a/1-add-macros.php b/1-add-macros.php
@@ -17,14 +17,14 @@ class AppServiceProvider extends ServiceProvider
     public function boot()
     {
         Route::macro('multiformat', function () {
-            $this->uri = $this->uri . '.{_extension?}';
+            $this->uri = $this->uri . '.{_format?}';
 
             return $this;
         });
 
         Request::macro('match', function ($responses, $defaultFormat = 'html') {
-            if ($this->route()->parameter('_extension') !== null) {
-                return value(array_get($responses, $this->route()->parameter('_extension'), function () {
+            if ($this->route('_format') !== null) {
+                return value(array_get($responses, $this->route('_format'), function () {
                     abort(404);
                 }));
             }

diff --git a/2-add-macros.php → 1-add-macros.php b/2-add-macros.php → 1-add-macros.php
@@ -17,27 +17,14 @@ class AppServiceProvider extends ServiceProvider
     public function boot()
     {
         Route::macro('multiformat', function () {
-            // Hello darkness, my old friend
-            if (count($this->parameterNames()) > 0 && ends_with($this->uri(), '}')) {
-                $lastParameter = array_last($this->parameterNames());
-                // I've come to talk with you again
-                if (! isset($this->wheres[$lastParameter])) {
-                    $this->where($lastParameter, '[^\/.]+');
-                }
-            }
-
-            $this->uri = $this->uri . '{_extension?}';
-            $this->where('_extension', '(\..+)');
-            $this->middleware(CaptureRequestExtension::class);
-
-            $this->parameterNames = $this->compileParameterNames();
+            $this->uri = $this->uri . '.{_extension?}';
 
             return $this;
         });
 
         Request::macro('match', function ($responses, $defaultFormat = 'html') {
-            if ($this->attributes->get('_extension') !== null) {
-                return value(array_get($responses, $this->attributes->get('_extension'), function () {
+            if ($this->route()->parameter('_extension') !== null) {
+                return value(array_get($responses, $this->route()->parameter('_extension'), function () {
                     abort(404);
                 }));
             }

diff --git a/1-add-middleware.php b/1-add-middleware.php
@@ -1,16 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-class CaptureRequestExtension
-{
-    public function handle($request, $next)
-    {
-        if ($request->route()->parameter('_extension') !== null) {
-            $request->attributes->set('_extension', substr($request->route()->parameter('_extension'), 1));
-            $request->route()->forgetParameter('_extension');
-        }
-
-        return $next($request);
-    }
-}

diff --git a/3-use-it.php → 2-use-it.php b/3-use-it.php → 2-use-it.php
diff --git a/2-add-macros.php b/2-add-macros.php
@@ -17,8 +17,10 @@ class AppServiceProvider extends ServiceProvider
     public function boot()
     {
         Route::macro('multiformat', function () {
+            // Hello darkness, my old friend
             if (count($this->parameterNames()) > 0 && ends_with($this->uri(), '}')) {
                 $lastParameter = array_last($this->parameterNames());
+                // I've come to talk with you again
                 if (! isset($this->wheres[$lastParameter])) {
                     $this->where($lastParameter, '[^\/.]+');
                 }

diff --git a/CaptureRequestExtension.php → 1-add-middleware.php b/CaptureRequestExtension.php → 1-add-middleware.php
@@ -2,10 +2,6 @@
 
 namespace App\Http\Middleware;
 
-use Illuminate\Support\Facades\Route;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
-
 class CaptureRequestExtension
 {
     public function handle($request, $next)

diff --git a/2-add-macros.php b/2-add-macros.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Providers;
+
+use Illuminate\Http\Request;
+use Illuminate\Routing\Route;
+use Illuminate\Support\ServiceProvider;
+use App\Http\Middleware\CaptureRequestExtension;
+
+class AppServiceProvider extends ServiceProvider
+{
+    /**
+     * Bootstrap any application services.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        Route::macro('multiformat', function () {
+            if (count($this->parameterNames()) > 0 && ends_with($this->uri(), '}')) {
+                $lastParameter = array_last($this->parameterNames());
+                if (! isset($this->wheres[$lastParameter])) {
+                    $this->where($lastParameter, '[^\/.]+');
+                }
+            }
+
+            $this->uri = $this->uri . '{_extension?}';
+            $this->where('_extension', '(\..+)');
+            $this->middleware(CaptureRequestExtension::class);
+
+            $this->parameterNames = $this->compileParameterNames();
+
+            return $this;
+        });
+
+        Request::macro('match', function ($responses, $defaultFormat = 'html') {
+            if ($this->attributes->get('_extension') !== null) {
+                return value(array_get($responses, $this->attributes->get('_extension'), function () {
+                    abort(404);
+                }));
+            }
+
+            return value(array_get($responses, $this->format($defaultFormat)));
+        });
+    }
+
+    /**
+     * Register any application services.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        //
+    }
+}
diff --git a/3-use-it.php b/3-use-it.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Mark a route as 'multiformat' to allow different extensions (html, json, xml, etc.)
+ *
+ * This route will match all of these requests:
+ *     /podcasts/4
+ *     /podcasts/4.json
+ *     /podcasts/4.html
+ *     /podcasts/4.zip
+ */
+Route::get('/podcasts/{id}', 'PodcastsController@show')->multiformat();
+
+/**
+ * Use `Request::match()` to return the right response for the requested format.
+ *
+ * Supports closures to avoid doing unnecessary work, and returns 404 if the
+ * requested format is not supported.
+ *
+ * Will also take into account the `Accept` header if no extension is provided.
+ */
+class PodcastsController
+{
+    public function show($id)
+    {
+        $podcast = Podcast::findOrFail($id);
+
+        return request()->match([
+            'html' => view('podcasts.show', [
+                'podcast' => $podcast,
+                'episodes' => $podcast->recentEpisodes(5),
+            ]),
+            'json' => $podcast,
+            'xml' => function () use ($podcast) {
+                return response($podcast->toXml(), 200, ['Content-Type' => 'text/xml']);
+            }
+        ]);
+    }
+}
diff --git a/request-macro.php b/request-macro.php
@@ -1,11 +0,0 @@
-<?php
-
-Request::macro('match', function ($responses, $defaultFormat = 'html') {
-    if ($this->attributes->get('_extension') !== null) {
-        return value(array_get($responses, $this->attributes->get('_extension'), function () {
-            abort(404);
-        }));
-    }
-
-    return value(array_get($responses, $this->format($defaultFormat)));
-});

diff --git a/route-macro.php b/route-macro.php
@@ -1,18 +0,0 @@
-<?php
-
-Route::macro('multitype', function () {
-    if (count($this->parameterNames()) > 0 && ends_with($this->uri(), '}')) {
-        $lastParameter = array_last($this->parameterNames());
-        if (! isset($this->wheres[$lastParameter])) {
-            $this->where($lastParameter, '[^.]+');
-        }
-    }
-
-    $this->uri = $this->uri . '{_extension?}';
-    $this->where('_extension', '(\..+)');
-    $this->middleware(CaptureRequestExtension::class);
-
-    $this->parameterNames = $this->compileParameterNames();
-
-    return $this;
-});

diff --git a/usage.php b/usage.php
@@ -1,21 +0,0 @@
-<?php
-
-// In routes file:
-Route::get('/podcasts/{id}', 'PodcastsController@show')->multitype();
-
-
-// In controller:
-public function show($id)
-{
-    $podcast = Podcast::findOrFail($id);
-
-    abort_unless($podcast->isVisibleTo(Auth::user()), 404);
-
-    return request()->match([
-        'html' => view('podcasts.show', [
-            'podcast' => $podcast,
-            'episodes' => $podcast->recentEpisodes(5),
-        ]),
-        'json' => $podcast,
-    ]);
-}

diff --git a/CaptureRequestExtension.php b/CaptureRequestExtension.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Illuminate\Support\Facades\Route;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
+
+class CaptureRequestExtension
+{
+    public function handle($request, $next)
+    {
+        if ($request->route()->parameter('_extension') !== null) {
+            $request->attributes->set('_extension', substr($request->route()->parameter('_extension'), 1));
+            $request->route()->forgetParameter('_extension');
+        }
+
+        return $next($request);
+    }
+}
diff --git a/request-macro.php b/request-macro.php
@@ -0,0 +1,11 @@
+<?php
+
+Request::macro('match', function ($responses, $defaultFormat = 'html') {
+    if ($this->attributes->get('_extension') !== null) {
+        return value(array_get($responses, $this->attributes->get('_extension'), function () {
+            abort(404);
+        }));
+    }
+
+    return value(array_get($responses, $this->format($defaultFormat)));
+});
diff --git a/route-macro.php b/route-macro.php
@@ -0,0 +1,18 @@
+<?php
+
+Route::macro('multitype', function () {
+    if (count($this->parameterNames()) > 0 && ends_with($this->uri(), '}')) {
+        $lastParameter = array_last($this->parameterNames());
+        if (! isset($this->wheres[$lastParameter])) {
+            $this->where($lastParameter, '[^.]+');
+        }
+    }
+
+    $this->uri = $this->uri . '{_extension?}';
+    $this->where('_extension', '(\..+)');
+    $this->middleware(CaptureRequestExtension::class);
+
+    $this->parameterNames = $this->compileParameterNames();
+
+    return $this;
+});
diff --git a/usage.php b/usage.php
@@ -0,0 +1,21 @@
+<?php
+
+// In routes file:
+Route::get('/podcasts/{id}', 'PodcastsController@show')->multitype();
+
+
+// In controller:
+public function show($id)
+{
+    $podcast = Podcast::findOrFail($id);
+
+    abort_unless($podcast->isVisibleTo(Auth::user()), 404);
+
+    return request()->match([
+        'html' => view('podcasts.show', [
+            'podcast' => $podcast,
+            'episodes' => $podcast->recentEpisodes(5),
+        ]),
+        'json' => $podcast,
+    ]);
+}