keeko / tools

src/KeekoTools.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 		$this->setDispatcher($dispatcher);
 		$this->keekoDispatcher = $dispatcher;
 
-		$dispatcher->addListener(ConsoleEvents::TERMINATE, function (ConsoleTerminateEvent $event) {
+		$dispatcher->addListener(ConsoleEvents::TERMINATE, function(ConsoleTerminateEvent $event) {
 			$command = $event->getCommand();
 			$this->finishedCommands[] = $command->getName();
 		});

src/command/InitCommand.php

Switch Indentation +6 added lines, -6 removed lines

@@ -358,13 +358,13 @@
 		$type = $this->getPackageType();
 
 		switch ($type) {
-			case 'app':
-				$this->handleAppClass($class);
-				break;
+		case 'app':
+			$this->handleAppClass($class);
+			break;
 				
-			case 'module':
-				$this->handleModuleClass($class);
-				break;
+		case 'module':
+			$this->handleModuleClass($class);
+			break;
 		}
 
 		$this->codegenService->dumpStruct($class, true);

Spacing +10 added lines, -10 removed lines

@@ -123,14 +123,14 @@ 
 			if (!empty($localName)) {
 				$name = $this->package->getFullName();
 			} else if (isset($git['github.user'])) {
-				$name = $git['github.user'] . '/' . $name;
+				$name = $git['github.user'].'/'.$name;
 			} elseif (!empty($_SERVER['USERNAME'])) {
-				$name = $_SERVER['USERNAME'] . '/' . $name;
+				$name = $_SERVER['USERNAME'].'/'.$name;
 			} elseif (get_current_user()) {
-				$name = get_current_user() . '/' . $name;
+				$name = get_current_user().'/'.$name;
 			} else {
 				// package names must be in the format foo/bar
-				$name = $name . '/' . $name;
+				$name = $name.'/'.$name;
 			}
 		} else {
 			$this->validateName($name);
@@ -171,9 +171,9 @@ 
 			$types = ['module', 'app'];
 			$question = new Question('Package type (module|app)', $type);
 			$question->setAutocompleterValues($types);
-			$question->setValidator(function ($answer) use ($types) {
+			$question->setValidator(function($answer) use ($types) {
 				if (!in_array($answer, $types)) {
-					throw new \RuntimeException('The name of the type should be one of: ' . 
+					throw new \RuntimeException('The name of the type should be one of: '. 
 							implode(',', $types));
 				}
 				return $answer;
@@ -204,7 +204,7 @@ 
 		// KEEKO values
 		$output->writeln([
 			'',
-			'Information for Keeko ' . ucfirst($type),
+			'Information for Keeko '.ucfirst($type),
 			''
 		]);
 
@@ -259,7 +259,7 @@ 
 		// type
 		if (($type = $input->getOption('type')) !== null) {
 			if (in_array($type, ['app', 'module'])) {
-				$this->package->setType('keeko-' . $type);
+				$this->package->setType('keeko-'.$type);
 			}
 		}
 		
@@ -368,7 +368,7 @@ 
 		$package = $this->package->getKeeko()->getKeekoPackage($type);
 		$fqcn = str_replace(['\\', 'keeko-', '-module', '-app'], ['/', '', '', ''], $package->getClass());
 		$classname = basename($fqcn);
-		$filename = $this->project->getRootPath() . '/src/' . $classname . '.php';
+		$filename = $this->project->getRootPath().'/src/'.$classname.'.php';
 		$fqcn = str_replace('/', '\\', $fqcn);
 		
 		if (!file_exists($filename) || $input->getOption('force')) {
@@ -499,7 +499,7 @@ 
 			$parts = explode('/', $pkgName);
 			$ns = $input->getOption('namespace');
 			$namespace = !empty($ns) ? $ns : str_replace('/', '\\', $pkgName);
-			$classname = $namespace . '\\' . ucfirst($parts[1]);
+			$classname = $namespace.'\\'.ucfirst($parts[1]);
 
 			// suffix
 			if ($type === 'module') {

src/helpers/QuestionHelperTrait.php

Spacing +1 added lines, -2 removed lines

@@ -24,8 +24,7 @@
 	 */
 	protected function getQuestion($question, $default = null, $sep = ':') {
 		return !empty($default) ?
-			sprintf('<info>%s</info> [<comment>%s</comment>]%s ', $question, $default, $sep) :
-			sprintf('<info>%s</info>%s ', $question, $sep);
+			sprintf('<info>%s</info> [<comment>%s</comment>]%s ', $question, $default, $sep) : sprintf('<info>%s</info>%s ', $question, $sep);
 	}
 	
 	/**

src/services/CodeGeneratorService.php

Switch Indentation +7 added lines, -7 removed lines

@@ -178,14 +178,14 @@
 		// iterate over behaviors to get their respective columns
 		foreach ($table->getBehaviors() as $behavior) {
 			switch ($behavior->getName()) {
-				case 'timestampable':
-					$fields[] = $behavior->getParameter('create_column');
-					$fields[] = $behavior->getParameter('update_column');
-					break;
+			case 'timestampable':
+				$fields[] = $behavior->getParameter('create_column');
+				$fields[] = $behavior->getParameter('update_column');
+				break;
 	
-				case 'aggregate_column':
-					$fields[] = $behavior->getParameter('name');
-					break;
+			case 'aggregate_column':
+				$fields[] = $behavior->getParameter('name');
+				break;
 			}
 		}
 	

Doc Comments +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
 	 * Adds authors to the docblock of the given struct
 	 *
 	 * @param AbstractPhpStruct $struct
-	 * @param array $package
+	 * @param PackageSchema $package
 	 */
 	public function addAuthors(AbstractPhpStruct $struct, PackageSchema $package) {
 		$docblock = $struct->getDocblock();

Spacing +2 added lines, -2 removed lines

@@ -17,7 +17,7 @@ 
 	
 	public function getCodegenFile() {
 		$basepath = dirname($this->project->getComposerFileName());
-		return $basepath . '/codegen.json';
+		return $basepath.'/codegen.json';
 	}
 	
 	/**
@@ -229,7 +229,7 @@ 
 		$jsonFile = $this->project->getComposerFileName();
 		$path = new Path(dirname($jsonFile));
 		$path = $path->append($relativeSourcePath);
-		$path = $path->append($struct->getName() . '.php');
+		$path = $path->append($struct->getName().'.php');
 		return $path->toString();
 	}
 	

src/command/GenerateActionCommand.php

Switch Indentation +7 added lines, -7 removed lines

@@ -268,14 +268,14 @@
 	private function getActionTitle($modelName, $type) {
 		$name = NameUtils::dasherize($modelName);
 		switch ($type) {
-			case 'list':
-				return 'List all ' . NameUtils::pluralize($name);
+		case 'list':
+			return 'List all ' . NameUtils::pluralize($name);
 
-			case 'create':
-			case 'read':
-			case 'update':
-			case 'delete':
-				return ucfirst($type) . 's ' . (in_array($name[0], ['a', 'e', 'i', 'o', 'u']) ? 'an' : 'a') . ' ' . $name;
+		case 'create':
+		case 'read':
+		case 'update':
+		case 'delete':
+			return ucfirst($type) . 's ' . (in_array($name[0], ['a', 'e', 'i', 'o', 'u']) ? 'an' : 'a') . ' ' . $name;
 		}
 	}
 

Spacing +10 added lines, -10 removed lines

@@ -190,7 +190,7 @@ 
 	}
 
 	private function generateModel($modelName) {
-		$this->logger->info('Generate Action from Model: ' . $modelName);
+		$this->logger->info('Generate Action from Model: '.$modelName);
 		$input = $this->io->getInput();
 		$model = $this->modelService->getModel($modelName);
 
@@ -209,7 +209,7 @@ 
 		foreach ($types as $type) {
 			$input->setOption('acl', ['admin']);
 			$input->setOption('type', $type);
-			$actionName = $modelName . '-' . $type;
+			$actionName = $modelName.'-'.$type;
 			
 			if ($model->isReadOnly() && in_array($type, ['create', 'update', 'delete'])) {
 				$this->logger->info(sprintf('Skip generate Action (%s), because Model (%s) is read-only', $actionName, $modelName));
@@ -252,13 +252,13 @@ 
 		$name = NameUtils::dasherize($modelName);
 		switch ($type) {
 			case 'list':
-				return 'List all ' . NameUtils::pluralize($name);
+				return 'List all '.NameUtils::pluralize($name);
 
 			case 'create':
 			case 'read':
 			case 'update':
 			case 'delete':
-				return ucfirst($type) . 's ' . (in_array($name[0], ['a', 'e', 'i', 'o', 'u']) ? 'an' : 'a') . ' ' . $name;
+				return ucfirst($type).'s '.(in_array($name[0], ['a', 'e', 'i', 'o', 'u']) ? 'an' : 'a').' '.$name;
 		}
 	}
 
@@ -290,7 +290,7 @@ 
 	 * @param string $actionName
 	 */
 	private function generateSkeleton($actionName) {
-		$this->logger->info('Generate Skeleton Action: ' . $actionName);
+		$this->logger->info('Generate Skeleton Action: '.$actionName);
 		$input = $this->io->getInput();
 		
 		// generate action
@@ -349,7 +349,7 @@ 
 	
 	private function guessClassname($name) {
 		$namespace = NamespaceResolver::getNamespace('src/action', $this->package);
-		return $namespace . '\\' . NameUtils::toStudlyCase($name) . 'Action';
+		return $namespace.'\\'.NameUtils::toStudlyCase($name).'Action';
 	}
 	
 	/**
@@ -413,10 +413,10 @@ 
 		foreach (array_keys($generators) as $type) {
 			// generate fqcn
 			$className = sprintf('%s%s%sAction', $model->getPhpName(), $fkModelName, ucfirst($type));
-			$fqcn = $this->packageService->getNamespace() . '\\action\\' . $className;
+			$fqcn = $this->packageService->getNamespace().'\\action\\'.$className;
 
 			// generate action
-			$action = new ActionSchema($actionNamePrefix . '-' . $type);
+			$action = new ActionSchema($actionNamePrefix.'-'.$type);
 			$action->addAcl('admin');
 			$action->setClass($fqcn);
 			$action->setTitle(str_replace(
@@ -454,10 +454,10 @@ 
 		foreach (array_keys($generators) as $type) {
 			// generate fqcn
 			$className = sprintf('%s%s%sAction', $model->getPhpName(), $fkModelName, ucfirst($type));
-			$fqcn = $this->packageService->getNamespace() . '\\action\\' . $className;
+			$fqcn = $this->packageService->getNamespace().'\\action\\'.$className;
 	
 			// generate action
-			$action = new ActionSchema($actionNamePrefix . '-' . $type);
+			$action = new ActionSchema($actionNamePrefix.'-'.$type);
 			$action->addAcl('admin');
 			$action->setClass($fqcn);
 			$action->setTitle(str_replace(

src/command/GenerateApiCommand.php

Switch Indentation +46 added lines, -46 removed lines

@@ -206,20 +206,20 @@ 
 	
 		// find path branch
 		switch ($type) {
-			case 'list':
-			case 'create':
-				$endpoint = '/' . $modelPluralName;
-				break;
+		case 'list':
+		case 'create':
+			$endpoint = '/' . $modelPluralName;
+			break;
 	
-			case 'read':
-			case 'update':
-			case 'delete':
-				$endpoint = '/' . $modelPluralName . '/{id}';
-				break;
+		case 'read':
+		case 'update':
+		case 'delete':
+			$endpoint = '/' . $modelPluralName . '/{id}';
+			break;
 	
-			default:
-				throw new \RuntimeException(sprintf('type (%s) not found, can\'t continue.', $type));
-				break;
+		default:
+			throw new \RuntimeException(sprintf('type (%s) not found, can\'t continue.', $type));
+			break;
 		}
 
 		$path = $paths->get($endpoint);
@@ -234,45 +234,45 @@ 
 		$responses = $operation->getResponses();
 	
 		switch ($type) {
-			case 'list':
-				$ok = $responses->get('200');
-				$ok->setDescription(sprintf('Array of %s', $modelPluralName));
-				$ok->getSchema()->setRef('#/definitions/' . 'Paged' . NameUtils::pluralize($modelObjectName));
-				break;
+		case 'list':
+			$ok = $responses->get('200');
+			$ok->setDescription(sprintf('Array of %s', $modelPluralName));
+			$ok->getSchema()->setRef('#/definitions/' . 'Paged' . NameUtils::pluralize($modelObjectName));
+			break;
 	
-			case 'create':
-				// params
-				$body = $params->getByName('body');
-				$body->setName('body');
-				$body->setIn('body');
-				$body->setDescription(sprintf('The new %s', $modelName));
-				$body->setRequired(true);
-				$body->getSchema()->setRef('#/definitions/Writable' . $modelObjectName);
+		case 'create':
+			// params
+			$body = $params->getByName('body');
+			$body->setName('body');
+			$body->setIn('body');
+			$body->setDescription(sprintf('The new %s', $modelName));
+			$body->setRequired(true);
+			$body->getSchema()->setRef('#/definitions/Writable' . $modelObjectName);
 	
-				// response
-				$ok = $responses->get('201');
-				$ok->setDescription(sprintf('%s created', $modelName));
-				break;
+			// response
+			$ok = $responses->get('201');
+			$ok->setDescription(sprintf('%s created', $modelName));
+			break;
 	
-			case 'read':
-				// response
-				$ok = $responses->get('200');
-				$ok->setDescription(sprintf('gets the %s', $modelName));
-				$ok->getSchema()->setRef('#/definitions/' . $modelObjectName);
-				break;
+		case 'read':
+			// response
+			$ok = $responses->get('200');
+			$ok->setDescription(sprintf('gets the %s', $modelName));
+			$ok->getSchema()->setRef('#/definitions/' . $modelObjectName);
+			break;
 	
-			case 'update':
-				// response
-				$ok = $responses->get('200');
-				$ok->setDescription(sprintf('%s updated', $modelName));
-				$ok->getSchema()->setRef('#/definitions/' . $modelObjectName);
-				break;
+		case 'update':
+			// response
+			$ok = $responses->get('200');
+			$ok->setDescription(sprintf('%s updated', $modelName));
+			$ok->getSchema()->setRef('#/definitions/' . $modelObjectName);
+			break;
 	
-			case 'delete':
-				// response
-				$ok = $responses->get('204');
-				$ok->setDescription(sprintf('%s deleted', $modelName));
-				break;
+		case 'delete':
+			// response
+			$ok = $responses->get('204');
+			$ok->setDescription(sprintf('%s deleted', $modelName));
+			break;
 		}
 	
 		if ($type == 'read' || $type == 'update' || $type == 'delete') {

Spacing +22 added lines, -22 removed lines

@@ -61,7 +61,7 @@ 
 
 		$module = $this->package->getKeeko()->getModule();
 		$swagger->setVersion('2.0');
-		$swagger->getInfo()->setTitle($module->getTitle() . ' API');
+		$swagger->getInfo()->setTitle($module->getTitle().' API');
 		$swagger->getTags()->clear();
 		$swagger->getTags()->add(new Tag(['name' => $module->getSlug()]));
 		
@@ -82,7 +82,7 @@ 
 		foreach ($models as $modelName) {
 			$tableName = $this->modelService->getTableName($modelName);
 			$model = $this->modelService->getModel($tableName);
-			$class = new PhpClass(str_replace('\\\\', '\\', $model->getNamespace() . '\\' . $model->getPhpName()));
+			$class = new PhpClass(str_replace('\\\\', '\\', $model->getNamespace().'\\'.$model->getPhpName()));
 			$file = new File($this->codegenService->getFilename($class));
 			
 			if ($file->exists()) {
@@ -110,7 +110,7 @@ 
 	}
 	
 	protected function generateOperation(Paths $paths, $actionName) {
-		$this->logger->notice('Generating Operation for: ' . $actionName);
+		$this->logger->notice('Generating Operation for: '.$actionName);
 
 		if (Text::create($actionName)->contains('relationship')) {
 			$this->generateRelationshipOperation($paths, $actionName);
@@ -120,18 +120,18 @@ 
 	}
 
 	protected function generateRelationshipOperation(Paths $paths, $actionName) {
-		$this->logger->notice('Generating Relationship Operation for: ' . $actionName);
+		$this->logger->notice('Generating Relationship Operation for: '.$actionName);
 		$prefix = substr($actionName, 0, strrpos($actionName, 'relationship') + 12);
 		$module = $this->packageService->getModule();
 
 		// test for to-many relationship:
-		$many = $module->hasAction($prefix . '-read') 
-			&& $module->hasAction($prefix . '-update')
-			&& $module->hasAction($prefix . '-add')
-			&& $module->hasAction($prefix . '-remove')
+		$many = $module->hasAction($prefix.'-read') 
+			&& $module->hasAction($prefix.'-update')
+			&& $module->hasAction($prefix.'-add')
+			&& $module->hasAction($prefix.'-remove')
 		;
-		$single = $module->hasAction($prefix . '-read') 
-			&& $module->hasAction($prefix . '-update')
+		$single = $module->hasAction($prefix.'-read') 
+			&& $module->hasAction($prefix.'-update')
 			&& !$many
 		;
 		
@@ -159,7 +159,7 @@ 
 		$action = $this->packageService->getAction($actionName);
 		$type = substr($actionName, strrpos($actionName, '-') + 1);
 		$method = $this->getMethod($type);
-		$endpoint = '/' . NameUtils::pluralize($modelName) . '/{id}/relationship/' . ($single ?
+		$endpoint = '/'.NameUtils::pluralize($modelName).'/{id}/relationship/'.($single ?
 			$foreignModelName : NameUtils::pluralize($foreignModelName));
 		
 		$path = $paths->get($endpoint);
@@ -190,7 +190,7 @@ 
 	}
 	
 	protected function generateCRUDOperation(Paths $paths, $actionName) {
-		$this->logger->notice('Generating CRUD Operation for: ' . $actionName);
+		$this->logger->notice('Generating CRUD Operation for: '.$actionName);
 		$database = $this->modelService->getDatabase();
 		$action = $this->packageService->getAction($actionName);
 		$modelName = $this->modelService->getModelNameByAction($action);
@@ -208,13 +208,13 @@ 
 		switch ($type) {
 			case 'list':
 			case 'create':
-				$endpoint = '/' . $modelPluralName;
+				$endpoint = '/'.$modelPluralName;
 				break;
 	
 			case 'read':
 			case 'update':
 			case 'delete':
-				$endpoint = '/' . $modelPluralName . '/{id}';
+				$endpoint = '/'.$modelPluralName.'/{id}';
 				break;
 	
 			default:
@@ -237,7 +237,7 @@ 
 			case 'list':
 				$ok = $responses->get('200');
 				$ok->setDescription(sprintf('Array of %s', $modelPluralName));
-				$ok->getSchema()->setRef('#/definitions/' . 'Paged' . NameUtils::pluralize($modelObjectName));
+				$ok->getSchema()->setRef('#/definitions/'.'Paged'.NameUtils::pluralize($modelObjectName));
 				break;
 	
 			case 'create':
@@ -247,7 +247,7 @@ 
 				$body->setIn('body');
 				$body->setDescription(sprintf('The new %s', $modelName));
 				$body->setRequired(true);
-				$body->getSchema()->setRef('#/definitions/Writable' . $modelObjectName);
+				$body->getSchema()->setRef('#/definitions/Writable'.$modelObjectName);
 	
 				// response
 				$ok = $responses->get('201');
@@ -258,14 +258,14 @@ 
 				// response
 				$ok = $responses->get('200');
 				$ok->setDescription(sprintf('gets the %s', $modelName));
-				$ok->getSchema()->setRef('#/definitions/' . $modelObjectName);
+				$ok->getSchema()->setRef('#/definitions/'.$modelObjectName);
 				break;
 	
 			case 'update':
 				// response
 				$ok = $responses->get('200');
 				$ok->setDescription(sprintf('%s updated', $modelName));
-				$ok->getSchema()->setRef('#/definitions/' . $modelObjectName);
+				$ok->getSchema()->setRef('#/definitions/'.$modelObjectName);
 				break;
 	
 			case 'delete':
@@ -352,19 +352,19 @@ 
 	}
 
 	protected function generateDefinition(Definitions $definitions, Table $model) {
-		$this->logger->notice('Generating Definition for: ' . $model->getOriginCommonName());
+		$this->logger->notice('Generating Definition for: '.$model->getOriginCommonName());
 		$modelObjectName = $model->getPhpName();
 		
 		// paged model
-		$pagedModel = 'Paged' . NameUtils::pluralize($modelObjectName);
+		$pagedModel = 'Paged'.NameUtils::pluralize($modelObjectName);
 		$paged = $definitions->get($pagedModel)->setType('object')->getProperties();
 		$paged->get('data')
 			->setType('array')
-			->getItems()->setRef('#/definitions/' . $modelObjectName);
+			->getItems()->setRef('#/definitions/'.$modelObjectName);
 		$paged->get('meta')->setRef('#/definitions/PagedMeta');
 		
 		// writable model
-		$writable = $definitions->get('Writable' . $modelObjectName)->setType('object')->getProperties();
+		$writable = $definitions->get('Writable'.$modelObjectName)->setType('object')->getProperties();
 		$this->generateModelProperties($writable, $model, true);
 
 		// readable model

src/config/ToolsConfig.php

Spacing +1 added lines, -1 removed lines

@@ -6,6 +6,6 @@
 	public function __construct() {}
 	
 	public function getTemplateRoot() {
-		return __DIR__ . '/../../templates';
+		return __DIR__.'/../../templates';
 	}
 }
\ No newline at end of file

src/generator/action/ModelListActionGenerator.php

Spacing +2 added lines, -2 removed lines

@@ -15,9 +15,9 @@
 
 		// method: run(Request $request)
 		$class->addUseStatement('Tobscure\\JsonApi\\Parameters');
-		$class->addUseStatement(str_replace('model', 'domain', $model->getNamespace()) . '\\' . $model->getPhpName() . 'Domain');
+		$class->addUseStatement(str_replace('model', 'domain', $model->getNamespace()).'\\'.$model->getPhpName().'Domain');
 		$class->setMethod($this->generateRunMethod($this->twig->render('list-run.twig', [
-			'domain' => $model->getPhpName() . 'Domain'
+			'domain' => $model->getPhpName().'Domain'
 		])));
 			
 	}

src/generator/action/ModelUpdateActionGenerator.php

Spacing +2 added lines, -2 removed lines

@@ -18,9 +18,9 @@
 	
 		// method: run(Request $request)
 		$class->addUseStatement('phootwork\\json\\Json');
-		$class->addUseStatement(str_replace('model', 'domain', $model->getNamespace()) . '\\' . $model->getPhpName() . 'Domain');
+		$class->addUseStatement(str_replace('model', 'domain', $model->getNamespace()).'\\'.$model->getPhpName().'Domain');
 		$class->setMethod($this->generateRunMethod($this->twig->render('update-run.twig', [
-			'domain' => $model->getPhpName() . 'Domain'
+			'domain' => $model->getPhpName().'Domain'
 		])));
 	}
 }
\ No newline at end of file