Algo-Web / POData-Laravel

src/Serialisers/IronicSerialiser.php

Doc Comments +5 added lines, -2 removed lines

@@ -362,6 +362,9 @@ 
         return $this->stack;
     }
 
+    /**
+     * @param string $containerName
+     */
     protected function getEntryInstanceKey($entityInstance, ResourceType $resourceType, $containerName)
     {
         $typeName = $resourceType->getName();
@@ -394,7 +397,7 @@ 
     /**
      * @param $entryObject
      * @param $type
-     * @param $relativeUri
+     * @param string $relativeUri
      * @param $resourceType
      * @return array
      */
@@ -461,7 +464,7 @@ 
      * Find a 'ExpandedProjectionNode' instance in the projection tree
      * which describes the current segment.
      *
-     * @return ExpandedProjectionNode|null
+     * @return null|\POData\UriProcessor\QueryProcessor\ExpandProjectionParser\RootProjectionNode|ExpandedProjectionNode
      */
     protected function getCurrentExpandedProjectionNode()
     {

Spacing +15 added lines, -15 removed lines

@@ -87,7 +87,7 @@ 
         $this->service = $service;
         $this->request = $request;
         $this->absoluteServiceUri = $service->getHost()->getAbsoluteServiceUri()->getUrlAsString();
-        $this->absoluteServiceUriWithSlash = rtrim($this->absoluteServiceUri, '/') . '/';
+        $this->absoluteServiceUriWithSlash = rtrim($this->absoluteServiceUri, '/').'/';
         $this->stack = new SegmentStack($request);
         $this->complexTypeInstanceCollection = [];
     }
@@ -132,7 +132,7 @@ 
             $resourceType,
             $resourceSet->getName()
         );
-        $absoluteUri = rtrim($this->absoluteServiceUri, '/') . '/' . $relativeUri;
+        $absoluteUri = rtrim($this->absoluteServiceUri, '/').'/'.$relativeUri;
 
         list($mediaLink, $mediaLinks) = $this->writeMediaData($entryObject, $type, $relativeUri, $resourceType);
 
@@ -153,8 +153,8 @@ 
             $propType = 'application/atom+xml;type='.$propTail;
             $propName = $prop->getName();
             $nuLink->title = $propName;
-            $nuLink->name = ODataConstants::ODATA_RELATED_NAMESPACE . $propName;
-            $nuLink->url = $relativeUri . '/' . $propName;
+            $nuLink->name = ODataConstants::ODATA_RELATED_NAMESPACE.$propName;
+            $nuLink->url = $relativeUri.'/'.$propName;
             $nuLink->type = $propType;
 
             $navProp = new ODataNavigationPropertyInfo($prop, $this->shouldExpandSegment($propName));
@@ -179,7 +179,7 @@ 
                         $nuLink->expandedResult->selfLink->title = $propName;
                         $nuLink->expandedResult->selfLink->url = $nuLink->url;
                         $nuLink->expandedResult->title = $propName;
-                        $nuLink->expandedResult->id = rtrim($this->absoluteServiceUri, '/') . '/' . $nuLink->url;
+                        $nuLink->expandedResult->id = rtrim($this->absoluteServiceUri, '/').'/'.$nuLink->url;
                     }
                 }
             }
@@ -251,7 +251,7 @@ 
             $segment = $this->getNextLinkUri($lastObject, $absoluteUri);
             $nextLink = new ODataLink();
             $nextLink->name = ODataConstants::ATOM_LINK_NEXT_ATTRIBUTE_STRING;
-            $nextLink->url = rtrim($this->absoluteServiceUri, '/') . '/' . $stackSegment . $segment;
+            $nextLink->url = rtrim($this->absoluteServiceUri, '/').'/'.$stackSegment.$segment;
             $odata->nextPageLink = $nextLink;
         }
 
