Algo-Web / POData

src/POData/BaseService.php

Spacing +2 added lines, -2 removed lines

@@ -682,7 +682,7 @@ 
      */
     protected function compareETag(
         &$entryObject,
-        ResourceType &$resourceType,
+        ResourceType & $resourceType,
         &$needToSerializeResponse
     ) {
         $needToSerializeResponse = true;
@@ -775,7 +775,7 @@ 
      *                     for use in a URI) there are etag properties, NULL if
      *                     there is no etag property
      */
-    protected function getETagForEntry(&$entryObject, ResourceType &$resourceType)
+    protected function getETagForEntry(&$entryObject, ResourceType & $resourceType)
     {
         $eTag = null;
         $comma = null;

src/POData/UriProcessor/QueryProcessor/SkipTokenParser/InternalSkipTokenInfo.php

Spacing +2 added lines, -2 removed lines

@@ -68,9 +68,9 @@
      * @param ResourceType        &$resourceType            Reference to the resource type pointed to by the request uri
      */
     public function __construct(
-        InternalOrderByInfo &$internalOrderByInfo,
+        InternalOrderByInfo & $internalOrderByInfo,
         $orderByValuesInSkipToken,
-        ResourceType &$resourceType
+        ResourceType & $resourceType
     ) {
         $this->internalOrderByInfo = $internalOrderByInfo;
         $this->orderByValuesInSkipToken = $orderByValuesInSkipToken;

src/POData/Common/Messages/resourceProperty.php

Spacing +3 added lines, -3 removed lines

@@ -13,7 +13,7 @@ 
      */
     public static function resourcePropertyInvalidKindParameter($argumentName)
     {
-        return 'The argument \''.$argumentName.'\' is not a valid ResourcePropertyKind enum value or'
+        return 'The argument \'' . $argumentName . '\' is not a valid ResourcePropertyKind enum value or'
                .' valid combination of ResourcePropertyKind enum values';
     }
 
@@ -29,7 +29,7 @@ 
         $resourcePropertyKindArgName,
         $resourceTypeArgName
     ) {
-        return 'The \''.$resourcePropertyKindArgName.'\' parameter does not match with the type of the resource'
-               .' type in parameter \''.$resourceTypeArgName.'\'';
+        return 'The \'' . $resourcePropertyKindArgName . '\' parameter does not match with the type of the resource'
+               .' type in parameter \'' . $resourceTypeArgName . '\'';
     }
 }

src/POData/Common/Messages/request.php

Spacing +7 added lines, -7 removed lines

@@ -16,8 +16,8 @@ 
      */
     public static function requestVersionTooLow($requestedVersion, $requiredVersion)
     {
-        return 'Request version \''.$requestedVersion.'\' is not supported for the request payload. The only'
-               .' supported version is \''.$requiredVersion.'\'.';
+        return 'Request version \'' . $requestedVersion . '\' is not supported for the request payload. The only'
+               .' supported version is \'' . $requiredVersion . '\'.';
     }
 
     /**
@@ -31,8 +31,8 @@ 
      */
     public static function requestVersionIsBiggerThanProtocolVersion($requiredVersion, $configuredVersion)
     {
-        return 'The response requires that version '.$requiredVersion.' of the protocol be used, but the'
-               .' MaxProtocolVersion of the data service is set to '.$configuredVersion.'.';
+        return 'The response requires that version ' . $requiredVersion . ' of the protocol be used, but the'
+               .' MaxProtocolVersion of the data service is set to ' . $configuredVersion . '.';
     }
 
     /**
@@ -46,7 +46,7 @@ 
      */
     public static function requestDescriptionInvalidVersionHeader($versionAsString, $headerName)
     {
-        return 'The header '.$headerName.' has malformed version value '.$versionAsString;
+        return 'The header ' . $headerName . ' has malformed version value ' . $versionAsString;
     }
 
     /**
@@ -64,7 +64,7 @@ 
         $requestedVersion,
         $availableVersions
     ) {
-        return 'The version value '.$requestedVersion.' in the header '.$requestHeaderName.' is not'
-               .' supported, available versions are '.$availableVersions;
+        return 'The version value ' . $requestedVersion . ' in the header ' . $requestHeaderName . ' is not'
+               .' supported, available versions are ' . $availableVersions;
     }
 }

src/POData/UriProcessor/SegmentStack.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
      * @throws InvalidOperationException
      * @return bool true if the segment was push, false otherwise
      */
