genesis-php / genesis

config/ContainerFactory.php

Doc Comments +3 added lines

@@ -21,6 +21,9 @@
 	private $workingDirectory;
 
 
+	/**
+	 * @param string $file
+	 */
 	public function addConfig($file)
 	{
 		$this->configs[] = $file;

Spacing +27 added lines, -27 removed lines

@@ -70,7 +70,7 @@ 
 				'workingDirectory' => $this->workingDirectory,
 			]
 		];
-		if($this->containersToMerge){
+		if ($this->containersToMerge) {
 			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]);

Braces +2 added lines, -2 removed lines

@@ -179,11 +179,11 @@
 				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)) {
+			} elseif (is_array($value)) {
 				$value = $this->parseValues($value, $allConfig, array_merge($keysPath, [$key]));
 			} elseif(!is_object($value)) {
 				$value = $this->parseValue($value, $allConfig);

Cli.php

Spacing +2 added lines, -2 removed lines

@@ -25,10 +25,10 @@
 
 	public static function getColoredString($string, $foreground = NULL, $background = NULL)
 	{
-		if(!self::$enableColors){
+		if (!self::$enableColors) {
 			return $string;
 		}
-		if($foreground === NULL && $background === NULL){
+		if ($foreground === NULL && $background === NULL) {
 			return $string;
 		}
 

commands/Help.php

Spacing +5 added lines, -5 removed lines

@@ -50,7 +50,7 @@ 
 	 */
 	public function setSectionTasks($section, array $tasks)
 	{
-		if(!isset($this->sections[$section])){
+		if (!isset($this->sections[$section])) {
 			throw new \InvalidArgumentException("Section '$section' not found.");
 		}
 		$this->sections[$section]['tasks'] = $tasks;
@@ -62,17 +62,17 @@ 
 		// detect max width
 		$minColumnWidth = 30;
 		foreach ($this->sections as $sectionName => $data) {
-			if(strlen($sectionName) > $minColumnWidth){
+			if (strlen($sectionName) > $minColumnWidth) {
 				$minColumnWidth = strlen($sectionName) + 5;
 			}
 			foreach ($data['tasks'] as $taskName => $description) {
-				if(strlen($taskName) > $minColumnWidth){
+				if (strlen($taskName) > $minColumnWidth) {
 					$minColumnWidth = strlen($taskName) + 2 + 5;
 				}
 			}
 		}
 		// empty section first
-		if(isset($this->sections[''])){
+		if (isset($this->sections[''])) {
 			$val = $this->sections[''];
 			unset($this->sections['']);
 			$this->sections = ['' => $val] + $this->sections;
@@ -84,7 +84,7 @@ 
 		echo "Available tasks:" . PHP_EOL;
 		foreach ($this->sections as $sectionName => $data) {
 			echo Cli::getColoredString($sectionName, 'yellow');
-			echo str_repeat(" ", $minColumnWidth - strlen($sectionName) + 2);  // +2 = two spaces before taskName (below)
+			echo str_repeat(" ", $minColumnWidth - strlen($sectionName) + 2); // +2 = two spaces before taskName (below)
 			echo Cli::getColoredString($data['description'], 'dark_gray');
 			echo PHP_EOL;
 			foreach ($data['tasks'] as $taskName => $description) {

commands/SelfInit.php

Spacing +2 added lines, -2 removed lines

@@ -75,7 +75,7 @@ 
 	public function execute()
 	{
 		$buildDir = $this->workingDirectory . DIRECTORY_SEPARATOR . $this->dirname;
-		if(is_dir($buildDir)){
+		if (is_dir($buildDir)) {
 			$this->error("Directory '$this->dirname' in working directory '$this->workingDirectory' already exists.");
 		}
 		$directory = new Filesystem\Directory();
@@ -85,7 +85,7 @@ 
 		foreach ($directory->read($this->distDirectory) as $fileInfo) {
 			$newFile = $buildDir . DIRECTORY_SEPARATOR . $fileInfo->getFilename();
 			$file->copy($fileInfo->getPathName(), $newFile);
-			if($fileInfo->getFilename() === 'build'){
+			if ($fileInfo->getFilename() === 'build') {
 				$file->makeExecutable($newFile);
 			}
 		}

commands/filesystem/Filesystem.php

Spacing +11 added lines, -11 removed lines

@@ -78,7 +78,7 @@ 
 	 */
 	public function addSymlinksRelativeToCreate(array $symlinksRelativeToCreate, $baseDir)
 	{
-		if(!isset($this->symlinksRelativeToCreate[$baseDir])){
+		if (!isset($this->symlinksRelativeToCreate[$baseDir])) {
 			$this->symlinksRelativeToCreate[$baseDir] = [];
 		}
 		$this->symlinksRelativeToCreate[$baseDir] = array_merge($this->symlinksRelativeToCreate[$baseDir], $symlinksRelativeToCreate);
@@ -110,7 +110,7 @@ 
 
 	public function execute()
 	{
-		if(count($this->directoriesToCreate) > 0) {
+		if (count($this->directoriesToCreate) > 0) {
 			$this->log(Cli::getColoredString('Creating directories', 'light_blue'));
 			$command = new Directory();
 			foreach ($this->directoriesToCreate as $directory => $chmod) {
@@ -122,7 +122,7 @@ 
 				$this->log("Directory '$directory' created.");
 			}
 		}
-		if(count($this->directoriesToClean) > 0) {
+		if (count($this->directoriesToClean) > 0) {
 			$this->log(Cli::getColoredString('Cleaning directories', 'light_blue'));
 			$command = new Directory();
 			foreach ($this->directoriesToClean as $directory) {
@@ -130,17 +130,17 @@ 
 				$this->log("Directory '$directory' cleaned.");
 			}
 		}
-		if(count($this->filesToCopy) > 0) {
+		if (count($this->filesToCopy) > 0) {
 			$this->log(Cli::getColoredString('Copying files', 'light_blue'));
 			$command = new File();
 			foreach ($this->filesToCopy as $destination => $options) {
-				if(is_file($destination)){
-					if($options['onDuplicate'] == self::ERROR){
+				if (is_file($destination)) {
+					if ($options['onDuplicate'] == self::ERROR) {
 						$this->error("File '$destination' already exists.");
-					}elseif($options['onDuplicate'] == self::SKIP){
+					}elseif ($options['onDuplicate'] == self::SKIP) {
 						$this->log("File '$destination' already exists, skipping ...");
 						continue;
-					}elseif($options['onDuplicate'] == self::REWRITE){
+					}elseif ($options['onDuplicate'] == self::REWRITE) {
 						@unlink($destination);
 					}
 				}
@@ -148,11 +148,11 @@ 
 				$this->log("File '$options[source]' copied to '$destination'.");
 			}
 		}
-		if(count($this->symlinksRelativeToCreate) > 0) {
+		if (count($this->symlinksRelativeToCreate) > 0) {
 			$this->log(Cli::getColoredString('Creating symlinks', 'light_blue'));
 			$command = new \Genesis\Commands\Filesystem\Symlink();
-			foreach($this->symlinksRelativeToCreate as $baseDir => $symlinks){
-				foreach($symlinks as $link => $target) {
+			foreach ($this->symlinksRelativeToCreate as $baseDir => $symlinks) {
+				foreach ($symlinks as $link => $target) {
 					$absoluteLinkPath = $baseDir . '/' . $link;
 					if (is_link($absoluteLinkPath)) {
 						$this->log("Symlink '$link' already exists, skipping ...");

Braces +2 added lines, -2 removed lines

@@ -137,10 +137,10 @@
 				if(is_file($destination)){
 					if($options['onDuplicate'] == self::ERROR){
 						$this->error("File '$destination' already exists.");
-					}elseif($options['onDuplicate'] == self::SKIP){
+					} elseif($options['onDuplicate'] == self::SKIP){
 						$this->log("File '$destination' already exists, skipping ...");
 						continue;
-					}elseif($options['onDuplicate'] == self::REWRITE){
+					} elseif($options['onDuplicate'] == self::REWRITE){
 						@unlink($destination);
 					}
 				}

commands/filesystem/Symlink.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 	 */
 	public function createRelative($directory, $target, $link)
 	{
-		if(!is_dir($directory)){
+		if (!is_dir($directory)) {
 			$this->error("Directory '$directory' not found.");
 		}
 		$cmd = 'cd ' . escapeshellarg($directory) . ' && ln -s  ' . escapeshellarg($target) . ' ' . escapeshellarg($link);

commands/filesystem/Directory.php

Spacing +3 added lines, -3 removed lines

@@ -27,19 +27,19 @@
 			if ($file->isLink()) {
 				$this->checkPath($file->getPathName(), $directory);
 				$result = @unlink($file->getPathname());
-				if(!$result){
+				if (!$result) {
 					$this->error("Cannot delete symlink '$file'.");
 				}
 			} elseif ($file->isDir()) {
 				$this->checkPath($file->getPathName(), $directory);
 				$result = @rmdir($file->getPathName());
-				if(!$result){
+				if (!$result) {
 					$this->error("Cannot delete file '$file'.");
 				}
 			} elseif ($file->isFile()) {
 				$this->checkPath($file->getPathName(), $directory);
 				$result = @unlink($file->getPathname());
-				if(!$result){
+				if (!$result) {
 					$this->error("Cannot delete file '$file'.");
 				}
 			}

Build.php

Spacing +3 added lines, -3 removed lines

@@ -34,7 +34,7 @@ 
 	{
 		$helpCommand = new Commands\Help;
 		foreach ($this->detectAvailableTasks() as $section => $tasks) {
-			if(!$helpCommand->hasSection($section)){
+			if (!$helpCommand->hasSection($section)) {
 				$helpCommand->addSection($section);
 			}
 			$helpCommand->setSectionTasks($section, $tasks);
@@ -51,11 +51,11 @@ 
 			if (preg_match('#^run(.*)#', $method->getName(), $match)) {
 				$doc = $method->getDocComment();
 				$section = NULL;
-				if(preg_match('#@section ?([^\s]*)\s#s', $doc, $m)){
+				if (preg_match('#@section ?([^\s]*)\s#s', $doc, $m)) {
 					$section = trim($m[1]);
 				}
 				$description = NULL;
-				if(preg_match('#([^@][a-zA-Z0-9]+)+#', $doc, $m)){
+				if (preg_match('#([^@][a-zA-Z0-9]+)+#', $doc, $m)) {
 					$description = trim($m[0]);
 				}
 				$tasks[$section][lcfirst($match[1])] = $description != '' ? $description : NULL;

Bootstrap.php

Spacing +8 added lines, -8 removed lines

@@ -37,7 +37,7 @@ 
 		}
 
 		$arguments = $inputArgs->getArguments();
-		if(isset($arguments[0]) && $arguments[0] === 'self-init'){
+		if (isset($arguments[0]) && $arguments[0] === 'self-init') {
 			$directoryName = isset($arguments[1]) ? $arguments[1] : 'build';
 			$selfInit = new Commands\SelfInit();
 			$selfInit->setDistDirectory(__DIR__ . '/build-dist');
@@ -52,9 +52,9 @@ 
 		if (is_file($bootstrapFile)) {
 			$this->log("Info: Found bootstrap.php in working directory.", 'dark_gray');
 			$container = require_once $bootstrapFile;
-			if($container === 1 || $container === TRUE){ // 1 = success, TRUE = already required
+			if ($container === 1 || $container === TRUE) { // 1 = success, TRUE = already required
 				$container = NULL;
-			}elseif(!($container instanceof Container)){
+			}elseif (!($container instanceof Container)) {
 				$this->log("Returned value from bootstrap.php must be instance of 'Genesis\\Container\\Container' or nothing (NULL).", 'red');
 				exit(255);
 			}
@@ -112,11 +112,11 @@ 
 	{
 		$factory = new ContainerFactory();
 		$factory->addConfig($workingDir . '/' . $configFile);
-		if(is_file($workingDir . '/config.local.neon')){
+		if (is_file($workingDir . '/config.local.neon')) {
 			$factory->addConfig($workingDir . '/config.local.neon');
 		}
 		$factory->setWorkingDirectory($workingDir);
-		if($bootstrapContainer !== NULL){
+		if ($bootstrapContainer !== NULL) {
 			$factory->addContainerToMerge($bootstrapContainer);
 		}
 		return $factory->create();
@@ -151,7 +151,7 @@ 
 	protected function autowire(IBuild $build, Container $container)
 	{
 		foreach ($this->getAutowiredProperties($build) as $property => $service) {
-			if(!$container->hasService($service)){
+			if (!$container->hasService($service)) {
 				throw new \RuntimeException("Cannot found service '$service' to inject into " . get_class($build) . "::$property.");
 			}
 			$build->$property = $container->getService($service);
@@ -163,10 +163,10 @@ 
 	{
 		$return = [];
 		$reflectionClass = new \ReflectionClass($class);
-		foreach($reflectionClass->getProperties(\ReflectionProperty::IS_PUBLIC) as $property){
+		foreach ($reflectionClass->getProperties(\ReflectionProperty::IS_PUBLIC) as $property) {
 			$reflectionProp = new \ReflectionProperty($class, $property->getName());
 			$doc = $reflectionProp->getDocComment();
-			if(preg_match('#@inject ?([^\s]*)\s#s', $doc, $matches)){
+			if (preg_match('#@inject ?([^\s]*)\s#s', $doc, $matches)) {
 				$return[$property->getName()] = trim($matches[1]) !== '' ? $matches[1] : $property->getName();
 			}
 		}

Braces +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 			$container = require_once $bootstrapFile;
 			if($container === 1 || $container === TRUE){ // 1 = success, TRUE = already required
 				$container = NULL;
-			}elseif(!($container instanceof Container)){
+			} elseif(!($container instanceof Container)){
 				$this->log("Returned value from bootstrap.php must be instance of 'Genesis\\Container\\Container' or nothing (NULL).", 'red');
 				exit(255);
 			}