iqltechnologies / brighty

brighty/wp-config.php

Braces +2 added lines, -4 removed lines

@@ -29,11 +29,9 @@
 	function getenv_docker($env, $default) {

 		if ($fileEnv = getenv($env . '_FILE')) {

 			return rtrim(file_get_contents($fileEnv), "\r\n");

-		}

-		else if (($val = getenv($env)) !== false) {

+		} else if (($val = getenv($env)) !== false) {

 			return $val;

-		}

-		else {

+		} else {

 			return $default;

 		}

 	}

plugins/megamenu/classes/pages/themes.php

Braces +5 added lines, -2 removed lines

@@ -771,8 +771,11 @@
 					<li class='mega-import-theme'><a href='<?php echo $import_url; ?>'><span class='dashicons dashicons-download'></span><?php _e( 'Import a theme', 'megamenu' ); ?></a></li>
 					<?php if ( $this->string_contains( $this->id, array( 'custom' ) ) ) : ?>
 						<li class='mega-delete-theme'><a class='delete confirm' href='<?php echo $delete_url; ?>'><span class='dashicons dashicons-trash'></span><?php _e( 'Delete theme', 'megamenu' ); ?></a></li>
-					<?php else : ?>
-						<li class='mega-revert-theme'><a class='confirm' href='<?php echo $revert_url; ?>'><span class='dashicons dashicons-update-alt'></span><?php _e( 'Revert theme', 'megamenu' ); ?></a></li>
+					<?php else {
+    : ?>
+						<li class='mega-revert-theme'><a class='confirm' href='<?php echo $revert_url;
+}
+?>'><span class='dashicons dashicons-update-alt'></span><?php _e( 'Revert theme', 'megamenu' ); ?></a></li>
 					<?php endif; ?>
 				</ul>
 			</div>

plugins/megamenu/classes/scssc.inc.php

Switch Indentation +369 added lines, -369 removed lines

@@ -442,12 +442,12 @@ 
 			if (!is_array($p)) continue;
 
 			switch ($p[0]) {
-			case "interpolate":
-				$p = $this->compileValue($p);
-				break;
-			case "string":
-				$p = $this->compileValue($p);
-				break;
+			    case "interpolate":
+				    $p = $this->compileValue($p);
+				    break;
+			    case "string":
+				    $p = $this->compileValue($p);
+				    break;
 			}
 		}
 
@@ -468,12 +468,12 @@ 
 			if (!is_array($p)) continue;
 
 			switch ($p[0]) {
-			case "self":
-				$p = "&";
-				break;
-			default:
-				$p = $this->compileValue($p);
-				break;
+			    case "self":
+				    $p = "&";
+				    break;
+			    default:
+				    $p = $this->compileValue($p);
+				    break;
 			}
 		}
 
