keeko / tools

src/services/ModelService.php

Spacing +9 added lines, -9 removed lines

@@ -34,10 +34,10 @@ 
 			$schema = null;
 			$schemas = [
 				$input->hasOption('schema') ? $input->getOption('schema') : '',
-				$workDir . '/database/schema.xml',
-				$workDir . '/res/database/schema.xml',
-				$workDir . '/vendor/keeko/core/database/schema.xml',
-				$workDir . '/vendor/keeko/core/res/database/schema.xml'
+				$workDir.'/database/schema.xml',
+				$workDir.'/res/database/schema.xml',
+				$workDir.'/vendor/keeko/core/database/schema.xml',
+				$workDir.'/vendor/keeko/core/res/database/schema.xml'
 			];
 			foreach ($schemas as $path) {
 				if (file_exists($path)) {
@@ -89,7 +89,7 @@ 
 	public function getTableName($name) {
 		$db = $this->getDatabase();
 		if (!Text::create($name)->startsWith($db->getTablePrefix())) {
-			$name = $db->getTablePrefix() . $name;
+			$name = $db->getTablePrefix().$name;
 		}
 	
 		return $name;
@@ -117,7 +117,7 @@ 
 	 */
 	public function getModels() {
 		if ($this->models === null) {
-			$namespace = $this->packageService->getNamespace() . '\\model';
+			$namespace = $this->packageService->getNamespace().'\\model';
 			$propel = $this->getDatabase();
 	
 			$this->models = new ArrayList();
@@ -162,14 +162,14 @@ 
 		if ($package->getVendor() == 'keeko' && $this->isCoreSchema()) {
 			$model = $package->getName();
 			if ($this->hasModel($model)) {
-				$models []= $model;
+				$models [] = $model;
 			}
 		}
 		
 		// anyway, generate all
 		else {
 			foreach ($this->getModels() as $model) {
-				$models []= $model->getOriginCommonName();
+				$models [] = $model->getOriginCommonName();
 			}
 		}
 		
@@ -235,7 +235,7 @@ 
 		$model = $this->getModel($modelName);
 		$modelObjectName = $model->getPhpName();
 
-		return $database->getNamespace() . '\\' . $modelObjectName;
+		return $database->getNamespace().'\\'.$modelObjectName;
 	}
 	
 	/**

src/generator/serializer/ModelSerializerGenerator.php

Spacing +5 added lines, -5 removed lines

@@ -27,13 +27,13 @@
 	}
 	
 	protected function getClassName(Table $model) {
-		return str_replace('model', 'serializer', $model->getNamespace()) . 
-			'\\' . $model->getPhpName() . 'Serializer';
+		return str_replace('model', 'serializer', $model->getNamespace()). 
+			'\\'.$model->getPhpName().'Serializer';
 	}
 
 	protected function ensureDomainTrait(PhpClass $class, Table $model) {
-		$class->addUseStatement(str_replace('model', 'serializer\\base', $model->getNamespace()) . 
-			'\\' . $model->getPhpName() . 'SerializerTrait');
-		$class->addTrait($model->getPhpName() . 'SerializerTrait');
+		$class->addUseStatement(str_replace('model', 'serializer\\base', $model->getNamespace()). 
+			'\\'.$model->getPhpName().'SerializerTrait');
+		$class->addTrait($model->getPhpName().'SerializerTrait');
 	}
 }
\ No newline at end of file

src/generator/domain/ModelDomainGenerator.php

Spacing +7 added lines, -7 removed lines

@@ -34,19 +34,19 @@ 
 	}
 	
 	protected function getClassName(Table $model) {
-		return str_replace('model', 'domain', $model->getNamespace()) . 
-			'\\' . $model->getPhpName() . 'Domain';
+		return str_replace('model', 'domain', $model->getNamespace()). 
+			'\\'.$model->getPhpName().'Domain';
 	}
 	
 	protected function ensureUseStatements(PhpClass $class, Table $model) {
-		$class->addUseStatement($model->getNamespace() . '\\' . $model->getPhpName() . 'Query');
+		$class->addUseStatement($model->getNamespace().'\\'.$model->getPhpName().'Query');
 	}
 	
 	protected function generateApplyFilter(PhpClass $class, Table $model) {
 		if (!$class->hasMethod('applyFilter')) {
 			$class->setMethod(PhpMethod::create('applyFilter')
 				->addParameter(PhpParameter::create('query')
-					->setType($model->getPhpName() . 'Query')
+					->setType($model->getPhpName().'Query')
 				)
 				->addParameter(PhpParameter::create('filter'))
 				->setVisibility(PhpMethod::VISIBILITY_PROTECTED)
@@ -55,8 +55,8 @@ 
 	}
 	
 	protected function ensureDomainTrait(PhpClass $class, Table $model) {
-		$class->addUseStatement(str_replace('model', 'domain\\base', $model->getNamespace()) . 
-			'\\' . $model->getPhpName() . 'DomainTrait');
-		$class->addTrait($model->getPhpName() . 'DomainTrait');
+		$class->addUseStatement(str_replace('model', 'domain\\base', $model->getNamespace()). 
+			'\\'.$model->getPhpName().'DomainTrait');
+		$class->addTrait($model->getPhpName().'DomainTrait');
 	}
 }
\ No newline at end of file

src/generator/domain/base/ReadOnlyModelDomainTraitGenerator.php

Spacing +11 added lines, -11 removed lines

@@ -22,9 +22,9 @@ 
 	protected function generateTrait(Table $model) {
 		$trait = PhpTrait::create()
 			->setNamespace(str_replace('model', 'domain\\base', $model->getNamespace()))
-			->setName($model->getPhpName() . 'DomainTrait')
-			->addUseStatement($model->getNamespace() . '\\' . $model->getPhpName())
-			->addUseStatement($model->getNamespace() . '\\' . $model->getPhpName() . 'Query')
+			->setName($model->getPhpName().'DomainTrait')
+			->addUseStatement($model->getNamespace().'\\'.$model->getPhpName())
+			->addUseStatement($model->getNamespace().'\\'.$model->getPhpName().'Query')
 			->addUseStatement('keeko\\framework\\service\\ServiceContainer')
 			->setMethod(PhpMethod::create('getServiceContainer')
 				->setVisibility(PhpMethod::VISIBILITY_PROTECTED)
@@ -34,7 +34,7 @@ 
 			)
 		;
 		$trait->addUseStatement('keeko\framework\domain\payload\PayloadInterface');
-		$trait->addUseStatement($model->getNamespace() . '\\' . $model->getPhpName());
+		$trait->addUseStatement($model->getNamespace().'\\'.$model->getPhpName());
 
 		return $trait;
 	}
@@ -48,8 +48,8 @@ 
 				'class' => $model->getPhpName()
 			]))
 			->setVisibility(PhpMethod::VISIBILITY_PROTECTED)
-			->setDescription('Returns one ' . $model->getPhpName() . ' with the given id from cache')
-			->setType($model->getPhpName() . '|null')
+			->setDescription('Returns one '.$model->getPhpName().' with the given id from cache')
+			->setType($model->getPhpName().'|null')
 		);
 	}
 	
@@ -63,7 +63,7 @@ 
 				'model' => NameUtils::toCamelCase($model->getOriginCommonName()),
 				'class' => $model->getPhpName()
 			]))
-			->setDescription('Returns one ' . $model->getPhpName() . ' with the given id')
+			->setDescription('Returns one '.$model->getPhpName().' with the given id')
 			->setType('PayloadInterface')
 		);
 	}
@@ -87,17 +87,17 @@ 
 		
 		$trait->setMethod(PhpMethod::create('applyFilter')
 			->addParameter(PhpParameter::create('query')
-				->setType($model->getPhpName() . 'Query')
+				->setType($model->getPhpName().'Query')
 			)
 			->addParameter(PhpParameter::create('filter'))
 			->setVisibility(PhpMethod::VISIBILITY_PROTECTED)
 			->setAbstract(true)
-			->setDescription('Implement this functionality at ' . $this->getClassName($model))
+			->setDescription('Implement this functionality at '.$this->getClassName($model))
 		);
 	}
 	
 	protected function getClassName(Table $model) {
-		return str_replace('model', 'domain', $model->getNamespace()) .
-			'\\' . $model->getPhpName() . 'Domain';
+		return str_replace('model', 'domain', $model->getNamespace()).
+			'\\'.$model->getPhpName().'Domain';
 	}
 }

src/generator/domain/base/ModelDomainTraitGenerator.php

Spacing +14 added lines, -14 removed lines

@@ -50,7 +50,7 @@ 
 				'model' => NameUtils::toCamelCase($model->getOriginCommonName()),
 				'class' => $model->getPhpName()
 			]))
-			->setDescription('Creates a new ' . $model->getPhpName() . ' with the provided data')
+			->setDescription('Creates a new '.$model->getPhpName().' with the provided data')
 			->setType('PayloadInterface')
 		);
 	}
@@ -68,7 +68,7 @@ 
 				'model' => NameUtils::toCamelCase($model->getOriginCommonName()),
 				'class' => $model->getPhpName()
 			]))
-			->setDescription('Updates a ' . $model->getPhpName() . ' with the given id' .
+			->setDescription('Updates a '.$model->getPhpName().' with the given id'.
 				'and the provided data')
 			->setType('PayloadInterface')
 		);
@@ -85,7 +85,7 @@ 
 				'model' => NameUtils::toCamelCase($model->getOriginCommonName()),
 				'class' => $model->getPhpName()
 			]))
-			->setDescription('Deletes a ' . $model->getPhpName() . ' with the given id')
+			->setDescription('Deletes a '.$model->getPhpName().' with the given id')
 			->setType('PayloadInterface')
 		);
 	}
@@ -96,7 +96,7 @@ 
 			$name = $foreign->getPhpName();
 		}
 		$localId = NameUtils::toCamelCase($fk->getLocalColumn()->getPhpName());
-		$trait->setMethod(PhpMethod::create('set' . $name . 'Id')
+		$trait->setMethod(PhpMethod::create('set'.$name.'Id')
 			->setDescription(str_replace('{foreign}', $foreign->getPhpName(), 'Sets the {foreign} id'))
 			->addParameter(PhpParameter::create('id'))
 			->addParameter(PhpParameter::create($localId))
@@ -111,9 +111,9 @@ 
 	}
 	
 	protected function generateToManyRelationshipAdd(PhpTrait $trait, Table $model, Table $foreign, Table $middle) {
-		$trait->addUseStatement($foreign->getNamespace() . '\\' . $foreign->getPhpName() . 'Query');
-		$trait->setMethod(PhpMethod::create('add' . $foreign->getPhpName())
-			->setDescription('Adds ' . $foreign->getPhpName() . ' to ' . $model->getPhpName())
+		$trait->addUseStatement($foreign->getNamespace().'\\'.$foreign->getPhpName().'Query');
+		$trait->setMethod(PhpMethod::create('add'.$foreign->getPhpName())
+			->setDescription('Adds '.$foreign->getPhpName().' to '.$model->getPhpName())
 			->addParameter(PhpParameter::create('id'))
 			->addParameter(PhpParameter::create('data'))
 			->setBody($this->twig->render('to-many-add.twig', [
@@ -127,10 +127,10 @@ 
 	}
 	
 	protected function generateToManyRelationshipUpdate(PhpTrait $trait, Table $model, Table $foreign, Table $middle) {
-		$trait->addUseStatement($middle->getNamespace() . '\\' . $middle->getPhpName() . 'Query');
-		$trait->addUseStatement($foreign->getNamespace() . '\\' . $foreign->getPhpName() . 'Query');
-		$trait->setMethod(PhpMethod::create('update' . $foreign->getPhpName())
-			->setDescription('Updates ' . $foreign->getPhpName() . ' on ' . $model->getPhpName())
+		$trait->addUseStatement($middle->getNamespace().'\\'.$middle->getPhpName().'Query');
+		$trait->addUseStatement($foreign->getNamespace().'\\'.$foreign->getPhpName().'Query');
+		$trait->setMethod(PhpMethod::create('update'.$foreign->getPhpName())
+			->setDescription('Updates '.$foreign->getPhpName().' on '.$model->getPhpName())
 			->addParameter(PhpParameter::create('id'))
 			->addParameter(PhpParameter::create('data'))
 			->setBody($this->twig->render('to-many-update.twig', [
@@ -145,9 +145,9 @@ 
 	}
 	
 	protected function generateToManyRelationshipRemove(PhpTrait $trait, Table $model, Table $foreign, Table $middle) {
-		$trait->addUseStatement($foreign->getNamespace() . '\\' . $foreign->getPhpName() . 'Query');
-		$trait->setMethod(PhpMethod::create('remove' . $foreign->getPhpName())
-			->setDescription('Removes ' . $foreign->getPhpName() . ' from ' . $model->getPhpName())
+		$trait->addUseStatement($foreign->getNamespace().'\\'.$foreign->getPhpName().'Query');
+		$trait->setMethod(PhpMethod::create('remove'.$foreign->getPhpName())
+			->setDescription('Removes '.$foreign->getPhpName().' from '.$model->getPhpName())
 			->addParameter(PhpParameter::create('id'))
 			->addParameter(PhpParameter::create('data'))
 			->setBody($this->twig->render('to-many-remove.twig', [

src/command/GenerateActionCommand.php

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/GenerateResponseCommand.php

Spacing +13 added lines, -13 removed lines

@@ -149,7 +149,7 @@ 
 				
 				// aks for serializer
 				if ($format == 'json' && $template == 'api') {
-					$guessedSerializer = NameUtils::toStudlyCase($name) . 'Serializer';
+					$guessedSerializer = NameUtils::toStudlyCase($name).'Serializer';
 					$serializerQuestion = new Question('Which format', $guessedSerializer);
 					$serializer = $this->askQuestion($serializerQuestion);
 					$input->setOption('serializer', $serializer);
@@ -190,7 +190,7 @@ 
 	
 		// generate responders for crud actions
 		foreach ($types as $type) {
-			$actionName = $modelName . '-' . $type;
+			$actionName = $modelName.'-'.$type;
 	
 			$this->generateResponder($actionName);
 		}
@@ -206,14 +206,14 @@ 
 				$fk = $relationship['fk'];
 				$foreignName = $fk->getForeignTable()->getOriginCommonName();
 				foreach ($types[$relationship['type']] as $type) {
-					$this->generateResponder($modelName . '-to-' . $foreignName . '-relationship-' . $type);
+					$this->generateResponder($modelName.'-to-'.$foreignName.'-relationship-'.$type);
 				}
 			}
 		}
 	}
 	
 	protected function generateResponder($actionName) {
-		$this->logger->info('Generate Responder for: ' . $actionName);
+		$this->logger->info('Generate Responder for: '.$actionName);
 		$module = $this->packageService->getModule();
 		
 		if (!$module->hasAction($actionName)) {
@@ -234,7 +234,7 @@ 
 
 		if (!$action->hasResponse($format)) {
 			$className = str_replace('action', 'responder', $action->getClass());
-			$className = preg_replace('/Action$/', ucwords($format) . 'Responder', $className);
+			$className = preg_replace('/Action$/', ucwords($format).'Responder', $className);
 			$action->setResponse($format, $className);
 		}
 
@@ -301,13 +301,13 @@ 
 			$foreign->getPhpName()
 		);
 		
-		$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
 		;
 		
@@ -336,8 +336,8 @@ 
 		// check fqcn
 		$class = PhpClass::create($serializer);
 		if ($class->getQualifiedName() == $serializer) {
-			$class->setQualifiedName(NamespaceResolver::getNamespace('src/serializer', $this->package) . 
-				'\\' . $serializer);
+			$class->setQualifiedName(NamespaceResolver::getNamespace('src/serializer', $this->package). 
+				'\\'.$serializer);
 		}
 		
 		// check serializer exists

src/command/GenerateSerializerCommand.php

Spacing +5 added lines, -5 removed lines

@@ -49,7 +49,7 @@ 
 	protected function initialize(InputInterface $input, OutputInterface $output) {
 		parent::initialize($input, $output);
 
-		$loader = new \Twig_Loader_Filesystem($this->service->getConfig()->getTemplateRoot() . '/serializer');
+		$loader = new \Twig_Loader_Filesystem($this->service->getConfig()->getTemplateRoot().'/serializer');
 		$this->twig = new \Twig_Environment($loader);
 	}
 
@@ -129,7 +129,7 @@ 
 	}
 
 	private function generateModel($modelName) {
-		$this->logger->info('Generate Serializer from Model: ' . $modelName);
+		$this->logger->info('Generate Serializer from Model: '.$modelName);
 		$model = $this->modelService->getModel($modelName);
 		
 		// generate class
@@ -143,7 +143,7 @@ 
 		$this->codegenService->dumpStruct($trait, true);
 		
 		// add serializer + ApiModelInterface on the model
-		$class = new PhpClass(str_replace('\\\\', '\\', $model->getNamespace() . '\\' . $model->getPhpName()));
+		$class = new PhpClass(str_replace('\\\\', '\\', $model->getNamespace().'\\'.$model->getPhpName()));
 		$file = $this->codegenService->getFile($class);
 		if ($file->exists()) {
 			$class = PhpClass::fromFile($this->codegenService->getFilename($class));
@@ -173,10 +173,10 @@ 
 	 * @param string $name
 	 */
 	private function generateSkeleton($name) {
-		$this->logger->info('Generate Skeleton Serializer: ' . $name);
+		$this->logger->info('Generate Skeleton Serializer: '.$name);
 		$input = $this->io->getInput();
 
-		$className = NamespaceResolver::getNamespace('src/serializer', $this->package) . '\\' . $name;
+		$className = NamespaceResolver::getNamespace('src/serializer', $this->package).'\\'.$name;
 		
 		if (!Text::create($className)->endsWith('Serializer')) {
 			$className .= 'Serializer';

src/command/GenerateDomainCommand.php

Spacing +4 added lines, -4 removed lines

@@ -46,7 +46,7 @@ 
 	protected function initialize(InputInterface $input, OutputInterface $output) {
 		parent::initialize($input, $output);
 
-		$loader = new \Twig_Loader_Filesystem($this->service->getConfig()->getTemplateRoot() . '/domain');
+		$loader = new \Twig_Loader_Filesystem($this->service->getConfig()->getTemplateRoot().'/domain');
 		$this->twig = new \Twig_Environment($loader);
 	}
 
@@ -129,7 +129,7 @@ 
 	}
 
 	private function generateModel($modelName) {
-		$this->logger->info('Generate Domain from Model: ' . $modelName);
+		$this->logger->info('Generate Domain from Model: '.$modelName);
 		$model = $this->modelService->getModel($modelName);
 		
 		// generate class
@@ -146,10 +146,10 @@ 
 	}
 	
 	private function generateSkeleton($name) {
-		$this->logger->info('Generate Skeleton Domain: ' . $name);
+		$this->logger->info('Generate Skeleton Domain: '.$name);
 		$input = $this->io->getInput();
 
-		$className = NamespaceResolver::getNamespace('src/domain', $this->package) . '\\' . $name;
+		$className = NamespaceResolver::getNamespace('src/domain', $this->package).'\\'.$name;
 		
 		if (!Text::create($className)->endsWith('Domain')) {
 			$className .= 'Domain';