dcngmbh / moox_core

Contrib/less.php/Visitor.php

Spacing +12 added lines, -12 removed lines

@@ -6,43 +6,43 @@
  * @package Less
  * @subpackage visitor
  */
-class Less_Visitor{
+class Less_Visitor {
 
 	protected $methods = array();
 	protected $_visitFnCache = array();
 
-	public function __construct(){
+	public function __construct() {
 		$this->_visitFnCache = get_class_methods(get_class($this));
 		$this->_visitFnCache = array_flip($this->_visitFnCache);
 	}
 
-	public function visitObj( $node ){
+	public function visitObj($node) {
 
 		$funcName = 'visit'.$node->type;
-		if( isset($this->_visitFnCache[$funcName]) ){
+		if (isset($this->_visitFnCache[$funcName])) {
 
 			$visitDeeper = true;
-			$this->$funcName( $node, $visitDeeper );
+			$this->$funcName($node, $visitDeeper);
 
-			if( $visitDeeper ){
+			if ($visitDeeper) {
 				$node->accept($this);
 			}
 
-			$funcName = $funcName . "Out";
-			if( isset($this->_visitFnCache[$funcName]) ){
-				$this->$funcName( $node );
+			$funcName = $funcName."Out";
+			if (isset($this->_visitFnCache[$funcName])) {
+				$this->$funcName($node);
 			}
 
-		}else{
+		}else {
 			$node->accept($this);
 		}
 
 		return $node;
 	}
 
-	public function visitArray( $nodes ){
+	public function visitArray($nodes) {
 
-		array_map( array($this,'visitObj'), $nodes);
+		array_map(array($this, 'visitObj'), $nodes);
 		return $nodes;
 	}
 }

Braces +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 				$this->$funcName( $node );
 			}
 
-		}else{
+		} else{
 			$node->accept($this);
 		}
 

Contrib/less.php/Visitor/extendFinder.php

Indentation +10 added lines, -10 removed lines

@@ -21,21 +21,21 @@ 
 	/**
 	 * @param Less_Tree_Ruleset $root
 	 */
-    public function run($root){
+	public function run($root){
 		$root = $this->visitObj($root);
 		$root->allExtends =& $this->allExtendsStack[0];
 		return $root;
 	}
 
-    public function visitRule($ruleNode, &$visitDeeper ){
+	public function visitRule($ruleNode, &$visitDeeper ){
 		$visitDeeper = false;
 	}
 
-    public function visitMixinDefinition( $mixinDefinitionNode, &$visitDeeper ){
+	public function visitMixinDefinition( $mixinDefinitionNode, &$visitDeeper ){
 		$visitDeeper = false;
 	}
 
-    public function visitRuleset($rulesetNode){
+	public function visitRuleset($rulesetNode){
 
 		if( $rulesetNode->root ){
 			return;
@@ -71,7 +71,7 @@ 
 		$this->contexts[] = $rulesetNode->selectors;
 	}
 
-    public function allExtendsStackPush($rulesetNode, $selectorPath, $extend, &$j){
+	public function allExtendsStackPush($rulesetNode, $selectorPath, $extend, &$j){
 		$this->foundExtends = true;
 		$extend = clone $extend;
 		$extend->findSelfSelectors( $selectorPath );
@@ -86,27 +86,27 @@ 
 	}
 
 
-    public function visitRulesetOut( $rulesetNode ){
+	public function visitRulesetOut( $rulesetNode ){
 		if( !is_object($rulesetNode) || !$rulesetNode->root ){
 			array_pop($this->contexts);
 		}
 	}
 
-    public function visitMedia( $mediaNode ){
+	public function visitMedia( $mediaNode ){
 		$mediaNode->allExtends = array();
 		$this->allExtendsStack[] =& $mediaNode->allExtends;
 	}
 
-    public function visitMediaOut(){
+	public function visitMediaOut(){
 		array_pop($this->allExtendsStack);
 	}
 
-    public function visitDirective( $directiveNode ){
+	public function visitDirective( $directiveNode ){
 		$directiveNode->allExtends = array();
 		$this->allExtendsStack[] =& $directiveNode->allExtends;
 	}
 
-    public function visitDirectiveOut(){
+	public function visitDirectiveOut(){
 		array_pop($this->allExtendsStack);
 	}
 }

Spacing +25 added lines, -25 removed lines

@@ -6,13 +6,13 @@ 
  * @package Less
  * @subpackage visitor
  */
-class Less_Visitor_extendFinder extends Less_Visitor{
+class Less_Visitor_extendFinder extends Less_Visitor {
 
 	public $contexts = array();
 	public $allExtendsStack;
 	public $foundExtends;
 
-	public function __construct(){
+	public function __construct() {
 		$this->contexts = array();
 		$this->allExtendsStack = array(array());
 		parent::__construct();
@@ -21,32 +21,32 @@ 
 	/**
 	 * @param Less_Tree_Ruleset $root
 	 */
-    public function run($root){
+    public function run($root) {
 		$root = $this->visitObj($root);
-		$root->allExtends =& $this->allExtendsStack[0];
+		$root->allExtends = & $this->allExtendsStack[0];
 		return $root;
 	}
 
-    public function visitRule($ruleNode, &$visitDeeper ){
+    public function visitRule($ruleNode, &$visitDeeper) {
 		$visitDeeper = false;
 	}
 
-    public function visitMixinDefinition( $mixinDefinitionNode, &$visitDeeper ){
+    public function visitMixinDefinition($mixinDefinitionNode, &$visitDeeper) {
 		$visitDeeper = false;
 	}
 
-    public function visitRuleset($rulesetNode){
+    public function visitRuleset($rulesetNode) {
 
-		if( $rulesetNode->root ){
+		if ($rulesetNode->root) {
 			return;
 		}
 
 		$allSelectorsExtendList = array();
 
 		// get &:extend(.a); rules which apply to all selectors in this ruleset
-		if( $rulesetNode->rules ){
-			foreach($rulesetNode->rules as $rule){
-				if( $rule instanceof Less_Tree_Extend ){
+		if ($rulesetNode->rules) {
+			foreach ($rulesetNode->rules as $rule) {
+				if ($rule instanceof Less_Tree_Extend) {
 					$allSelectorsExtendList[] = $rule;
 					$rulesetNode->extendOnEveryPath = true;
 				}
@@ -56,14 +56,14 @@ 
 
 		// now find every selector and apply the extends that apply to all extends
 		// and the ones which apply to an individual extend
-		foreach($rulesetNode->paths as $selectorPath){
+		foreach ($rulesetNode->paths as $selectorPath) {
 			$selector = end($selectorPath); //$selectorPath[ count($selectorPath)-1];
 
 			$j = 0;
-			foreach($selector->extendList as $extend){
+			foreach ($selector->extendList as $extend) {
 				$this->allExtendsStackPush($rulesetNode, $selectorPath, $extend, $j);
 			}
-			foreach($allSelectorsExtendList as $extend){
+			foreach ($allSelectorsExtendList as $extend) {
 				$this->allExtendsStackPush($rulesetNode, $selectorPath, $extend, $j);
 			}
 		}
@@ -71,12 +71,12 @@ 
 		$this->contexts[] = $rulesetNode->selectors;
 	}
 
-    public function allExtendsStackPush($rulesetNode, $selectorPath, $extend, &$j){
+    public function allExtendsStackPush($rulesetNode, $selectorPath, $extend, &$j) {
 		$this->foundExtends = true;
 		$extend = clone $extend;
-		$extend->findSelfSelectors( $selectorPath );
+		$extend->findSelfSelectors($selectorPath);
 		$extend->ruleset = $rulesetNode;
-		if( $j === 0 ){
+		if ($j===0) {
 			$extend->firstExtendOnThisSelectorPath = true;
 		}
 
@@ -86,27 +86,27 @@ 
 	}
 
 
-    public function visitRulesetOut( $rulesetNode ){
-		if( !is_object($rulesetNode) || !$rulesetNode->root ){
+    public function visitRulesetOut($rulesetNode) {
+		if (!is_object($rulesetNode) || !$rulesetNode->root) {
 			array_pop($this->contexts);
 		}
 	}
 
-    public function visitMedia( $mediaNode ){
+    public function visitMedia($mediaNode) {
 		$mediaNode->allExtends = array();
-		$this->allExtendsStack[] =& $mediaNode->allExtends;
+		$this->allExtendsStack[] = & $mediaNode->allExtends;
 	}
 
-    public function visitMediaOut(){
+    public function visitMediaOut() {
 		array_pop($this->allExtendsStack);
 	}
 
-    public function visitDirective( $directiveNode ){
+    public function visitDirective($directiveNode) {
 		$directiveNode->allExtends = array();
-		$this->allExtendsStack[] =& $directiveNode->allExtends;
+		$this->allExtendsStack[] = & $directiveNode->allExtends;
 	}
 
-    public function visitDirectiveOut(){
+    public function visitDirectiveOut() {
 		array_pop($this->allExtendsStack);
 	}
 }

Contrib/less.php/Visitor/joinSelector.php

Indentation +5 added lines, -5 removed lines

@@ -17,15 +17,15 @@ 
 		return $this->visitObj($root);
 	}
 
-    public function visitRule( $ruleNode, &$visitDeeper ){
+	public function visitRule( $ruleNode, &$visitDeeper ){
 		$visitDeeper = false;
 	}
 
-    public function visitMixinDefinition( $mixinDefinitionNode, &$visitDeeper ){
+	public function visitMixinDefinition( $mixinDefinitionNode, &$visitDeeper ){
 		$visitDeeper = false;
 	}
 
-    public function visitRuleset( $rulesetNode ){
+	public function visitRuleset( $rulesetNode ){
 
 		$paths = array();
 
@@ -54,11 +54,11 @@ 
 		$this->contexts[] = $paths; //different from less.js. Placed after joinSelectors() so that $this->contexts will get correct $paths
 	}
 
-    public function visitRulesetOut(){
+	public function visitRulesetOut(){
 		array_pop($this->contexts);
 	}
 
-    public function visitMedia($mediaNode) {
+	public function visitMedia($mediaNode) {
 		$context = end($this->contexts); //$context = $this->contexts[ count($this->contexts) - 1];
 
 		if( !count($context) || (is_object($context[0]) && $context[0]->multiMedia) ){

Spacing +15 added lines, -15 removed lines

@@ -6,46 +6,46 @@ 
  * @package Less
  * @subpackage visitor
  */
-class Less_Visitor_joinSelector extends Less_Visitor{
+class Less_Visitor_joinSelector extends Less_Visitor {
 
-	public $contexts = array( array() );
+	public $contexts = array(array());
 
 	/**
 	 * @param Less_Tree_Ruleset $root
 	 */
-	public function run( $root ){
+	public function run($root) {
 		return $this->visitObj($root);
 	}
 
-    public function visitRule( $ruleNode, &$visitDeeper ){
+    public function visitRule($ruleNode, &$visitDeeper) {
 		$visitDeeper = false;
 	}
 
-    public function visitMixinDefinition( $mixinDefinitionNode, &$visitDeeper ){
+    public function visitMixinDefinition($mixinDefinitionNode, &$visitDeeper) {
 		$visitDeeper = false;
 	}
 
-    public function visitRuleset( $rulesetNode ){
+    public function visitRuleset($rulesetNode) {
 
 		$paths = array();
 
-		if( !$rulesetNode->root ){
+		if (!$rulesetNode->root) {
 			$selectors = array();
 
-			if( $rulesetNode->selectors && $rulesetNode->selectors ){
-				foreach($rulesetNode->selectors as $selector){
-					if( $selector->getIsOutput() ){
+			if ($rulesetNode->selectors && $rulesetNode->selectors) {
+				foreach ($rulesetNode->selectors as $selector) {
+					if ($selector->getIsOutput()) {
 						$selectors[] = $selector;
 					}
 				}
 			}
 
-			if( !$selectors ){
+			if (!$selectors) {
 				$rulesetNode->selectors = null;
 				$rulesetNode->rules = null;
-			}else{
+			}else {
 				$context = end($this->contexts); //$context = $this->contexts[ count($this->contexts) - 1];
-				$paths = $rulesetNode->joinSelectors( $context, $selectors);
+				$paths = $rulesetNode->joinSelectors($context, $selectors);
 			}
 
 			$rulesetNode->paths = $paths;
@@ -54,14 +54,14 @@ 
 		$this->contexts[] = $paths; //different from less.js. Placed after joinSelectors() so that $this->contexts will get correct $paths
 	}
 
-    public function visitRulesetOut(){
+    public function visitRulesetOut() {
 		array_pop($this->contexts);
 	}
 
     public function visitMedia($mediaNode) {
 		$context = end($this->contexts); //$context = $this->contexts[ count($this->contexts) - 1];
 
-		if( !count($context) || (is_object($context[0]) && $context[0]->multiMedia) ){
+		if (!count($context) || (is_object($context[0]) && $context[0]->multiMedia)) {
 			$mediaNode->rules[0]->root = true;
 		}
 	}

Braces +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
 			if( !$selectors ){
 				$rulesetNode->selectors = null;
 				$rulesetNode->rules = null;
-			}else{
+			} else{
 				$context = end($this->contexts); //$context = $this->contexts[ count($this->contexts) - 1];
 				$paths = $rulesetNode->joinSelectors( $context, $selectors);
 			}

Contrib/less.php/Visitor/processExtends.php

Spacing +103 added lines, -103 removed lines

@@ -6,29 +6,29 @@ 
  * @package Less
  * @subpackage visitor
  */
-class Less_Visitor_processExtends extends Less_Visitor{
+class Less_Visitor_processExtends extends Less_Visitor {
 
 	public $allExtendsStack;
 
 	/**
 	 * @param Less_Tree_Ruleset $root
 	 */
-	public function run( $root ){
+	public function run($root) {
 		$extendFinder = new Less_Visitor_extendFinder();
-		$extendFinder->run( $root );
-		if( !$extendFinder->foundExtends){
+		$extendFinder->run($root);
+		if (!$extendFinder->foundExtends) {
 			return $root;
 		}
 
-		$root->allExtends = $this->doExtendChaining( $root->allExtends, $root->allExtends);
+		$root->allExtends = $this->doExtendChaining($root->allExtends, $root->allExtends);
 
 		$this->allExtendsStack = array();
 		$this->allExtendsStack[] = &$root->allExtends;
 
-		return $this->visitObj( $root );
+		return $this->visitObj($root);
 	}
 
-	private function doExtendChaining( $extendsList, $extendsListTarget, $iterationCount = 0){
+	private function doExtendChaining($extendsList, $extendsListTarget, $iterationCount = 0) {
 		//
 		// chaining is different from normal extension.. if we extend an extend then we are not just copying, altering and pasting
 		// the selector we would do normally, but we are also adding an extend with the same target selector
@@ -47,33 +47,33 @@ 
 		// and the second is the target.
 		// the seperation into two lists allows us to process a subset of chains with a bigger set, as is the
 		// case when processing media queries
-		for( $extendIndex = 0, $extendsList_len = count($extendsList); $extendIndex < $extendsList_len; $extendIndex++ ){
-			for( $targetExtendIndex = 0; $targetExtendIndex < count($extendsListTarget); $targetExtendIndex++ ){
+		for ($extendIndex = 0, $extendsList_len = count($extendsList); $extendIndex<$extendsList_len; $extendIndex++) {
+			for ($targetExtendIndex = 0; $targetExtendIndex<count($extendsListTarget); $targetExtendIndex++) {
 
 				$extend = $extendsList[$extendIndex];
 				$targetExtend = $extendsListTarget[$targetExtendIndex];
 
 				// look for circular references
-				if( in_array($targetExtend->object_id, $extend->parent_ids,true) ){
+				if (in_array($targetExtend->object_id, $extend->parent_ids, true)) {
 					continue;
 				}
 
 				// find a match in the target extends self selector (the bit before :extend)
-				$selectorPath = array( $targetExtend->selfSelectors[0] );
-				$matches = $this->findMatch( $extend, $selectorPath);
+				$selectorPath = array($targetExtend->selfSelectors[0]);
+				$matches = $this->findMatch($extend, $selectorPath);
 
 
-				if( $matches ){
+				if ($matches) {
 
 					// we found a match, so for each self selector..
-					foreach($extend->selfSelectors as $selfSelector ){
+					foreach ($extend->selfSelectors as $selfSelector) {
 
 
 						// process the extend as usual
-						$newSelector = $this->extendSelector( $matches, $selectorPath, $selfSelector);
+						$newSelector = $this->extendSelector($matches, $selectorPath, $selfSelector);
 
 						// but now we create a new extend from it
-						$newExtend = new Less_Tree_Extend( $targetExtend->selector, $targetExtend->option, 0);
+						$newExtend = new Less_Tree_Extend($targetExtend->selector, $targetExtend->option, 0);
 						$newExtend->selfSelectors = $newSelector;
 
 						// add the extend onto the list of extends for that selector
@@ -85,12 +85,12 @@ 
 						$newExtend->ruleset = $targetExtend->ruleset;
 
 						//remember its parents for circular references
-						$newExtend->parent_ids = array_merge($newExtend->parent_ids,$targetExtend->parent_ids,$extend->parent_ids);
+						$newExtend->parent_ids = array_merge($newExtend->parent_ids, $targetExtend->parent_ids, $extend->parent_ids);
 
 						// only process the selector once.. if we have :extend(.a,.b) then multiple
 						// extends will look at the same selector path, so when extending
 						// we know that any others will be duplicates in terms of what is added to the css
-						if( $targetExtend->firstExtendOnThisSelectorPath ){
+						if ($targetExtend->firstExtendOnThisSelectorPath) {
 							$newExtend->firstExtendOnThisSelectorPath = true;
 							$targetExtend->ruleset->paths[] = $newSelector;
 						}
@@ -99,79 +99,79 @@ 
 			}
 		}
 
-		if( $extendsToAdd ){
+		if ($extendsToAdd) {
 			// try to detect circular references to stop a stack overflow.
 			// may no longer be needed.			$this->extendChainCount++;
-			if( $iterationCount > 100) {
+			if ($iterationCount>100) {
 
-				try{
+				try {
 					$selectorOne = $extendsToAdd[0]->selfSelectors[0]->toCSS();
 					$selectorTwo = $extendsToAdd[0]->selector->toCSS();
-				}catch(Exception $e){
+				} catch (Exception $e) {
 					$selectorOne = "{unable to calculate}";
 					$selectorTwo = "{unable to calculate}";
 				}
 
-				throw new Less_Exception_Parser("extend circular reference detected. One of the circular extends is currently:"+$selectorOne+":extend(" + $selectorTwo+")");
+				throw new Less_Exception_Parser("extend circular reference detected. One of the circular extends is currently:"+$selectorOne+":extend(" +$selectorTwo+")");
 			}
 
 			// now process the new extends on the existing rules so that we can handle a extending b extending c ectending d extending e...
-			$extendsToAdd = $this->doExtendChaining( $extendsToAdd, $extendsListTarget, $iterationCount+1);
+			$extendsToAdd = $this->doExtendChaining($extendsToAdd, $extendsListTarget, $iterationCount+1);
 		}
 
 		return array_merge($extendsList, $extendsToAdd);
 	}
 
 
-	protected function visitRule( $ruleNode, &$visitDeeper ){
+	protected function visitRule($ruleNode, &$visitDeeper) {
 		$visitDeeper = false;
 	}
 
-	protected function visitMixinDefinition( $mixinDefinitionNode, &$visitDeeper ){
+	protected function visitMixinDefinition($mixinDefinitionNode, &$visitDeeper) {
 		$visitDeeper = false;
 	}
 
-	protected function visitSelector( $selectorNode, &$visitDeeper ){
+	protected function visitSelector($selectorNode, &$visitDeeper) {
 		$visitDeeper = false;
 	}
 
-	protected function visitRuleset($rulesetNode){
+	protected function visitRuleset($rulesetNode) {
 
 
-		if( $rulesetNode->root ){
+		if ($rulesetNode->root) {
 			return;
 		}
 
-		$allExtends	= end($this->allExtendsStack);
+		$allExtends = end($this->allExtendsStack);
 		$paths_len = count($rulesetNode->paths);
 
 		// look at each selector path in the ruleset, find any extend matches and then copy, find and replace
-		foreach($allExtends as $allExtend){
-			for($pathIndex = 0; $pathIndex < $paths_len; $pathIndex++ ){
+		foreach ($allExtends as $allExtend) {
+			for ($pathIndex = 0; $pathIndex<$paths_len; $pathIndex++) {
 
 				// extending extends happens initially, before the main pass
-				if( isset($rulesetNode->extendOnEveryPath) && $rulesetNode->extendOnEveryPath ){
+				if (isset($rulesetNode->extendOnEveryPath) && $rulesetNode->extendOnEveryPath) {
 					continue;
 				}
 
 				$selectorPath = $rulesetNode->paths[$pathIndex];
 
-				if( end($selectorPath)->extendList ){
+				if (end($selectorPath)->extendList) {
 					continue;
 				}
 
-				$this->ExtendMatch( $rulesetNode, $allExtend, $selectorPath);
+				$this->ExtendMatch($rulesetNode, $allExtend, $selectorPath);
 
 			}
 		}
 	}
 
 
-	private function ExtendMatch( $rulesetNode, $extend, $selectorPath ){
+	private function ExtendMatch($rulesetNode, $extend, $selectorPath) {
 		$matches = $this->findMatch($extend, $selectorPath);
 
-		if( $matches ){
-			foreach($extend->selfSelectors as $selfSelector ){
+		if ($matches) {
+			foreach ($extend->selfSelectors as $selfSelector) {
 				$rulesetNode->paths[] = $this->extendSelector($matches, $selectorPath, $selfSelector);
 			}
 		}
@@ -179,10 +179,10 @@ 
 
 
 
-	private function findMatch($extend, $haystackSelectorPath ){
+	private function findMatch($extend, $haystackSelectorPath) {
 
 
-		if( !$this->HasMatches($extend, $haystackSelectorPath) ){
+		if (!$this->HasMatches($extend, $haystackSelectorPath)) {
 			return false;
 		}
 
@@ -201,41 +201,41 @@ 
 
 		// loop through the haystack elements
 		$haystack_path_len = count($haystackSelectorPath);
-		for($haystackSelectorIndex = 0; $haystackSelectorIndex < $haystack_path_len; $haystackSelectorIndex++ ){
+		for ($haystackSelectorIndex = 0; $haystackSelectorIndex<$haystack_path_len; $haystackSelectorIndex++) {
 			$hackstackSelector = $haystackSelectorPath[$haystackSelectorIndex];
 
 			$haystack_elements_len = count($hackstackSelector->elements);
-			for($hackstackElementIndex = 0; $hackstackElementIndex < $haystack_elements_len; $hackstackElementIndex++ ){
+			for ($hackstackElementIndex = 0; $hackstackElementIndex<$haystack_elements_len; $hackstackElementIndex++) {
 
 				$haystackElement = $hackstackSelector->elements[$hackstackElementIndex];
 
 				// if we allow elements before our match we can add a potential match every time. otherwise only at the first element.
-				if( $extend->allowBefore || ($haystackSelectorIndex === 0 && $hackstackElementIndex === 0) ){
+				if ($extend->allowBefore || ($haystackSelectorIndex===0 && $hackstackElementIndex===0)) {
 					$potentialMatches[] = array('pathIndex'=> $haystackSelectorIndex, 'index'=> $hackstackElementIndex, 'matched'=> 0, 'initialCombinator'=> $haystackElement->combinator);
 					$potentialMatches_len++;
 				}
 
-				for($i = 0; $i < $potentialMatches_len; $i++ ){
+				for ($i = 0; $i<$potentialMatches_len; $i++) {
 
 					$potentialMatch = &$potentialMatches[$i];
-					$potentialMatch = $this->PotentialMatch( $potentialMatch, $needleElements, $haystackElement, $hackstackElementIndex );
+					$potentialMatch = $this->PotentialMatch($potentialMatch, $needleElements, $haystackElement, $hackstackElementIndex);
 
 
 					// if we are still valid and have finished, test whether we have elements after and whether these are allowed
-					if( $potentialMatch && $potentialMatch['matched'] === $extend->selector->elements_len ){
+					if ($potentialMatch && $potentialMatch['matched']===$extend->selector->elements_len) {
 						$potentialMatch['finished'] = true;
 
-						if( !$extend->allowAfter && ($hackstackElementIndex+1 < $haystack_elements_len || $haystackSelectorIndex+1 < $haystack_path_len) ){
+						if (!$extend->allowAfter && ($hackstackElementIndex+1<$haystack_elements_len || $haystackSelectorIndex+1<$haystack_path_len)) {
 							$potentialMatch = null;
 						}
 					}
 
 					// if null we remove, if not, we are still valid, so either push as a valid match or continue
-					if( $potentialMatch ){
-						if( $potentialMatch['finished'] ){
+					if ($potentialMatch) {
+						if ($potentialMatch['finished']) {
 							$potentialMatch['length'] = $extend->selector->elements_len;
 							$potentialMatch['endPathIndex'] = $haystackSelectorIndex;
-							$potentialMatch['endPathElementIndex'] = $hackstackElementIndex + 1; // index after end of match
+							$potentialMatch['endPathElementIndex'] = $hackstackElementIndex+1; // index after end of match
 							$potentialMatches = array(); // we don't allow matches to overlap, so start matching again
 							$potentialMatches_len = 0;
 							$matches[] = $potentialMatch;
@@ -256,20 +256,20 @@ 
 
 	// Before going through all the nested loops, lets check to see if a match is possible
 	// Reduces Bootstrap 3.1 compile time from ~6.5s to ~5.6s
-	private function HasMatches($extend, $haystackSelectorPath){
+	private function HasMatches($extend, $haystackSelectorPath) {
 
-		if( !$extend->selector->cacheable ){
+		if (!$extend->selector->cacheable) {
 			return true;
 		}
 
 		$first_el = $extend->selector->_oelements[0];
 
-		foreach($haystackSelectorPath as $hackstackSelector){
-			if( !$hackstackSelector->cacheable ){
+		foreach ($haystackSelectorPath as $hackstackSelector) {
+			if (!$hackstackSelector->cacheable) {
 				return true;
 			}
 
-			if( in_array($first_el, $hackstackSelector->_oelements) ){
+			if (in_array($first_el, $hackstackSelector->_oelements)) {
 				return true;
 			}
 		}
@@ -281,26 +281,26 @@ 
 	/**
 	 * @param integer $hackstackElementIndex
 	 */
-	private function PotentialMatch( $potentialMatch, $needleElements, $haystackElement, $hackstackElementIndex ){
+	private function PotentialMatch($potentialMatch, $needleElements, $haystackElement, $hackstackElementIndex) {
 
 
-		if( $potentialMatch['matched'] > 0 ){
+		if ($potentialMatch['matched']>0) {
 
 			// selectors add " " onto the first element. When we use & it joins the selectors together, but if we don't
 			// then each selector in haystackSelectorPath has a space before it added in the toCSS phase. so we need to work out
 			// what the resulting combinator will be
 			$targetCombinator = $haystackElement->combinator;
-			if( $targetCombinator === '' && $hackstackElementIndex === 0 ){
+			if ($targetCombinator==='' && $hackstackElementIndex===0) {
 				$targetCombinator = ' ';
 			}
 
-			if( $needleElements[ $potentialMatch['matched'] ]->combinator !== $targetCombinator ){
+			if ($needleElements[$potentialMatch['matched']]->combinator!==$targetCombinator) {
 				return null;
 			}
 		}
 
 		// if we don't match, null our match to indicate failure
-		if( !$this->isElementValuesEqual( $needleElements[$potentialMatch['matched'] ]->value, $haystackElement->value) ){
+		if (!$this->isElementValuesEqual($needleElements[$potentialMatch['matched']]->value, $haystackElement->value)) {
 			return null;
 		}
 
@@ -311,23 +311,23 @@ 
 	}
 
 
-	private function isElementValuesEqual( $elementValue1, $elementValue2 ){
+	private function isElementValuesEqual($elementValue1, $elementValue2) {
 
-		if( $elementValue1 === $elementValue2 ){
+		if ($elementValue1===$elementValue2) {
 			return true;
 		}
 
-		if( is_string($elementValue1) || is_string($elementValue2) ) {
+		if (is_string($elementValue1) || is_string($elementValue2)) {
 			return false;
 		}
 
-		if( $elementValue1 instanceof Less_Tree_Attribute ){
-			return $this->isAttributeValuesEqual( $elementValue1, $elementValue2 );
+		if ($elementValue1 instanceof Less_Tree_Attribute) {
+			return $this->isAttributeValuesEqual($elementValue1, $elementValue2);
 		}
 
 		$elementValue1 = $elementValue1->value;
-		if( $elementValue1 instanceof Less_Tree_Selector ){
-			return $this->isSelectorValuesEqual( $elementValue1, $elementValue2 );
+		if ($elementValue1 instanceof Less_Tree_Selector) {
+			return $this->isSelectorValuesEqual($elementValue1, $elementValue2);
 		}
 
 		return false;
@@ -337,22 +337,22 @@ 
 	/**
 	 * @param Less_Tree_Selector $elementValue1
 	 */
-	private function isSelectorValuesEqual( $elementValue1, $elementValue2 ){
+	private function isSelectorValuesEqual($elementValue1, $elementValue2) {
 
 		$elementValue2 = $elementValue2->value;
-		if( !($elementValue2 instanceof Less_Tree_Selector) || $elementValue1->elements_len !== $elementValue2->elements_len ){
+		if (!($elementValue2 instanceof Less_Tree_Selector) || $elementValue1->elements_len!==$elementValue2->elements_len) {
 			return false;
 		}
 
-		for( $i = 0; $i < $elementValue1->elements_len; $i++ ){
+		for ($i = 0; $i<$elementValue1->elements_len; $i++) {
 
-			if( $elementValue1->elements[$i]->combinator !== $elementValue2->elements[$i]->combinator ){
-				if( $i !== 0 || ($elementValue1->elements[$i]->combinator || ' ') !== ($elementValue2->elements[$i]->combinator || ' ') ){
+			if ($elementValue1->elements[$i]->combinator!==$elementValue2->elements[$i]->combinator) {
+				if ($i!==0 || ($elementValue1->elements[$i]->combinator || ' ')!==($elementValue2->elements[$i]->combinator || ' ')) {
 					return false;
 				}
 			}
 
-			if( !$this->isElementValuesEqual($elementValue1->elements[$i]->value, $elementValue2->elements[$i]->value) ){
+			if (!$this->isElementValuesEqual($elementValue1->elements[$i]->value, $elementValue2->elements[$i]->value)) {
 				return false;
 			}
 		}
@@ -364,27 +364,27 @@ 
 	/**
 	 * @param Less_Tree_Attribute $elementValue1
 	 */
-	private function isAttributeValuesEqual( $elementValue1, $elementValue2 ){
+	private function isAttributeValuesEqual($elementValue1, $elementValue2) {
 
-		if( $elementValue1->op !== $elementValue2->op || $elementValue1->key !== $elementValue2->key ){
+		if ($elementValue1->op!==$elementValue2->op || $elementValue1->key!==$elementValue2->key) {
 			return false;
 		}
 
-		if( !$elementValue1->value || !$elementValue2->value ){
-			if( $elementValue1->value || $elementValue2->value ) {
+		if (!$elementValue1->value || !$elementValue2->value) {
+			if ($elementValue1->value || $elementValue2->value) {
 				return false;
 			}
 			return true;
 		}
 
-		$elementValue1 = ($elementValue1->value->value ? $elementValue1->value->value : $elementValue1->value );
-		$elementValue2 = ($elementValue2->value->value ? $elementValue2->value->value : $elementValue2->value );
+		$elementValue1 = ($elementValue1->value->value ? $elementValue1->value->value : $elementValue1->value);
+		$elementValue2 = ($elementValue2->value->value ? $elementValue2->value->value : $elementValue2->value);
 
-		return $elementValue1 === $elementValue2;
+		return $elementValue1===$elementValue2;
 	}
 
 
-	private function extendSelector($matches, $selectorPath, $replacementSelector){
+	private function extendSelector($matches, $selectorPath, $replacementSelector) {
 
 		//for a set of matches, replace each match with the replacement selector
 
@@ -393,11 +393,11 @@ 
 		$path = array();
 		$selectorPath_len = count($selectorPath);
 
-		for($matchIndex = 0, $matches_len = count($matches); $matchIndex < $matches_len; $matchIndex++ ){
+		for ($matchIndex = 0, $matches_len = count($matches); $matchIndex<$matches_len; $matchIndex++) {
 
 
 			$match = $matches[$matchIndex];
-			$selector = $selectorPath[ $match['pathIndex'] ];
+			$selector = $selectorPath[$match['pathIndex']];
 
 			$firstElement = new Less_Tree_Element(
 				$match['initialCombinator'],
@@ -406,63 +406,63 @@ 
 				$replacementSelector->elements[0]->currentFileInfo
 			);
 
-			if( $match['pathIndex'] > $currentSelectorPathIndex && $currentSelectorPathElementIndex > 0 ){
+			if ($match['pathIndex']>$currentSelectorPathIndex && $currentSelectorPathElementIndex>0) {
 				$last_path = end($path);
-				$last_path->elements = array_merge( $last_path->elements, array_slice( $selectorPath[$currentSelectorPathIndex]->elements, $currentSelectorPathElementIndex));
+				$last_path->elements = array_merge($last_path->elements, array_slice($selectorPath[$currentSelectorPathIndex]->elements, $currentSelectorPathElementIndex));
 				$currentSelectorPathElementIndex = 0;
 				$currentSelectorPathIndex++;
 			}
 
 			$newElements = array_merge(
-				array_slice($selector->elements, $currentSelectorPathElementIndex, ($match['index'] - $currentSelectorPathElementIndex) ) // last parameter of array_slice is different than the last parameter of javascript's slice
+				array_slice($selector->elements, $currentSelectorPathElementIndex, ($match['index']-$currentSelectorPathElementIndex)) // last parameter of array_slice is different than the last parameter of javascript's slice
 				, array($firstElement)
-				, array_slice($replacementSelector->elements,1)
+				, array_slice($replacementSelector->elements, 1)
 				);
 
-			if( $currentSelectorPathIndex === $match['pathIndex'] && $matchIndex > 0 ){
+			if ($currentSelectorPathIndex===$match['pathIndex'] && $matchIndex>0) {
 				$last_key = count($path)-1;
-				$path[$last_key]->elements = array_merge($path[$last_key]->elements,$newElements);
-			}else{
-				$path = array_merge( $path, array_slice( $selectorPath, $currentSelectorPathIndex, $match['pathIndex'] ));
-				$path[] = new Less_Tree_Selector( $newElements );
+				$path[$last_key]->elements = array_merge($path[$last_key]->elements, $newElements);
+			}else {
+				$path = array_merge($path, array_slice($selectorPath, $currentSelectorPathIndex, $match['pathIndex']));
+				$path[] = new Less_Tree_Selector($newElements);
 			}
 
 			$currentSelectorPathIndex = $match['endPathIndex'];
 			$currentSelectorPathElementIndex = $match['endPathElementIndex'];
-			if( $currentSelectorPathElementIndex >= count($selectorPath[$currentSelectorPathIndex]->elements) ){
+			if ($currentSelectorPathElementIndex>=count($selectorPath[$currentSelectorPathIndex]->elements)) {
 				$currentSelectorPathElementIndex = 0;
 				$currentSelectorPathIndex++;
 			}
 		}
 
-		if( $currentSelectorPathIndex < $selectorPath_len && $currentSelectorPathElementIndex > 0 ){
+		if ($currentSelectorPathIndex<$selectorPath_len && $currentSelectorPathElementIndex>0) {
 			$last_path = end($path);
-			$last_path->elements = array_merge( $last_path->elements, array_slice($selectorPath[$currentSelectorPathIndex]->elements, $currentSelectorPathElementIndex));
+			$last_path->elements = array_merge($last_path->elements, array_slice($selectorPath[$currentSelectorPathIndex]->elements, $currentSelectorPathElementIndex));
 			$currentSelectorPathIndex++;
 		}
 
-		$slice_len = $selectorPath_len - $currentSelectorPathIndex;
+		$slice_len = $selectorPath_len-$currentSelectorPathIndex;
 		$path = array_merge($path, array_slice($selectorPath, $currentSelectorPathIndex, $slice_len));
 
 		return $path;
 	}
 
 
-	protected function visitMedia( $mediaNode ){
-		$newAllExtends = array_merge( $mediaNode->allExtends, end($this->allExtendsStack) );
+	protected function visitMedia($mediaNode) {
+		$newAllExtends = array_merge($mediaNode->allExtends, end($this->allExtendsStack));
 		$this->allExtendsStack[] = $this->doExtendChaining($newAllExtends, $mediaNode->allExtends);
 	}
 
-	protected function visitMediaOut(){
-		array_pop( $this->allExtendsStack );
+	protected function visitMediaOut() {
+		array_pop($this->allExtendsStack);
 	}
 
-	protected function visitDirective( $directiveNode ){
-		$newAllExtends = array_merge( $directiveNode->allExtends, end($this->allExtendsStack) );
+	protected function visitDirective($directiveNode) {
+		$newAllExtends = array_merge($directiveNode->allExtends, end($this->allExtendsStack));
 		$this->allExtendsStack[] = $this->doExtendChaining($newAllExtends, $directiveNode->allExtends);
 	}
 
-	protected function visitDirectiveOut(){
+	protected function visitDirectiveOut() {
 		array_pop($this->allExtendsStack);
 	}
 

Braces +2 added lines, -2 removed lines

@@ -107,7 +107,7 @@ 
 				try{
 					$selectorOne = $extendsToAdd[0]->selfSelectors[0]->toCSS();
 					$selectorTwo = $extendsToAdd[0]->selector->toCSS();
-				}catch(Exception $e){
+				} catch(Exception $e){
 					$selectorOne = "{unable to calculate}";
 					$selectorTwo = "{unable to calculate}";
 				}
@@ -422,7 +422,7 @@ 
 			if( $currentSelectorPathIndex === $match['pathIndex'] && $matchIndex > 0 ){
 				$last_key = count($path)-1;
 				$path[$last_key]->elements = array_merge($path[$last_key]->elements,$newElements);
-			}else{
+			} else{
 				$path = array_merge( $path, array_slice( $selectorPath, $currentSelectorPathIndex, $match['pathIndex'] ));
 				$path[] = new Less_Tree_Selector( $newElements );
 			}

Contrib/less.php/VisitorReplacing.php

Spacing +23 added lines, -23 removed lines

@@ -6,43 +6,43 @@ 
  * @package Less
  * @subpackage visitor
  */
-class Less_VisitorReplacing extends Less_Visitor{
+class Less_VisitorReplacing extends Less_Visitor {
 
-	public function visitObj( $node ){
+	public function visitObj($node) {
 
 		$funcName = 'visit'.$node->type;
-		if( isset($this->_visitFnCache[$funcName]) ){
+		if (isset($this->_visitFnCache[$funcName])) {
 
 			$visitDeeper = true;
-			$node = $this->$funcName( $node, $visitDeeper );
+			$node = $this->$funcName($node, $visitDeeper);
 
-			if( $node ){
-				if( $visitDeeper && is_object($node) ){
+			if ($node) {
+				if ($visitDeeper && is_object($node)) {
 					$node->accept($this);
 				}
 
-				$funcName = $funcName . "Out";
-				if( isset($this->_visitFnCache[$funcName]) ){
-					$this->$funcName( $node );
+				$funcName = $funcName."Out";
+				if (isset($this->_visitFnCache[$funcName])) {
+					$this->$funcName($node);
 				}
 			}
 
-		}else{
+		}else {
 			$node->accept($this);
 		}
 
 		return $node;
 	}
 
-	public function visitArray( $nodes ){
+	public function visitArray($nodes) {
 
 		$newNodes = array();
-		foreach($nodes as $node){
+		foreach ($nodes as $node) {
 			$evald = $this->visitObj($node);
-			if( $evald ){
-				if( is_array($evald) ){
-					self::flatten($evald,$newNodes);
-				}else{
+			if ($evald) {
+				if (is_array($evald)) {
+					self::flatten($evald, $newNodes);
+				}else {
 					$newNodes[] = $evald;
 				}
 			}
@@ -50,18 +50,18 @@ 
 		return $newNodes;
 	}
 
-	public function flatten( $arr, &$out ){
+	public function flatten($arr, &$out) {
 
-		foreach($arr as $item){
-			if( !is_array($item) ){
+		foreach ($arr as $item) {
+			if (!is_array($item)) {
 				$out[] = $item;
 				continue;
 			}
 
-			foreach($item as $nestedItem){
-				if( is_array($nestedItem) ){
-					self::flatten( $nestedItem, $out);
-				}else{
+			foreach ($item as $nestedItem) {
+				if (is_array($nestedItem)) {
+					self::flatten($nestedItem, $out);
+				}else {
 					$out[] = $nestedItem;
 				}
 			}

Braces +3 added lines, -3 removed lines

@@ -27,7 +27,7 @@ 
 				}
 			}
 
-		}else{
+		} else{
 			$node->accept($this);
 		}
 
@@ -42,7 +42,7 @@ 
 			if( $evald ){
 				if( is_array($evald) ){
 					self::flatten($evald,$newNodes);
-				}else{
+				} else{
 					$newNodes[] = $evald;
 				}
 			}
@@ -61,7 +61,7 @@ 
 			foreach($item as $nestedItem){
 				if( is_array($nestedItem) ){
 					self::flatten( $nestedItem, $out);
-				}else{
+				} else{
 					$out[] = $nestedItem;
 				}
 			}

Tests/Unit/Controller/CoreContentControllerTest.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
 	 */
 	public function testNoopAction($action) {
 		$instance = new CoreContentController();
-		$actionMethod = $action . 'Action';
+		$actionMethod = $action.'Action';
 		$result = $instance->$actionMethod();
 		$this->assertNull($result);
 	}

Tests/Unit/Provider/CoreContentProviderTest.php

Spacing +2 added lines, -2 removed lines

@@ -115,7 +115,7 @@ 
 		$service->expects($this->once())->method('getDefaults')->willReturn($defaults);
 		$instance->injectConfigurationService($service);
 		$result = $this->callInaccessibleMethod($instance, 'getVariant', $row);
-		$this->assertEquals(NULL === $expected ? $defaults['variant'] : $expected, $result);
+		$this->assertEquals(NULL===$expected ? $defaults['variant'] : $expected, $result);
 	}
 
 	/**
@@ -130,7 +130,7 @@ 
 		$service->expects($this->once())->method('getDefaults')->willReturn($defaults);
 		$instance->injectConfigurationService($service);
 		$result = $this->callInaccessibleMethod($instance, 'getVersion', $row);
-		$this->assertEquals(NULL === $expected ? $defaults['version'] : $expected, $result);
+		$this->assertEquals(NULL===$expected ? $defaults['version'] : $expected, $result);
 	}
 
 	/**

Tests/bootstrap.php

Spacing +8 added lines, -8 removed lines

@@ -1,19 +1,19 @@
 <?php
 // Register composer autoloader
-if (!file_exists(__DIR__ . '/../vendor/autoload.php')) {
+if (!file_exists(__DIR__.'/../vendor/autoload.php')) {
 	throw new \RuntimeException(
 		'Could not find vendor/autoload.php, make sure you ran composer.'
 	);
 }
 
 /** @var Composer\Autoload\ClassLoader $autoloader */
-$autoloader = require __DIR__ . '/../vendor/autoload.php';
-$autoloader->addPsr4('FluidTYPO3\\FluidcontentCore\\Tests\\Fixtures\\', __DIR__ . '/Fixtures/');
-$autoloader->addPsr4('FluidTYPO3\\FluidcontentCore\\Tests\\Unit\\', __DIR__ . '/Unit/');
-$autoloader->addPsr4('TYPO3\\CMS\\Core\\', __DIR__ . '/../vendor/typo3/cms/typo3/sysext/core/Classes/');
-$autoloader->addPsr4('TYPO3\\CMS\\Extbase\\', __DIR__ . '/../vendor/typo3/cms/typo3/sysext/extbase/Classes/');
-$autoloader->addPsr4('TYPO3\\CMS\\Fluid\\', __DIR__ . '/../vendor/typo3/cms/typo3/sysext/fluid/Classes/');
-$autoloader->addPsr4('TYPO3\\CMS\\Frontend\\', __DIR__ . '/../vendor/typo3/cms/typo3/sysext/frontend/Classes/');
+$autoloader = require __DIR__.'/../vendor/autoload.php';
+$autoloader->addPsr4('FluidTYPO3\\FluidcontentCore\\Tests\\Fixtures\\', __DIR__.'/Fixtures/');
+$autoloader->addPsr4('FluidTYPO3\\FluidcontentCore\\Tests\\Unit\\', __DIR__.'/Unit/');
+$autoloader->addPsr4('TYPO3\\CMS\\Core\\', __DIR__.'/../vendor/typo3/cms/typo3/sysext/core/Classes/');
+$autoloader->addPsr4('TYPO3\\CMS\\Extbase\\', __DIR__.'/../vendor/typo3/cms/typo3/sysext/extbase/Classes/');
+$autoloader->addPsr4('TYPO3\\CMS\\Fluid\\', __DIR__.'/../vendor/typo3/cms/typo3/sysext/fluid/Classes/');
+$autoloader->addPsr4('TYPO3\\CMS\\Frontend\\', __DIR__.'/../vendor/typo3/cms/typo3/sysext/frontend/Classes/');
 
 \FluidTYPO3\Development\Bootstrap::initialize(array(
 	'fluid_template' => \FluidTYPO3\Development\Bootstrap::CACHE_PHP_NULL,

ext_autoload.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-$extensionPath = PATH_site . 'typo3conf/ext/moox_core/';
+$extensionPath = PATH_site.'typo3conf/ext/moox_core/';
 return array(
-	'Less_Autoloader' => $extensionPath . 'Contrib/less.php/Autoloader.php',
+	'Less_Autoloader' => $extensionPath.'Contrib/less.php/Autoloader.php',
 );