Completed
Push — master ( 159932...f1c264 )
by Thomas
08:09
created
src/generator/action/ModelReadActionGenerator.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -15,9 +15,9 @@
 block discarded – undo
15 15
 
16 16
 		// method: run(Request $request)
17 17
 		$class->addUseStatement('Tobscure\\JsonApi\\Parameters');
18
-		$class->addUseStatement(str_replace('model', 'domain', $model->getNamespace()) . '\\' . $model->getPhpName() . 'Domain');
18
+		$class->addUseStatement(str_replace('model', 'domain', $model->getNamespace()).'\\'.$model->getPhpName().'Domain');
19 19
 		$class->setMethod($this->generateRunMethod($this->twig->render('list-run.twig', [
20
-			'domain' => $model->getPhpName() . 'Domain'
20
+			'domain' => $model->getPhpName().'Domain'
21 21
 		])));
22 22
 			
23 23
 	}
Please login to merge, or discard this patch.
src/generator/action/ModelCreateActionGenerator.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -18,9 +18,9 @@
 block discarded – undo
18 18
 	
19 19
 		// method: run(Request $request)
20 20
 		$class->addUseStatement('phootwork\\json\\Json');
21
-		$class->addUseStatement(str_replace('model', 'domain', $model->getNamespace()) . '\\' . $model->getPhpName() . 'Domain');
21
+		$class->addUseStatement(str_replace('model', 'domain', $model->getNamespace()).'\\'.$model->getPhpName().'Domain');
22 22
 		$class->setMethod($this->generateRunMethod($this->twig->render('update-run.twig', [
23
-			'domain' => $model->getPhpName() . 'Domain'
23
+			'domain' => $model->getPhpName().'Domain'
24 24
 		])));
25 25
 	}
26 26
 }
27 27
\ No newline at end of file
Please login to merge, or discard this patch.
src/generator/responder/ToManyRelationshipJsonResponderGenerator.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@
 block discarded – undo
21 21
 