@@ -276,7 +276,7 @@ 
                 $this->getCurrentResourceSetWrapper()->getName()
             );
 
-            $url->url = rtrim($this->absoluteServiceUri, '/') . '/' . $relativeUri;
+            $url->url = rtrim($this->absoluteServiceUri, '/').'/'.$relativeUri;
         }
 
         return $url;
@@ -306,7 +306,7 @@ 
                 $segment = $this->getNextLinkUri($lastObject, $this->getRequest()->getRequestUrl()->getUrlAsString());
                 $nextLink = new ODataLink();
                 $nextLink->name = ODataConstants::ATOM_LINK_NEXT_ATTRIBUTE_STRING;
-                $nextLink->url = rtrim($this->absoluteServiceUri, '/') . '/' . $stackSegment . $segment;
+                $nextLink->url = rtrim($this->absoluteServiceUri, '/').'/'.$stackSegment.$segment;
                 $urls->nextPageLink = $nextLink;
             }
         }
@@ -331,7 +331,7 @@ 
      * @return ODataPropertyContent
      * @codeCoverageIgnore
      */
-    public function writeTopLevelComplexObject(&$complexValue, $propertyName, ResourceType &$resourceType)
+    public function writeTopLevelComplexObject(&$complexValue, $propertyName, ResourceType & $resourceType)
     {
         // TODO: Figure out if we need to bother implementing this
     }
@@ -348,7 +348,7 @@ 
      * @codeCoverageIgnore
      * @return ODataPropertyContent
      */
-    public function writeTopLevelBagObject(&$BagValue, $propertyName, ResourceType &$resourceType)
+    public function writeTopLevelBagObject(&$BagValue, $propertyName, ResourceType & $resourceType)
     {
         // TODO: Figure out if we need to bother implementing this
     }
@@ -365,7 +365,7 @@ 
      * @codeCoverageIgnore
      * @return ODataPropertyContent
      */
-    public function writeTopLevelPrimitive(&$primitiveValue, ResourceProperty &$resourceProperty = null)
+    public function writeTopLevelPrimitive(&$primitiveValue, ResourceProperty & $resourceProperty = null)
     {
         // TODO: Figure out if we need to bother implementing this
     }
@@ -418,7 +418,7 @@ 
         $typeName = $resourceType->getName();
         $keyProperties = $resourceType->getKeyProperties();
         assert(count($keyProperties) != 0, 'count($keyProperties) == 0');
-        $keyString = $containerName . '(';
+        $keyString = $containerName.'(';
         $comma = null;
         foreach ($keyProperties as $keyName => $resourceProperty) {
             $keyType = $resourceProperty->getInstanceType();
@@ -432,7 +432,7 @@ 
             }
 
             $keyValue = $keyType->convertToOData($keyValue);
-            $keyString .= $comma . $keyName . '=' . $keyValue;
+            $keyString .= $comma.$keyName.'='.$keyValue;
             $comma = ',';
         }
 
@@ -457,7 +457,7 @@ 
         $mediaLink = null;
         if ($resourceType->isMediaLinkEntry()) {
             $eTag = $streamProviderWrapper->getStreamETag2($entryObject, null, $context);
-            $mediaLink = new ODataMediaLink($type, '/$value', $relativeUri . '/$value', '*/*', $eTag);
+            $mediaLink = new ODataMediaLink($type, '/$value', $relativeUri.'/$value', '*/*', $eTag);
         }
         $mediaLinks = [];
         if ($resourceType->hasNamedStream()) {
@@ -599,7 +599,7 @@ 
         $segmentWrappers = $this->getStack()->getSegmentWrappers();
         $count = count($segmentWrappers);
 
-        return 0 == $count ? $this->getRequest()->getTargetResourceSetWrapper() : $segmentWrappers[$count - 1];
+        return 0 == $count ? $this->getRequest()->getTargetResourceSetWrapper() : $segmentWrappers[$count-1];
     }
 
     /**