Completed
Pull Request — master (#130)
by Alex
04:31
created
src/POData/Common/Messages/queryProvider.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@
 block discarded – undo
25 25
     public static function queryProviderResultCountMissing($methodName, QueryType $queryType)
26 26
     {
27 27
         return 'The implementation of the method ' . $methodName . ' must return a QueryResult instance with ' .
28
-               'a count for queries of type ' . $queryType . '.';
28
+                'a count for queries of type ' . $queryType . '.';
29 29
     }
30 30
 
31 31
     /**
Please login to merge, or discard this patch.
src/POData/Common/Messages/expressionParser.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -132,6 +132,6 @@
 block discarded – undo
132 132
     public static function expressionParserEntityCollectionNotAllowedInFilter($property, $parentProperty, $pos)
133 133
     {
134 134
         return 'The \'' . $property . '\' is an entity collection property of \'' . $parentProperty .
135
-               '\' (position: ' . $pos . '), which cannot be used in $filter query option';
135
+                '\' (position: ' . $pos . '), which cannot be used in $filter query option';
136 136
     }
137 137
 }
Please login to merge, or discard this patch.
src/POData/Common/Messages/keyDescriptor.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
     public static function keyDescriptorKeyCountNotMatching($segment, $expectedCount, $actualCount)
18 18
     {
19 19
         return 'The predicate in the segment \'' . $segment . '\' expect ' . $expectedCount .
20
-               ' keys but ' . $actualCount . ' provided';
20
+                ' keys but ' . $actualCount . ' provided';
21 21
     }
22 22
 
23 23
     /**
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
     public static function keyDescriptorMissingKeys($segment, $expectedKeys)
33 33
     {
34 34
         return 'Missing keys in key predicate for the segment \'' . $segment . '\'. The key predicate ' .
35
-               'expects the keys \'' . $expectedKeys . '\'';
35
+                'expects the keys \'' . $expectedKeys . '\'';
36 36
     }
37 37
 
38 38
     /**
Please login to merge, or discard this patch.
src/POData/Common/Messages/httpProcessUtility.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -93,7 +93,7 @@
 block discarded – undo
93 93
     public static function httpProcessUtilityClosingQuoteNotFound($parameterName)
94 94
     {
95 95
         return 'Value for MIME type parameter \'' . $parameterName . '\' is incorrect because the closing quote '.
96
-               'character could not be found while the parameter value started with a quote character.';
96
+                'character could not be found while the parameter value started with a quote character.';
97 97
     }
98 98
 
99 99
     /**
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -92,7 +92,7 @@
 block discarded – undo
92 92
      */
93 93
     public static function httpProcessUtilityClosingQuoteNotFound($parameterName)
94 94
     {
95
-        return 'Value for MIME type parameter \'' . $parameterName . '\' is incorrect because the closing quote '.
95
+        return 'Value for MIME type parameter \'' . $parameterName . '\' is incorrect because the closing quote ' .
96 96
                'character could not be found while the parameter value started with a quote character.';
97 97
     }
98 98
 
Please login to merge, or discard this patch.
src/POData/OperationContext/Web/IncomingRequest.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -131,7 +131,7 @@
 block discarded – undo
131 131
             }
132 132
 
133 133
             $this->rawUrl .= '://' .
134
-                             $_SERVER[HttpProcessUtility::headerToServerKey(ODataConstants::HTTPREQUEST_HEADER_HOST)];
134
+                                $_SERVER[HttpProcessUtility::headerToServerKey(ODataConstants::HTTPREQUEST_HEADER_HOST)];
135 135
             $this->rawUrl .= utf8_decode(urldecode($_SERVER[ODataConstants::HTTPREQUEST_URI]));
136 136
         }
137 137
 
Please login to merge, or discard this patch.
src/POData/ObjectModel/ObjectModelSerializerBase.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -294,7 +294,7 @@  discard block
 block discarded – undo
294 294
      *
295 295
      * @return bool true if a segment was pushed, false otherwise
296 296
      */