-    public function pushSegment($segmentName, ResourceSetWrapper &$resourceSetWrapper)
+    public function pushSegment($segmentName, ResourceSetWrapper & $resourceSetWrapper)
     {
         if (!is_string($segmentName)) {
             throw new InvalidOperationException('segmentName must be a string');

src/POData/ObjectModel/ObjectModelSerializerBase.php

Spacing +3 added lines, -3 removed lines

@@ -299,7 +299,7 @@ 
      *
      * @return bool true if a segment was pushed, false otherwise
      */
-    protected function pushSegmentForNavigationProperty(ResourceProperty &$resourceProperty)
+    protected function pushSegmentForNavigationProperty(ResourceProperty & $resourceProperty)
     {
         if (ResourceTypeKind::ENTITY() == $resourceProperty->getTypeKind()) {
             assert(!empty($this->getStack()->getSegmentNames()), 'Segment names should not be empty');
@@ -412,7 +412,7 @@ 
      *
      * @return bool true if the segment was push, false otherwise
      */
-    private function pushSegment($segmentName, ResourceSetWrapper &$resourceSetWrapper)
+    private function pushSegment($segmentName, ResourceSetWrapper & $resourceSetWrapper)
     {
         // Even though there is no expand in the request URI, still we need to push
         // the segment information if we need to count
@@ -629,7 +629,7 @@ 
         &$parentPathSegments,
         &$selectionPaths,
         &$expansionPaths,
-        ExpandedProjectionNode &$expandedProjectionNode,
+        ExpandedProjectionNode & $expandedProjectionNode,
         &$foundSelections,
         &$foundExpansions
     ) {

src/POData/ObjectModel/ObjectModelSerializer.php

Spacing +26 added lines, -26 removed lines

@@ -75,7 +75,7 @@ 
      *
      * @return ODataFeed
      */
-    public function writeTopLevelElements(QueryResult &$entryObjects)
+    public function writeTopLevelElements(QueryResult & $entryObjects)
     {
         assert(is_array($entryObjects->results), '!is_array($entryObjects->results)');
         $requestTargetSource = $this->getRequest()->getTargetSource();
@@ -191,9 +191,9 @@ 
      * @return ODataPropertyContent
      */
     public function writeTopLevelComplexObject(
-        QueryResult &$complexValue,
+        QueryResult & $complexValue,
         $propertyName,
-        ResourceType &$resourceType
+        ResourceType & $resourceType
     ) {
         $propertyContent = new ODataPropertyContent();
         $this->writeComplexValue(
@@ -216,9 +216,9 @@ 
      * @return ODataPropertyContent
      */
     public function writeTopLevelBagObject(
-        QueryResult &$bagValue,
+        QueryResult & $bagValue,
         $propertyName,
-        ResourceType &$resourceType
+        ResourceType & $resourceType
     ) {
         $propertyContent = new ODataPropertyContent();
         $this->writeBagValue(
@@ -241,8 +241,8 @@ 
      * @return ODataPropertyContent
      */
     public function writeTopLevelPrimitive(
-        QueryResult &$primitiveValue,
-        ResourceProperty &$resourceProperty = null
+        QueryResult & $primitiveValue,
+        ResourceProperty & $resourceProperty = null
     ) {
         assert(null != $resourceProperty, 'Resource property must not be null');
         $propertyContent = new ODataPropertyContent();
@@ -330,11 +330,11 @@ 
      */
     private function writeFeedElements(
         &$entryObjects,
-        ResourceType &$resourceType,
+        ResourceType & $resourceType,
         $title,
         $absoluteUri,
         $relativeUri,
-        ODataFeed &$feed,
+        ODataFeed & $feed,
         $needLink = false
     ) {
         assert(is_array($entryObjects), '!_writeFeedElements::is_array($entryObjects)');
@@ -393,11 +393,11 @@ 
      */
     private function writeObjectProperties(
         $customObject,
-        ResourceType &$resourceType,
+        ResourceType & $resourceType,
         $absoluteUri,
         $relativeUri,
         &$odataEntry,
-        ODataPropertyContent &$odataPropertyContent
+        ODataPropertyContent & $odataPropertyContent
     ) {
         $resourceTypeKind = $resourceType->getResourceTypeKind();
         if ((null === $absoluteUri) == (ResourceTypeKind::ENTITY() == $resourceTypeKind)
@@ -521,8 +521,8 @@ 
      */
     private function writePrimitiveValue(
         &$primitiveValue,
-        ODataProperty &$odataProperty,
-        ResourceProperty &$resourceProperty
+        ODataProperty & $odataProperty,
+        ResourceProperty & $resourceProperty
     ) {
         if (is_object($primitiveValue)) {
             //TODO ERROR: The property 'PropertyName'
@@ -556,9 +556,9 @@ 
     private function writeComplexValue(
         &$complexValue,
         $propertyName,
-        ResourceType &$resourceType,
+        ResourceType & $resourceType,
         $relativeUri,
-        ODataPropertyContent &$odataPropertyContent
+        ODataPropertyContent & $odataPropertyContent
     ) {
         $odataProperty = new ODataProperty();
         $odataProperty->name = $propertyName;
@@ -599,9 +599,9 @@ 
     private function writeBagValue(
         &$bagValue,
         $propertyName,
-        ResourceType &$resourceType,
+        ResourceType & $resourceType,
         $relativeUri,
-        ODataPropertyContent &$odataPropertyContent
+        ODataPropertyContent & $odataPropertyContent
     ) {
         assert(null == $bagValue || is_array($bagValue), 'Bag parameter must be null or array');
         $bagItemResourceTypeKind = $resourceType->getResourceTypeKind();
@@ -659,10 +659,10 @@ 
      */
     private function writeMediaResourceMetadata(
         $entryObject,
-        ResourceType &$resourceType,
+        ResourceType & $resourceType,
         $title,
         $relativeUri,
-        ODataEntry &$odataEntry
+        ODataEntry & $odataEntry
     ) {
         $streamProviderWrapper = $this->getService()->getStreamProviderWrapper();
         assert(null != $streamProviderWrapper, 'Retrieved stream provider must not be null');
@@ -735,7 +735,7 @@ 
      * @return string
      */
     private function primitiveToString(
-        ResourceType &$primitiveResourceType,
+        ResourceType & $primitiveResourceType,
         $primitiveValue
     ) {
         $type = $primitiveResourceType->getInstanceType();
@@ -775,9 +775,9 @@ 
     private function complexObjectToContent(
         &$complexValue,
         $propertyName,
-        ResourceType &$resourceType,
+        ResourceType & $resourceType,
         $relativeUri,
-        ODataPropertyContent &$odataPropertyContent
+        ODataPropertyContent & $odataPropertyContent
     ) {
         $count = count($this->complexTypeInstanceCollection);
         for ($i = 0; $i < $count; ++$i) {
@@ -820,9 +820,9 @@ 
      */
     private function writeObjectPropertiesUnexpanded(
         $customObject,
-        ResourceType &$resourceType,
+        ResourceType & $resourceType,
         $relativeUri,
-        ODataPropertyContent &$odataPropertyContent,
+        ODataPropertyContent & $odataPropertyContent,
         ResourceTypeKind $resourceTypeKind,
         $navigationProperties
     ) {
@@ -940,9 +940,9 @@ 
      */
     private function writeObjectPropertiesExpanded(
         $customObject,
-        ResourceType &$resourceType,
+        ResourceType & $resourceType,
         $relativeUri,
-        ODataPropertyContent &$odataPropertyContent,
+        ODataPropertyContent & $odataPropertyContent,
         $projectionNodes,
         $navigationProperties
     ) {

src/POData/UriProcessor/RequestExpander.php

Spacing +2 added lines, -2 removed lines

@@ -194,7 +194,7 @@ 
      *
      * @return bool true if a segment was pushed, false otherwise
      */
-    private function pushSegmentForNavigationProperty(ResourceProperty &$resourceProperty)
+    private function pushSegmentForNavigationProperty(ResourceProperty & $resourceProperty)
     {
         if ($resourceProperty->getTypeKind() == ResourceTypeKind::ENTITY()) {
             assert(!empty($this->getStack()->getSegmentNames()), '!is_empty($this->getStack()->getSegmentNames())');
@@ -279,7 +279,7 @@ 
      *
      * @return bool true if the segment was push, false otherwise
      */
-    private function pushSegment($segmentName, ResourceSetWrapper &$resourceSetWrapper)
+    private function pushSegment($segmentName, ResourceSetWrapper & $resourceSetWrapper)
     {
         return $this->getStack()->pushSegment($segmentName, $resourceSetWrapper);
     }

src/POData/OperationContext/ServiceHost.php

Spacing +3 added lines, -3 removed lines

@@ -222,7 +222,7 @@ 
                     );
                 }
 
-                $builtServiceUri = $requestUriScheme .'://' . $this->getAbsoluteRequestUri()->getHost();
+                $builtServiceUri = $requestUriScheme . '://' . $this->getAbsoluteRequestUri()->getHost();
 
                 if (($requestUriScheme == 'http' && $requestUriPort != '80') ||
                     ($requestUriScheme == 'https' && $requestUriPort != '443')
@@ -511,7 +511,7 @@ 
             $this->getOperationContext()->outgoingResponse()->setContentLength($value);
         } else {
             throw ODataException::notAcceptableError(
-                'ContentLength: '.$value.' is invalid'
+                'ContentLength: ' . $value . ' is invalid'
             );
         }
     }
@@ -556,7 +556,7 @@ 
     public function setResponseStatusCode($value)
     {
         if (!is_numeric($value)) {
-            $msg = 'Invalid, non-numeric, status code: '.$value;
+            $msg = 'Invalid, non-numeric, status code: ' . $value;
             throw ODataException::createInternalServerError($msg);
         }
         $floor = floor($value/100);