Algo-Web / POData-Laravel

src/Serialisers/IronicSerialiser.php

Doc Comments +9 added lines, -6 removed lines

@@ -105,7 +105,7 @@ 
     /**
      * Write a top level entry resource.
      *
-     * @param mixed $entryObject Reference to the entry object to be written
+     * @param QueryResult $entryObject Reference to the entry object to be written
      *
      * @return ODataEntry
      */
@@ -250,7 +250,7 @@ 
     /**
      * Write top level url element.
      *
-     * @param mixed $entryObject The entry resource whose url to be written
+     * @param QueryResult $entryObject The entry resource whose url to be written
      *
      * @return ODataURL
      */
@@ -274,7 +274,7 @@ 
     /**
      * Write top level url collection.
      *
-     * @param array $entryObjects Array of entry resources
+     * @param QueryResult $entryObjects Array of entry resources
      *                            whose url to be written
      *
      * @return ODataURLCollection
@@ -402,6 +402,9 @@ 
         return $this->stack;
     }
 
+    /**
+     * @param string $containerName
+     */
     protected function getEntryInstanceKey($entityInstance, ResourceType $resourceType, $containerName)
     {
         $typeName = $resourceType->getName();
@@ -433,7 +436,7 @@ 
     /**
      * @param $entryObject
      * @param $type
-     * @param $relativeUri
+     * @param string $relativeUri
      * @param $resourceType
      * @return array
      */
@@ -500,7 +503,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()
     {
@@ -723,7 +726,7 @@ 
     /**
      * @param $entryObject
      * @param $prop
-     * @param $nuLink
+     * @param ODataLink $nuLink
      * @param $propKind
      * @param $propName
      */

Spacing +22 added lines, -22 removed lines

@@ -96,7 +96,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 = [];
         $this->modelSerialiser = new ModelSerialiser();
@@ -142,7 +142,7 @@ 
             $resourceType,
             $resourceSet->getName()
         );
-        $absoluteUri = rtrim($this->absoluteServiceUri, '/') . '/' . $relativeUri;
+        $absoluteUri = rtrim($this->absoluteServiceUri, '/').'/'.$relativeUri;
 
         list($mediaLink, $mediaLinks) = $this->writeMediaData($entryObject->results, $type, $relativeUri, $resourceType);
 
@@ -163,8 +163,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));
@@ -200,7 +200,7 @@ 
      *
      * @return ODataFeed
      */
-    public function writeTopLevelElements(QueryResult &$entryObjects)
+    public function writeTopLevelElements(QueryResult & $entryObjects)
     {
         assert(is_array($entryObjects->results), '!is_array($entryObjects->results)');
 
@@ -240,7 +240,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;
         }
 
@@ -265,7 +265,7 @@ 
                 $this->getCurrentResourceSetWrapper()->getName()
             );
 
-            $url->url = rtrim($this->absoluteServiceUri, '/') . '/' . $relativeUri;
+            $url->url = rtrim($this->absoluteServiceUri, '/').'/'.$relativeUri;
         }
 
         return $url;
@@ -295,7 +295,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;
             }
         }
@@ -320,7 +320,7 @@ 
      * @return ODataPropertyContent
      * @codeCoverageIgnore
      */
-    public function writeTopLevelComplexObject(QueryResult &$complexValue, $propertyName, ResourceType &$resourceType)
+    public function writeTopLevelComplexObject(QueryResult & $complexValue, $propertyName, ResourceType & $resourceType)
     {
         // TODO: Figure out if we need to bother implementing this
     }
@@ -337,7 +337,7 @@ 
      * @codeCoverageIgnore
      * @return ODataPropertyContent
      */
-    public function writeTopLevelBagObject(QueryResult &$BagValue, $propertyName, ResourceType &$resourceType)
+    public function writeTopLevelBagObject(QueryResult & $BagValue, $propertyName, ResourceType & $resourceType)
     {
         // TODO: Figure out if we need to bother implementing this
     }
@@ -354,7 +354,7 @@ 
      * @codeCoverageIgnore
      * @return ODataPropertyContent
      */