297
-    protected function pushSegmentForNavigationProperty(ResourceProperty &$resourceProperty)
297
+    protected function pushSegmentForNavigationProperty(ResourceProperty & $resourceProperty)
298 298
     {
299 299
         if (ResourceTypeKind::ENTITY == $resourceProperty->getTypeKind()) {
300 300
             assert(!empty($this->getStack()->getSegmentNames()), 'Segment names should not be empty');
@@ -405,7 +405,7 @@  discard block
 block discarded – undo
405 405
      *
406 406
      * @return bool true if the segment was push, false otherwise
407 407
      */
408
-    private function pushSegment($segmentName, ResourceSetWrapper &$resourceSetWrapper)
408
+    private function pushSegment($segmentName, ResourceSetWrapper & $resourceSetWrapper)
409 409
     {
410 410
         // Even though there is no expand in the request URI, still we need to push
411 411
         // the segment information if we need to count
@@ -640,7 +640,7 @@  discard block
 block discarded – undo
640 640
         &$parentPathSegments,
641 641
         &$selectionPaths,
642 642
         &$expansionPaths,
643
-        ExpandedProjectionNode &$expandedProjectionNode,
643
+        ExpandedProjectionNode & $expandedProjectionNode,
644 644
         &$foundSelections,
645 645
         &$foundExpansions
646 646
     ) {
Please login to merge, or discard this patch.
src/POData/ObjectModel/ODataNavigationPropertyInfo.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
      * @param bool             $expanded          Whether the navigation is expanded
22 22
      *                                            or not
23 23
      */
24
-    public function __construct(ResourceProperty &$resourceProperty, $expanded)
24
+    public function __construct(ResourceProperty & $resourceProperty, $expanded)
25 25
     {
26 26
         $this->resourceProperty = $resourceProperty;
27 27
         $this->expanded = $expanded;
Please login to merge, or discard this patch.
src/POData/ObjectModel/ObjectModelSerializer.php 1 patch
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
      *
76 76
      * @return ODataFeed
77 77
      */
78
-    public function writeTopLevelElements(QueryResult &$entryObjects)
78
+    public function writeTopLevelElements(QueryResult & $entryObjects)
79 79
     {
80 80
         assert(is_array($entryObjects->results), '!is_array($entryObjects->results)');
81 81
         $requestTargetSource = $this->getRequest()->getTargetSource();
@@ -191,9 +191,9 @@  discard block
 block discarded – undo
191 191
      * @return ODataPropertyContent
192 192
      */
193 193
     public function writeTopLevelComplexObject(
194
-        QueryResult &$complexValue,
194
+        QueryResult & $complexValue,
195 195
         $propertyName,
196
-        ResourceType &$resourceType
196
+        ResourceType & $resourceType
197 197
     ) {
198 198
         $propertyContent = new ODataPropertyContent();
199 199
         $this->writeComplexValue(
@@ -216,9 +216,9 @@  discard block
 block discarded – undo
216 216
      * @return ODataPropertyContent
217 217
      */
218 218
     public function writeTopLevelBagObject(
219
-        QueryResult &$bagValue,
219
+        QueryResult & $bagValue,
220 220
         $propertyName,
221
-        ResourceType &$resourceType
221
+        ResourceType & $resourceType
222 222
     ) {
223 223
         $propertyContent = new ODataPropertyContent();
224 224
         $this->writeBagValue(
@@ -241,8 +241,8 @@  discard block
 block discarded – undo
241 241
      * @return ODataPropertyContent
242 242
      */
243 243
     public function writeTopLevelPrimitive(
244
-        QueryResult &$primitiveValue,
245
-        ResourceProperty &$resourceProperty = null
244
+        QueryResult & $primitiveValue,
245
+        ResourceProperty & $resourceProperty = null
246 246
     ) {
247 247
         assert(null != $resourceProperty, 'Resource property must not be null');
248 248
         $propertyContent = new ODataPropertyContent();
@@ -330,11 +330,11 @@  discard block
 block discarded – undo
330 330
      */
331 331
     private function writeFeedElements(
332 332
         &$entryObjects,
333
-        ResourceType &$resourceType,
333
+        ResourceType & $resourceType,
334 334
         $title,
335 335
         $absoluteUri,
336 336
         $relativeUri,
337
-        ODataFeed &$feed,
337
+        ODataFeed & $feed,
338 338
         $needLink = false
339 339
     ) {
340 340
         assert(is_array($entryObjects), '!_writeFeedElements::is_array($entryObjects)');
@@ -391,11 +391,11 @@  discard block
 block discarded – undo
391 391
      */
392 392
     private function writeObjectProperties(
393 393
         $customObject,
394
-        ResourceType &$resourceType,
394
+        ResourceType & $resourceType,
395 395
         $absoluteUri,
396 396
         $relativeUri,
397 397
         &$odataEntry,
398
-        ODataPropertyContent &$odataPropertyContent
398
+        ODataPropertyContent & $odataPropertyContent
399 399
     ) {
400 400
         $resourceTypeKind = $resourceType->getResourceTypeKind();
401 401
         if ((null === $absoluteUri) == (ResourceTypeKind::ENTITY == $resourceTypeKind)
@@ -519,8 +519,8 @@  discard block
 block discarded – undo
519 519
      */
520 520
     private function writePrimitiveValue(
521 521
         &$primitiveValue,
522
-        ODataProperty &$odataProperty,
523
-        ResourceProperty &$resourceProperty
522
+        ODataProperty & $odataProperty,
523
+        ResourceProperty & $resourceProperty
524 524
     ) {
525 525
         if (is_object($primitiveValue)) {
526 526
             //TODO ERROR: The property 'PropertyName'
@@ -554,9 +554,9 @@  discard block
 block discarded – undo
554 554
     private function writeComplexValue(
555 555
         &$complexValue,
556 556
         $propertyName,
557
-        ResourceType &$resourceType,
557
+        ResourceType & $resourceType,
558 558
         $relativeUri,
559
-        ODataPropertyContent &$odataPropertyContent
559
+        ODataPropertyContent & $odataPropertyContent
560 560
     ) {
561 561
         $odataProperty = new ODataProperty();
562 562
         $odataProperty->name = $propertyName;
@@ -597,9 +597,9 @@  discard block
 block discarded – undo
597 597
     private function writeBagValue(
598 598
         &$bagValue,
599 599
         $propertyName,
600
-        ResourceType &$resourceType,
600
+        ResourceType & $resourceType,
601 601
         $relativeUri,
602
-        ODataPropertyContent &$odataPropertyContent
602
+        ODataPropertyContent & $odataPropertyContent
603 603
     ) {
604 604
         assert(null == $bagValue || is_array($bagValue), 'Bag parameter must be null or array');
605 605
         $bagItemResourceTypeKind = $resourceType->getResourceTypeKind();
@@ -657,10 +657,10 @@  discard block
 block discarded – undo
657 657
      */
658 658
     private function writeMediaResourceMetadata(
659 659
         $entryObject,
660
-        ResourceType &$resourceType,
660
+        ResourceType & $resourceType,
661 661
         $title,
662 662
         $relativeUri,
663
-        ODataEntry &$odataEntry
663
+        ODataEntry & $odataEntry
664 664
     ) {
665 665
         $streamProviderWrapper = $this->getService()->getStreamProviderWrapper();
666 666
         assert(null != $streamProviderWrapper, 'Retrieved stream provider must not be null');
@@ -733,7 +733,7 @@  discard block
 block discarded – undo
733 733
      * @return string
734 734
      */
735 735
     private function primitiveToString(
736
-        ResourceType &$primitiveResourceType,
736
+        ResourceType & $primitiveResourceType,
737 737
         $primitiveValue
738 738
     ) {
739 739
         $type = $primitiveResourceType->getInstanceType();
@@ -772,9 +772,9 @@  discard block
 block discarded – undo
772 772
     private function complexObjectToContent(
773 773
         &$complexValue,
774 774
         $propertyName,
775
-        ResourceType &$resourceType,
775
+        ResourceType & $resourceType,
776 776
         $relativeUri,
777
-        ODataPropertyContent &$odataPropertyContent
777
+        ODataPropertyContent & $odataPropertyContent
778 778
     ) {
779 779
         $count = count($this->complexTypeInstanceCollection);
780 780
         for ($i = 0; $i < $count; ++$i) {
@@ -817,9 +817,9 @@  discard block
 block discarded – undo
817 817
      */
818 818
     private function writeObjectPropertiesUnexpanded(
819 819
         $customObject,
820
-        ResourceType &$resourceType,
820
+        ResourceType & $resourceType,
821 821
         $relativeUri,
822
-        ODataPropertyContent &$odataPropertyContent,
822
+        ODataPropertyContent & $odataPropertyContent,
823 823
         $resourceTypeKind,
824 824
         $navigationProperties
825 825
     ) {
@@ -937,9 +937,9 @@  discard block
 block discarded – undo
937 937
      */
938 938
     private function writeObjectPropertiesExpanded(
939 939
         $customObject,
940
-        ResourceType &$resourceType,
940
+        ResourceType & $resourceType,
941 941
         $relativeUri,
942
-        ODataPropertyContent &$odataPropertyContent,
942
+        ODataPropertyContent & $odataPropertyContent,
943 943
         $projectionNodes,
944 944
         $navigationProperties
945 945
     ) {
Please login to merge, or discard this patch.
src/POData/Providers/ProvidersQueryWrapper.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -421,8 +421,8 @@
 block discarded – undo
421 421
      */
422 422
     private function validateEntityInstance(
423 423
         $entityInstance,
424
-        ResourceSet &$resourceSet,
425
-        KeyDescriptor &$keyDescriptor,
424
+        ResourceSet & $resourceSet,
425
+        KeyDescriptor & $keyDescriptor,
426 426
         $methodName
427 427
     ) {
428 428
         if (null === $entityInstance) {
Please login to merge, or discard this patch.