@@ -235,7 +235,7 @@ |
||
235 | 235 | $mappedParam = $this->createFilterAttributeParameter($jsonName, $column, $value); |
236 | 236 | } elseif ($this->canMapRelationship($jsonName) === true) { |
237 | 237 | $modelName = $this->getRelationshipMappings()[$jsonName]; |
238 | - $type = $this->getModelSchemes()->getRelationshipType($this->getCurrentModelClass(), $modelName); |
|
238 | + $type = $this->getModelSchemes()->getRelationshipType($this->getCurrentModelClass(), $modelName); |
|
239 | 239 | $mappedParam = $this->createFilterRelationshipParameter($jsonName, $modelName, $value, $type); |
240 | 240 | } else { |
241 | 241 | // filters could actually be applied to attributes in relationships |
@@ -49,10 +49,10 @@ discard block |
||
49 | 49 | $subUri = $type = $schemeClass::TYPE; |
50 | 50 | |
51 | 51 | $indexSlug = '/{' . BaseController::ROUTE_KEY_INDEX . '}'; |
52 | - $params = function ($method) use ($type) { |
|
52 | + $params = function($method) use ($type) { |
|
53 | 53 | return [RouteInterface::PARAM_NAME => $type . '_' . $method]; |
54 | 54 | }; |
55 | - $handler = function ($method) use ($controllerClass) { |
|
55 | + $handler = function($method) use ($controllerClass) { |
|
56 | 56 | return [$controllerClass, $method]; |
57 | 57 | }; |
58 | 58 | |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | |
85 | 85 | /** @var SchemaInterface $schemaClass */ |
86 | 86 | assert(array_key_exists(SchemaInterface::class, class_implements($schemaClass)) === true); |
87 | - $subUri = $schemaClass::TYPE; |
|
87 | + $subUri = $schemaClass::TYPE; |
|
88 | 88 | |
89 | 89 | /** @var string $controllerClass */ |
90 | 90 | /** @var string $schemaClass */ |
@@ -287,7 +287,7 @@ discard block |
||
287 | 287 | $table = $this->getTableName($modelClass); |
288 | 288 | foreach ($sortParams as $sortParam) { |
289 | 289 | /** @var SortParameterInterface $sortParam */ |
290 | - $column = null; |
|
290 | + $column = null; |
|
291 | 291 | if ($sortParam->isRelationship() === false) { |
292 | 292 | $column = $sortParam->getName(); |
293 | 293 | } elseif ($sortParam->getRelationshipType() === RelationshipTypes::BELONGS_TO) { |
@@ -357,7 +357,7 @@ discard block |
||
357 | 357 | switch ($filterParam->getRelationshipType()) { |
358 | 358 | case RelationshipTypes::BELONGS_TO: |
359 | 359 | if ($filterParam->isForAttributeInRelationship() === true) { |
360 | - $foreignKey = $modelSchemes->getForeignKey( |
|
360 | + $foreignKey = $modelSchemes->getForeignKey( |
|
361 | 361 | $modelClass, |
362 | 362 | $filterParam->getRelationshipName() |
363 | 363 | ); |
@@ -414,7 +414,7 @@ discard block |
||
414 | 414 | break; |
415 | 415 | case RelationshipTypes::BELONGS_TO_MANY: |
416 | 416 | // here we join intermediate belongsToMany table and apply filter on its 2nd foreign key |
417 | - list ($intermediateTable, $intermediatePk , $intermediateFk) = $modelSchemes |
|
417 | + list ($intermediateTable, $intermediatePk, $intermediateFk) = $modelSchemes |
|
418 | 418 | ->getBelongsToManyRelationship($modelClass, $filterParam->getRelationshipName()); |
419 | 419 | $primaryKey = $modelSchemes->getPrimaryKey($modelClass); |
420 | 420 | $aliased = $intermediateTable . $this->getNewAliasId(); |
@@ -181,8 +181,7 @@ discard block |
||
181 | 181 | foreach ($values as $value) { |
182 | 182 | $placeholders[] = $builder->createNamedParameter((string)$value); |
183 | 183 | } |
184 | - $placeholders === null ?: |
|
185 | - $link->add($builder->expr()->in($this->getTableColumn($table, $column), $placeholders)); |
|
184 | + $placeholders === null ?: $link->add($builder->expr()->in($this->getTableColumn($table, $column), $placeholders)); |
|
186 | 185 | } |
187 | 186 | |
188 | 187 | /** |
@@ -205,8 +204,7 @@ discard block |
||
205 | 204 | foreach ($values as $value) { |
206 | 205 | $placeholders[] = $builder->createNamedParameter((string)$value); |
207 | 206 | } |
208 | - $placeholders === null ?: |
|
209 | - $link->add($builder->expr()->notIn($this->getTableColumn($table, $column), $placeholders)); |
|
207 | + $placeholders === null ?: $link->add($builder->expr()->notIn($this->getTableColumn($table, $column), $placeholders)); |
|
210 | 208 | } |
211 | 209 | |
212 | 210 | /** |
@@ -1,20 +1,20 @@ |
||
1 | 1 | <?php namespace Limoncello\Flute\Contracts\Models; |
2 | 2 | |
3 | 3 | /** |
4 | - * Copyright 2015-2017 [email protected] |
|
5 | - * |
|
6 | - * Licensed under the Apache License, Version 2.0 (the "License"); |
|
7 | - * you may not use this file except in compliance with the License. |
|
8 | - * You may obtain a copy of the License at |
|
9 | - * |
|
10 | - * http://www.apache.org/licenses/LICENSE-2.0 |
|
11 | - * |
|
12 | - * Unless required by applicable law or agreed to in writing, software |
|
13 | - * distributed under the License is distributed on an "AS IS" BASIS, |
|
14 | - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
|
15 | - * See the License for the specific language governing permissions and |
|
16 | - * limitations under the License. |
|
17 | - */ |
|
4 | + * Copyright 2015-2017 [email protected] |
|
5 | + * |
|
6 | + * Licensed under the Apache License, Version 2.0 (the "License"); |
|
7 | + * you may not use this file except in compliance with the License. |
|
8 | + * You may obtain a copy of the License at |
|
9 | + * |
|
10 | + * http://www.apache.org/licenses/LICENSE-2.0 |
|
11 | + * |
|
12 | + * Unless required by applicable law or agreed to in writing, software |
|
13 | + * distributed under the License is distributed on an "AS IS" BASIS, |
|
14 | + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
|
15 | + * See the License for the specific language governing permissions and |
|
16 | + * limitations under the License. |
|
17 | + */ |
|
18 | 18 | |
19 | 19 | /** |
20 | 20 | * @package Limoncello\Flute |
@@ -1,20 +1,20 @@ |
||
1 | 1 | <?php namespace Limoncello\Flute\Contracts\Models; |
2 | 2 | |
3 | 3 | /** |
4 | - * Copyright 2015-2017 [email protected] |
|
5 | - * |
|
6 | - * Licensed under the Apache License, Version 2.0 (the "License"); |
|
7 | - * you may not use this file except in compliance with the License. |
|
8 | - * You may obtain a copy of the License at |
|
9 | - * |
|
10 | - * http://www.apache.org/licenses/LICENSE-2.0 |
|
11 | - * |
|
12 | - * Unless required by applicable law or agreed to in writing, software |
|
13 | - * distributed under the License is distributed on an "AS IS" BASIS, |
|
14 | - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
|
15 | - * See the License for the specific language governing permissions and |
|
16 | - * limitations under the License. |
|
17 | - */ |
|
4 | + * Copyright 2015-2017 [email protected] |
|
5 | + * |
|
6 | + * Licensed under the Apache License, Version 2.0 (the "License"); |
|
7 | + * you may not use this file except in compliance with the License. |
|
8 | + * You may obtain a copy of the License at |
|
9 | + * |
|
10 | + * http://www.apache.org/licenses/LICENSE-2.0 |
|
11 | + * |
|
12 | + * Unless required by applicable law or agreed to in writing, software |
|
13 | + * distributed under the License is distributed on an "AS IS" BASIS, |
|
14 | + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
|
15 | + * See the License for the specific language governing permissions and |
|
16 | + * limitations under the License. |
|
17 | + */ |
|
18 | 18 | |
19 | 19 | /** |
20 | 20 | * @package Limoncello\Flute |
@@ -1,20 +1,20 @@ |
||
1 | 1 | <?php namespace Limoncello\Flute\Contracts\Models; |
2 | 2 | |
3 | 3 | /** |
4 | - * Copyright 2015-2017 [email protected] |
|
5 | - * |
|
6 | - * Licensed under the Apache License, Version 2.0 (the "License"); |
|
7 | - * you may not use this file except in compliance with the License. |
|
8 | - * You may obtain a copy of the License at |
|
9 | - * |
|
10 | - * http://www.apache.org/licenses/LICENSE-2.0 |
|
11 | - * |
|
12 | - * Unless required by applicable law or agreed to in writing, software |
|
13 | - * distributed under the License is distributed on an "AS IS" BASIS, |
|
14 | - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
|
15 | - * See the License for the specific language governing permissions and |
|
16 | - * limitations under the License. |
|
17 | - */ |
|
4 | + * Copyright 2015-2017 [email protected] |
|
5 | + * |
|
6 | + * Licensed under the Apache License, Version 2.0 (the "License"); |
|
7 | + * you may not use this file except in compliance with the License. |
|
8 | + * You may obtain a copy of the License at |
|
9 | + * |
|
10 | + * http://www.apache.org/licenses/LICENSE-2.0 |
|
11 | + * |
|
12 | + * Unless required by applicable law or agreed to in writing, software |
|
13 | + * distributed under the License is distributed on an "AS IS" BASIS, |
|
14 | + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
|
15 | + * See the License for the specific language governing permissions and |
|
16 | + * limitations under the License. |
|
17 | + */ |
|
18 | 18 | |
19 | 19 | /** |
20 | 20 | * @package Limoncello\Flute |