22 22
 	protected function addMethods(PhpClass $class, ActionSchema $action) {
23 23
 		// method: run(Request $request, $data = null)
24
-		$class->addUseStatement($this->model->getNamespace() . '\\' . $this->model->getPhpName());
24
+		$class->addUseStatement($this->model->getNamespace().'\\'.$this->model->getPhpName());
25 25
 		$class->setMethod($this->generateRunMethod($this->twig->render('dump-to-one-relationship.twig', [
26 26
 			'class' => $this->model->getPhpName(),
27 27
 			'related' => $this->foreign->getCamelCaseName()
Please login to merge, or discard this patch.
src/generator/responder/ModelListJsonResponderGenerator.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
 
18 18
 		$fields = $this->getModelFields($model);
19 19
 		foreach ($fields as $field) {
20
-			$class->addUseStatement($field->getNamespace() . '\\' . $field->getPhpName());
20
+			$class->addUseStatement($field->getNamespace().'\\'.$field->getPhpName());
21 21
 		}
22 22
 		
23 23
 		$updated = $this->generatePayloadMethod('updated', $this->twig->render('model-read.twig', [
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 		$class->addUseStatement('Tobscure\\JsonApi\\Document');
31 31
 		$class->addUseStatement('Tobscure\\JsonApi\\Resource');
32 32
 		$class->addUseStatement('Tobscure\\JsonApi\\Parameters');
33
-		$class->addUseStatement($model->getNamespace() . '\\' . $model->getPhpName());
33
+		$class->addUseStatement($model->getNamespace().'\\'.$model->getPhpName());
34 34
 		
35 35
 		// method: notUpdated(Request $request, PayloadInterface $payload)
36 36
 		$notUpdated = $this->generatePayloadMethod('notUpdated', $this->twig->render('model-notUpdated.twig'));
Please login to merge, or discard this patch.
src/generator/responder/AbstractPayloadJsonResponderGenerator.php 2 patches
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -32,6 +32,10 @@
 block discarded – undo
32 32
 		);
33 33
 	}
34 34
 	
35
+	/**
36
+	 * @param string $name
37
+	 * @param string $body
38
+	 */
35 39
 	protected function generatePayloadMethod($name, $body) {
36 40
 		return PhpMethod::create($name)
37 41
 			->addParameter(PhpParameter::create('request')
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 			if ($rel['type'] == 'many') {
74 74
 				$typeName = NameUtils::pluralize($typeName);
75 75
 			}
76
-			$includes[] = (!empty($root) ? $root . '.' : '') . $typeName;
76
+			$includes[] = (!empty($root) ? $root.'.' : '').$typeName;
77 77
 			$includes = array_merge($includes, $this->getRelationshipIncludes($foreignModel, $typeName, $processed));
78 78
 		}
79 79
 	
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
 			if ($rel['type'] == 'many') {
99 99
 				$typeName = NameUtils::pluralize($typeName);
100 100
 			}
101
-			$name = (!empty($root) ? $root . '.' : '') . $typeName;
101
+			$name = (!empty($root) ? $root.'.' : '').$typeName;
102 102
 			
103 103
 			$fields[$name] = $foreignModel;
104 104
 			$fields = array_merge($fields, $this->getModelFields($foreignModel, $name, $processed));
Please login to merge, or discard this patch.
src/generator/serializer/base/ModelSerializerTraitGenerator.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
 			foreach ($fields as $field) {
95 95
 				$code .= "'$field'";
96 96
 				if (isset($conversions[$field])) {
97
-					$code .= ' => function($v) {'."\n\t".'return ' . $conversions[$field] . ';'."\n".'}';
97
+					$code .= ' => function($v) {'."\n\t".'return '.$conversions[$field].';'."\n".'}';
98 98
 				}
99 99
 		
100 100
 				$code .= ', ';
@@ -142,8 +142,8 @@  discard block
 block discarded – undo
142 142
 				$name = NameUtils::dasherize($refPhpName);
143 143
 				$method = NameUtils::toCamelCase($refPhpName);
144 144
 				$crudMethod = $refPhpName;
145
-				$rels[$name] = $foreignModel->getPhpName() . '::getSerializer()->getType(null)';
146
-				$class->addUseStatement($foreignModel->getNamespace() . '\\' . $foreignModel->getPhpName());
145
+				$rels[$name] = $foreignModel->getPhpName().'::getSerializer()->getType(null)';
146
+				$class->addUseStatement($foreignModel->getNamespace().'\\'.$foreignModel->getPhpName());
147 147
 				$class->addUseStatement('Tobscure\\JsonApi\\Resource');
148 148
 				
149 149
 				// read
@@ -175,8 +175,8 @@  discard block
 block discarded – undo
175 175
 				$name = NameUtils::dasherize($refPhpName);
176 176
 				$method = NameUtils::toCamelCase($refPhpName);
177 177
 				$crudMethod = NameUtils::pluralize($refPhpName);
178
-				$rels[$name] = $foreignModel->getPhpName() . '::getSerializer()->getType(null)';
179
-				$class->addUseStatement($foreignModel->getNamespace() . '\\' . $foreignModel->getPhpName());
178
+				$rels[$name] = $foreignModel->getPhpName().'::getSerializer()->getType(null)';
179
+				$class->addUseStatement($foreignModel->getNamespace().'\\'.$foreignModel->getPhpName());
180 180
 // 				$class->addUseStatement($foreignModel->getNamespace() . '\\' . $foreignModel->getPhpName() . 'Query');
181 181
 				$class->addUseStatement('Tobscure\\JsonApi\\Collection');
182 182
 				
Please login to merge, or discard this patch.
src/generator/responder/ToOneRelationshipJsonResponderGenerator.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@
 block discarded – undo
33 33
 		]));
34 34
 		
35 35
 		$class->setMethod($read);
36
-		$class->addUseStatement($model->getNamespace() . '\\' . $model->getPhpName());
36
+		$class->addUseStatement($model->getNamespace().'\\'.$model->getPhpName());
37 37
 		
38 38
 		// method: notUpdated(Request $request, PayloadInterface $payload)
39 39
 		$notUpdated = $this->generatePayloadMethod('notUpdated', $this->twig->render('payload/notUpdated.twig'));
Please login to merge, or discard this patch.
src/generator/domain/ReadOnlyDomainTraitGenerator.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -22,9 +22,9 @@  discard block
 block discarded – undo
22 22
 	protected function generateTrait(Table $model) {
23 23
 		$trait = PhpTrait::create()
24 24
 			->setNamespace(str_replace('model', 'domain\\base', $model->getNamespace()))
25
-			->setName($model->getPhpName() . 'DomainTrait')
26
-			->addUseStatement($model->getNamespace() . '\\' . $model->getPhpName())
27
-			->addUseStatement($model->getNamespace() . '\\' . $model->getPhpName() . 'Query')
25
+			->setName($model->getPhpName().'DomainTrait')
26
+			->addUseStatement($model->getNamespace().'\\'.$model->getPhpName())
27
+			->addUseStatement($model->getNamespace().'\\'.$model->getPhpName().'Query')
28 28
 			->addUseStatement('keeko\\framework\\service\\ServiceContainer')
29 29
 			->setMethod(PhpMethod::create('getServiceContainer')
30 30
 				->setVisibility(PhpMethod::VISIBILITY_PROTECTED)
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 			)
35 35
 		;
36 36
 		$trait->addUseStatement('keeko\framework\domain\payload\PayloadInterface');
37
-		$trait->addUseStatement($model->getNamespace() . '\\' . $model->getPhpName());
37
+		$trait->addUseStatement($model->getNamespace().'\\'.$model->getPhpName());
38 38
 
39 39
 		return $trait;
40 40
 	}
@@ -48,8 +48,8 @@  discard block
 block discarded – undo
48 48
 				'class' => $model->getPhpName()
49 49
 			]))
50 50
 			->setVisibility(PhpMethod::VISIBILITY_PROTECTED)
51
-			->setDescription('Returns one ' . $model->getPhpName() . ' with the given id from cache')
52
-			->setType($model->getPhpName() . '|null')
51
+			->setDescription('Returns one '.$model->getPhpName().' with the given id from cache')
52
+			->setType($model->getPhpName().'|null')
53 53
 		);
54 54
 	}
