Completed
Pull Request — master (#45)
by Alex
14:17
created
src/POData/UriProcessor/RequestExpander.php 2 patches
Doc Comments   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
      * Pushes a segment for the root of the tree
171 171
      * Note: Calls to this method should be balanced with calls to popSegment.
172 172
      *
173
-     * @return bool true if the segment was pushed, false otherwise
173
+     * @return boolean|null true if the segment was pushed, false otherwise
174 174
      */
175 175
     private function pushSegmentForRoot()
176 176
     {
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
      * @param ResourceProperty &$resourceProperty Current navigation property
190 190
      *                                            being written out
191 191
      *
192
-     * @return bool true if a segment was pushed, false otherwise
192
+     * @return boolean|null true if a segment was pushed, false otherwise
193 193
      *
194 194
      * @throws InvalidOperationException If this function invoked with non-navigation
195 195
      *                                   property instance
@@ -277,7 +277,7 @@  discard block
 block discarded – undo
277 277
      * @param ResourceSetWrapper &$resourceSetWrapper The resource set wrapper
278 278
      *                                                to push
279 279
      *
280
-     * @return bool true if the segment was push, false otherwise
280
+     * @return boolean|null true if the segment was push, false otherwise
281 281
      */
282 282
     private function pushSegment($segmentName, ResourceSetWrapper &$resourceSetWrapper)
283 283
     {
@@ -301,7 +301,7 @@  discard block
 block discarded – undo
301 301
     }
302 302
 
303 303
     /**
304
-     * @param $expandedProjectionNode
304
+     * @param ExpandedProjectionNode $expandedProjectionNode
305 305
      * @param $entry
306 306
      * @return null|\object[]
307 307
      */
@@ -327,10 +327,10 @@  discard block
 block discarded – undo
327 327
     }
328 328
 
329 329
     /**
330
-     * @param $expandedProjectionNode
330
+     * @param ExpandedProjectionNode $expandedProjectionNode
331 331
      * @param $entry
332
-     * @param $resourceType
333
-     * @param $expandedPropertyName
332
+     * @param \POData\Providers\Metadata\ResourceType $resourceType
333
+     * @param string $expandedPropertyName
334 334
      * @throws InvalidOperationException
335 335
      * @throws \POData\Common\ODataException
336 336
      */
@@ -360,9 +360,9 @@  discard block
 block discarded – undo
360 360
     /**
361 361
      * @param $entry
362 362
      * @param $result
363
-     * @param $expandedProjectionNode
364
-     * @param $resourceType
365
-     * @param $expandedPropertyName
363
+     * @param ExpandedProjectionNode $expandedProjectionNode
364
+     * @param \POData\Providers\Metadata\ResourceType $resourceType
365
+     * @param string $expandedPropertyName
366 366
      * @throws InvalidOperationException
367 367
      */
368 368
     private function executeCollectionExpansionProcessExpansion(
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
      * @throws InvalidOperationException If this function invoked with non-navigation
195 195
      *                                   property instance
196 196
      */
197
-    private function pushSegmentForNavigationProperty(ResourceProperty &$resourceProperty)
197
+    private function pushSegmentForNavigationProperty(ResourceProperty & $resourceProperty)
198 198
     {
199 199
         if ($resourceProperty->getTypeKind() == ResourceTypeKind::ENTITY) {
200 200
             assert(!empty($this->getStack()->getSegmentNames()), '!is_empty($this->getStack()->getSegmentNames())');
@@ -279,7 +279,7 @@  discard block
 block discarded – undo
279 279
      *
280 280
      * @return bool true if the segment was push, false otherwise
281 281
      */
282
-    private function pushSegment($segmentName, ResourceSetWrapper &$resourceSetWrapper)
282
+    private function pushSegment($segmentName, ResourceSetWrapper & $resourceSetWrapper)
283 283
     {
284 284
         $this->getStack()->pushSegment($segmentName, $resourceSetWrapper);
285 285
     }
Please login to merge, or discard this patch.
src/POData/UriProcessor/UriProcessor.php 2 patches
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -737,7 +737,7 @@  discard block
 block discarded – undo
737 737
      * Pushes a segment for the root of the tree
738 738
      * Note: Calls to this method should be balanced with calls to popSegment.
739 739
      *
740
-     * @return bool true if the segment was pushed, false otherwise
740
+     * @return boolean|null true if the segment was pushed, false otherwise
741 741
      */
742 742
     private function _pushSegmentForRoot()
743 743
     {
@@ -757,7 +757,7 @@  discard block
 block discarded – undo
757 757
      * @param ResourceProperty &$resourceProperty Current navigation property
758 758
      *                                            being written out
759 759
      *
760
-     * @return bool true if a segment was pushed, false otherwise
760
+     * @return boolean|null true if a segment was pushed, false otherwise
761 761
      *
762 762
      * @throws InvalidOperationException If this function invoked with non-navigation
763 763
      *                                   property instance
@@ -856,7 +856,7 @@  discard block
 block discarded – undo
856 856
      * @param ResourceSetWrapper &$resourceSetWrapper The resource set wrapper
857 857
      *                                                to push
858 858
      *
859
-     * @return bool true if the segment was push, false otherwise
859
+     * @return boolean|null true if the segment was push, false otherwise
860 860
      */
861 861
     private function _pushSegment($segmentName, ResourceSetWrapper &$resourceSetWrapper)
862 862
     {
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
 
124 124
     public function __get($name)
125 125
     {
126
-        $name = 'get'.Str::studly($name);
126
+        $name = 'get' . Str::studly($name);
127 127
 
128 128
         if (method_exists($this, $name)) {
129 129
             return $this->$name();
@@ -401,7 +401,7 @@  discard block
 block discarded – undo
401 401
             $segment->setResult($entityInstance);
402 402
         } else {
403 403
             $skip = (null == $this->getRequest()) ? 0 : $this->getRequest()->getSkipCount();
404
-            $skip = (null == $skip) ? 0 :$skip;
404
+            $skip = (null == $skip) ? 0 : $skip;
405 405
             $queryResult = $this->getProviders()->getResourceSet(
406 406
                 $this->getRequest()->queryType,
407 407
                 $segment->getTargetResourceSetWrapper(),
@@ -762,7 +762,7 @@  discard block
 block discarded – undo
762 762
      * @throws InvalidOperationException If this function invoked with non-navigation
763 763
      *                                   property instance
764 764
      */
765
-    private function _pushSegmentForNavigationProperty(ResourceProperty &$resourceProperty)
765
+    private function _pushSegmentForNavigationProperty(ResourceProperty & $resourceProperty)
766 766
     {
767 767
         if ($resourceProperty->getTypeKind() == ResourceTypeKind::ENTITY) {
768 768
             $this->assert(
@@ -858,7 +858,7 @@  discard block
 block discarded – undo
858 858
      *
859 859
      * @return bool true if the segment was push, false otherwise
860 860
      */
861
-    private function _pushSegment($segmentName, ResourceSetWrapper &$resourceSetWrapper)
861
+    private function _pushSegment($segmentName, ResourceSetWrapper & $resourceSetWrapper)
862 862
     {
863 863
         $this->getStack()->pushSegment($segmentName, $resourceSetWrapper);
864 864
     }
Please login to merge, or discard this patch.
src/POData/UriProcessor/SegmentStack.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@
 block discarded – undo
50 50
      *
51 51
      * @return bool true if the segment was push, false otherwise
52 52
      */
53
-    public function pushSegment($segmentName, ResourceSetWrapper &$resourceSetWrapper)
53
+    public function pushSegment($segmentName, ResourceSetWrapper & $resourceSetWrapper)
54 54
     {
55 55
         $rootProjectionNode = $this->getRequest()->getRootProjectionNode();
56 56
         if (!is_null($rootProjectionNode) && $rootProjectionNode->isExpansionSpecified()) {
Please login to merge, or discard this patch.