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/Query/LaravelReadQuery.php

Spacing +2 added lines, -2 removed lines

@@ -96,14 +96,14 @@
             // loop thru, chunk by chunk, to reduce chances of exhausting memory
             $sourceEntityInstance->chunk(
                 5000,
-                function ($results) use ($isvalid, &$skipToken, &$resultSet, &$rawCount, $rawTop) {
+                function($results) use ($isvalid, &$skipToken, &$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() + $skipToken) {
+                    if ($rawTop > $resultSet->count()+$skipToken) {
                         $resultSet = collect(array_merge($resultSet->all(), $results->all()));
                         $sliceAmount = min($skipToken, $resultSet->count());
                         $resultSet = $resultSet->slice($sliceAmount);

Doc Comments +1 added lines

@@ -346,6 +346,7 @@
 
     /**
      * @param $sourceEntityInstance
+     * @param Model $checkInstance
      * @throws ODataException
      */
     private function checkAuth($sourceEntityInstance, $checkInstance = null)

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/Serialisers/IronicSerialiser.php

Doc Comments +6 added lines, -3 removed lines

@@ -395,6 +395,9 @@ 
         return $this->stack;
     }
 
+    /**
+     * @param string $containerName
+     */
     protected function getEntryInstanceKey($entityInstance, ResourceType $resourceType, $containerName)
     {
         $typeName = $resourceType->getName();
@@ -426,7 +429,7 @@ 
     /**
      * @param $entryObject
      * @param $type
-     * @param $relativeUri
+     * @param string $relativeUri
      * @param $resourceType
      * @return array
      */
@@ -493,7 +496,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()
     {
@@ -664,7 +667,7 @@ 
     /**
      * @param $entryObject
      * @param $prop
-     * @param $nuLink
+     * @param ODataLink $nuLink
      * @param $propKind
      * @param $propName
      */

Spacing +17 added lines, -17 removed lines

@@ -94,7 +94,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();
@@ -140,7 +140,7 @@ 
             $resourceType,
             $resourceSet->getName()
         );
-        $absoluteUri = rtrim($this->absoluteServiceUri, '/') . '/' . $relativeUri;
+        $absoluteUri = rtrim($this->absoluteServiceUri, '/').'/'.$relativeUri;
 
         list($mediaLink, $mediaLinks) = $this->writeMediaData($entryObject, $type, $relativeUri, $resourceType);
 
@@ -161,8 +161,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));
@@ -233,7 +233,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;
         }
 
@@ -258,7 +258,7 @@ 
                 $this->getCurrentResourceSetWrapper()->getName()
             );
 
-            $url->url = rtrim($this->absoluteServiceUri, '/') . '/' . $relativeUri;
+            $url->url = rtrim($this->absoluteServiceUri, '/').'/'.$relativeUri;
         }
 
         return $url;
@@ -288,7 +288,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;
             }
         }
@@ -313,7 +313,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
     }
@@ -330,7 +330,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
     }
@@ -347,7 +347,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
     }
@@ -400,7 +400,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();
@@ -414,7 +414,7 @@ 
             }
 
             $keyValue = $keyType->convertToOData($keyValue);
-            $keyString .= $comma . $keyName . '=' . $keyValue;
+            $keyString .= $comma.$keyName.'='.$keyValue;
             $comma = ',';
         }
 
@@ -439,7 +439,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()) {
@@ -580,7 +580,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];
     }
 
     /**
@@ -620,7 +620,7 @@ 
      *
      * @return string
      */
-    private function primitiveToString(IType &$type, $primitiveValue)
+    private function primitiveToString(IType & $type, $primitiveValue)
     {
         if ($type instanceof Boolean) {
             $stringValue = (true === $primitiveValue) ? 'true' : 'false';
@@ -690,7 +690,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;
             }
         }
     }
@@ -704,6 +704,6 @@ 
     {
         $this->service = $service;
         $this->absoluteServiceUri = $service->getHost()->getAbsoluteServiceUri()->getUrlAsString();
-        $this->absoluteServiceUriWithSlash = rtrim($this->absoluteServiceUri, '/') . '/';
+        $this->absoluteServiceUriWithSlash = rtrim($this->absoluteServiceUri, '/').'/';
     }
 }