55 55
 	
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
 				'model' => NameUtils::toCamelCase($model->getOriginCommonName()),
64 64
 				'class' => $model->getPhpName()
65 65
 			]))
66
-			->setDescription('Returns one ' . $model->getPhpName() . ' with the given id')
66
+			->setDescription('Returns one '.$model->getPhpName().' with the given id')
67 67
 			->setType('PayloadInterface')
68 68
 		);
69 69
 	}
@@ -87,17 +87,17 @@  discard block
 block discarded – undo
87 87
 		
88 88
 		$trait->setMethod(PhpMethod::create('applyFilter')
89 89
 			->addParameter(PhpParameter::create('query')
90
-				->setType($model->getPhpName() . 'Query')
90
+				->setType($model->getPhpName().'Query')
91 91
 			)
92 92
 			->addParameter(PhpParameter::create('filter'))
93 93
 			->setVisibility(PhpMethod::VISIBILITY_PROTECTED)
94 94
 			->setAbstract(true)
95
-			->setDescription('Implement this functionality at ' . $this->getClassName($model))
95
+			->setDescription('Implement this functionality at '.$this->getClassName($model))
96 96
 		);
97 97
 	}
98 98
 	
99 99
 	protected function getClassName(Table $model) {
100
-		return str_replace('model', 'domain', $model->getNamespace()) .
101
-			'\\' . $model->getPhpName() . 'Domain';
100
+		return str_replace('model', 'domain', $model->getNamespace()).
101
+			'\\'.$model->getPhpName().'Domain';
102 102
 	}
103 103
 }
Please login to merge, or discard this patch.
src/generator/domain/DomainTraitGenerator.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
 				'model' => NameUtils::toCamelCase($model->getOriginCommonName()),
51 51
 				'class' => $model->getPhpName()
52 52
 			]))
53
-			->setDescription('Creates a new ' . $model->getPhpName() . ' with the provided data')
53
+			->setDescription('Creates a new '.$model->getPhpName().' with the provided data')
54 54
 			->setType('PayloadInterface')
55 55
 		);
56 56
 	}
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 				'model' => NameUtils::toCamelCase($model->getOriginCommonName()),
69 69
 				'class' => $model->getPhpName()
70 70
 			]))
71
-			->setDescription('Updates a ' . $model->getPhpName() . ' with the given id' .
71
+			->setDescription('Updates a '.$model->getPhpName().' with the given id'.
72 72
 				'and the provided data')
73 73
 			->setType('PayloadInterface')
74 74
 		);
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 				'model' => NameUtils::toCamelCase($model->getOriginCommonName()),
86 86
 				'class' => $model->getPhpName()
87 87
 			]))
