From b73f5cce23e875c99cb66e6bcbaa3249b1d255b6 Mon Sep 17 00:00:00 2001
From: Olivier Paroz <github@oparoz.com>
Date: Fri, 9 Jan 2015 22:00:20 +0100
Subject: Some optimisations

---
 utility/normalizer.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'utility')

diff --git a/utility/normalizer.php b/utility/normalizer.php
index 09dcaace..a5228756 100644
--- a/utility/normalizer.php
+++ b/utility/normalizer.php
@@ -31,23 +31,20 @@ class Normalizer {
 	 * @return string|array
 	 */
 	public function normalize($data, $depth = 0) {
-
 		$scalar = $this->normalizeScalar($data);
+		$traversable = $this->normalizeTraversable($data, $depth);
+		$object = $this->normalizeObject($data, $depth);
+		$resource = $this->normalizeResource($data);
+
 		if (!is_array($scalar)) {
 			return $scalar;
 		}
-
-		$traversable = $this->normalizeTraversable($data, $depth);
 		if ($traversable !== null) {
 			return $traversable;
 		}
-
-		$object = $this->normalizeObject($data, $depth);
 		if ($object !== null) {
 			return $object;
 		}
-
-		$resource = $this->normalizeResource($data);
 		if ($resource !== null) {
 			return $resource;
 		}
-- 
cgit v1.2.3