@@ -622,204 +622,204 @@ 
 		$this->sourceParser = isset($child[-2]) ? $child[-2] : $this->parser;
 
 		switch ($child[0]) {
-		case "import":
-			list(,$rawPath) = $child;
-			$rawPath = $this->reduce($rawPath);
-			if (!$this->compileImport($rawPath, $out)) {
-				$out->lines[] = "@import " . $this->compileValue($rawPath) . ";";
-			}
-			break;
-		case "directive":
-			list(, $directive) = $child;
-			$s = "@" . $directive->name;
-			if (!empty($directive->value)) {
-				$s .= " " . $this->compileValue($directive->value);
-			}
-			$this->compileNestedBlock($directive, array($s));
-			break;
-		case "media":
-			$this->compileMedia($child[1]);
-			break;
-		case "block":
-			$this->compileBlock($child[1]);
-			break;
-		case "charset":
-			$out->lines[] = "@charset ".$this->compileValue($child[1]).";";
-			break;
-		case "assign":
-			list(,$name, $value) = $child;
-			if ($name[0] == "var") {
-				$isDefault = !empty($child[3]);
-
-				if ($isDefault) {
-					$existingValue = $this->get($name[1], true);
-					$shouldSet = $existingValue === true || $existingValue == self::$null;
-				}
-
-				if (!$isDefault || $shouldSet) {
-					$this->set($name[1], $this->reduce($value));
-				}
-				break;
-			}
-
-			// if the value reduces to null from something else then
-			// the property should be discarded
-			if ($value[0] != "null") {
-				$value = $this->reduce($value);
-				if ($value[0] == "null") {
-					break;
-				}
-			}
-
-			$compiledValue = $this->compileValue($value);
-			$out->lines[] = $this->formatter->property(
-				$this->compileValue($name),
-				$compiledValue);
-			break;
-		case "comment":
-			$out->lines[] = $child[1];
-			break;
-		case "mixin":
-		case "function":
-			list(,$block) = $child;
-			$this->set(self::$namespaces[$block->type] . $block->name, $block);
-			break;
-		case "extend":
-			list(, $selectors) = $child;
-			foreach ($selectors as $sel) {
-				// only use the first one
-				$sel = current($this->evalSelector($sel));
-				$this->pushExtends($sel, $out->selectors);
-			}
-			break;
-		case "if":
-			list(, $if) = $child;
-			if ($this->isTruthy($this->reduce($if->cond, true))) {
-				return $this->compileChildren($if->children, $out);
-			} else {
-				foreach ($if->cases as $case) {
-					if ($case->type == "else" ||
-						$case->type == "elseif" && $this->isTruthy($this->reduce($case->cond)))
-					{
-						return $this->compileChildren($case->children, $out);
-					}
-				}
-			}
-			break;
-		case "return":
-			return $this->reduce($child[1], true);
-		case "each":
-			list(,$each) = $child;
-			$list = $this->coerceList($this->reduce($each->list));
-			foreach ($list[2] as $item) {
-				$this->pushEnv();
-				$this->set($each->var, $item);
-				// TODO: allow return from here
-				$this->compileChildren($each->children, $out);
-				$this->popEnv();
-			}
-			break;
-		case "while":
-			list(,$while) = $child;
-			while ($this->isTruthy($this->reduce($while->cond, true))) {
-				$ret = $this->compileChildren($while->children, $out);
-				if ($ret) return $ret;
-			}
-			break;
-		case "for":
-			list(,$for) = $child;
-			$start = $this->reduce($for->start, true);
-			$start = $start[1];
-			$end = $this->reduce($for->end, true);
-			$end = $end[1];
-			$d = $start < $end ? 1 : -1;
-
-			while (true) {
-				if ((!$for->until && $start - $d == $end) ||
-					($for->until && $start == $end))
-				{
-					break;
-				}
-
-				$this->set($for->var, array("number", $start, ""));
-				$start += $d;
-
-				$ret = $this->compileChildren($for->children, $out);
-				if ($ret) return $ret;
-			}
-
-			break;
-		case "nestedprop":
-			list(,$prop) = $child;
-			$prefixed = array();
-			$prefix = $this->compileValue($prop->prefix) . "-";
-			foreach ($prop->children as $child) {
-				if ($child[0] == "assign") {
-					array_unshift($child[1][2], $prefix);
-				}
-				if ($child[0] == "nestedprop") {
-					array_unshift($child[1]->prefix[2], $prefix);
-				}
-				$prefixed[] = $child;
-			}
-			$this->compileChildren($prefixed, $out);
-			break;
-		case "include": // including a mixin
-			list(,$name, $argValues, $content) = $child;
-			$mixin = $this->get(self::$namespaces["mixin"] . $name, false);
-			if (!$mixin) {
-				$this->throwError("Undefined mixin $name");
-			}
-
-			$callingScope = $this->env;
-
-			// push scope, apply args
-			$this->pushEnv();
-			if ($this->env->depth > 0) {
-				$this->env->depth--;
-			}
-
-			if (isset($content)) {
-				$content->scope = $callingScope;
-				$this->setRaw(self::$namespaces["special"] . "content", $content);
-			}
-
-			if (isset($mixin->args)) {
-				$this->applyArguments($mixin->args, $argValues);
-			}
-
-			foreach ($mixin->children as $child) {
-				$this->compileChild($child, $out);
-			}
-
-			$this->popEnv();
-
-			break;
-		case "mixin_content":
-			$content = $this->get(self::$namespaces["special"] . "content");
-			if (!isset($content)) {
-				$this->throwError("Expected @content inside of mixin");
-			}
-
-			$strongTypes = array('include', 'block', 'for', 'while');
-			foreach ($content->children as $child) {
-				$this->storeEnv = (in_array($child[0], $strongTypes))
-					? null
-					: $content->scope;
-
-				$this->compileChild($child, $out);
-			}
-
-			unset($this->storeEnv);
-			break;
-		case "debug":
-			list(,$value, $pos) = $child;
-			$line = $this->parser->getLineNo($pos);
-			$value = $this->compileValue($this->reduce($value, true));
-			fwrite(STDERR, "Line $line DEBUG: $value\n");
-			break;
-		default:
-			$this->throwError("unknown child type: $child[0]");
+		    case "import":
+			    list(,$rawPath) = $child;
+			    $rawPath = $this->reduce($rawPath);
+			    if (!$this->compileImport($rawPath, $out)) {
+				    $out->lines[] = "@import " . $this->compileValue($rawPath) . ";";
+			    }
+			    break;
+		    case "directive":
+			    list(, $directive) = $child;
+			    $s = "@" . $directive->name;
+			    if (!empty($directive->value)) {
+				    $s .= " " . $this->compileValue($directive->value);
+			    }
+			    $this->compileNestedBlock($directive, array($s));
+			    break;
+		    case "media":
+			    $this->compileMedia($child[1]);
+			    break;
+		    case "block":
+			    $this->compileBlock($child[1]);
+			    break;
+		    case "charset":
+			    $out->lines[] = "@charset ".$this->compileValue($child[1]).";";
+			    break;
+		    case "assign":
+			    list(,$name, $value) = $child;
+			    if ($name[0] == "var") {
+				    $isDefault = !empty($child[3]);
+
+				    if ($isDefault) {
+					    $existingValue = $this->get($name[1], true);
+					    $shouldSet = $existingValue === true || $existingValue == self::$null;
+				    }
+
+				    if (!$isDefault || $shouldSet) {
+					    $this->set($name[1], $this->reduce($value));
+				    }
+				    break;
+			    }
+
+			    // if the value reduces to null from something else then
+			    // the property should be discarded
+			    if ($value[0] != "null") {
+				    $value = $this->reduce($value);
+				    if ($value[0] == "null") {
+					    break;
+				    }
+			    }
+
+			    $compiledValue = $this->compileValue($value);
+			    $out->lines[] = $this->formatter->property(
+				    $this->compileValue($name),
+				    $compiledValue);
+			    break;
+		    case "comment":
+			    $out->lines[] = $child[1];
+			    break;
+		    case "mixin":
+		    case "function":
+			    list(,$block) = $child;
+			    $this->set(self::$namespaces[$block->type] . $block->name, $block);
+			    break;
+		    case "extend":
+			    list(, $selectors) = $child;
+			    foreach ($selectors as $sel) {
+				    // only use the first one
+				    $sel = current($this->evalSelector($sel));
+				    $this->pushExtends($sel, $out->selectors);
+			    }
+			    break;
+		    case "if":
+			    list(, $if) = $child;
+			    if ($this->isTruthy($this->reduce($if->cond, true))) {
+				    return $this->compileChildren($if->children, $out);
+			    } else {
+				    foreach ($if->cases as $case) {
+					    if ($case->type == "else" ||
+						    $case->type == "elseif" && $this->isTruthy($this->reduce($case->cond)))
+					    {
+						    return $this->compileChildren($case->children, $out);
+					    }
+				    }
+			    }
+			    break;
+		    case "return":
+			    return $this->reduce($child[1], true);
+		    case "each":
+			    list(,$each) = $child;
+			    $list = $this->coerceList($this->reduce($each->list));
+			    foreach ($list[2] as $item) {
+				    $this->pushEnv();
+				    $this->set($each->var, $item);
+				    // TODO: allow return from here
+				    $this->compileChildren($each->children, $out);
+				    $this->popEnv();
+			    }
+			    break;
+		    case "while":
+			    list(,$while) = $child;
+			    while ($this->isTruthy($this->reduce($while->cond, true))) {
+				    $ret = $this->compileChildren($while->children, $out);
+				    if ($ret) return $ret;
+			    }
+			    break;
+		    case "for":
+			    list(,$for) = $child;
+			    $start = $this->reduce($for->start, true);
+			    $start = $start[1];
+			    $end = $this->reduce($for->end, true);
+			    $end = $end[1];
+			    $d = $start < $end ? 1 : -1;
+
+			    while (true) {
+				    if ((!$for->until && $start - $d == $end) ||
+					    ($for->until && $start == $end))
+				    {
+					    break;
+				    }
+
+				    $this->set($for->var, array("number", $start, ""));
+				    $start += $d;
+
+				    $ret = $this->compileChildren($for->children, $out);
+				    if ($ret) return $ret;
+			    }
+
+			    break;
+		    case "nestedprop":
+			    list(,$prop) = $child;
+			    $prefixed = array();
+			    $prefix = $this->compileValue($prop->prefix) . "-";
+			    foreach ($prop->children as $child) {
+				    if ($child[0] == "assign") {
+					    array_unshift($child[1][2], $prefix);
+				    }
+				    if ($child[0] == "nestedprop") {
+					    array_unshift($child[1]->prefix[2], $prefix);
+				    }
+				    $prefixed[] = $child;
+			    }
+			    $this->compileChildren($prefixed, $out);
+			    break;
+		    case "include": // including a mixin
+			    list(,$name, $argValues, $content) = $child;
+			    $mixin = $this->get(self::$namespaces["mixin"] . $name, false);
+			    if (!$mixin) {
+				    $this->throwError("Undefined mixin $name");
+			    }
+
+			    $callingScope = $this->env;
+
+			    // push scope, apply args
+			    $this->pushEnv();
+			    if ($this->env->depth > 0) {
+				    $this->env->depth--;
+			    }
+
+			    if (isset($content)) {
+				    $content->scope = $callingScope;
+				    $this->setRaw(self::$namespaces["special"] . "content", $content);
+			    }
+
+			    if (isset($mixin->args)) {
+				    $this->applyArguments($mixin->args, $argValues);
+			    }
+
+			    foreach ($mixin->children as $child) {
+				    $this->compileChild($child, $out);
+			    }
+
+			    $this->popEnv();
+
+			    break;
+		    case "mixin_content":
+			    $content = $this->get(self::$namespaces["special"] . "content");
+			    if (!isset($content)) {
+				    $this->throwError("Expected @content inside of mixin");
+			    }
+
+			    $strongTypes = array('include', 'block', 'for', 'while');
+			    foreach ($content->children as $child) {
+				    $this->storeEnv = (in_array($child[0], $strongTypes))
+					    ? null
+					    : $content->scope;
+
+				    $this->compileChild($child, $out);
+			    }
+
+			    unset($this->storeEnv);
+			    break;
+		    case "debug":
+			    list(,$value, $pos) = $child;
+			    $line = $this->parser->getLineNo($pos);
+			    $value = $this->compileValue($this->reduce($value, true));
+			    fwrite(STDERR, "Line $line DEBUG: $value\n");
+			    break;
+		    default:
+			    $this->throwError("unknown child type: $child[0]");
 		}
 	}
 
