genesis-php / genesis

config/ContainerFactory.php

Spacing +27 added lines, -27 removed lines

@@ -70,7 +70,7 @@ 
 				'workingDirectory' => $this->workingDirectory,
 			]
 		];
-		if($this->containersToMerge !== NULL){
+		if ($this->containersToMerge !== NULL) {
 			foreach ($this->containersToMerge as $containerToMerge) {
 				foreach ($containerToMerge->getParameters() as $k => $v) {
 					$config['parameters'][$k] = $v;
@@ -86,34 +86,34 @@ 
 
 		// BC break check
 		$mainSections = ['includes', 'class', 'parameters', 'services'];
-		foreach($config as $key => $val){
-			if(!in_array($key, $mainSections)) {
+		foreach ($config as $key => $val) {
+			if (!in_array($key, $mainSections)) {
 				throw new \RuntimeException("Since version 2.0 are supported main only these sections: " . implode(", ", $mainSections) . ". Section '$key' found. Move your variables into parameters section.");
 			}
 		}
 
 		$container = new Container();
 		$container->setClass($config['class']);
-		if(isset($config['parameters'])){
+		if (isset($config['parameters'])) {
 			$container->setParameters($config['parameters']);
 		}
-		if(isset($config['services'])){
-			foreach($config['services'] as $name => $config){
-				if(!is_array($config)){
+		if (isset($config['services'])) {
+			foreach ($config['services'] as $name => $config) {
+				if (!is_array($config)) {
 					$container->addService($name, $config); // is directly service object from merged container
 					continue;
 				}
 				$class = $config['class'];
 				$arguments = [];
-				if($config['class'] instanceof \Nette\Neon\Entity){
+				if ($config['class'] instanceof \Nette\Neon\Entity) {
 					$class = $config['class']->value;
 					$arguments = $config['class']->attributes;
 				}
 				$reflectionClass = new \ReflectionClass($class);
 				$service = $reflectionClass->newInstanceArgs($arguments);
-				if(isset($config['setup'])){
-					foreach($config['setup'] as $neonEntity){
-						if(!method_exists($service, $neonEntity->value)){
+				if (isset($config['setup'])) {
+					foreach ($config['setup'] as $neonEntity) {
+						if (!method_exists($service, $neonEntity->value)) {
 							throw new \RuntimeException("Class $class does not have method $neonEntity->value().");
 						}
 						call_user_func_array(array($service, $neonEntity->value), $neonEntity->attributes);
@@ -132,9 +132,9 @@ 
 		$return = [];
 		foreach ($files as $file) {
 			$array = $this->readFile($file);
-			if($array !== NULL){
-				if(isset($array['includes'])){
-					foreach($array['includes'] as $include){
+			if ($array !== NULL) {
+				if (isset($array['includes'])) {
+					foreach ($array['includes'] as $include) {
 						$return[] = dirname($file) . DIRECTORY_SEPARATOR . $include;
 					}
 				}
@@ -149,7 +149,7 @@ 
 	{
 		foreach ($files as $file) {
 			$array = $this->readFile($file);
-			if($array !== NULL) {
+			if ($array !== NULL) {
 				$config = array_replace_recursive($config, $array);
 			}
 		}
@@ -174,18 +174,18 @@ 
 	{
 		$config = $this->resolveUnmergables($config);
 		foreach ($config as $key => $value) {
-			if($value instanceof \Nette\Neon\Entity){
+			if ($value instanceof \Nette\Neon\Entity) {
 				$value->value = $this->parseValue($value->value, $allConfig);
-				foreach($value->attributes as $k => $v){
-					if(is_array($v)){
+				foreach ($value->attributes as $k => $v) {
+					if (is_array($v)) {
 						$value->attributes[$k] = $this->parseValues($v, $allConfig, array_merge($keysPath, [$key]));
-					}else{
+					} else {
 						$value->attributes[$k] = $this->parseValue($v, $allConfig);
 					}
 				}
 			}elseif (is_array($value)) {
 				$value = $this->parseValues($value, $allConfig, array_merge($keysPath, [$key]));
-			} elseif(!is_object($value)) {
+			} elseif (!is_object($value)) {
 				$value = $this->parseValue($value, $allConfig);
 			}
 
@@ -195,11 +195,11 @@ 
 			$config[$newKey] = $value;
 
 			// write to global config
-			$v =& $allConfig;
+			$v = & $allConfig;
 			foreach ($keysPath as $kp) {
-				$v =& $v[$kp];
+				$v = & $v[$kp];
 			}
-			if(!($value instanceof \Nette\Neon\Entity)) {
+			if (!($value instanceof \Nette\Neon\Entity)) {
 				$v[$newKey] = $value;
 			}
 		}
@@ -212,14 +212,14 @@ 
 		if (preg_match_all('#%([^%]+)%#', $value, $matches)) {
 			foreach ($matches[1] as $match) {
 				$parameter = $config['parameters'];
-				foreach(explode(".", $match) as $m){
+				foreach (explode(".", $match) as $m) {
 					if (!array_key_exists($m, $parameter)) {
 						throw new \RuntimeException("Cannot find variable '$match', part '$m'.");
 					}
 					$parameter = $parameter[$m];
 				}
-				if(is_array($parameter)){
-					if("%$match%" !== $value){ // if is variable value an array, must not be part of a string
+				if (is_array($parameter)) {
+					if ("%$match%" !== $value) { // if is variable value an array, must not be part of a string
 						throw new \RuntimeException("Array value cannot be part of a string.");
 					}
 					return $parameter;
@@ -234,7 +234,7 @@ 
 	private function resolveUnmergables($config)
 	{
 		foreach ($config as $key => $value) {
-			if(preg_match('#!$#', $key)){
+			if (preg_match('#!$#', $key)) {
 				$newKey = substr($key, 0, strlen($key) - 1);
 				$config[$newKey] = $value;
 				unset($config[$key]);