Simplifying the code a bit

cakephp · Apr 21, 2014 · 499a26e · 499a26e
1 parent f7bb82f
commit 499a26e
Showing 1 changed file with 8 additions and 21 deletions.
diff --git a/src/Utility/Time.php b/src/Utility/Time.php
@@ -233,9 +233,14 @@ public function timeAgoInWords(array $options = []) {
 		$relativeString = __d('cake', '%s ago');
 		$absoluteString = __d('cake', 'on %s');
 		$accuracy = static::$wordAccuracy;
+		$from = static::now();
+		$opts = ['timezone', 'format', 'end', 'relativeString', 'absoluteString', 'from'];
 
-		if (isset($options['timezone'])) {
-			$timezone = $options['timezone'];
+		foreach ($opts as $option) {
+			if (isset($options[$option])) {
+				$$option = $options[$option];
+				unset($options[$option]);
+			}
 		}
 
 		if (isset($options['accuracy'])) {
@@ -248,25 +253,7 @@ public function timeAgoInWords(array $options = []) {
 			}
 		}
 
-		if (isset($options['format'])) {
-			$format = $options['format'];
-		}
-		if (isset($options['end'])) {
-			$end = $options['end'];
-		}
-		if (isset($options['relativeString'])) {
-			$relativeString = $options['relativeString'];
-			unset($options['relativeString']);
-		}
-		if (isset($options['absoluteString'])) {
-			$absoluteString = $options['absoluteString'];
-			unset($options['absoluteString']);
-		}
-
-		$now = empty($options['from']) ? static::now() : $options['from'];
-		unset($options['end'], $options['format'], $options['from']);
-
-		$now = $now->format('U');
+		$now = $from->format('U');
 		$inSeconds = $this->format('U');
 		$backwards = ($inSeconds > $now);