@@ -840,13 +840,13 @@ 
 	// should $value cause its operand to eval
 	protected function shouldEval($value) {
 		switch ($value[0]) {
-		case "exp":
-			if ($value[1] == "/") {
-				return $this->shouldEval($value[2], $value[3]);
-			}
-		case "var":
-		case "fncall":
-			return true;
+		    case "exp":
+			    if ($value[1] == "/") {
+				    return $this->shouldEval($value[2], $value[3]);
+			    }
+		    case "var":
+		    case "fncall":
+			    return true;
 		}
 		return false;
 	}
@@ -947,11 +947,11 @@ 
 				$exp = $this->reduce($exp);
 				if ($exp[0] == "number") {
 					switch ($op) {
-					case "+":
-						return $exp;
-					case "-":
-						$exp[1] *= -1;
-						return $exp;
+					    case "+":
+						    return $exp;
+					    case "-":
+						    $exp[1] *= -1;
+						    return $exp;
 					}
 				}
 
@@ -1033,19 +1033,19 @@ 
 		list($type) = $value;
 
 		switch ($type) {
-		case "list":
-			$value = $this->extractInterpolation($value);
-			if ($value[0] != "list") {
-				return array("keyword", $this->compileValue($value));
-			}
-			foreach ($value[2] as $key => $item) {
-				$value[2][$key] = $this->normalizeValue($item);
-			}
-			return $value;
-		case "number":
-			return $this->normalizeNumber($value);
-		default:
-			return $value;
+		    case "list":
+			    $value = $this->extractInterpolation($value);
+			    if ($value[0] != "list") {
+				    return array("keyword", $this->compileValue($value));
+			    }
+			    foreach ($value[2] as $key => $item) {
+				    $value[2][$key] = $this->normalizeValue($item);
+			    }
+			    return $value;
+		    case "number":
+			    return $this->normalizeNumber($value);
+		    default:
+			    return $value;
 		}
 	}
 
@@ -1126,30 +1126,30 @@ 
 			$lval = isset($left[$i]) ? $left[$i] : 0;
 			$rval = isset($right[$i]) ? $right[$i] : 0;
 			switch ($op) {
-			case '+':
-				$out[] = $lval + $rval;
-				break;
-			case '-':
-				$out[] = $lval - $rval;
-				break;
-			case '*':
-				$out[] = $lval * $rval;
-				break;
-			case '%':
-				$out[] = $lval % $rval;
-				break;
-			case '/':
-				if ($rval == 0) {
-					$this->throwError("color: Can't divide by zero");
-				}
-				$out[] = $lval / $rval;
-				break;
-			case "==":
-				return $this->op_eq($left, $right);
-			case "!=":
-				return $this->op_neq($left, $right);
-			default:
-				$this->throwError("color: unknown op $op");
+			    case '+':
+				    $out[] = $lval + $rval;
+				    break;
+			    case '-':
+				    $out[] = $lval - $rval;
+				    break;
+			    case '*':
+				    $out[] = $lval * $rval;
+				    break;
+			    case '%':
+				    $out[] = $lval % $rval;
+				    break;
+			    case '/':
+				    if ($rval == 0) {
+					    $this->throwError("color: Can't divide by zero");
+				    }
+				    $out[] = $lval / $rval;
+				    break;
+			    case "==":
+				    return $this->op_eq($left, $right);
+			    case "!=":
+				    return $this->op_neq($left, $right);
+			    default:
+				    $this->throwError("color: unknown op $op");
 			}
 		}
 
@@ -1223,82 +1223,82 @@ 
 
 		list($type) = $value;
 		switch ($type) {
-		case "keyword":
-			return $value[1];
-		case "color":
-			// [1] - red component (either number for a %)
-			// [2] - green component
-			// [3] - blue component
-			// [4] - optional alpha component
-			list(, $r, $g, $b) = $value;
-
-			$r = round((int)$r);
-			$g = round((int)$g);
-			$b = round((int)$b);
-
-			if (count($value) == 5 && $value[4] != 1) { // rgba
-				return 'rgba('.$r.', '.$g.', '.$b.', '.$value[4].')';
-			}
-
-			$h = sprintf("#%02x%02x%02x", $r, $g, $b);
-
-			// Converting hex color to short notation (e.g. #003399 to #039)
-			if ($h[1] === $h[2] && $h[3] === $h[4] && $h[5] === $h[6]) {
-				$h = '#' . $h[1] . $h[3] . $h[5];
-			}
-
-			return $h;
-		case "number":
-			return round($value[1], $this->numberPrecision) . $value[2];
-		case "string":
-			return $value[1] . $this->compileStringContent($value) . $value[1];
-		case "function":
-			$args = !empty($value[2]) ? $this->compileValue($value[2]) : "";
-			return "$value[1]($args)";
-		case "list":
-			$value = $this->extractInterpolation($value);
-			if ($value[0] != "list") return $this->compileValue($value);
-
-			list(, $delim, $items) = $value;
-
-			$filtered = array();
-			foreach ($items as $item) {
-				if ($item[0] == "null") continue;
-				$filtered[] = $this->compileValue($item);
-			}
-
-			return implode("$delim ", $filtered);
-		case "interpolated": # node created by extractInterpolation
-			list(, $interpolate, $left, $right) = $value;
-			list(,, $whiteLeft, $whiteRight) = $interpolate;
-
-			$left = count($left[2]) > 0 ?
-				$this->compileValue($left).$whiteLeft : "";
-
-			$right = count($right[2]) > 0 ?
-				$whiteRight.$this->compileValue($right) : "";
-
-			return $left.$this->compileValue($interpolate).$right;
-
-		case "interpolate": # raw parse node
-			list(, $exp) = $value;
-
-			// strip quotes if it's a string
-			$reduced = $this->reduce($exp);
-			switch ($reduced[0]) {
+		    case "keyword":
+			    return $value[1];
+		    case "color":
+			    // [1] - red component (either number for a %)
+			    // [2] - green component
+			    // [3] - blue component
+			    // [4] - optional alpha component
+			    list(, $r, $g, $b) = $value;
+
+			    $r = round((int)$r);
+			    $g = round((int)$g);
+			    $b = round((int)$b);
+
+			    if (count($value) == 5 && $value[4] != 1) { // rgba
+				    return 'rgba('.$r.', '.$g.', '.$b.', '.$value[4].')';
+			    }
+
+			    $h = sprintf("#%02x%02x%02x", $r, $g, $b);
+
+			    // Converting hex color to short notation (e.g. #003399 to #039)
+			    if ($h[1] === $h[2] && $h[3] === $h[4] && $h[5] === $h[6]) {
+				    $h = '#' . $h[1] . $h[3] . $h[5];
+			    }
+
+			    return $h;
+		    case "number":
+			    return round($value[1], $this->numberPrecision) . $value[2];
+		    case "string":
+			    return $value[1] . $this->compileStringContent($value) . $value[1];
+		    case "function":
+			    $args = !empty($value[2]) ? $this->compileValue($value[2]) : "";
+			    return "$value[1]($args)";
+		    case "list":
+			    $value = $this->extractInterpolation($value);
+			    if ($value[0] != "list") return $this->compileValue($value);
+
+			    list(, $delim, $items) = $value;
+
+			    $filtered = array();
+			    foreach ($items as $item) {
+				    if ($item[0] == "null") continue;
+				    $filtered[] = $this->compileValue($item);
+			    }
+
+			    return implode("$delim ", $filtered);
+		    case "interpolated": # node created by extractInterpolation
+			    list(, $interpolate, $left, $right) = $value;
+			    list(,, $whiteLeft, $whiteRight) = $interpolate;
+
+			    $left = count($left[2]) > 0 ?
+				    $this->compileValue($left).$whiteLeft : "";
+
+			    $right = count($right[2]) > 0 ?
+				    $whiteRight.$this->compileValue($right) : "";
+
+			    return $left.$this->compileValue($interpolate).$right;
+
+		    case "interpolate": # raw parse node
+			    list(, $exp) = $value;
+
+			    // strip quotes if it's a string
+			    $reduced = $this->reduce($exp);
+			    switch ($reduced[0]) {
 				case "string":
 					$reduced = array("keyword",
 						$this->compileStringContent($reduced));
 					break;
 				case "null":
 					$reduced = array("keyword", "");
-			}
+			    }
 
 			return $this->compileValue($reduced);
-		case "null":
-			return "null";
-		default:
-			$this->throwError("unknown value type: $type");
+		    case "null":
+			    return "null";
+		    default:
+			    $this->throwError("unknown value type: $type");
 		}
 	}
 
