@@ -54,7 +54,7 @@ |
||
54 | 54 | }; |
55 | 55 | $this->functionDescriptionParsers[ODataConstants::STRFUN_ENDSWITH] = function ($params) { |
56 | 56 | return '(strcmp(substr(' . $params[0] . ', strlen(' . $params[0] . ') - strlen(' . $params[1] . ')), ' |
57 | - .$params[1] . ') === 0)'; |
|
57 | + .$params[1] . ') === 0)'; |
|
58 | 58 | }; |
59 | 59 | $this->functionDescriptionParsers[ODataConstants::STRFUN_INDEXOF] = function ($params) { |
60 | 60 | return 'strpos(' . $params[0] . ', ' . $params[1] . ')'; |
@@ -789,10 +789,10 @@ |
||
789 | 789 | { |
790 | 790 | $queryParameterString = null; |
791 | 791 | foreach ([ODataConstants::HTTPQUERY_STRING_FILTER, |
792 | - ODataConstants::HTTPQUERY_STRING_EXPAND, |
|
793 | - ODataConstants::HTTPQUERY_STRING_ORDERBY, |
|
794 | - ODataConstants::HTTPQUERY_STRING_INLINECOUNT, |
|
795 | - ODataConstants::HTTPQUERY_STRING_SELECT, ] as $queryOption) { |
|
792 | + ODataConstants::HTTPQUERY_STRING_EXPAND, |
|
793 | + ODataConstants::HTTPQUERY_STRING_ORDERBY, |
|
794 | + ODataConstants::HTTPQUERY_STRING_INLINECOUNT, |
|
795 | + ODataConstants::HTTPQUERY_STRING_SELECT, ] as $queryOption) { |
|
796 | 796 | $value = $this->getService()->getHost()->getQueryStringItem($queryOption); |
797 | 797 | if (null !== $value) { |
798 | 798 | if (null !== $queryParameterString) { |
@@ -227,17 +227,17 @@ |
||
227 | 227 | $lastCode = $code[strlen($code)-1]; |
228 | 228 | assert('}' == $lastCode, 'Final character of function definition must be closing brace'); |
229 | 229 | foreach ([ |
230 | - 'hasMany', |
|
231 | - 'hasManyThrough', |
|
232 | - 'belongsToMany', |
|
233 | - 'hasOne', |
|
234 | - 'belongsTo', |
|
235 | - 'morphOne', |
|
236 | - 'morphTo', |
|
237 | - 'morphMany', |
|
238 | - 'morphToMany', |
|
239 | - 'morphedByMany' |
|
240 | - ] as $relation) { |
|
230 | + 'hasMany', |
|
231 | + 'hasManyThrough', |
|
232 | + 'belongsToMany', |
|
233 | + 'hasOne', |
|
234 | + 'belongsTo', |
|
235 | + 'morphOne', |
|
236 | + 'morphTo', |
|
237 | + 'morphMany', |
|
238 | + 'morphToMany', |
|
239 | + 'morphedByMany' |
|
240 | + ] as $relation) { |
|
241 | 241 | $search = '$this->' . $relation . '('; |
242 | 242 | if ($pos = stripos($code, $search)) { |
243 | 243 | //Resolve the relation's model to a Relation object. |
@@ -137,7 +137,7 @@ |
||
137 | 137 | $metaCount = count($meta->oDataEntityMap); |
138 | 138 | $entityCount = count($entities); |
139 | 139 | $expected = 2 * $entityCount; |
140 | - assert($metaCount == $expected, 'Expected ' . $expected . ' items, actually got '.$metaCount); |
|
140 | + assert($metaCount == $expected, 'Expected ' . $expected . ' items, actually got ' . $metaCount); |
|
141 | 141 | |
142 | 142 | if (null === $objectModel->getAssociations()) { |
143 | 143 | return; |
@@ -487,7 +487,7 @@ discard block |
||
487 | 487 | assert(is_string($line), 'Eager-load elements must be non-empty strings'); |
488 | 488 | $lineParts = explode('/', $line); |
489 | 489 | $numberOfParts = count($lineParts); |
490 | - for ($i = 0; $i<$numberOfParts;$i++) { |
|
490 | + for ($i = 0; $i < $numberOfParts; $i++) { |
|
491 | 491 | $lineParts[$i] = $this->getLaravelRelationName($lineParts[$i]); |
492 | 492 | } |
493 | 493 | $remixLine = implode('.', $lineParts); |
@@ -500,7 +500,7 @@ discard block |
||
500 | 500 | * @param string $odataProperty |
501 | 501 | * @return string |
502 | 502 | */ |
503 | - private function getLaravelRelationName($odataProperty){ |
|
503 | + private function getLaravelRelationName($odataProperty) { |
|
504 | 504 | $laravelProperty = $odataProperty; |
505 | 505 | $pos = strrpos($laravelProperty, '_'); |
506 | 506 | if ($pos !== false) { |
@@ -500,7 +500,8 @@ |
||
500 | 500 | * @param string $odataProperty |
501 | 501 | * @return string |
502 | 502 | */ |
503 | - private function getLaravelRelationName($odataProperty){ |
|
503 | + private function getLaravelRelationName($odataProperty) |
|
504 | + { |
|
504 | 505 | $laravelProperty = $odataProperty; |
505 | 506 | $pos = strrpos($laravelProperty, '_'); |
506 | 507 | if ($pos !== false) { |
@@ -134,8 +134,8 @@ |
||
134 | 134 | foreach ($lastCandidates as $lc) { |
135 | 135 | $stub = clone $this->knownSides[$knownType][$key]; |
136 | 136 | $isMulti = ($stub->getMultiplicity()->getValue() == AssociationStubRelationType::MANY); |
137 | - $relPolyTypeName = substr($lc->getBaseType(),strrpos($lc->getBaseType(),"\\")+1); |
|
138 | - $relPolyTypeName = str_plural($relPolyTypeName, $isMulti?2:1); |
|
137 | + $relPolyTypeName = substr($lc->getBaseType(), strrpos($lc->getBaseType(), "\\")+1); |
|
138 | + $relPolyTypeName = str_plural($relPolyTypeName, $isMulti ? 2 : 1); |
|
139 | 139 | $stub->setRelationName($stub->getRelationName() . "_" . $relPolyTypeName); |
140 | 140 | $assoc = new AssociationMonomorphic(); |
141 | 141 | $first = -1 === $stub->compare($lc); |