-    public function writeTopLevelPrimitive(QueryResult &$primitiveValue, ResourceProperty &$resourceProperty = null)
+    public function writeTopLevelPrimitive(QueryResult & $primitiveValue, ResourceProperty & $resourceProperty = null)
     {
         // TODO: Figure out if we need to bother implementing this
     }
@@ -407,7 +407,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();
@@ -421,7 +421,7 @@ 
             }
 
             $keyValue = $keyType->convertToOData($keyValue);
-            $keyString .= $comma . $keyName . '=' . $keyValue;
+            $keyString .= $comma.$keyName.'='.$keyValue;
             $comma = ',';
         }
 
@@ -446,7 +446,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()) {
@@ -587,7 +587,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];
     }
 
     /**
@@ -637,21 +637,21 @@ 
             $value = $this->getService()->getHost()->getQueryStringItem($queryOption);
             if (!is_null($value)) {
                 if (!is_null($queryParameterString)) {
-                    $queryParameterString = $queryParameterString . '&';
+                    $queryParameterString = $queryParameterString.'&';
                 }
 
-                $queryParameterString .= $queryOption . '=' . $value;
+                $queryParameterString .= $queryOption.'='.$value;
             }
         }
 
         $topCountValue = $this->getRequest()->getTopOptionCount();
         if (!is_null($topCountValue)) {
-            $remainingCount = $topCountValue - $this->getRequest()->getTopCount();
+            $remainingCount = $topCountValue-$this->getRequest()->getTopCount();
             if (!is_null($queryParameterString)) {
                 $queryParameterString .= '&';
             }
 
-            $queryParameterString .= ODataConstants::HTTPQUERY_STRING_TOP . '=' . $remainingCount;
+            $queryParameterString .= ODataConstants::HTTPQUERY_STRING_TOP.'='.$remainingCount;
         }
 
         if (!is_null($queryParameterString)) {
@@ -679,7 +679,7 @@ 
      *
      * @return string
      */
-    private function primitiveToString(IType &$type, $primitiveValue)
+    private function primitiveToString(IType & $type, $primitiveValue)
     {
         if ($type instanceof Boolean) {
             $stringValue = (true === $primitiveValue) ? 'true' : 'false';
@@ -751,7 +751,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;
             }
         }
     }
@@ -765,6 +765,6 @@ 
     {
         $this->service = $service;
         $this->absoluteServiceUri = $service->getHost()->getAbsoluteServiceUri()->getUrlAsString();
-        $this->absoluteServiceUriWithSlash = rtrim($this->absoluteServiceUri, '/') . '/';
+        $this->absoluteServiceUriWithSlash = rtrim($this->absoluteServiceUri, '/').'/';
     }
 }

src/Query/LaravelReadQuery.php

Spacing +3 added lines, -3 removed lines

@@ -153,14 +153,14 @@ 
             // loop thru, chunk by chunk, to reduce chances of exhausting memory
             $sourceEntityInstance->chunk(
                 5000,
-                function ($results) use ($isvalid, &$skip, &$resultSet, &$rawCount, $rawTop) {
+                function($results) use ($isvalid, &$skip, &$resultSet, &$rawCount, $rawTop) {
                     // apply filter
                     $results = $results->filter($isvalid);
                     // need to iterate through full result set to find count of items matching filter,
                     // so we can't bail out early
                     $rawCount += $results->count();
                     // now bolt on filtrate to accumulating result set if we haven't accumulated enough bitz
-                    if ($rawTop > $resultSet->count() + $skip) {
+                    if ($rawTop > $resultSet->count()+$skip) {
                         $resultSet = collect(array_merge($resultSet->all(), $results->all()));
                         $sliceAmount = min($skip, $resultSet->count());
                         $resultSet = $resultSet->slice($sliceAmount);
@@ -199,7 +199,7 @@ 
         if (QueryType::COUNT() == $queryType || QueryType::ENTITIES_WITH_COUNT() == $queryType) {
             $result->count = $resultCount;
         }
-        $hazMore = $bulkSetCount > $skip + count($resultSet);
+        $hazMore = $bulkSetCount > $skip+count($resultSet);
         $result->hasMore = $hazMore;
         return $result;
     }