88
-			->setDescription('Deletes a ' . $model->getPhpName() . ' with the given id')
88
+			->setDescription('Deletes a '.$model->getPhpName().' with the given id')
89 89
 			->setType('PayloadInterface')
90 90
 		);
91 91
 	}
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 			$name = $foreign->getPhpName();
97 97
 		}
98 98
 		$localId = NameUtils::toCamelCase($fk->getLocalColumn()->getPhpName());
99
-		$trait->setMethod(PhpMethod::create('set' . $name . 'Id')
99
+		$trait->setMethod(PhpMethod::create('set'.$name.'Id')
100 100
 			->setDescription(str_replace('{foreign}', $foreign->getPhpName(), 'Sets the {foreign} id'))
101 101
 			->addParameter(PhpParameter::create('id'))
102 102
 			->addParameter(PhpParameter::create($localId))
@@ -111,9 +111,9 @@  discard block
 block discarded – undo
111 111
 	}
112 112
 	
113 113
 	protected function generateToManyRelationshipAdd(PhpTrait $trait, Table $model, Table $foreign, Table $middle) {
114
-		$trait->addUseStatement($foreign->getNamespace() . '\\' . $foreign->getPhpName() . 'Query');
115
-		$trait->setMethod(PhpMethod::create('add' . $foreign->getPhpName())
116
-			->setDescription('Adds ' . $foreign->getPhpName() . ' to ' . $model->getPhpName())
114
+		$trait->addUseStatement($foreign->getNamespace().'\\'.$foreign->getPhpName().'Query');
115
+		$trait->setMethod(PhpMethod::create('add'.$foreign->getPhpName())
116
+			->setDescription('Adds '.$foreign->getPhpName().' to '.$model->getPhpName())
117 117
 			->addParameter(PhpParameter::create('id'))
118 118
 			->addParameter(PhpParameter::create('data'))
119 119
 			->setBody($this->twig->render('to-many-add.twig', [
@@ -127,10 +127,10 @@  discard block
 block discarded – undo
127 127
 	}
128 128
 	
129 129
 	protected function generateToManyRelationshipUpdate(PhpTrait $trait, Table $model, Table $foreign, Table $middle) {
130
-		$trait->addUseStatement($middle->getNamespace() . '\\' . $middle->getPhpName() . 'Query');
131
-		$trait->addUseStatement($foreign->getNamespace() . '\\' . $foreign->getPhpName() . 'Query');
132
-		$trait->setMethod(PhpMethod::create('update' . $foreign->getPhpName())
133
-			->setDescription('Updates ' . $foreign->getPhpName() . ' on ' . $model->getPhpName())
130
+		$trait->addUseStatement($middle->getNamespace().'\\'.$middle->getPhpName().'Query');
131
+		$trait->addUseStatement($foreign->getNamespace().'\\'.$foreign->getPhpName().'Query');
132
+		$trait->setMethod(PhpMethod::create('update'.$foreign->getPhpName())
133
+			->setDescription('Updates '.$foreign->getPhpName().' on '.$model->getPhpName())
134 134
 			->addParameter(PhpParameter::create('id'))
135 135
 			->addParameter(PhpParameter::create('data'))
136 136
 			->setBody($this->twig->render('to-many-update.twig', [
@@ -145,9 +145,9 @@  discard block
 block discarded – undo
145 145
 	}
146 146
 	
147 147
 	protected function generateToManyRelationshipRemove(PhpTrait $trait, Table $model, Table $foreign, Table $middle) {
148
-		$trait->addUseStatement($foreign->getNamespace() . '\\' . $foreign->getPhpName() . 'Query');
149
-		$trait->setMethod(PhpMethod::create('remove' . $foreign->getPhpName())
150
-			->setDescription('Removes ' . $foreign->getPhpName() . ' from ' . $model->getPhpName())
148
+		$trait->addUseStatement($foreign->getNamespace().'\\'.$foreign->getPhpName().'Query');
149
+		$trait->setMethod(PhpMethod::create('remove'.$foreign->getPhpName())
150
+			->setDescription('Removes '.$foreign->getPhpName().' from '.$model->getPhpName())
151 151
 			->addParameter(PhpParameter::create('id'))
152 152
 			->addParameter(PhpParameter::create('data'))
153 153
 			->setBody($this->twig->render('to-many-remove.twig', [
Please login to merge, or discard this patch.