keeko / tools

src/generator/action/ToManyRelationshipAddActionGenerator.php

Spacing +2 added lines, -2 removed lines

@@ -21,9 +21,9 @@
 		// method: run(Request $request) : Response
 		$class->addUseStatement('phootwork\\json\\Json');
 		$class->addUseStatement('Tobscure\\JsonApi\\Exception\\InvalidParameterException');
-		$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('to-many-remove-run.twig', [
-			'domain' =>  $model->getPhpName() . 'Domain',
+			'domain' =>  $model->getPhpName().'Domain',
 			'foreign_class' => $foreignModel->getPhpName()
 		])));
 

src/generator/action/ToManyRelationshipReadActionGenerator.php

Spacing +2 added lines, -2 removed lines

@@ -20,9 +20,9 @@
 		$this->addConfigureParamsMethod($class, $this->twig->render('relationship-configureParams.twig'));
 
 		// method: run(Request $request) : Response
-		$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('to-one-read-run.twig', [
-			'domain' =>  $model->getPhpName() . 'Domain'
+			'domain' =>  $model->getPhpName().'Domain'
 		])));
 
 		return $class;

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/command/GenerateSerializerCommand.php

Unused Use Statements -1 removed lines

@@ -7,7 +7,6 @@
 use keeko\tools\generator\serializer\base\ModelSerializerTraitGenerator;
 use keeko\tools\generator\serializer\SkeletonSerializerGenerator;
 use keeko\tools\helpers\QuestionHelperTrait;
-use phootwork\file\File;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;

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/generator/responder/ApiJsonResponderGenerator.php

Doc Comments +3 added lines

@@ -8,6 +8,9 @@
 
 	protected $serializer;
 
+	/**
+	 * @param string $serializer
+	 */
 	public function setSerializer($serializer) {
 		$this->serializer = $serializer;
 	}

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', [