ry167 / twig-gravatar

src/TwigGravatar.php

Indentation +8 added lines, -8 removed lines

@@ -19,14 +19,14 @@
 	 * {@inheritdoc}
 	 */
 	public function getFilters(){
-        return array(
-            new \Twig_SimpleFilter($this->filterPrefix . 'Avatar', array($this, 'avatar'), $this->filterOptions),
-            new \Twig_SimpleFilter($this->filterPrefix . 'Https', array($this, 'https'), $this->filterOptions),
-            new \Twig_SimpleFilter($this->filterPrefix . 'Size', array($this, 'size'), $this->filterOptions),
-            new \Twig_SimpleFilter($this->filterPrefix . 'Default', array($this, 'def'), $this->filterOptions),
-            new \Twig_SimpleFilter($this->filterPrefix . 'Rating', array($this, 'rating'), $this->filterOptions)
-        );
-    }
+		return array(
+			new \Twig_SimpleFilter($this->filterPrefix . 'Avatar', array($this, 'avatar'), $this->filterOptions),
+			new \Twig_SimpleFilter($this->filterPrefix . 'Https', array($this, 'https'), $this->filterOptions),
+			new \Twig_SimpleFilter($this->filterPrefix . 'Size', array($this, 'size'), $this->filterOptions),
+			new \Twig_SimpleFilter($this->filterPrefix . 'Default', array($this, 'def'), $this->filterOptions),
+			new \Twig_SimpleFilter($this->filterPrefix . 'Rating', array($this, 'rating'), $this->filterOptions)
+		);
+	}
 
 	/**
 	 * Get a Gravatar Avatar URL

Spacing +8 added lines, -8 removed lines

@@ -18,13 +18,13 @@ 
 	/**
 	 * {@inheritdoc}
 	 */
-	public function getFilters(){
+	public function getFilters() {
         return array(
-            new \Twig_SimpleFilter($this->filterPrefix . 'Avatar', array($this, 'avatar'), $this->filterOptions),
-            new \Twig_SimpleFilter($this->filterPrefix . 'Https', array($this, 'https'), $this->filterOptions),
-            new \Twig_SimpleFilter($this->filterPrefix . 'Size', array($this, 'size'), $this->filterOptions),
-            new \Twig_SimpleFilter($this->filterPrefix . 'Default', array($this, 'def'), $this->filterOptions),
-            new \Twig_SimpleFilter($this->filterPrefix . 'Rating', array($this, 'rating'), $this->filterOptions)
+            new \Twig_SimpleFilter($this->filterPrefix.'Avatar', array($this, 'avatar'), $this->filterOptions),
+            new \Twig_SimpleFilter($this->filterPrefix.'Https', array($this, 'https'), $this->filterOptions),
+            new \Twig_SimpleFilter($this->filterPrefix.'Size', array($this, 'size'), $this->filterOptions),
+            new \Twig_SimpleFilter($this->filterPrefix.'Default', array($this, 'def'), $this->filterOptions),
+            new \Twig_SimpleFilter($this->filterPrefix.'Rating', array($this, 'rating'), $this->filterOptions)
         );
     }
 
@@ -36,7 +36,7 @@ 
 	 */
 	public function avatar($email) {
 		if (filter_var($email, FILTER_VALIDATE_EMAIL)) {
-			return $this->baseUrl . "avatar/" . $this->generateHash($email);
+			return $this->baseUrl."avatar/".$this->generateHash($email);
 		} else {
 			throw new InvalidArgumentException("The avatar filter must be passed a valid Email address");
 		}
@@ -136,7 +136,7 @@ 
 	 */
 	private function query($string, array $addition) {
 		foreach ($addition as $name => $value) {
-			$string .= (strpos($string, "?") === FALSE ? "?" : "&") . $name . "=" . $value;
+			$string .= (strpos($string, "?") === FALSE ? "?" : "&").$name."=".$value;
 		}
 		return $string;
 	}

Braces +11 added lines, -17 removed lines

@@ -51,8 +51,7 @@ 
 	public function https($value) {
 		if (strpos($value, $this->baseUrl) === false) {
 			throw new InvalidArgumentException("You can only convert existing Gravatar URLs to HTTPS");
-		}
-		else {
+		} else {
 			return str_replace($this->baseUrl, $this->httpsUrl, $value);
 		}
 	}
@@ -66,12 +65,10 @@ 
 	public function size($value, $px = 100) {
 		if (!is_numeric($px) || $px < 0 || $px > 2048) {
 			throw new InvalidArgumentException("You must pass the size filter a valid number between 0 and 2048");
-		}
-		else if (strpos($value, $this->baseUrl) === false
+		} else if (strpos($value, $this->baseUrl) === false
 			&& strpos($value, $this->httpsUrl) === false) {
 			throw new InvalidArgumentException("You must pass the size filter an existing Gravatar URL");
-		}
-		else {
+		} else {
 			return $this->query($value, array("size" => $px));
 		}
 	}
@@ -86,15 +83,14 @@ 
 	public function def($value, $default = "mm", $force = false) {
 		if (strpos($value, $this->baseUrl) === false && strpos($value, $this->httpsUrl) === false) {
 			throw new InvalidArgumentException("You can only a default to existing Gravatar URLs");
-		}
-		else if (!filter_var($default, FILTER_VALIDATE_URL) && !in_array($default, $this->defaults)) {
+		} else if (!filter_var($default, FILTER_VALIDATE_URL) && !in_array($default, $this->defaults)) {
 			throw new InvalidArgumentException("Default must be a URL or valid default");
-		}
-		else if (!is_bool($force)) {
+		} else if (!is_bool($force)) {
 			throw new InvalidArgumentException("The force option for a default must be boolean");
-		}
-		else {
-			if (filter_var($default, FILTER_VALIDATE_URL)) $default = urlencode($default);
+		} else {
+			if (filter_var($default, FILTER_VALIDATE_URL)) {
+				$default = urlencode($default);
+			}
 			$force = ($force ? "y" : "n");
 			return $this->query($value, array("default" => $default, "forcedefault" => $force));
 		}
@@ -109,11 +105,9 @@ 
 	public function rating($value, $rating = "g") {
 		if (strpos($value, $this->baseUrl) === false && strpos($value, $this->httpsUrl) === false) {
 			throw new InvalidArgumentException("You can only add a rating to an existing Gravatar URL");
-		}
-		else if (!in_array(strtolower($rating), $this->ratings)) {
+		} else if (!in_array(strtolower($rating), $this->ratings)) {
 			throw new InvalidArgumentException("Rating must be g,pg,r or x");
-		}
-		else {
+		} else {
 			return $this->query($value, array("rating" => $rating));
 		}
 	}