@@ -1741,16 +1741,16 @@ 
 
 	protected function coerceColor($value) {
 		switch ($value[0]) {
-		case "color": return $value;
-		case "keyword":
-			$name = $value[1];
-			if (isset(self::$cssColors[$name])) {
-				$rgba = explode(',', self::$cssColors[$name]);
-				return isset($rgba[3])
-					? array('color', (int) $rgba[0], (int) $rgba[1], (int) $rgba[2], (int) $rgba[3])
-					: array('color', (int) $rgba[0], (int) $rgba[1], (int) $rgba[2]);
-			}
-			return null;
+		    case "color": return $value;
+		    case "keyword":
+			    $name = $value[1];
+			    if (isset(self::$cssColors[$name])) {
+				    $rgba = explode(',', self::$cssColors[$name]);
+				    return isset($rgba[3])
+					    ? array('color', (int) $rgba[0], (int) $rgba[1], (int) $rgba[2], (int) $rgba[3])
+					    : array('color', (int) $rgba[0], (int) $rgba[1], (int) $rgba[2]);
+			    }
+			    return null;
 		}
 
 		return null;
@@ -1758,10 +1758,10 @@ 
 
 	protected function coerceString($value) {
 		switch ($value[0]) {
-		case "string":
-			return $value;
-		case "keyword":
-			return array("string", "", array($value[1]));
+		    case "string":
+			    return $value;
+		    case "keyword":
+			    return array("string", "", array($value[1]));
 		}
 		return null;
 	}
@@ -1974,16 +1974,16 @@ 
 		// 4, 5, 6 - hsl
 		// 7 - a
 		switch ($i) {
-		case 1:
-		case 2:
-		case 3:
-			$max = 255; break;
-		case 4:
-			$max = 360; break;
-		case 7:
-			$max = 1; break;
-		default:
-			$max = 100;
+		    case 1:
+		    case 2:
+		    case 3:
+			    $max = 255; break;
+		    case 4:
+			    $max = 360; break;
+		    case 7:
+			    $max = 1; break;
+		    default:
+			    $max = 100;
 		}
 
 		$scale = $scale / 100;
@@ -2324,12 +2324,12 @@ 
 	protected function listSeparatorForJoin($list1, $sep) {
 		if (!isset($sep)) return $list1[1];
 		switch ($this->compileValue($sep)) {
-		case "comma":
-			return ",";
-		case "space":
-			return "";
-		default:
-			return $list1[1];
+		    case "comma":
+			    return ",";
+		    case "space":
+			    return "";
+		    default:
+			    return $list1[1];
 		}
 	}
 
@@ -2376,18 +2376,18 @@ 
 	protected function lib_type_of($args) {
 		$value = $args[0];
 		switch ($value[0]) {
-		case "keyword":
-			if ($value == self::$true || $value == self::$false) {
-				return "bool";
-			}
-
-			if ($this->coerceColor($value)) {
-				return "color";
-			}
-
-			return "string";
-		default:
-			return $value[0];
+		    case "keyword":
+			    if ($value == self::$true || $value == self::$false) {
+				    return "bool";
+			    }
+
+			    if ($this->coerceColor($value)) {
+				    return "color";
+			    }
+
+			    return "string";
+		    default:
+			    return $value[0];
 		}
 	}
 

Braces +288 added lines, -112 removed lines

@@ -163,7 +163,10 @@ 
 	protected function matchExtendsSingle($single, &$outOrigin) {
 		$counts = array();
 		foreach ($single as $part) {
-			if (!is_string($part)) return false; // hmm
+			if (!is_string($part)) {
+			    return false;
+			}
+			// hmm
 
 			if (isset($this->extendsMap[$part])) {
 				foreach ($this->extendsMap[$part] as $idx) {
@@ -180,10 +183,14 @@ 
 			list($target, $origin) = $this->extends[$idx];
 
 			// check count
-			if ($count != count($target)) continue;
+			if ($count != count($target)) {
+			    continue;
+			}
 
 			// check if target is subset of single
-			if (array_diff(array_intersect($single, $target), $target)) continue;
+			if (array_diff(array_intersect($single, $target), $target)) {
+			    continue;
+			}
 
 			$rem = array_diff($single, $target);
 
@@ -229,7 +236,9 @@ 
 
 	protected function matchExtends($selector, &$out, $from = 0, $initial=true) {
 		foreach ($selector as $i => $part) {
-			if ($i < $from) continue;
+			if ($i < $from) {
+			    continue;
+			}
 
 			if ($this->matchExtendsSingle($part, $origin)) {
 				$before = array_slice($selector, 0, $i);
@@ -253,7 +262,9 @@ 
 						$after);
 
 
-					if ($result == $selector) continue;
+					if ($result == $selector) {
+					    continue;
+					}
 					$out[] = $result;
 
 					// recursively check for more matches
@@ -279,7 +290,9 @@ 
 			$selectors = array();
 			foreach ($block->selectors as $s) {
 				$selectors[] = $s;
-				if (!is_array($s)) continue;
+				if (!is_array($s)) {
+				    continue;
+				}
 				// check extends
 				if (!empty($this->extendsMap)) {
 					$this->matchExtends($s, $selectors);
@@ -439,7 +452,9 @@ 
 
 	protected function evalSelectorPart($piece) {
 		foreach ($piece as &$p) {
-			if (!is_array($p)) continue;
+			if (!is_array($p)) {
+			    continue;
+			}
 
 			switch ($p[0]) {
 			case "interpolate":
@@ -457,7 +472,10 @@ 
 	// compiles to string
 	// self(&) should have been replaced by now
 	protected function compileSelector($selector) {
-		if (!is_array($selector)) return $selector; // media and the like
+		if (!is_array($selector)) {
+		    return $selector;
+		}
+		// media and the like
 
 		return implode(" ", array_map(
 			array($this, "compileSelectorPart"), $selector));
@@ -465,7 +483,9 @@ 
 
 	protected function compileSelectorPart($piece) {
 		foreach ($piece as &$p) {
-			if (!is_array($p)) continue;
+			if (!is_array($p)) {
+			    continue;
+			}
 
 			switch ($p[0]) {
 			case "self":
@@ -482,7 +502,9 @@ 
 
 	protected function hasSelectorPlaceholder($selector)
 	{
-		if (!is_array($selector)) return false;
+		if (!is_array($selector)) {
+		    return false;
+		}
 
 		foreach ($selector as $parts) {
 			foreach ($parts as $part) {
@@ -498,7 +520,9 @@ 
 	protected function compileChildren($stms, $out) {
 		foreach ($stms as $stm) {
 			$ret = $this->compileChild($stm, $out);
-			if (isset($ret)) return $ret;
+			if (isset($ret)) {
+			    return $ret;
+			}
 		}
 	}
 
@@ -601,9 +625,13 @@ 
 		}
 		if ($rawPath[0] == "list") {
 			// handle a list of strings
-			if (count($rawPath[2]) == 0) return false;
+			if (count($rawPath[2]) == 0) {
+			    return false;
+			}
 			foreach ($rawPath[2] as $path) {
-				if ($path[0] != "string") return false;
+				if ($path[0] != "string") {
+				    return false;
+				}
 			}
 
 			foreach ($rawPath[2] as $path) {
@@ -723,7 +751,9 @@ 
 			list(,$while) = $child;
 			while ($this->isTruthy($this->reduce($while->cond, true))) {
 				$ret = $this->compileChildren($while->children, $out);
-				if ($ret) return $ret;
+				if ($ret) {
+				    return $ret;
+				}
 			}
 			break;
 		case "for":
@@ -745,7 +775,9 @@ 
 				$start += $d;
 
 				$ret = $this->compileChildren($for->children, $out);
-				if ($ret) return $ret;
+				if ($ret) {
+				    return $ret;
+				}
 			}
 
 			break;
@@ -826,9 +858,13 @@ 
 	protected function expToString($exp) {
 		list(, $op, $left, $right, $inParens, $whiteLeft, $whiteRight) = $exp;
 		$content = array($this->reduce($left));
-		if ($whiteLeft) $content[] = " ";
+		if ($whiteLeft) {
+		    $content[] = " ";
+		}
 		$content[] = $op;
-		if ($whiteRight) $content[] = " ";
+		if ($whiteRight) {
+		    $content[] = " ";
+		}
 		$content[] = $this->reduce($right);
 		return array("string", "", $content);
 	}
@@ -1109,14 +1145,22 @@ 
 	}
 
 	protected function op_and($left, $right, $shouldEval) {
-		if (!$shouldEval) return;
-		if ($left != self::$false) return $right;
+		if (!$shouldEval) {
+		    return;
+		}
+		if ($left != self::$false) {
+		    return $right;
+		}
 		return $left;
 	}
 
 	protected function op_or($left, $right, $shouldEval) {
-		if (!$shouldEval) return;
-		if ($left != self::$false) return $left;
+		if (!$shouldEval) {
+		    return;
+		}
+		if ($left != self::$false) {
+		    return $left;
+		}
 		return $right;
 	}
 
@@ -1153,8 +1197,11 @@ 
 			}
 		}
 
-		if (isset($left[4])) $out[4] = $left[4];
-		elseif (isset($right[4])) $out[4] = $right[4];
+		if (isset($left[4])) {
+		    $out[4] = $left[4];
+		} elseif (isset($right[4])) {
+		    $out[4] = $right[4];
+		}
 
 		return $this->fixColor($out);
 	}
@@ -1257,13 +1304,17 @@ 
 			return "$value[1]($args)";
 		case "list":
 			$value = $this->extractInterpolation($value);
-			if ($value[0] != "list") return $this->compileValue($value);
+			if ($value[0] != "list") {
+			    return $this->compileValue($value);
+			}
 
 			list(, $delim, $items) = $value;
 
 			$filtered = array();
 			foreach ($items as $item) {
-				if ($item[0] == "null") continue;
+				if ($item[0] == "null") {
+				    continue;
+				}
 				$filtered[] = $this->compileValue($item);
 			}
 
@@ -1521,7 +1572,9 @@ 
 	}
 
 	protected function setExisting($name, $value, $env = null) {
-		if (!isset($env)) $env = $this->getStoreEnv();
+		if (!isset($env)) {
+		    $env = $this->getStoreEnv();
+		}
 
 		if (isset($env->store[$name]) || !isset($env->parent)) {
 			$env->store[$name] = $value;
@@ -1538,8 +1591,12 @@ 
 	public function get($name, $defaultValue = null, $env = null) {
 		$name = $this->normalizeName($name);
 
-		if (!isset($env)) $env = $this->getStoreEnv();
-		if (!isset($defaultValue)) $defaultValue = self::$defaultValue;
+		if (!isset($env)) {
+		    $env = $this->getStoreEnv();
+		}
+		if (!isset($defaultValue)) {
+		    $defaultValue = self::$defaultValue;
+		}
 
 		if (isset($env->store[$name])) {
 			return $env->store[$name];
@@ -1705,7 +1762,9 @@ 
 			}
 		}
 
-		if (!isset($prototype)) return $posArgs;
+		if (!isset($prototype)) {
+		    return $posArgs;
+		}
 
 		$finalArgs = array();
 		foreach ($prototype as $i => $names) {
@@ -1767,19 +1826,23 @@ 
 	}
 
 	public function assertList($value) {
-		if ($value[0] != "list")
-			$this->throwError("expecting list");
+		if ($value[0] != "list") {
+					$this->throwError("expecting list");
+		}
 		return $value;
 	}
 
 	public function assertColor($value) {
-		if ($color = $this->coerceColor($value)) return $color;
+		if ($color = $this->coerceColor($value)) {
+		    return $color;
+		}
 		$this->throwError("expecting color");
 	}
 
 	public function assertNumber($value) {
-		if ($value[0] != "number")
-			$this->throwError("expecting number");
+		if ($value[0] != "number") {
+					$this->throwError("expecting number");
+		}
 		return $value[1];
 	}
 
@@ -1796,8 +1859,12 @@ 
 	// make sure a color's components don't go out of bounds
 	protected function fixColor($c) {
 		foreach (range(1, 3) as $i) {
-			if ($c[$i] < 0) $c[$i] = 0;
-			if ($c[$i] > 255) $c[$i] = 255;
+			if ($c[$i] < 0) {
+			    $c[$i] = 0;
+			}
+			if ($c[$i] > 255) {
+			    $c[$i] = 255;
+			}
 		}
 
 		return $c;
@@ -1814,36 +1881,42 @@ 
 		} else {
 			$d = $max - $min;
 
-			if ($l < 255)
-				$s = $d / $l;
-			else
-				$s = $d / (510 - $l);
+			if ($l < 255) {
+							$s = $d / $l;
+			} else {
+							$s = $d / (510 - $l);
+			}
 
-			if ($red == $max)
-				$h = 60 * ($green - $blue) / $d;
-			elseif ($green == $max)
-				$h = 60 * ($blue - $red) / $d + 120;
-			elseif ($blue == $max)
-				$h = 60 * ($red - $green) / $d + 240;
+			if ($red == $max) {
+							$h = 60 * ($green - $blue) / $d;
+			} elseif ($green == $max) {
+							$h = 60 * ($blue - $red) / $d + 120;
+			} elseif ($blue == $max) {
+							$h = 60 * ($red - $green) / $d + 240;
+			}
 		}
 
 		return array('hsl', fmod($h, 360), $s * 100, $l / 5.1);
 	}
 
 	public function hueToRGB($m1, $m2, $h) {
-		if ($h < 0)
-			$h += 1;
-		elseif ($h > 1)
-			$h -= 1;
+		if ($h < 0) {
+					$h += 1;
+		} elseif ($h > 1) {
+					$h -= 1;
+		}
 
-		if ($h * 6 < 1)
-			return $m1 + ($m2 - $m1) * $h * 6;
+		if ($h * 6 < 1) {
+					return $m1 + ($m2 - $m1) * $h * 6;
+		}
 
-		if ($h * 2 < 1)
-			return $m2;
+		if ($h * 2 < 1) {
+					return $m2;
+		}
 
-		if ($h * 3 < 2)
-			return $m1 + ($m2 - $m1) * (2/3 - $h) * 6;
+		if ($h * 3 < 2) {
+					return $m1 + ($m2 - $m1) * (2/3 - $h) * 6;
+		}
 
 		return $m1;
 	}
@@ -1874,7 +1947,9 @@ 
 	protected static $lib_if = array("condition", "if-true", "if-false");
 	protected function lib_if($args) {
 		list($cond,$t, $f) = $args;
-		if (!$this->isTruthy($cond)) return $f;
+		if (!$this->isTruthy($cond)) {
+		    return $f;
+		}
 		return $t;
 	}
 
@@ -1936,7 +2011,9 @@ 
 			}
 
 			$rgb = $this->toRGB($hsl[1], $hsl[2], $hsl[3]);
-			if (isset($color[4])) $rgb[4] = $color[4];
+			if (isset($color[4])) {
+			    $rgb[4] = $color[4];
+			}
 			$color = $rgb;
 		}
 
@@ -2036,7 +2113,9 @@ 
 	protected static $lib_opacity = array("color");
 	protected function lib_opacity($args) {
 		$value = $args[0];
-		if ($value[0] === 'number') return null;
+		if ($value[0] === 'number') {
+		    return null;
+		}
 		return $this->lib_alpha($args);
 	}
 
@@ -2115,7 +2194,9 @@ 
 		$hsl = $this->toHSL($color[1], $color[2], $color[3]);
 		$hsl[$idx] += $amount;
 		$out = $this->toRGB($hsl[1], $hsl[2], $hsl[3]);
-		if (isset($color[4])) $out[4] = $color[4];
+		if (isset($color[4])) {
+		    $out[4] = $color[4];
+		}
 		return $out;
 	}
 
@@ -2143,7 +2224,9 @@ 
 	protected static $lib_saturate = array("color", "amount");
 	protected function lib_saturate($args) {
 		$value = $args[0];
-		if ($value[0] === 'number') return null;
+		if ($value[0] === 'number') {
+		    return null;
+		}
 		$color = $this->assertColor($value);
 		$amount = 100*$this->coercePercent($args[1]);
 		return $this->adjustHsl($color, 2, $amount);
@@ -2159,7 +2242,9 @@ 
 	protected static $lib_grayscale = array("color");
 	protected function lib_grayscale($args) {
 		$value = $args[0];
-		if ($value[0] === 'number') return null;
+		if ($value[0] === 'number') {
+		    return null;
+		}
 		return $this->adjustHsl($this->assertColor($value), 2, -100);
 	}
 
@@ -2171,7 +2256,9 @@ 
 	protected static $lib_invert = array("color");
 	protected function lib_invert($args) {
 		$value = $args[0];
-		if ($value[0] === 'number') return null;
+		if ($value[0] === 'number') {
+		    return null;
+		}
 		$color = $this->assertColor($value);
 		$color[1] = 255 - $color[1];
 		$color[2] = 255 - $color[2];
@@ -2214,15 +2301,18 @@ 
 	protected static $lib_unquote = array("string");
 	protected function lib_unquote($args) {
 		$str = $args[0];
-		if ($str[0] == "string") $str[1] = "";
+		if ($str[0] == "string") {
+		    $str[1] = "";
+		}
 		return $str;
 	}
 
 	protected static $lib_quote = array("string");
 	protected function lib_quote($args) {
 		$value = $args[0];
-		if ($value[0] == "string" && !empty($value[1]))
-			return $value;
+		if ($value[0] == "string" && !empty($value[1])) {
+					return $value;
+		}
 		return array("string", '"', array($value));
 	}
 
@@ -2322,7 +2412,9 @@ 
 	}
 
 	protected function listSeparatorForJoin($list1, $sep) {
-		if (!isset($sep)) return $list1[1];
+		if (!isset($sep)) {
+		    return $list1[1];
+		}
 		switch ($this->compileValue($sep)) {
 		case "comma":
 			return ",";
@@ -2667,8 +2759,9 @@ 
 		$this->whitespace();
 		while (false !== $this->parseChunk());
 
-		if ($this->count != strlen($this->buffer))
-			$this->throwParseError();
+		if ($this->count != strlen($this->buffer)) {
+					$this->throwParseError();
+		}
 
 		if (!empty($this->env->parent)) {
 			$this->throwParseError("unclosed block");
@@ -2912,7 +3005,9 @@ 
 			{
 				$directive = $this->pushSpecialBlock("directive");
 				$directive->name = $dirName;
-				if (isset($dirValue)) $directive->value = $dirValue;
+				if (isset($dirValue)) {
+				    $directive->value = $dirValue;
+				}
 				return true;
 			}
 
@@ -3030,7 +3125,9 @@ 
 	}
 
 	protected function literal($what, $eatWhitespace = null) {
-		if (!isset($eatWhitespace)) $eatWhitespace = $this->eatWhiteDefault;
+		if (!isset($eatWhitespace)) {
+		    $eatWhitespace = $this->eatWhiteDefault;
+		}
 
 		// shortcut on single letter
 		if (!isset($what[1]) && isset($this->buffer[$this->count])) {
@@ -3081,7 +3178,9 @@ 
 	protected function append($statement, $pos=null) {
 		if ($pos !== null) {
 			$statement[-1] = $pos;
-			if (!$this->rootParser) $statement[-2] = $this;
+			if (!$this->rootParser) {
+			    $statement[-2] = $this;
+			}
 		}
 		$this->env->children[] = $statement;
 	}
@@ -3089,8 +3188,9 @@ 
 	// last child that was appended
 	protected function last() {
 		$i = count($this->env->children) - 1;
-		if (isset($this->env->children[$i]))
-			return $this->env->children[$i];
+		if (isset($this->env->children[$i])) {
+					return $this->env->children[$i];
+		}
 	}
 
 	// high level parsers (they return parts of ast)
@@ -3107,8 +3207,12 @@ 
 
 		if (($this->literal("only") && ($only = true) || $this->literal("not") && ($not = true) || true) && $this->mixedKeyword($mediaType)) {
 			$prop = array("mediaType");
-			if (isset($only)) $prop[] = array("keyword", "only");
-			if (isset($not)) $prop[] = array("keyword", "not");
+			if (isset($only)) {
+			    $prop[] = array("keyword", "only");
+			}
+			if (isset($not)) {
+			    $prop[] = array("keyword", "not");
+			}
 			$media = array("list", "", array());
 			foreach ((array)$mediaType as $type) {
 				if (is_array($type)) {
@@ -3123,7 +3227,9 @@ 
 
 		if (empty($parts) || $this->literal("and")) {
 			$this->genericList($expressions, "mediaExpression", "and", false);
-			if (is_array($expressions)) $parts = array_merge($parts, $expressions[2]);
+			if (is_array($expressions)) {
+			    $parts = array_merge($parts, $expressions[2]);
+			}
 		}
 
 		$out = $parts;
@@ -3139,7 +3245,9 @@ 
 			$this->literal(")"))
 		{
 			$out = array("mediaExp", $feature);
-			if ($value) $out[] = $value;
+			if ($value) {
+			    $out[] = $value;
+			}
 			return true;
 		}
 
@@ -3193,7 +3301,9 @@ 
 		while ($this->$parseItem($value)) {
 			$items[] = $value;
 			if ($delim) {
-				if (!$this->literal($delim)) break;
+				if (!$this->literal($delim)) {
+				    break;
+				}
 			}
 		}
 
@@ -3249,10 +3359,14 @@ 
 
 			// don't turn negative numbers into expressions
 			if ($op == "-" && $whiteBefore) {
-				if (!$whiteAfter) break;
+				if (!$whiteAfter) {
+				    break;
+				}
 			}
 
-			if (!$this->value($rhs)) break;
+			if (!$this->value($rhs)) {
+			    break;
+			}
 
 			// peek and see if rhs belongs to next operator
 			if ($this->peek($opstr, $next) && self::$precedence[$next[1]] > self::$precedence[$op]) {
@@ -3298,14 +3412,30 @@ 
 			$this->seek($s);
 		}
 
-		if ($this->parenValue($out)) return true;
-		if ($this->interpolation($out)) return true;
-		if ($this->variable($out)) return true;
-		if ($this->color($out)) return true;
-		if ($this->unit($out)) return true;
-		if ($this->string($out)) return true;
-		if ($this->func($out)) return true;
-		if ($this->progid($out)) return true;
+		if ($this->parenValue($out)) {
+		    return true;
+		}
+		if ($this->interpolation($out)) {
+		    return true;
+		}
+		if ($this->variable($out)) {
+		    return true;
+		}
+		if ($this->color($out)) {
+		    return true;
+		}
+		if ($this->unit($out)) {
+		    return true;
+		}
+		if ($this->string($out)) {
+		    return true;
+		}
+		if ($this->func($out)) {
+		    return true;
+		}
+		if ($this->progid($out)) {
+		    return true;
+		}
 
 		if ($this->keyword($keyword)) {
 			if ($keyword == "null") {
@@ -3412,7 +3542,9 @@ 
 
 			$args[] = $arg;
 
-			if (!$this->literal(",")) break;
+			if (!$this->literal(",")) {
+			    break;
+			}
 
 			$args[] = array("string", "", array(", "));
 		}
@@ -3454,7 +3586,9 @@ 
 			}
 
 			$args[] = $arg;
-			if (!$this->literal(",")) break;
+			if (!$this->literal(",")) {
+			    break;
+			}
 		}
 
 		if (!$this->literal(")")) {
@@ -3571,7 +3705,9 @@ 
 
 		$this->eatWhiteDefault = $oldWhite;
 
-		if (count($parts) == 0) return false;
+		if (count($parts) == 0) {
+		    return false;
+		}
 
 		if ($this->eatWhiteDefault) {
 			$this->whitespace();
@@ -3630,7 +3766,9 @@ 
 
 		$this->eatWhiteDefault = $oldWhite;
 
-		if (count($content) == 0) return false;
+		if (count($content) == 0) {
+		    return false;
+		}
 
 		// trim the end
 		if (is_string(end($content))) {
@@ -3660,7 +3798,9 @@ 
 
 			$out = array("interpolate", $value, $left, $right);
 			$this->eatWhiteDefault = $oldWhite;
-			if ($this->eatWhiteDefault) $this->whitespace();
+			if ($this->eatWhiteDefault) {
+			    $this->whitespace();
+			}
 			return true;
 		}
 
@@ -3693,7 +3833,9 @@ 
 		}
 
 		$this->eatWhiteDefault = $oldWhite;
-		if (count($parts) == 0) return false;
+		if (count($parts) == 0) {
+		    return false;
+		}
 
 		// match comment hack
 		if (preg_match(self::$whitePattern,
@@ -3717,7 +3859,9 @@ 
 		$selectors = array();
 		while ($this->selector($sel)) {
 			$selectors[] = $sel;
-			if (!$this->literal(",")) break;
+			if (!$this->literal(",")) {
+			    break;
+			}
 			while ($this->literal(",")); // ignore extra
 		}
 
@@ -3832,7 +3976,9 @@ 
 					$this->literal(")"))
 				{
 					$parts[] = "(";
-					if (!empty($str)) $parts[] = $str;
+					if (!empty($str)) {
+					    $parts[] = $str;
+					}
 					$parts[] = ")";
 				} else {
 					$this->seek($ss);
@@ -3898,7 +4044,9 @@ 
 
 		$this->eatWhiteDefault = $oldWhite;
 
-		if (count($parts) == 0) return false;
+		if (count($parts) == 0) {
+		    return false;
+		}
 
 		$out = $parts;
 		return true;
@@ -3952,8 +4100,13 @@ 
 		} else {
 			$validChars = $allowNewline ? "." : "[^\n]";
 		}
-		if (!$this->match('('.$validChars.'*?)'.$this->preg_quote($what), $m, !$until)) return false;
-		if ($until) $this->count -= strlen($what); // give back $what
+		if (!$this->match('('.$validChars.'*?)'.$this->preg_quote($what), $m, !$until)) {
+		    return false;
+		}
+		if ($until) {
+		    $this->count -= strlen($what);
+		}
+		// give back $what
 		$out = $m[1];
 		return true;
 	}
@@ -4024,12 +4177,16 @@ 
 
 	// try to match something on head of buffer
 	protected function match($regex, &$out, $eatWhitespace = null) {
-		if (!isset($eatWhitespace)) $eatWhitespace = $this->eatWhiteDefault;
+		if (!isset($eatWhitespace)) {
+		    $eatWhitespace = $this->eatWhiteDefault;
+		}
 
 		$r = '/'.$regex.'/Ais';
 		if (preg_match($r, $this->buffer, $out, null, $this->count)) {
 			$this->count += strlen($out[0]);
-			if ($eatWhitespace) $this->whitespace();
+			if ($eatWhitespace) {
+			    $this->whitespace();
+			}
 			return true;
 		}
 		return false;
@@ -4052,7 +4209,9 @@ 
 	}
 
 	protected function peek($regex, &$out, $from=null) {
-		if (!isset($from)) $from = $this->count;
+		if (!isset($from)) {
+		    $from = $this->count;
+		}
 
 		$r = '/'.$regex.'/Ais';
 		$result = preg_match($r, $this->buffer, $out, null, $from);
@@ -4061,8 +4220,11 @@ 
 	}
 
 	protected function seek($where = null) {
-		if ($where === null) return $this->count;
-		else $this->count = $where;
+		if ($where === null) {
+		    return $this->count;
+		} else {
+		    $this->count = $where;
+		}
 		return true;
 	}
 
@@ -4113,7 +4275,9 @@ 
 	}
 
 	protected function block($block) {
-		if (empty($block->lines) && empty($block->children)) return;
+		if (empty($block->lines) && empty($block->children)) {
+		    return;
+		}
 
 		$inner = $pre = $this->indentStr();
 
@@ -4139,7 +4303,9 @@ 
 
 		if (!empty($block->selectors)) {
 			$this->indentLevel--;
-			if (empty($block->children)) echo $this->break;
+			if (empty($block->children)) {
+			    echo $this->break;
+			}
 			echo $pre . $this->close . $this->break;
 		}
 	}
@@ -4215,7 +4381,9 @@ 
 		if (!empty($block->lines)) {
 			$glue = $this->break.$inner;
 			echo $inner . implode($glue, $block->lines);
-			if (!empty($block->children)) echo $this->break;
+			if (!empty($block->children)) {
+			    echo $this->break;
+			}
 		}
 
 		foreach ($block->children as $i => $child) {
@@ -4341,17 +4509,23 @@ 
 	 * @return boolean True if compile required.
 	 */
 	protected function needsCompile($in, $out) {
-		if (!is_file($out)) return true;
+		if (!is_file($out)) {
+		    return true;
+		}
 
 		$mtime = filemtime($out);
-		if (filemtime($in) > $mtime) return true;
+		if (filemtime($in) > $mtime) {
+		    return true;
+		}
 
 		// look for modified imports
 		$icache = $this->importsCacheName($out);
 		if (is_readable($icache)) {
 			$imports = unserialize(file_get_contents($icache));
 			foreach ($imports as $import) {
-				if (filemtime($import) > $mtime) return true;
+				if (filemtime($import) > $mtime) {
+				    return true;
+				}
 			}
 		}
 		return false;
@@ -4426,7 +4600,9 @@ 
 		}
 
 		$this->cacheDir = $cacheDir;
-		if (!is_dir($this->cacheDir)) mkdir($this->cacheDir, 0755, true);
+		if (!is_dir($this->cacheDir)) {
+		    mkdir($this->cacheDir, 0755, true);
+		}
 
 		if (!isset($scss)) {
 			$scss = new scssc();

plugins/subaccounts-for-woocommerce/admin/admin.php

Braces +6 added lines, -4 removed lines

@@ -696,8 +696,9 @@ 
 

 function sfwc_appearance_tab_content() {

 	global $sfwc_active_tab;

-	if ( '' || 'appearance' != $sfwc_active_tab )

-		return;

+	if ( '' || 'appearance' != $sfwc_active_tab ) {
+			return;
+	}
 	?>

 

 	<div id="sub_accounts_settings_appearance_tab">

@@ -859,8 +860,9 @@ 
 

 	global $sfwc_active_tab;

 

-	if ( 'options' != $sfwc_active_tab )

-		return;

+	if ( 'options' != $sfwc_active_tab ) {
+			return;
+	}
 	?>

 

 	<div id="sub_accounts_settings_options_tab">

plugins/subaccounts-for-woocommerce/freemius/start.php

Braces +3 added lines, -1 removed lines

@@ -432,9 +432,11 @@
                 }
             }
 
-			if ( empty( $sdk_symlink ) ) // Has symlinks, therefore, we need to configure WP_FS__DIR based on the symlink.
+			if ( empty( $sdk_symlink ) ) {
+			    // Has symlinks, therefore, we need to configure WP_FS__DIR based on the symlink.
 			{
 				$partial_path_right = basename( $file_path );
+			}
 				$partial_path_left  = dirname( $file_path );
 				$realpath           = realpath( $plugins_or_theme_dir_path . $partial_path_right );
 

plugins/subaccounts-for-woocommerce/freemius/includes/class-fs-plugin-updater.php

Braces +6 added lines, -4 removed lines

@@ -953,12 +953,14 @@
 

             $dir = "/{$module_type}";

 

-            if ( ! is_dir( WP_LANG_DIR . $dir ) )

-                return array();

+            if ( ! is_dir( WP_LANG_DIR . $dir ) ) {
+                            return array();
+            }
 

             $files = scandir( WP_LANG_DIR . $dir );

-            if ( ! $files )

-                return array();

+            if ( ! $files ) {
+                            return array();
+            }
 

             $language_data = array();

 

plugins/subaccounts-for-woocommerce/freemius/includes/fs-essential-functions.php

Braces +4 added lines, -2 removed lines

@@ -74,9 +74,11 @@
 				return false;

 			}

 

-			if ( ! $location ) // allows the wp_redirect filter to cancel a redirect

+			if ( ! $location ) {
+			    // allows the wp_redirect filter to cancel a redirect

 			{

-				return false;

+				return false;
+			}
 			}

 

 			$location = fs_sanitize_redirect( $location );

plugins/subaccounts-for-woocommerce/freemius/includes/fs-plugin-info-dialog.php

Braces +5 added lines, -2 removed lines

@@ -1272,7 +1272,8 @@ 
                                                 <?php if ( $has_annual ) : ?>

                                                 // Select annual by default.

                                                 $plan.find('.nav-tab[data-billing-cycle=annual]').click();

-                                                <?php else : ?>

+                                                <?php else {
+    : ?>

                                                 // Select first tab.

                                                 $plan.find('.nav-tab:first').click();

                                                 <?php endif ?>

@@ -1315,7 +1316,9 @@ 
                     <ul>

                         <?php if ( ! empty( $api->version ) ) { ?>

                             <li>

-                                <strong><?php fs_esc_html_echo_x_inline( 'Version', 'product version', 'version', $api->slug ); ?>

+                                <strong><?php fs_esc_html_echo_x_inline( 'Version', 'product version', 'version', $api->slug );
+}
+?>

                                     :</strong> <?php echo $api->version; ?></li>

                             <?php

                         }

plugins/subaccounts-for-woocommerce/freemius/templates/account.php

Braces +9 added lines, -4 removed lines

@@ -511,7 +511,8 @@ 
                                                             <input type="checkbox" class="fs-toggle-beta-mode" <?php checked( true, $p['value'] ) ?>/><span><?php

                                                                 fs_esc_html_echo_inline( 'Join the Beta program', 'join-beta', $slug )

                                                         ?></span></label>

-													<?php else : ?>

+													<?php else {
+    : ?>

 														<code><?php echo htmlspecialchars( $p['value'] ) ?></code>

 													<?php endif ?>

 													<?php if ( 'email' === $p['id'] && ! $user->is_verified() ) : ?>

@@ -549,9 +550,11 @@ 
                                                                     'is_localhost' => $site->is_localhost(),

                                                                     'install_id'   => $site->id,

                                                                     'class'        => 'button-primary',

-                                                                );

+                                                                );
+}
                                                                 fs_require_template( 'account/partials/activate-license-button.php', $view_params ); ?>

-															<?php else : ?>

+															<?php else {
+    : ?>

 																<form action="<?php echo $fs->_get_admin_page_url( 'account' ) ?>"

 																      method="POST" class="button-group">

 																	<?php if ( $show_upgrade && $is_premium ) : ?>

@@ -567,7 +570,9 @@ 
 																	   class="button<?php

 																		   echo $show_upgrade ?

 																			   ' button-primary fs-upgrade' :

-																			   ' fs-change-plan'; ?> button-upgrade"><i

+																			   ' fs-change-plan';
+}
+?> button-upgrade"><i

 																			class="dashicons dashicons-cart"></i> <?php echo esc_html( $show_upgrade ? $upgrade_text : $change_plan_text ) ?></a>

 																	<?php endif ?>

 																</form>