refactoring view strategy priorization

zendframework · Jul 14, 2012 · 79b036a · 79b036a
1 parent 4dc27f8
commit 79b036a
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 29 deletions.
diff --git a/src/Strategy/FeedStrategy.php b/src/Strategy/FeedStrategy.php
@@ -98,23 +98,25 @@ public function selectRenderer(ViewEvent $e)
         }
 
         $headers = $request->getHeaders();
-        if ($headers->has('accept')) {
-            $accept  = $headers->get('accept');
+        if (!$headers->has('accept')) {
+            return;
+        }
 
-            $match = $accept->match('application/rss+xml, application/atom+xml');
-            if ($match && $match->getTypeString() == 'application/rss+xml') {
-                $this->renderer->setFeedType('rss');
-                return $this->renderer;
-            }
+        $accept  = $headers->get('accept');
+        if (($match = $accept->match('application/rss+xml, application/atom+xml')) == false) {
+            return;
+        }
 
-            if ($match && $match->getTypeString() == 'application/atom+xml') {
-                $this->renderer->setFeedType('atom');
-                return $this->renderer;
-            }
+        if ($match->getTypeString() == 'application/rss+xml') {
+            $this->renderer->setFeedType('rss');
+            return $this->renderer;
+        }
+
+        if ($match->getTypeString() == 'application/atom+xml') {
+            $this->renderer->setFeedType('atom');
+            return $this->renderer;
         }
 
-        // Not matched!
-        return;
     }
 
     /**

diff --git a/src/Strategy/JsonStrategy.php b/src/Strategy/JsonStrategy.php
@@ -97,27 +97,27 @@ public function selectRenderer(ViewEvent $e)
         }
 
         $headers = $request->getHeaders();
-        if ($headers->has('accept')) {
-            $accept  = $headers->get('Accept');
+        if (!$headers->has('accept')) {
+            return;
+        }
 
-            $match = $accept->match('application/json, application/javascript');
 
-            if ($match && $match->getFormat() == 'json') {
-                // application/json Accept header found
-                return $this->renderer;
-            }
+        $accept  = $headers->get('Accept');
+        if (($match = $accept->match('application/json, application/javascript')) == false) {
+            return;
+        }
 
-            if ($match) {
-                // application/javascript Accept header found
-                if (false != ($callback = $request->getQuery()->get('callback'))) {
-                    $this->renderer->setJsonpCallback($callback);
-                }
-                return $this->renderer;
-            }
+        if ($match->getFormat() == 'json') {
+            // application/json Accept header found
+            return $this->renderer;
+        }
+
+        // application/javascript Accept header found
+        if (false != ($callback = $request->getQuery()->get('callback'))) {
+            $this->renderer->setJsonpCallback($callback);
         }
 
-        // Not matched!
-        return;
+        return $this->renderer;
     }
 
     /**