@@ -58,9 +58,9 @@ |
||
58 | 58 | $cerealRequest = serialize($request); |
59 | 59 | $cerealMeta = serialize($meta); |
60 | 60 | $cerealResponse = serialize($odataResponse); |
61 | - Storage::put($xTest.'request', $cerealRequest); |
|
62 | - Storage::put($xTest.'metadata', $cerealMeta); |
|
63 | - Storage::put($xTest.'response', $cerealResponse); |
|
61 | + Storage::put($xTest . 'request', $cerealRequest); |
|
62 | + Storage::put($xTest . 'metadata', $cerealMeta); |
|
63 | + Storage::put($xTest . 'response', $cerealResponse); |
|
64 | 64 | } |
65 | 65 | } |
66 | 66 |
@@ -53,7 +53,7 @@ |
||
53 | 53 | foreach ($lock as $barrel => $roll) { |
54 | 54 | assert( |
55 | 55 | !array_key_exists($barrel, $metamix[$key]), |
56 | - 'Mapping already defined for model '.$key.' and CRUD verb '.$barrel |
|
56 | + 'Mapping already defined for model ' . $key . ' and CRUD verb ' . $barrel |
|
57 | 57 | ); |
58 | 58 | $metamix[$key][$barrel] = $roll; |
59 | 59 | } |
@@ -310,12 +310,12 @@ discard block |
||
310 | 310 | $map = $raw->getMetadata(); |
311 | 311 | |
312 | 312 | if (!array_key_exists($class, $map)) { |
313 | - throw new \POData\Common\InvalidOperationException('Controller mapping missing for class '.$class.'.'); |
|
313 | + throw new \POData\Common\InvalidOperationException('Controller mapping missing for class ' . $class . '.'); |
|
314 | 314 | } |
315 | 315 | $goal = $raw->getMapping($class, $verb); |
316 | 316 | if (null == $goal) { |
317 | 317 | throw new \POData\Common\InvalidOperationException( |
318 | - 'Controller mapping missing for '.$verb.' verb on class '.$class.'.' |
|
318 | + 'Controller mapping missing for ' . $verb . ' verb on class ' . $class . '.' |
|
319 | 319 | ); |
320 | 320 | } |
321 | 321 | |
@@ -391,7 +391,7 @@ discard block |
||
391 | 391 | throw new ODataException($e->getMessage(), 500); |
392 | 392 | } |
393 | 393 | } |
394 | - throw new ODataException('Target model not successfully '.$lastWord, 422); |
|
394 | + throw new ODataException('Target model not successfully ' . $lastWord, 422); |
|
395 | 395 | } |
396 | 396 | |
397 | 397 | /** |
@@ -434,7 +434,7 @@ discard block |
||
434 | 434 | } |
435 | 435 | $outData = $result->getData(); |
436 | 436 | if (is_object($outData)) { |
437 | - $outData = (array)$outData; |
|
437 | + $outData = (array) $outData; |
|
438 | 438 | } |
439 | 439 | |
440 | 440 | if (!is_array($outData)) { |
@@ -135,8 +135,8 @@ discard block |
||
135 | 135 | $nullFilter = true; |
136 | 136 | $isvalid = null; |
137 | 137 | if (isset($filterInfo)) { |
138 | - $method = 'return '.$filterInfo->getExpressionAsString().';'; |
|
139 | - $clln = '$'.$resourceSet->getResourceType()->getName(); |
|
138 | + $method = 'return ' . $filterInfo->getExpressionAsString() . ';'; |
|
139 | + $clln = '$' . $resourceSet->getResourceType()->getName(); |
|
140 | 140 | $isvalid = create_function($clln, $method); |
141 | 141 | $nullFilter = false; |
142 | 142 | } |
@@ -164,7 +164,7 @@ discard block |
||
164 | 164 | // so we can't bail out early |
165 | 165 | $rawCount += $results->count(); |
166 | 166 | // now bolt on filtrate to accumulating result set if we haven't accumulated enough bitz |
167 | - if ($rawTop > $resultSet->count() + $skip) { |
|
167 | + if ($rawTop > $resultSet->count()+$skip) { |
|
168 | 168 | $resultSet = collect(array_merge($resultSet->all(), $results->all())); |
169 | 169 | $sliceAmount = min($skip, $resultSet->count()); |
170 | 170 | $resultSet = $resultSet->slice($sliceAmount); |
@@ -202,7 +202,7 @@ discard block |
||
202 | 202 | if (QueryType::COUNT() == $queryType || QueryType::ENTITIES_WITH_COUNT() == $queryType) { |
203 | 203 | $result->count = $resultCount; |
204 | 204 | } |
205 | - $hazMore = $bulkSetCount > $skip + count($resultSet); |
|
205 | + $hazMore = $bulkSetCount > $skip+count($resultSet); |
|
206 | 206 | $result->hasMore = $hazMore; |
207 | 207 | return $result; |
208 | 208 | } |
@@ -365,7 +365,7 @@ discard block |
||
365 | 365 | } |
366 | 366 | $propertyName = $targetProperty->getName(); |
367 | 367 | if (!method_exists($sourceEntityInstance, $propertyName)) { |
368 | - $msg = 'Relation method, '.$propertyName.', does not exist on supplied entity.'; |
|
368 | + $msg = 'Relation method, ' . $propertyName . ', does not exist on supplied entity.'; |
|
369 | 369 | throw new InvalidArgumentException($msg); |
370 | 370 | } |
371 | 371 | // take key descriptor and turn it into where clause here, rather than in getResource call |
@@ -35,29 +35,29 @@ discard block |
||
35 | 35 | assert(0 < count($this->mapping), 'Mapping array must not be empty'); |
36 | 36 | |
37 | 37 | if (!array_key_exists($modelName, $this->mapping)) { |
38 | - throw new \Exception('Metadata mapping for model '.$modelName.' not defined'); |
|
38 | + throw new \Exception('Metadata mapping for model ' . $modelName . ' not defined'); |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | if (!in_array(strtolower($crudVerb), $this->crudVerbs)) { |
42 | - throw new \Exception('CRUD verb '.$crudVerb.' not defined'); |
|
42 | + throw new \Exception('CRUD verb ' . $crudVerb . ' not defined'); |
|
43 | 43 | } |
44 | 44 | |
45 | 45 | $lookup = $this->mapping[$modelName]; |
46 | 46 | if (!is_array($lookup)) { |
47 | - throw new \Exception('Metadata mapping for model '.$modelName.' not an array'); |
|
47 | + throw new \Exception('Metadata mapping for model ' . $modelName . ' not an array'); |
|
48 | 48 | } |
49 | 49 | |
50 | 50 | if (!array_key_exists($crudVerb, $lookup)) { |
51 | - throw new \Exception('Metadata mapping for CRUD verb '.$crudVerb.' on model '.$modelName.' not defined'); |
|
51 | + throw new \Exception('Metadata mapping for CRUD verb ' . $crudVerb . ' on model ' . $modelName . ' not defined'); |
|
52 | 52 | } |
53 | 53 | $result = $lookup[$crudVerb]; |
54 | 54 | if (!isset($result)) { |
55 | - throw new \Exception('Metadata mapping for CRUD verb '.$crudVerb.' on model '.$modelName.' null'); |
|
55 | + throw new \Exception('Metadata mapping for CRUD verb ' . $crudVerb . ' on model ' . $modelName . ' null'); |
|
56 | 56 | } |
57 | 57 | |
58 | 58 | if (!method_exists($this, $result)) { |
59 | 59 | throw new \Exception( |
60 | - 'Metadata target for CRUD verb '.$crudVerb.' on model '.$modelName.' does not exist' |
|
60 | + 'Metadata target for CRUD verb ' . $crudVerb . ' on model ' . $modelName . ' does not exist' |
|
61 | 61 | ); |
62 | 62 | } |
63 | 63 | |
@@ -79,19 +79,19 @@ discard block |
||
79 | 79 | // check that mapping array is well formed and sane, rather than waiting to stab us with a spatula |
80 | 80 | foreach ($this->mapping as $key => $map) { |
81 | 81 | if (!is_array($map)) { |
82 | - throw new \Exception('Metadata mapping for model '.$key.' not an array'); |
|
82 | + throw new \Exception('Metadata mapping for model ' . $key . ' not an array'); |
|
83 | 83 | } |
84 | 84 | foreach ($map as $verb => $method) { |
85 | 85 | if (!in_array(strtolower($verb), $this->crudVerbs)) { |
86 | - throw new \Exception('CRUD verb '.$verb.' not defined'); |
|
86 | + throw new \Exception('CRUD verb ' . $verb . ' not defined'); |
|
87 | 87 | } |
88 | 88 | if (!isset($method)) { |
89 | - throw new \Exception('Metadata mapping for CRUD verb '.$verb.' on model '.$key.' null'); |
|
89 | + throw new \Exception('Metadata mapping for CRUD verb ' . $verb . ' on model ' . $key . ' null'); |
|
90 | 90 | } |
91 | 91 | |
92 | 92 | if (!method_exists($this, $method)) { |
93 | 93 | throw new \Exception( |
94 | - 'Metadata target for CRUD verb '.$verb.' on model '.$key.' does not exist' |
|
94 | + 'Metadata target for CRUD verb ' . $verb . ' on model ' . $key . ' does not exist' |
|
95 | 95 | ); |
96 | 96 | } |
97 | 97 | $parmArray = $this->getParameterNames($method); |
@@ -56,7 +56,7 @@ |
||
56 | 56 | }; |
57 | 57 | $this->functionDescriptionParsers[ODataConstants::STRFUN_ENDSWITH] = function ($params) { |
58 | 58 | return '(strcmp(substr('.$params[0].', strlen('.$params[0].') - strlen('.$params[1].')), ' |
59 | - .$params[1].') === 0)'; |
|
59 | + .$params[1].') === 0)'; |
|
60 | 60 | }; |
61 | 61 | $this->functionDescriptionParsers[ODataConstants::STRFUN_INDEXOF] = function ($params) { |
62 | 62 | return 'strpos('.$params[0].', '.$params[1].')'; |
@@ -52,81 +52,81 @@ discard block |
||
52 | 52 | public function __construct() |
53 | 53 | { |
54 | 54 | $this->functionDescriptionParsers[ODataConstants::STRFUN_COMPARE] = function ($params) { |
55 | - return 'strcmp('.$params[0].', '.$params[1].')'; |
|
55 | + return 'strcmp(' . $params[0] . ', ' . $params[1] . ')'; |
|
56 | 56 | }; |
57 | 57 | $this->functionDescriptionParsers[ODataConstants::STRFUN_ENDSWITH] = function ($params) { |
58 | - return '(strcmp(substr('.$params[0].', strlen('.$params[0].') - strlen('.$params[1].')), ' |
|
59 | - .$params[1].') === 0)'; |
|
58 | + return '(strcmp(substr(' . $params[0] . ', strlen(' . $params[0] . ') - strlen(' . $params[1] . ')), ' |
|
59 | + .$params[1] . ') === 0)'; |
|
60 | 60 | }; |
61 | 61 | $this->functionDescriptionParsers[ODataConstants::STRFUN_INDEXOF] = function ($params) { |
62 | - return 'strpos('.$params[0].', '.$params[1].')'; |
|
62 | + return 'strpos(' . $params[0] . ', ' . $params[1] . ')'; |
|
63 | 63 | }; |
64 | 64 | $this->functionDescriptionParsers[ODataConstants::STRFUN_REPLACE] = function ($params) { |
65 | - return 'str_replace('.$params[1].', '.$params[2].', '.$params[0].')'; |
|
65 | + return 'str_replace(' . $params[1] . ', ' . $params[2] . ', ' . $params[0] . ')'; |
|
66 | 66 | }; |
67 | 67 | $this->functionDescriptionParsers[ODataConstants::STRFUN_STARTSWITH] = function ($params) { |
68 | - return '(strpos('.$params[0].', '.$params[1].') === 0)'; |
|
68 | + return '(strpos(' . $params[0] . ', ' . $params[1] . ') === 0)'; |
|
69 | 69 | }; |
70 | 70 | $this->functionDescriptionParsers[ODataConstants::STRFUN_TOLOWER] = function ($params) { |
71 | - return 'strtolower('.$params[0].')'; |
|
71 | + return 'strtolower(' . $params[0] . ')'; |
|
72 | 72 | }; |
73 | 73 | $this->functionDescriptionParsers[ODataConstants::STRFUN_TOUPPER] = function ($params) { |
74 | - return 'strtoupper('.$params[0].')'; |
|
74 | + return 'strtoupper(' . $params[0] . ')'; |
|
75 | 75 | }; |
76 | 76 | $this->functionDescriptionParsers[ODataConstants::STRFUN_TRIM] = function ($params) { |
77 | - return 'trim('.$params[0].')'; |
|
77 | + return 'trim(' . $params[0] . ')'; |
|
78 | 78 | }; |
79 | 79 | $this->functionDescriptionParsers[ODataConstants::STRFUN_SUBSTRING] = function ($params) { |
80 | 80 | return count($params) == 3 ? |
81 | - 'substr('.$params[0].', '.$params[1].', '.$params[2].')' : 'substr('.$params[0].', '.$params[1].')'; |
|
81 | + 'substr(' . $params[0] . ', ' . $params[1] . ', ' . $params[2] . ')' : 'substr(' . $params[0] . ', ' . $params[1] . ')'; |
|
82 | 82 | }; |
83 | 83 | $this->functionDescriptionParsers[ODataConstants::STRFUN_SUBSTRINGOF] = function ($params) { |
84 | - return '(strpos('.$params[1].', '.$params[0].') !== false)'; |
|
84 | + return '(strpos(' . $params[1] . ', ' . $params[0] . ') !== false)'; |
|
85 | 85 | }; |
86 | 86 | $this->functionDescriptionParsers[ODataConstants::STRFUN_CONCAT] = function ($params) { |
87 | - return $params[0].' . '.$params[1]; |
|
87 | + return $params[0] . ' . ' . $params[1]; |
|
88 | 88 | }; |
89 | 89 | $this->functionDescriptionParsers[ODataConstants::STRFUN_LENGTH] = function ($params) { |
90 | - return 'strlen('.$params[0].')'; |
|
90 | + return 'strlen(' . $params[0] . ')'; |
|
91 | 91 | }; |
92 | 92 | $this->functionDescriptionParsers[ODataConstants::GUIDFUN_EQUAL] = function ($params) { |
93 | - return self::TYPE_NAMESPACE.'Guid::guidEqual('.$params[0].', '.$params[1].')'; |
|
93 | + return self::TYPE_NAMESPACE . 'Guid::guidEqual(' . $params[0] . ', ' . $params[1] . ')'; |
|
94 | 94 | }; |
95 | 95 | $this->functionDescriptionParsers[ODataConstants::DATETIME_COMPARE] = function ($params) { |
96 | - return self::TYPE_NAMESPACE.'DateTime::dateTimeCmp('.$params[0].', '.$params[1].')'; |
|
96 | + return self::TYPE_NAMESPACE . 'DateTime::dateTimeCmp(' . $params[0] . ', ' . $params[1] . ')'; |
|
97 | 97 | }; |
98 | 98 | $this->functionDescriptionParsers[ODataConstants::DATETIME_YEAR] = function ($params) { |
99 | - return self::TYPE_NAMESPACE.'DateTime::year('.$params[0].')'; |
|
99 | + return self::TYPE_NAMESPACE . 'DateTime::year(' . $params[0] . ')'; |
|
100 | 100 | }; |
101 | 101 | $this->functionDescriptionParsers[ODataConstants::DATETIME_MONTH] = function ($params) { |
102 | - return self::TYPE_NAMESPACE.'DateTime::month('.$params[0].')'; |
|
102 | + return self::TYPE_NAMESPACE . 'DateTime::month(' . $params[0] . ')'; |
|
103 | 103 | }; |
104 | 104 | $this->functionDescriptionParsers[ODataConstants::DATETIME_DAY] = function ($params) { |
105 | - return self::TYPE_NAMESPACE.'DateTime::day('.$params[0].')'; |
|
105 | + return self::TYPE_NAMESPACE . 'DateTime::day(' . $params[0] . ')'; |
|
106 | 106 | }; |
107 | 107 | $this->functionDescriptionParsers[ODataConstants::DATETIME_HOUR] = function ($params) { |
108 | - return self::TYPE_NAMESPACE.'DateTime::hour('.$params[0].')'; |
|
108 | + return self::TYPE_NAMESPACE . 'DateTime::hour(' . $params[0] . ')'; |
|
109 | 109 | }; |
110 | 110 | $this->functionDescriptionParsers[ODataConstants::DATETIME_MINUTE] = function ($params) { |
111 | - return self::TYPE_NAMESPACE.'DateTime::minute('.$params[0].')'; |
|
111 | + return self::TYPE_NAMESPACE . 'DateTime::minute(' . $params[0] . ')'; |
|
112 | 112 | }; |
113 | 113 | $this->functionDescriptionParsers[ODataConstants::DATETIME_SECOND] = function ($params) { |
114 | - return self::TYPE_NAMESPACE.'DateTime::second('.$params[0].')'; |
|
114 | + return self::TYPE_NAMESPACE . 'DateTime::second(' . $params[0] . ')'; |
|
115 | 115 | }; |
116 | 116 | $this->functionDescriptionParsers[ODataConstants::MATHFUN_ROUND] = function ($params) { |
117 | - return 'round('.$params[0].')'; |
|
117 | + return 'round(' . $params[0] . ')'; |
|
118 | 118 | }; |
119 | 119 | $this->functionDescriptionParsers[ODataConstants::MATHFUN_CEILING] = function ($params) { |
120 | - return 'ceil('.$params[0].')'; |
|
120 | + return 'ceil(' . $params[0] . ')'; |
|
121 | 121 | }; |
122 | 122 | $this->functionDescriptionParsers[ODataConstants::MATHFUN_FLOOR] = function ($params) { |
123 | - return 'floor('.$params[0].')'; |
|
123 | + return 'floor(' . $params[0] . ')'; |
|
124 | 124 | }; |
125 | 125 | $this->functionDescriptionParsers[ODataConstants::BINFUL_EQUAL] = function ($params) { |
126 | - return self::TYPE_NAMESPACE.'Binary::binaryEqual('.$params[0].', '.$params[1].')'; |
|
126 | + return self::TYPE_NAMESPACE . 'Binary::binaryEqual(' . $params[0] . ', ' . $params[1] . ')'; |
|
127 | 127 | }; |
128 | 128 | $this->functionDescriptionParsers['is_null'] = function ($params) { |
129 | - return 'is_null('.$params[0].')'; |
|
129 | + return 'is_null(' . $params[0] . ')'; |
|
130 | 130 | }; |
131 | 131 | } |
132 | 132 | /** |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | */ |
158 | 158 | public function setResourceType(ResourceType $resourceType) |
159 | 159 | { |
160 | - $this->iteratorName = '$'.$resourceType->getName(); |
|
160 | + $this->iteratorName = '$' . $resourceType->getName(); |
|
161 | 161 | $this->resourceType = $resourceType; |
162 | 162 | } |
163 | 163 | /** |
@@ -282,11 +282,11 @@ discard block |
||
282 | 282 | $parent = $expression; |
283 | 283 | $variable = null; |
284 | 284 | do { |
285 | - $variable = $parent->getResourceProperty()->getName().self::MEMBER_ACCESS.$variable; |
|
285 | + $variable = $parent->getResourceProperty()->getName() . self::MEMBER_ACCESS . $variable; |
|
286 | 286 | $parent = $parent->getParent(); |
287 | 287 | } while ($parent != null); |
288 | 288 | $variable = rtrim($variable, self::MEMBER_ACCESS); |
289 | - $variable = $this->getIteratorName().self::MEMBER_ACCESS.$variable; |
|
289 | + $variable = $this->getIteratorName() . self::MEMBER_ACCESS . $variable; |
|
290 | 290 | return $variable; |
291 | 291 | } |
292 | 292 | /** |
@@ -318,7 +318,7 @@ discard block |
||
318 | 318 | */ |
319 | 319 | private function prepareBinaryExpression($operator, $left, $right) |
320 | 320 | { |
321 | - return self::OPEN_BRACKET.$left.' '.$operator.' '.$right.self::CLOSE_BRACKET; |
|
321 | + return self::OPEN_BRACKET . $left . ' ' . $operator . ' ' . $right . self::CLOSE_BRACKET; |
|
322 | 322 | } |
323 | 323 | /** |
324 | 324 | * To format unary expression. |
@@ -330,6 +330,6 @@ discard block |
||
330 | 330 | */ |
331 | 331 | private function prepareUnaryExpression($operator, $child) |
332 | 332 | { |
333 | - return $operator.self::OPEN_BRACKET.$child.self::CLOSE_BRACKET; |
|
333 | + return $operator . self::OPEN_BRACKET . $child . self::CLOSE_BRACKET; |
|
334 | 334 | } |
335 | 335 | } |
@@ -13,7 +13,7 @@ |
||
13 | 13 | |
14 | 14 | class MetadataProvider extends MetadataBaseProvider |
15 | 15 | { |
16 | - protected $multConstraints = [ '0..1' => ['1'], '1' => ['0..1', '*'], '*' => ['1', '*']]; |
|
16 | + protected $multConstraints = ['0..1' => ['1'], '1' => ['0..1', '*'], '*' => ['1', '*']]; |
|
17 | 17 | protected static $metaNAMESPACE = 'Data'; |
18 | 18 | |
19 | 19 | /** |
@@ -293,12 +293,12 @@ discard block |
||
293 | 293 | 'morphToMany', |
294 | 294 | 'morphedByMany' |
295 | 295 | ] as $relation) { |
296 | - $search = '$this->'.$relation.'('; |
|
296 | + $search = '$this->' . $relation . '('; |
|
297 | 297 | if ($pos = stripos($code, $search)) { |
298 | 298 | //Resolve the relation's model to a Relation object. |
299 | 299 | $relationObj = $model->$method(); |
300 | 300 | if ($relationObj instanceof Relation) { |
301 | - $relatedModel = '\\'.get_class($relationObj->getRelated()); |
|
301 | + $relatedModel = '\\' . get_class($relationObj->getRelated()); |
|
302 | 302 | $relations = [ |
303 | 303 | 'hasManyThrough', |
304 | 304 | 'belongsToMany', |
@@ -442,7 +442,7 @@ discard block |
||
442 | 442 | break; |
443 | 443 | } |
444 | 444 | } |
445 | - assert(in_array($fkMethodName, $methodList), 'Selected method, '.$fkMethodName.', not in method list'); |
|
445 | + assert(in_array($fkMethodName, $methodList), 'Selected method, ' . $fkMethodName . ', not in method list'); |
|
446 | 446 | $rkMethodName = 'getQualifiedRelatedPivotKeyName'; |
447 | 447 | foreach ($rkList as $option) { |
448 | 448 | if (in_array($option, $methodList)) { |
@@ -450,7 +450,7 @@ discard block |
||
450 | 450 | break; |
451 | 451 | } |
452 | 452 | } |
453 | - assert(in_array($rkMethodName, $methodList), 'Selected method, '.$rkMethodName.', not in method list'); |
|
453 | + assert(in_array($rkMethodName, $methodList), 'Selected method, ' . $rkMethodName . ', not in method list'); |
|
454 | 454 | $line = ['fk' => $fkMethodName, 'rk' => $rkMethodName]; |
455 | 455 | static::$methodPrimary[get_class($foo)] = $line; |
456 | 456 | } |
@@ -479,7 +479,7 @@ discard block |
||
479 | 479 | break; |
480 | 480 | } |
481 | 481 | } |
482 | - assert(in_array($fkMethodName, $methodList), 'Selected method, '.$fkMethodName.', not in method list'); |
|
482 | + assert(in_array($fkMethodName, $methodList), 'Selected method, ' . $fkMethodName . ', not in method list'); |
|
483 | 483 | $rkMethodName = 'getQualifiedParentKeyName'; |
484 | 484 | foreach ($rkList as $option) { |
485 | 485 | if (in_array($option, $methodList)) { |
@@ -487,7 +487,7 @@ discard block |
||
487 | 487 | break; |
488 | 488 | } |
489 | 489 | } |
490 | - assert(in_array($rkMethodName, $methodList), 'Selected method, '.$rkMethodName.', not in method list'); |
|
490 | + assert(in_array($rkMethodName, $methodList), 'Selected method, ' . $rkMethodName . ', not in method list'); |
|
491 | 491 | $line = ['fk' => $fkMethodName, 'rk' => $rkMethodName]; |
492 | 492 | static::$methodAlternate[get_class($foo)] = $line; |
493 | 493 | } |
@@ -534,10 +534,10 @@ discard block |
||
534 | 534 | |
535 | 535 | $keyRaw = $isBelong ? $foo->$fkMethodName() : $foo->$fkMethodAlternate(); |
536 | 536 | $keySegments = explode('.', $keyRaw); |
537 | - $keyName = $keySegments[count($keySegments) - 1]; |
|
537 | + $keyName = $keySegments[count($keySegments)-1]; |
|
538 | 538 | $localRaw = $isBelong ? $foo->$rkMethodName() : $foo->$rkMethodAlternate(); |
539 | 539 | $localSegments = explode('.', $localRaw); |
540 | - $localName = $localSegments[count($localSegments) - 1]; |
|
540 | + $localName = $localSegments[count($localSegments)-1]; |
|
541 | 541 | $first = $keyName; |
542 | 542 | $last = $localName; |
543 | 543 | $this->addRelationsHook($hooks, $first, $property, $last, $mult, $targ); |
@@ -563,10 +563,10 @@ discard block |
||
563 | 563 | |
564 | 564 | $keyName = $isBelong ? $foo->$fkMethodName() : $foo->$fkMethodAlternate(); |
565 | 565 | $keySegments = explode('.', $keyName); |
566 | - $keyName = $keySegments[count($keySegments) - 1]; |
|
566 | + $keyName = $keySegments[count($keySegments)-1]; |
|
567 | 567 | $localRaw = $isBelong ? $foo->$rkMethodName() : $foo->$rkMethodAlternate(); |
568 | 568 | $localSegments = explode('.', $localRaw); |
569 | - $localName = $localSegments[count($localSegments) - 1]; |
|
569 | + $localName = $localSegments[count($localSegments)-1]; |
|
570 | 570 | $first = $isBelong ? $localName : $keyName; |
571 | 571 | $last = $isBelong ? $keyName : $localName; |
572 | 572 | $this->addRelationsHook($hooks, $first, $property, $last, $mult, $targ); |
@@ -590,10 +590,10 @@ discard block |
||
590 | 590 | |
591 | 591 | $keyRaw = $isMany ? $foo->$fkMethodName() : $foo->$fkMethodAlternate(); |
592 | 592 | $keySegments = explode('.', $keyRaw); |
593 | - $keyName = $keySegments[count($keySegments) - 1]; |
|
593 | + $keyName = $keySegments[count($keySegments)-1]; |
|
594 | 594 | $localRaw = $isMany ? $foo->$rkMethodName() : $foo->$rkMethodAlternate(); |
595 | 595 | $localSegments = explode('.', $localRaw); |
596 | - $localName = $localSegments[count($localSegments) - 1]; |
|
596 | + $localName = $localSegments[count($localSegments)-1]; |
|
597 | 597 | $first = $isMany ? $keyName : $localName; |
598 | 598 | $last = $isMany ? $localName : $keyName; |
599 | 599 | $this->addRelationsHook($hooks, $first, $property, $last, $mult, $targ); |
@@ -616,10 +616,10 @@ discard block |
||
616 | 616 | |
617 | 617 | $keyRaw = $isMany ? $foo->$fkMethodName() : $foo->$fkMethodAlternate(); |
618 | 618 | $keySegments = explode('.', $keyRaw); |
619 | - $keyName = $keySegments[count($keySegments) - 1]; |
|
619 | + $keyName = $keySegments[count($keySegments)-1]; |
|
620 | 620 | $localRaw = $isMany ? $foo->$rkMethodName() : $foo->$rkMethodAlternate(); |
621 | 621 | $localSegments = explode('.', $localRaw); |
622 | - $localName = $localSegments[count($localSegments) - 1]; |
|
622 | + $localName = $localSegments[count($localSegments)-1]; |
|
623 | 623 | |
624 | 624 | $first = $keyName; |
625 | 625 | $last = (isset($localName) && '' != $localName) ? $localName : $foo->getRelated()->getKeyName(); |
@@ -169,7 +169,7 @@ discard block |
||
169 | 169 | .' $propKind != ResourcePropertyKind::RESOURCE_REFERENCE' |
170 | 170 | ); |
171 | 171 | $propTail = ResourcePropertyKind::RESOURCE_REFERENCE == $propKind ? 'entry' : 'feed'; |
172 | - $propType = 'application/atom+xml;type='.$propTail; |
|
172 | + $propType = 'application/atom+xml;type=' . $propTail; |
|
173 | 173 | $propName = $prop->getName(); |
174 | 174 | $nuLink->title = $propName; |
175 | 175 | $nuLink->name = ODataConstants::ODATA_RELATED_NAMESPACE . $propName; |
@@ -212,7 +212,7 @@ discard block |
||
212 | 212 | * |
213 | 213 | * @return ODataFeed |
214 | 214 | */ |
215 | - public function writeTopLevelElements(QueryResult &$entryObjects) |
|
215 | + public function writeTopLevelElements(QueryResult & $entryObjects) |
|
216 | 216 | { |
217 | 217 | assert(is_array($entryObjects->results), '!is_array($entryObjects->results)'); |
218 | 218 | |
@@ -249,7 +249,7 @@ discard block |
||
249 | 249 | $resourceSet = $this->getRequest()->getTargetResourceSetWrapper()->getResourceSet(); |
250 | 250 | $requestTop = $this->getRequest()->getTopOptionCount(); |
251 | 251 | $pageSize = $this->getService()->getConfiguration()->getEntitySetPageSize($resourceSet); |
252 | - $requestTop = (null == $requestTop) ? $pageSize + 1 : $requestTop; |
|
252 | + $requestTop = (null == $requestTop) ? $pageSize+1 : $requestTop; |
|
253 | 253 | |
254 | 254 | if (true === $entryObjects->hasMore && $requestTop > $pageSize) { |
255 | 255 | $stackSegment = $setName; |
@@ -332,7 +332,7 @@ discard block |
||
332 | 332 | * |
333 | 333 | * @return ODataPropertyContent |
334 | 334 | */ |
335 | - public function writeTopLevelComplexObject(QueryResult &$complexValue, $propertyName, ResourceType &$resourceType) |
|
335 | + public function writeTopLevelComplexObject(QueryResult & $complexValue, $propertyName, ResourceType & $resourceType) |
|
336 | 336 | { |
337 | 337 | $result = $complexValue->results; |
338 | 338 | |
@@ -361,14 +361,14 @@ discard block |
||
361 | 361 | * bag object |
362 | 362 | * @return ODataPropertyContent |
363 | 363 | */ |
364 | - public function writeTopLevelBagObject(QueryResult &$BagValue, $propertyName, ResourceType &$resourceType) |
|
364 | + public function writeTopLevelBagObject(QueryResult & $BagValue, $propertyName, ResourceType & $resourceType) |
|
365 | 365 | { |
366 | 366 | $result = $BagValue->results; |
367 | 367 | |
368 | 368 | $propertyContent = new ODataPropertyContent(); |
369 | 369 | $odataProperty = new ODataProperty(); |
370 | 370 | $odataProperty->name = $propertyName; |
371 | - $odataProperty->typeName = 'Collection('.$resourceType->getFullName().')'; |
|
371 | + $odataProperty->typeName = 'Collection(' . $resourceType->getFullName() . ')'; |
|
372 | 372 | $odataProperty->value = $this->writeBagValue($resourceType, $result); |
373 | 373 | |
374 | 374 | $propertyContent->properties[] = $odataProperty; |
@@ -384,7 +384,7 @@ discard block |
||
384 | 384 | * primitive property to be written |
385 | 385 | * @return ODataPropertyContent |
386 | 386 | */ |
387 | - public function writeTopLevelPrimitive(QueryResult &$primitiveValue, ResourceProperty &$resourceProperty = null) |
|
387 | + public function writeTopLevelPrimitive(QueryResult & $primitiveValue, ResourceProperty & $resourceProperty = null) |
|
388 | 388 | { |
389 | 389 | assert(null != $resourceProperty, 'Resource property must not be null'); |
390 | 390 | $propertyContent = new ODataPropertyContent(); |
@@ -633,7 +633,7 @@ discard block |
||
633 | 633 | $segmentWrappers = $this->getStack()->getSegmentWrappers(); |
634 | 634 | $count = count($segmentWrappers); |
635 | 635 | |
636 | - return 0 == $count ? $this->getRequest()->getTargetResourceSetWrapper() : $segmentWrappers[$count - 1]; |
|
636 | + return 0 == $count ? $this->getRequest()->getTargetResourceSetWrapper() : $segmentWrappers[$count-1]; |
|
637 | 637 | } |
638 | 638 | |
639 | 639 | /** |
@@ -658,7 +658,7 @@ discard block |
||
658 | 658 | $skipToken = $internalOrderByInfo->buildSkipTokenValue($lastObject); |
659 | 659 | assert(!is_null($skipToken), '!is_null($skipToken)'); |
660 | 660 | $token = (1 < $numSegments) ? '$skiptoken=' : '$skip='; |
661 | - $skipToken = '?'.$queryParameterString.$token.$skipToken; |
|
661 | + $skipToken = '?' . $queryParameterString . $token . $skipToken; |
|
662 | 662 | |
663 | 663 | return $skipToken; |
664 | 664 | } |
@@ -692,7 +692,7 @@ discard block |
||
692 | 692 | |
693 | 693 | $topCountValue = $this->getRequest()->getTopOptionCount(); |
694 | 694 | if (!is_null($topCountValue)) { |
695 | - $remainingCount = $topCountValue - $this->getRequest()->getTopCount(); |
|
695 | + $remainingCount = $topCountValue-$this->getRequest()->getTopCount(); |
|
696 | 696 | if (0 < $remainingCount) { |
697 | 697 | if (!is_null($queryParameterString)) { |
698 | 698 | $queryParameterString .= '&'; |
@@ -727,7 +727,7 @@ discard block |
||
727 | 727 | * |
728 | 728 | * @return string |
729 | 729 | */ |
730 | - private function primitiveToString(IType &$type, $primitiveValue) |
|
730 | + private function primitiveToString(IType & $type, $primitiveValue) |
|
731 | 731 | { |
732 | 732 | if ($type instanceof Boolean) { |
733 | 733 | $stringValue = (true === $primitiveValue) ? 'true' : 'false'; |
@@ -821,7 +821,7 @@ discard block |
||
821 | 821 | * @param $result |
822 | 822 | * @return ODataBagContent|null |
823 | 823 | */ |
824 | - protected function writeBagValue(ResourceType &$resourceType, $result) |
|
824 | + protected function writeBagValue(ResourceType & $resourceType, $result) |
|
825 | 825 | { |
826 | 826 | assert(null == $result || is_array($result), 'Bag parameter must be null or array'); |
827 | 827 | $typeKind = $resourceType->getResourceTypeKind(); |
@@ -854,7 +854,7 @@ discard block |
||
854 | 854 | * @param string|null $propertyName |
855 | 855 | * @return ODataPropertyContent |
856 | 856 | */ |
857 | - protected function writeComplexValue(ResourceType &$resourceType, &$result, $propertyName = null) |
|
857 | + protected function writeComplexValue(ResourceType & $resourceType, &$result, $propertyName = null) |
|
858 | 858 | { |
859 | 859 | assert(is_object($result), 'Supplied $customObject must be an object'); |
860 | 860 |