@@ -819,7 +819,7 @@ |
||
819 | 819 | * @param iterable $iterable1 |
820 | 820 | * @param iterable $iterable2 |
821 | 821 | * |
822 | - * @return iterable |
|
822 | + * @return \Generator |
|
823 | 823 | */ |
824 | 824 | private function mergeIterables(iterable $iterable1, iterable $iterable2): iterable |
825 | 825 | { |
@@ -184,7 +184,7 @@ |
||
184 | 184 | { |
185 | 185 | assert( |
186 | 186 | call_user_func( |
187 | - function (array $paths): bool { |
|
187 | + function(array $paths): bool { |
|
188 | 188 | $pathsOk = true; |
189 | 189 | foreach ($paths as $path) { |
190 | 190 | $pathsOk = $pathsOk === true && is_string($path) === true && empty($path) === false; |
@@ -117,7 +117,7 @@ |
||
117 | 117 | * @param string $type |
118 | 118 | * @param iterable $fields |
119 | 119 | * |
120 | - * @return iterable |
|
120 | + * @return \Generator |
|
121 | 121 | */ |
122 | 122 | protected function filterFields(string $type, iterable $fields): iterable |
123 | 123 | { |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | { |
74 | 74 | // Feel free to override this method to change default URL or add meta |
75 | 75 | |
76 | - $url = $this->getSelfSubUrl($resource) . '/' . DocumentInterface::KEYWORD_RELATIONSHIPS . '/' . $name; |
|
76 | + $url = $this->getSelfSubUrl($resource).'/'.DocumentInterface::KEYWORD_RELATIONSHIPS.'/'.$name; |
|
77 | 77 | |
78 | 78 | return $this->getFactory()->createLink(true, $url, false); |
79 | 79 | } |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | { |
86 | 86 | // Feel free to override this method to change default URL or add meta |
87 | 87 | |
88 | - $url = $this->getSelfSubUrl($resource) . '/' . $name; |
|
88 | + $url = $this->getSelfSubUrl($resource).'/'.$name; |
|
89 | 89 | |
90 | 90 | return $this->getFactory()->createLink(true, $url, false); |
91 | 91 | } |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | protected function getResourcesSubUrl(): string |
153 | 153 | { |
154 | 154 | if ($this->subUrl === null) { |
155 | - $this->subUrl = '/' . $this->getType(); |
|
155 | + $this->subUrl = '/'.$this->getType(); |
|
156 | 156 | } |
157 | 157 | |
158 | 158 | return $this->subUrl; |
@@ -165,6 +165,6 @@ discard block |
||
165 | 165 | */ |
166 | 166 | protected function getSelfSubUrl($resource): string |
167 | 167 | { |
168 | - return $this->getResourcesSubUrl() . '/' . $this->getId($resource); |
|
168 | + return $this->getResourcesSubUrl().'/'.$this->getId($resource); |
|
169 | 169 | } |
170 | 170 | } |
@@ -566,7 +566,7 @@ discard block |
||
566 | 566 | */ |
567 | 567 | protected function getPathToData(): string |
568 | 568 | { |
569 | - return '/' . DocumentInterface::KEYWORD_DATA; |
|
569 | + return '/'.DocumentInterface::KEYWORD_DATA; |
|
570 | 570 | } |
571 | 571 | |
572 | 572 | /** |
@@ -574,7 +574,7 @@ discard block |
||
574 | 574 | */ |
575 | 575 | protected function getPathToType(): string |
576 | 576 | { |
577 | - return $this->getPathToData() . '/' . DocumentInterface::KEYWORD_TYPE; |
|
577 | + return $this->getPathToData().'/'.DocumentInterface::KEYWORD_TYPE; |
|
578 | 578 | } |
579 | 579 | |
580 | 580 | /** |
@@ -582,7 +582,7 @@ discard block |
||
582 | 582 | */ |
583 | 583 | protected function getPathToId(): string |
584 | 584 | { |
585 | - return $this->getPathToData() . '/' . DocumentInterface::KEYWORD_ID; |
|
585 | + return $this->getPathToData().'/'.DocumentInterface::KEYWORD_ID; |
|
586 | 586 | } |
587 | 587 | |
588 | 588 | /** |
@@ -590,7 +590,7 @@ discard block |
||
590 | 590 | */ |
591 | 591 | protected function getPathToAttributes(): string |
592 | 592 | { |
593 | - return $this->getPathToData() . '/' . DocumentInterface::KEYWORD_ATTRIBUTES; |
|
593 | + return $this->getPathToData().'/'.DocumentInterface::KEYWORD_ATTRIBUTES; |
|
594 | 594 | } |
595 | 595 | |
596 | 596 | /** |
@@ -600,7 +600,7 @@ discard block |
||
600 | 600 | */ |
601 | 601 | protected function getPathToAttribute(string $name): string |
602 | 602 | { |
603 | - return $this->getPathToData() . '/' . DocumentInterface::KEYWORD_ATTRIBUTES . '/' . $name; |
|
603 | + return $this->getPathToData().'/'.DocumentInterface::KEYWORD_ATTRIBUTES.'/'.$name; |
|
604 | 604 | } |
605 | 605 | |
606 | 606 | /** |
@@ -608,7 +608,7 @@ discard block |
||
608 | 608 | */ |
609 | 609 | protected function getPathToRelationships(): string |
610 | 610 | { |
611 | - return $this->getPathToData() . '/' . DocumentInterface::KEYWORD_RELATIONSHIPS; |
|
611 | + return $this->getPathToData().'/'.DocumentInterface::KEYWORD_RELATIONSHIPS; |
|
612 | 612 | } |
613 | 613 | |
614 | 614 | /** |
@@ -618,7 +618,7 @@ discard block |
||
618 | 618 | */ |
619 | 619 | protected function getPathToRelationship(string $name): string |
620 | 620 | { |
621 | - return $this->getPathToRelationships() . '/' . $name; |
|
621 | + return $this->getPathToRelationships().'/'.$name; |
|
622 | 622 | } |
623 | 623 | |
624 | 624 | /** |
@@ -628,8 +628,8 @@ discard block |
||
628 | 628 | */ |
629 | 629 | protected function getPathToRelationshipType(string $name): string |
630 | 630 | { |
631 | - return $this->getPathToRelationship($name) . '/' . |
|
632 | - DocumentInterface::KEYWORD_DATA . '/' . DocumentInterface::KEYWORD_TYPE; |
|
631 | + return $this->getPathToRelationship($name).'/'. |
|
632 | + DocumentInterface::KEYWORD_DATA.'/'.DocumentInterface::KEYWORD_TYPE; |
|
633 | 633 | } |
634 | 634 | |
635 | 635 | /** |
@@ -639,7 +639,7 @@ discard block |
||
639 | 639 | */ |
640 | 640 | protected function getPathToRelationshipId(string $name): string |
641 | 641 | { |
642 | - return $this->getPathToRelationship($name) . '/' . |
|
643 | - DocumentInterface::KEYWORD_DATA . '/' . DocumentInterface::KEYWORD_ID; |
|
642 | + return $this->getPathToRelationship($name).'/'. |
|
643 | + DocumentInterface::KEYWORD_DATA.'/'.DocumentInterface::KEYWORD_ID; |
|
644 | 644 | } |
645 | 645 | } |
@@ -175,15 +175,15 @@ discard block |
||
175 | 175 | $currentType = $this->getType(); |
176 | 176 | $currentPath = $this->getPosition()->getPath(); |
177 | 177 | $nextLevel = $this->getPosition()->getLevel() + 1; |
178 | - $nextPathPrefix = empty($currentPath) === true ? '' : $currentPath . PositionInterface::PATH_SEPARATOR; |
|
178 | + $nextPathPrefix = empty($currentPath) === true ? '' : $currentPath.PositionInterface::PATH_SEPARATOR; |
|
179 | 179 | foreach ($this->getSchema()->getRelationships($this->getData()) as $name => $description) { |
180 | 180 | assert( |
181 | 181 | is_string($name) === true && empty($name) === false, |
182 | - "Relationship names for type `" . $currentType . '` should be non-empty strings.' |
|
182 | + "Relationship names for type `".$currentType.'` should be non-empty strings.' |
|
183 | 183 | ); |
184 | 184 | assert( |
185 | 185 | is_array($description) === true && empty($description) === false, |
186 | - "Relationship `$name` for type `" . $currentType . '` should be a non-empty array.' |
|
186 | + "Relationship `$name` for type `".$currentType.'` should be a non-empty array.' |
|
187 | 187 | ); |
188 | 188 | |
189 | 189 | $hasData = array_key_exists(SchemaInterface::RELATIONSHIP_DATA, $description); |
@@ -230,13 +230,13 @@ discard block |
||
230 | 230 | $hasLinks = $addSelfLink === true || $addRelatedLink === true || empty($schemaLinks) === false; |
231 | 231 | assert( |
232 | 232 | $hasData || $hasMeta || $hasLinks, |
233 | - "Relationship `$name` for type `" . $currentType . |
|
233 | + "Relationship `$name` for type `".$currentType. |
|
234 | 234 | '` MUST contain at least one of the following: links, data or meta.' |
235 | 235 | ); |
236 | 236 | |
237 | 237 | $nextPosition = $this->getFactory()->createPosition( |
238 | 238 | $nextLevel, |
239 | - $nextPathPrefix . $name, |
|
239 | + $nextPathPrefix.$name, |
|
240 | 240 | $currentType, |
241 | 241 | $name |
242 | 242 | ); |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | |
48 | 48 | /** @var string */ |
49 | 49 | public const MSG_CAN_NOT_PARSE_RELATIONSHIP = |
50 | - 'For resource of type `%s` with ID `%s` relationship `%s` cannot be parsed because it either ' . |
|
50 | + 'For resource of type `%s` with ID `%s` relationship `%s` cannot be parsed because it either '. |
|
51 | 51 | 'has `null` or identifier as data. Skipping.'; |
52 | 52 | |
53 | 53 | /** |
@@ -533,7 +533,7 @@ discard block |
||
533 | 533 | foreach ($paths as $path) { |
534 | 534 | $curPath = ''; |
535 | 535 | foreach (explode($separator, $path) as $pathPart) { |
536 | - $curPath = empty($curPath) === true ? $pathPart : $curPath . $separator . $pathPart; |
|
536 | + $curPath = empty($curPath) === true ? $pathPart : $curPath.$separator.$pathPart; |
|
537 | 537 | $normalizedPaths[$curPath] = true; |
538 | 538 | } |
539 | 539 | } |