Algo-Web / POData-Laravel

src/Providers/MetadataControllerProvider.php

Spacing +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
      */
     public function register()
     {
-        $this->app->singleton('metadataControllers', function ($app) {
+        $this->app->singleton('metadataControllers', function($app) {
             return new MetadataControllerContainer();
         });
     }

Unused Use Statements -2 removed lines

@@ -3,9 +3,7 @@
 namespace AlgoWeb\PODataLaravel\Providers;
 
 use AlgoWeb\PODataLaravel\Controllers\MetadataControllerTrait;
-use AlgoWeb\PODataLaravel\Controllers\TestController;
 use Illuminate\Routing\Controller;
-use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Facades\Cache;
 use AlgoWeb\PODataLaravel\Controllers\MetadataControllerContainer;
 use Illuminate\Support\Facades\App;

src/Providers/QueryProvider.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
      */
     public function register()
     {
-        $this->app->singleton('odataquery', function ($app) {
+        $this->app->singleton('odataquery', function($app) {
             return new LaravelQuery();
         });
     }

src/Query/LaravelQuery.php

Doc Comments +2 added lines, -2 removed lines

@@ -315,7 +315,7 @@ 
     }
     /**
      * Delete resource from a resource set.
-     * @param ResourceSet|null $sourceResourceSet
+     * @param ResourceSet $sourceResourceSet
      * @param object           $sourceEntityInstance
      *
      * return bool true if resources sucessfully deteled, otherwise false.
@@ -460,7 +460,7 @@ 
      * @param ResourceSet $sourceResourceSet
      * @param $sourceEntityInstance
      * @param $data
-     * @param $verb
+     * @param string $verb
      * @return mixed
      * @throws ODataException
      * @throws \POData\Common\InvalidOperationException

Spacing +1 added lines, -1 removed lines

@@ -490,7 +490,7 @@
         }
         $outData = $result->getData();
         if (is_object($outData)) {
-            $outData = (array)$outData;
+            $outData = (array) $outData;
         }
 
         if (!is_array($outData)) {

src/Models/MetadataTrait.php

Doc Comments +2 added lines, -2 removed lines

@@ -414,8 +414,8 @@
      * @param $first
      * @param $property
      * @param $last
-     * @param $mult
-     * @param $targ
+     * @param string $mult
+     * @param string $targ
      */
     private function addRelationsHook(&$hooks, $first, $property, $last, $mult, $targ)
     {

Spacing +8 added lines, -8 removed lines

@@ -534,10 +534,10 @@ 
 
             $keyRaw = $isBelong ? $foo->$fkMethodName() : $foo->$fkMethodAlternate();
             $keySegments = explode('.', $keyRaw);
-            $keyName = $keySegments[count($keySegments) - 1];
+            $keyName = $keySegments[count($keySegments)-1];
             $localRaw = $isBelong ? $foo->$rkMethodName() : $foo->$rkMethodAlternate();
             $localSegments = explode('.', $localRaw);
-            $localName = $localSegments[count($localSegments) - 1];
+            $localName = $localSegments[count($localSegments)-1];
             $first = $keyName;
             $last = $localName;
             $this->addRelationsHook($hooks, $first, $property, $last, $mult, $targ);
@@ -563,10 +563,10 @@ 
 
             $keyName = $isBelong ? $foo->$fkMethodName() : $foo->$fkMethodAlternate();
             $keySegments = explode('.', $keyName);
-            $keyName = $keySegments[count($keySegments) - 1];
+            $keyName = $keySegments[count($keySegments)-1];
             $localRaw = $isBelong ? $foo->$rkMethodName() : $foo->$rkMethodAlternate();
             $localSegments = explode('.', $localRaw);
-            $localName = $localSegments[count($localSegments) - 1];
+            $localName = $localSegments[count($localSegments)-1];
             $first = $isBelong ? $localName : $keyName;
             $last = $isBelong ? $keyName : $localName;
             $this->addRelationsHook($hooks, $first, $property, $last, $mult, $targ);
@@ -590,10 +590,10 @@ 
 
             $keyRaw = $isMany ? $foo->$fkMethodName() : $foo->$fkMethodAlternate();
             $keySegments = explode('.', $keyRaw);
-            $keyName = $keySegments[count($keySegments) - 1];
+            $keyName = $keySegments[count($keySegments)-1];
             $localRaw = $isMany ? $foo->$rkMethodName() : $foo->$rkMethodAlternate();
             $localSegments = explode('.', $localRaw);
-            $localName = $localSegments[count($localSegments) - 1];
+            $localName = $localSegments[count($localSegments)-1];
             $first = $isMany ? $keyName : $localName;
             $last = $isMany ? $localName : $keyName;
             $this->addRelationsHook($hooks, $first, $property, $last, $mult, $targ);
@@ -616,10 +616,10 @@ 
 
             $keyRaw = $isMany ? $foo->$fkMethodName() : $foo->$fkMethodAlternate();
             $keySegments = explode('.', $keyRaw);
-            $keyName = $keySegments[count($keySegments) - 1];
+            $keyName = $keySegments[count($keySegments)-1];
             $localRaw = $isMany ? $foo->$rkMethodName() : $foo->$rkMethodAlternate();
             $localSegments = explode('.', $localRaw);
-            $localName = $localSegments[count($localSegments) - 1];
+            $localName = $localSegments[count($localSegments)-1];
 
             $first = $keyName;
             $last = (isset($localName) && "" != $localName) ? $localName : $foo->getRelated()->getKeyName();

src/Providers/MetadataProvider.php

Spacing +6 added lines, -6 removed lines

@@ -12,7 +12,7 @@ 
 
 class MetadataProvider extends MetadataBaseProvider
 {
-    protected $multConstraints = [ '0..1' => ['1'], '1' => ['0..1', '*'], '*' => ['1', '*']];
+    protected $multConstraints = ['0..1' => ['1'], '1' => ['0..1', '*'], '*' => ['1', '*']];
     protected static $METANAMESPACE = "Data";
 
     /**
@@ -75,7 +75,7 @@ 
      */
     public function register()
     {
-        $this->app->singleton('metadata', function ($app) {
+        $this->app->singleton('metadata', function($app) {
             return new SimpleMetadataProvider('Data', self::$METANAMESPACE);
         });
     }
@@ -196,11 +196,11 @@ 
                     $dependentProperty = $foreign[$dependentType]['property'];
                     assert(
                         in_array($dependentMult, $this->multConstraints[$principalMult]),
-                        "Cannot pair multiplicities " . $dependentMult . " and " . $principalMult
+                        "Cannot pair multiplicities ".$dependentMult." and ".$principalMult
                     );
                     assert(
                         in_array($principalMult, $this->multConstraints[$dependentMult]),
-                        "Cannot pair multiplicities " . $principalMult . " and " . $dependentMult
+                        "Cannot pair multiplicities ".$principalMult." and ".$dependentMult
                     );
                     // generate forward and reverse relations
                     list($forward, $reverse) = $this->calculateRoundTripRelationsGenForwardReverse(
@@ -244,11 +244,11 @@ 
                         $dependentProperty = $foreign['property'];
                         assert(
                             in_array($dependentMult, $this->multConstraints[$principalMult]),
-                            "Cannot pair multiplicities " . $dependentMult . " and " . $principalMult
+                            "Cannot pair multiplicities ".$dependentMult." and ".$principalMult
                         );
                         assert(
                             in_array($principalMult, $this->multConstraints[$dependentMult]),
-                            "Cannot pair multiplicities " . $principalMult . " and " . $dependentMult
+                            "Cannot pair multiplicities ".$principalMult." and ".$dependentMult
                         );
                         // generate forward and reverse relations
                         list($forward, $reverse) = $this->calculateRoundTripRelationsGenForwardReverse(

Unused Use Statements -3 removed lines

@@ -3,12 +3,9 @@
 namespace AlgoWeb\PODataLaravel\Providers;
 
 use Illuminate\Support\Facades\App;
-use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Facades\Cache;
 use POData\Providers\Metadata\IMetadataProvider;
-use POData\Providers\Metadata\ResourceType;
 use POData\Providers\Metadata\SimpleMetadataProvider;
-use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Facades\Schema as Schema;
 
 class MetadataProvider extends MetadataBaseProvider

src/Query/LaravelExpressionProvider.php

Spacing +25 added lines, -25 removed lines

@@ -51,80 +51,80 @@
      */
     public function __construct()
     {
-        $this->functionDescriptionParsers[ODataConstants::STRFUN_COMPARE] = function ($params) {
+        $this->functionDescriptionParsers[ODataConstants::STRFUN_COMPARE] = function($params) {
             return "strcmp($params[0], $params[1])";
         };
-        $this->functionDescriptionParsers[ODataConstants::STRFUN_ENDSWITH] = function ($params) {
+        $this->functionDescriptionParsers[ODataConstants::STRFUN_ENDSWITH] = function($params) {
             return "(strcmp(substr($params[0], strlen($params[0]) - strlen($params[1])), $params[1]) === 0)";
         };
-        $this->functionDescriptionParsers[ODataConstants::STRFUN_INDEXOF] = function ($params) {
+        $this->functionDescriptionParsers[ODataConstants::STRFUN_INDEXOF] = function($params) {
             return "strpos($params[0], $params[1])";
         };
-        $this->functionDescriptionParsers[ODataConstants::STRFUN_REPLACE] = function ($params) {
+        $this->functionDescriptionParsers[ODataConstants::STRFUN_REPLACE] = function($params) {
             return "str_replace($params[1], $params[2], $params[0])";
         };
-        $this->functionDescriptionParsers[ODataConstants::STRFUN_STARTSWITH] = function ($params) {
+        $this->functionDescriptionParsers[ODataConstants::STRFUN_STARTSWITH] = function($params) {
             return "(strpos($params[0], $params[1]) === 0)";
         };
-        $this->functionDescriptionParsers[ODataConstants::STRFUN_TOLOWER] = function ($params) {
+        $this->functionDescriptionParsers[ODataConstants::STRFUN_TOLOWER] = function($params) {
             return "strtolower($params[0])";
         };
-        $this->functionDescriptionParsers[ODataConstants::STRFUN_TOUPPER] = function ($params) {
+        $this->functionDescriptionParsers[ODataConstants::STRFUN_TOUPPER] = function($params) {
             return "strtoupper($params[0])";
         };
-        $this->functionDescriptionParsers[ODataConstants::STRFUN_TRIM] = function ($params) {
+        $this->functionDescriptionParsers[ODataConstants::STRFUN_TRIM] = function($params) {
             return "trim($params[0])";
         };
-        $this->functionDescriptionParsers[ODataConstants::STRFUN_SUBSTRING] = function ($params) {
+        $this->functionDescriptionParsers[ODataConstants::STRFUN_SUBSTRING] = function($params) {
             return count($params) == 3 ?
                 "substr($params[0], $params[1], $params[2])" : "substr($params[0], $params[1])";
         };
-        $this->functionDescriptionParsers[ODataConstants::STRFUN_SUBSTRINGOF] = function ($params) {
+        $this->functionDescriptionParsers[ODataConstants::STRFUN_SUBSTRINGOF] = function($params) {
             return "(strpos($params[1], $params[0]) !== false)";
         };
-        $this->functionDescriptionParsers[ODataConstants::STRFUN_CONCAT] = function ($params) {
+        $this->functionDescriptionParsers[ODataConstants::STRFUN_CONCAT] = function($params) {
             return $params[0].' . '.$params[1];
         };
-        $this->functionDescriptionParsers[ODataConstants::STRFUN_LENGTH] = function ($params) {
+        $this->functionDescriptionParsers[ODataConstants::STRFUN_LENGTH] = function($params) {
             return "strlen($params[0])";
         };
-        $this->functionDescriptionParsers[ODataConstants::GUIDFUN_EQUAL] = function ($params) {
+        $this->functionDescriptionParsers[ODataConstants::GUIDFUN_EQUAL] = function($params) {
             return self::TYPE_NAMESPACE."Guid::guidEqual($params[0], $params[1])";
         };
-        $this->functionDescriptionParsers[ODataConstants::DATETIME_COMPARE] = function ($params) {
+        $this->functionDescriptionParsers[ODataConstants::DATETIME_COMPARE] = function($params) {
             return self::TYPE_NAMESPACE."DateTime::dateTimeCmp($params[0], $params[1])";
         };
-        $this->functionDescriptionParsers[ODataConstants::DATETIME_YEAR] = function ($params) {
+        $this->functionDescriptionParsers[ODataConstants::DATETIME_YEAR] = function($params) {
             return self::TYPE_NAMESPACE."DateTime::year($params[0])";
         };
-        $this->functionDescriptionParsers[ODataConstants::DATETIME_MONTH] = function ($params) {
+        $this->functionDescriptionParsers[ODataConstants::DATETIME_MONTH] = function($params) {
             return self::TYPE_NAMESPACE."DateTime::month($params[0])";
         };
-        $this->functionDescriptionParsers[ODataConstants::DATETIME_DAY] = function ($params) {
+        $this->functionDescriptionParsers[ODataConstants::DATETIME_DAY] = function($params) {
             return self::TYPE_NAMESPACE."DateTime::day($params[0])";
         };
-        $this->functionDescriptionParsers[ODataConstants::DATETIME_HOUR] = function ($params) {
+        $this->functionDescriptionParsers[ODataConstants::DATETIME_HOUR] = function($params) {
             return self::TYPE_NAMESPACE."DateTime::hour($params[0])";
         };
-        $this->functionDescriptionParsers[ODataConstants::DATETIME_MINUTE] = function ($params) {
+        $this->functionDescriptionParsers[ODataConstants::DATETIME_MINUTE] = function($params) {
             return self::TYPE_NAMESPACE."DateTime::minute($params[0])";
         };
-        $this->functionDescriptionParsers[ODataConstants::DATETIME_SECOND] = function ($params) {
+        $this->functionDescriptionParsers[ODataConstants::DATETIME_SECOND] = function($params) {
             return self::TYPE_NAMESPACE."DateTime::second($params[0])";
         };
-        $this->functionDescriptionParsers[ODataConstants::MATHFUN_ROUND] = function ($params) {
+        $this->functionDescriptionParsers[ODataConstants::MATHFUN_ROUND] = function($params) {
             return "round($params[0])";
         };
-        $this->functionDescriptionParsers[ODataConstants::MATHFUN_CEILING] = function ($params) {
+        $this->functionDescriptionParsers[ODataConstants::MATHFUN_CEILING] = function($params) {
             return "ceil($params[0])";
         };
-        $this->functionDescriptionParsers[ODataConstants::MATHFUN_FLOOR] = function ($params) {
+        $this->functionDescriptionParsers[ODataConstants::MATHFUN_FLOOR] = function($params) {
             return "floor($params[0])";
         };
-        $this->functionDescriptionParsers[ODataConstants::BINFUL_EQUAL] = function ($params) {
+        $this->functionDescriptionParsers[ODataConstants::BINFUL_EQUAL] = function($params) {
             return self::TYPE_NAMESPACE."Binary::binaryEqual($params[0], $params[1])";
         };
-        $this->functionDescriptionParsers['is_null'] = function ($params) {
+        $this->functionDescriptionParsers['is_null'] = function($params) {
             return "is_null($params[0])";
         };
     }

src/Controllers/ODataController.php

Doc Comments +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
     }
 
     /**
-     * @return mixed
+     * @return boolean
      */
     protected function getIsDumping()
     {

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
             $date = Carbon::now(0);
             $timeString = $date->toTimeString();
             $xTest = (null !== $xTest) ? $xTest
-                : $request->method() . ";" . str_replace("/", "-", $request->path()) . ";" . $timeString . ";";
+                : $request->method().";".str_replace("/", "-", $request->path()).";".$timeString.";";
             if (null != $xTest) {
                 $reflectionClass = new \ReflectionClass('Illuminate\Http\Request');
                 $reflectionProperty = $reflectionClass->getProperty('userResolver');

src/Query/LaravelReadQuery.php

Doc Comments +2 added lines

@@ -184,6 +184,7 @@ 
      * @param mixed $orderBy sorted order if we want to get the data in some specific order
      * @param int $top number of records which  need to be skip
      * @param String $skip value indicating what records to skip
+     * @param SkipTokenInfo $skipToken
      *
      * @return QueryResult
      *
@@ -362,6 +363,7 @@ 
 
     /**
      * @param $sourceEntityInstance
+     * @param Model $checkInstance
      * @throws ODataException
      */
     private function checkAuth($sourceEntityInstance, $checkInstance = null)

Spacing +4 added lines, -4 removed lines

@@ -113,7 +113,7 @@ 
             foreach ($parameters as $name => $line) {
                 $processed[$name] = ['direction' => $line['direction'], 'value' => $line['value']];
                 $sourceEntityInstance = $sourceEntityInstance
-                    ->orWhere(function ($query) use ($processed) {
+                    ->orWhere(function($query) use ($processed) {
                         foreach ($processed as $key => $proc) {
                             $query->where($key, $proc['direction'], $proc['value']);
                         }
@@ -156,14 +156,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);
@@ -201,7 +201,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;
     }

src/Serialisers/IronicSerialiser.php

Indentation +4 added lines, -4 removed lines

@@ -621,10 +621,10 @@
     {
         $queryParameterString = null;
         foreach ([ODataConstants::HTTPQUERY_STRING_FILTER,
-                     ODataConstants::HTTPQUERY_STRING_EXPAND,
-                     ODataConstants::HTTPQUERY_STRING_ORDERBY,
-                     ODataConstants::HTTPQUERY_STRING_INLINECOUNT,
-                     ODataConstants::HTTPQUERY_STRING_SELECT, ] as $queryOption) {
+                        ODataConstants::HTTPQUERY_STRING_EXPAND,
+                        ODataConstants::HTTPQUERY_STRING_ORDERBY,
+                        ODataConstants::HTTPQUERY_STRING_INLINECOUNT,
+                        ODataConstants::HTTPQUERY_STRING_SELECT, ] as $queryOption) {
             $value = $this->getService()->getHost()->getQueryStringItem($queryOption);
             if (!is_null($value)) {
                 if (!is_null($queryParameterString)) {

Doc Comments +12 added lines, -6 removed lines

@@ -107,7 +107,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
      */
@@ -257,7 +257,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
      */
@@ -281,7 +281,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
@@ -441,6 +441,9 @@ 
         return $this->stack;
     }
 
+    /**
+     * @param string $containerName
+     */
     protected function getEntryInstanceKey($entityInstance, ResourceType $resourceType, $containerName)
     {
         $typeName = $resourceType->getName();
@@ -472,7 +475,7 @@ 
     /**
      * @param $entryObject
      * @param $type
-     * @param $relativeUri
+     * @param string $relativeUri
      * @param $resourceType
      * @return array
      */
@@ -539,7 +542,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()
     {
@@ -764,7 +767,7 @@ 
     /**
      * @param $entryObject
      * @param $prop
-     * @param $nuLink
+     * @param ODataLink $nuLink
      * @param $propKind
      * @param $propName
      */
@@ -875,6 +878,9 @@ 
         return $internalContent;
     }
 
+    /**
+     * @param ResourcePropertyKind $resourceKind
+     */
     public static function isMatchPrimitive($resourceKind)
     {
         if (16 > $resourceKind) {

Spacing +25 added lines, -25 removed lines

@@ -99,7 +99,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();
@@ -145,7 +145,7 @@ 
             $resourceType,
             $resourceSet->getName()
         );
-        $absoluteUri = rtrim($this->absoluteServiceUri, '/') . '/' . $relativeUri;
+        $absoluteUri = rtrim($this->absoluteServiceUri, '/').'/'.$relativeUri;
 
         list($mediaLink, $mediaLinks) = $this->writeMediaData($entryObject->results, $type, $relativeUri, $resourceType);
 
@@ -166,8 +166,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));
@@ -203,7 +203,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 @@ 
         $resourceSet = $this->getRequest()->getTargetResourceSetWrapper()->getResourceSet();
         $requestTop = $this->getRequest()->getTopOptionCount();
         $pageSize = $this->getService()->getConfiguration()->getEntitySetPageSize($resourceSet);
-        $requestTop = (null == $requestTop) ? $pageSize + 1 : $requestTop;
+        $requestTop = (null == $requestTop) ? $pageSize+1 : $requestTop;
 
         if (true === $entryObjects->hasMore && $requestTop > $pageSize) {
             $stackSegment = $setName;
@@ -248,7 +248,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;
         }
 
@@ -273,7 +273,7 @@ 
                 $this->getCurrentResourceSetWrapper()->getName()
             );
 
-            $url->url = rtrim($this->absoluteServiceUri, '/') . '/' . $relativeUri;
+            $url->url = rtrim($this->absoluteServiceUri, '/').'/'.$relativeUri;
         }
 
         return $url;
@@ -303,7 +303,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;
             }
         }
@@ -327,7 +327,7 @@ 
      *
      * @return ODataPropertyContent
      */
-    public function writeTopLevelComplexObject(QueryResult &$complexValue, $propertyName, ResourceType &$resourceType)
+    public function writeTopLevelComplexObject(QueryResult & $complexValue, $propertyName, ResourceType & $resourceType)
     {
         $result = $complexValue->results;
 
@@ -356,7 +356,7 @@ 
      *                                    bag object
      * @return ODataPropertyContent
      */
-    public function writeTopLevelBagObject(QueryResult &$BagValue, $propertyName, ResourceType &$resourceType)
+    public function writeTopLevelBagObject(QueryResult & $BagValue, $propertyName, ResourceType & $resourceType)
     {
         $result = $BagValue->results;
 
@@ -379,7 +379,7 @@ 
      *                                            primitive property to be written
      * @return ODataPropertyContent
      */
-    public function writeTopLevelPrimitive(QueryResult &$primitiveValue, ResourceProperty &$resourceProperty = null)
+    public function writeTopLevelPrimitive(QueryResult & $primitiveValue, ResourceProperty & $resourceProperty = null)
     {
         assert(null != $resourceProperty, "Resource property must not be null");
         $propertyContent = new ODataPropertyContent();
@@ -447,7 +447,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();
@@ -461,7 +461,7 @@ 
             }
 
             $keyValue = $keyType->convertToOData($keyValue);
-            $keyString .= $comma . $keyName . '=' . $keyValue;
+            $keyString .= $comma.$keyName.'='.$keyValue;
             $comma = ',';
         }
 
@@ -486,7 +486,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()) {
@@ -627,7 +627,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];
     }
 
     /**
@@ -677,22 +677,22 @@ 
             $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 (0 < $remainingCount) {
                 if (!is_null($queryParameterString)) {
                     $queryParameterString .= '&';
                 }
 
-                $queryParameterString .= ODataConstants::HTTPQUERY_STRING_TOP . '=' . $remainingCount;
+                $queryParameterString .= ODataConstants::HTTPQUERY_STRING_TOP.'='.$remainingCount;
             }
         }
 
@@ -721,7 +721,7 @@ 
      *
      * @return string
      */
-    private function primitiveToString(IType &$type, $primitiveValue)
+    private function primitiveToString(IType & $type, $primitiveValue)
     {
         if ($type instanceof Boolean) {
             $stringValue = (true === $primitiveValue) ? 'true' : 'false';
@@ -793,7 +793,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;
             }
         }
     }
@@ -807,7 +807,7 @@ 
     {
         $this->service = $service;
         $this->absoluteServiceUri = $service->getHost()->getAbsoluteServiceUri()->getUrlAsString();
-        $this->absoluteServiceUriWithSlash = rtrim($this->absoluteServiceUri, '/') . '/';
+        $this->absoluteServiceUriWithSlash = rtrim($this->absoluteServiceUri, '/').'/';
     }
 
     /**
@@ -815,7 +815,7 @@ 
      * @param $result
      * @return ODataBagContent
      */
-    protected function writeBagValue(ResourceType &$resourceType, $result)
+    protected function writeBagValue(ResourceType & $resourceType, $result)
     {
         assert(null == $result || is_array($result), 'Bag parameter must be null or array');
         $typeKind = $resourceType->getResourceTypeKind();
@@ -847,7 +847,7 @@ 
      * @param string $propertyName
      * @return ODataPropertyContent
      */
-    protected function writeComplexValue(ResourceType &$resourceType, &$result, $propertyName = null)
+    protected function writeComplexValue(ResourceType & $resourceType, &$result, $propertyName = null)
     {
         assert(is_object($result), 'Supplied $customObject must be an object');