Qeti / POData

src/POData/UriProcessor/QueryProcessor/QueryProcessor.php

Indentation +40 added lines, -40 removed lines

@@ -71,21 +71,21 @@ 
 
         $isSingleResult = $request->isSingleResult();
 
-	    //$top, $skip, $order, $inlinecount & $count are only applicable if:
-	    //The query targets a resource collection
+        //$top, $skip, $order, $inlinecount & $count are only applicable if:
+        //The query targets a resource collection
         $this->_setQueryApplicable = ($request->getTargetKind() == TargetKind::RESOURCE() && !$isSingleResult);
-	    //Or it's a $count resource (although $inlinecount isn't applicable in this case..but there's a check somewhere else for this
-	    $this->_setQueryApplicable |= $request->queryType == QueryType::COUNT();
+        //Or it's a $count resource (although $inlinecount isn't applicable in this case..but there's a check somewhere else for this
+        $this->_setQueryApplicable |= $request->queryType == QueryType::COUNT();
 
-	    //Paging is allowed if
-	    //The request targets a resource collection
-	    //and the request isn't for a $count segment
-	    $this->_pagingApplicable = $this->request->getTargetKind() == TargetKind::RESOURCE() && !$isSingleResult && ($request->queryType != QueryType::COUNT());
+        //Paging is allowed if
+        //The request targets a resource collection
+        //and the request isn't for a $count segment
+        $this->_pagingApplicable = $this->request->getTargetKind() == TargetKind::RESOURCE() && !$isSingleResult && ($request->queryType != QueryType::COUNT());
 
-	    $targetResourceType = $this->request->getTargetResourceType();
+        $targetResourceType = $this->request->getTargetResourceType();
         $targetResourceSetWrapper = $this->request->getTargetResourceSetWrapper();
 
-	    $this->_expandSelectApplicable = !is_null($targetResourceType)
+        $this->_expandSelectApplicable = !is_null($targetResourceType)
             && !is_null($targetResourceSetWrapper)
             && $targetResourceType->getResourceTypeKind() == ResourceTypeKind::ENTITY
             && !$this->request->isLinkUri();
@@ -270,7 +270,7 @@ 
             || $kind == TargetKind::COMPLEX_OBJECT()
             || $this->request->queryType == QueryType::COUNT() )
         ) {
-			throw ODataException::createBadRequestError(
+            throw ODataException::createBadRequestError(
                 Messages::queryProcessorQueryFilterOptionNotApplicable()
             );
         }
@@ -296,27 +296,27 @@ 
     {
         $inlineCount = $this->service->getHost()->getQueryStringItem( ODataConstants::HTTPQUERY_STRING_INLINECOUNT );
 
-	    //If it's not specified, we're done
-	    if(is_null($inlineCount)) return;
+        //If it's not specified, we're done
+        if(is_null($inlineCount)) return;
 
-	    //If the service doesn't allow count requests..then throw an exception
+        //If the service doesn't allow count requests..then throw an exception
         if (!$this->service->getConfiguration()->getAcceptCountRequests()) {
-			throw ODataException::createBadRequestError(
+            throw ODataException::createBadRequestError(
                 Messages::configurationCountNotAccepted()
             );
         }
 
         $inlineCount = trim($inlineCount);
 
-	    //if it's set to none, we don't do inline counts
+        //if it's set to none, we don't do inline counts
         if ($inlineCount === ODataConstants::URI_ROWCOUNT_OFFOPTION) {
             return;
         }
 
-	    //You can't specify $count & $inlinecount together
-	    //TODO: ensure there's a test for this case see #55
+        //You can't specify $count & $inlinecount together
+        //TODO: ensure there's a test for this case see #55
         if ($this->request->queryType == QueryType::COUNT() ) {
-			throw ODataException::createBadRequestError(
+            throw ODataException::createBadRequestError(
                 Messages::queryProcessorInlineCountWithValueCount()
             );
         }
@@ -325,13 +325,13 @@ 
 
 
         if ($inlineCount === ODataConstants::URI_ROWCOUNT_ALLOPTION) {
-	        $this->request->queryType = QueryType::ENTITIES_WITH_COUNT();
+            $this->request->queryType = QueryType::ENTITIES_WITH_COUNT();
 
             $this->request->raiseMinVersionRequirement( 2, 0 );
             $this->request->raiseResponseVersion( 2, 0 );
 
         } else {
-			throw ODataException::createBadRequestError(
+            throw ODataException::createBadRequestError(
                 Messages::queryProcessorInvalidInlineCountOptionError()
             );
         }
@@ -361,13 +361,13 @@ 
         }
 
         if (!$this->_pagingApplicable) {
-			throw ODataException::createBadRequestError(
+            throw ODataException::createBadRequestError(
                 Messages::queryProcessorSkipTokenNotAllowed()
             );
         }
 
         if (!$this->_isSSPagingRequired()) {
-			throw ODataException::createBadRequestError(
+            throw ODataException::createBadRequestError(
                 Messages::queryProcessorSkipTokenCannotBeAppliedForNonPagedResourceSet($this->request->getTargetResourceSetWrapper())
             );
         }
@@ -412,7 +412,7 @@ 
 
         if (!is_null($select)) {
             if (!$this->service->getConfiguration()->getAcceptProjectionRequests()) {
-				throw ODataException::createBadRequestError( Messages::configurationProjectionsNotAccepted() );
+                throw ODataException::createBadRequestError( Messages::configurationProjectionsNotAccepted() );
             }
 
             $this->_checkExpandOrSelectApplicable( ODataConstants::HTTPQUERY_STRING_SELECT );
@@ -423,19 +423,19 @@ 
         // 'RootProjectionNode' is required while generating next page Link
         if ($this->_expandSelectApplicable || $this->request->isLinkUri() ) {
 
-			$rootProjectionNode = ExpandProjectionParser::parseExpandAndSelectClause(
-				 $this->request->getTargetResourceSetWrapper(),
-				 $this->request->getTargetResourceType(),
-				 $this->request->getInternalOrderByInfo(),
-				 $this->request->getSkipCount(),
-				 $this->request->getTopCount(),
-				 $expand,
-				 $select,
-				 $this->service->getProvidersWrapper()
-			);
-			if ($rootProjectionNode->isSelectionSpecified()) {
-			    $this->request->raiseMinVersionRequirement(2, 0 );
-			}
+            $rootProjectionNode = ExpandProjectionParser::parseExpandAndSelectClause(
+                    $this->request->getTargetResourceSetWrapper(),
+                    $this->request->getTargetResourceType(),
+                    $this->request->getInternalOrderByInfo(),
+                    $this->request->getSkipCount(),
+                    $this->request->getTopCount(),
+                    $expand,
+                    $select,
+                    $this->service->getProvidersWrapper()
+            );
+            if ($rootProjectionNode->isSelectionSpecified()) {
+                $this->request->raiseMinVersionRequirement(2, 0 );
+            }
 
             if ($rootProjectionNode->hasPagedExpandedResult()) {
                 $this->request->raiseResponseVersion( 2, 0 );
@@ -533,7 +533,7 @@ 
             || !is_null($serviceHost->getQueryStringItem(ODataConstants::HTTPQUERY_STRING_SKIPTOKEN))
             || !is_null($serviceHost->getQueryStringItem(ODataConstants::HTTPQUERY_STRING_TOP))
         ) {
-			throw ODataException::createBadRequestError(
+            throw ODataException::createBadRequestError(
                 Messages::queryProcessorNoQueryOptionsApplicable()
             );
         }
@@ -551,7 +551,7 @@ 
     private function _checkSetQueryApplicable()
     {
         if (!$this->_setQueryApplicable) {
-			throw ODataException::createBadRequestError(
+            throw ODataException::createBadRequestError(
                 Messages::queryProcessorQuerySetOptionsNotApplicable()
             );
         }
@@ -572,7 +572,7 @@ 
     private function _checkExpandOrSelectApplicable($queryItem)
     {
         if (!$this->_expandSelectApplicable) {
-			throw ODataException::createBadRequestError(
+            throw ODataException::createBadRequestError(
                 Messages::queryProcessorSelectOrExpandOptionNotApplicable($queryItem)
             );
         }

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

Indentation +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
         $orderByPathSegments = $internalOrderByInfo->getOrderByPathSegments();
         $orderByPathCount = count($orderByPathSegments);
         if ($count != ($orderByPathCount)) {
-			    throw ODataException::createBadRequestError(
+                throw ODataException::createBadRequestError(
                     Messages::skipTokenParserSkipTokenNotMatchingOrdering(
                         $count, $skipToken, $orderByPathCount
                     )

src/POData/UriProcessor/RequestDescription.php

Indentation +50 added lines, -50 removed lines

@@ -75,8 +75,8 @@ 
      */
     private $requiredMinRequestVersion;
 
-	/** @var Version */
-	private $maxServiceVersion;
+    /** @var Version */
+    private $maxServiceVersion;
 
     /**
      * Collection of known data service versions.
@@ -114,12 +114,12 @@ 
     private $_containerName;
 
 
-	/**
-	 * The count option specified in the request.
-	 *
-	 * @var QueryType
-	 */
-	public $queryType;
+    /**
+     * The count option specified in the request.
+     *
+     * @var QueryType
+     */
+    public $queryType;
 
     /**
      * Number of segments.
@@ -213,36 +213,36 @@ 
 
 
 
-	/**
-	 * @param SegmentDescriptor[] $segmentDescriptors Description of segments in the resource path.
-	 * @param Url $requestUri
-	 * @param Version $serviceMaxVersion
-	 * @param $requestVersion
-	 * @param $maxRequestVersion
-	 */
-	public function __construct($segmentDescriptors, Url $requestUri, Version $serviceMaxVersion, $requestVersion, $maxRequestVersion)
+    /**
+     * @param SegmentDescriptor[] $segmentDescriptors Description of segments in the resource path.
+     * @param Url $requestUri
+     * @param Version $serviceMaxVersion
+     * @param $requestVersion
+     * @param $maxRequestVersion
+     */
+    public function __construct($segmentDescriptors, Url $requestUri, Version $serviceMaxVersion, $requestVersion, $maxRequestVersion)
     {
         $this->segments = $segmentDescriptors;
         $this->_segmentCount = count($this->segments);
         $this->requestUrl = $requestUri;
         $this->lastSegment = $segmentDescriptors[$this->_segmentCount - 1];
-	    $this->queryType = QueryType::ENTITIES();
+        $this->queryType = QueryType::ENTITIES();
 
         //we use this for validation checks down in validateVersions...but maybe we should check that outside of this object...
         $this->maxServiceVersion = $serviceMaxVersion;
 
-	    //Per OData 1 & 2 spec we must return the smallest size
-	    //We start at 1.0 and move it up as features are requested
+        //Per OData 1 & 2 spec we must return the smallest size
+        //We start at 1.0 and move it up as features are requested
         $this->requiredMinResponseVersion = clone Version::v1();
         $this->requiredMinRequestVersion = clone Version::v1();
 
 
-	    //see http://www.odata.org/documentation/odata-v2-documentation/overview/#ProtocolVersioning
-	    //if requestVersion isn't there, use Service Max Version
-	    $this->requestVersion = is_null($requestVersion) ? $serviceMaxVersion : self::parseVersionHeader($requestVersion, ODataConstants::ODATAVERSIONHEADER);
+        //see http://www.odata.org/documentation/odata-v2-documentation/overview/#ProtocolVersioning
+        //if requestVersion isn't there, use Service Max Version
+        $this->requestVersion = is_null($requestVersion) ? $serviceMaxVersion : self::parseVersionHeader($requestVersion, ODataConstants::ODATAVERSIONHEADER);
 
-	    //if max version isn't there, use the request version
-	    $this->requestMaxVersion = is_null($maxRequestVersion) ? $this->requestVersion : self::parseVersionHeader($maxRequestVersion, ODataConstants::ODATAMAXVERSIONHEADER);
+        //if max version isn't there, use the request version
+        $this->requestMaxVersion = is_null($maxRequestVersion) ? $this->requestVersion : self::parseVersionHeader($maxRequestVersion, ODataConstants::ODATAMAXVERSIONHEADER);
 
         //if it's OData v3..things change a bit
         if($this->maxServiceVersion == Version::v3()){
@@ -284,7 +284,7 @@ 
     public function raiseMinVersionRequirement($major, $minor) {
         if($this->requiredMinRequestVersion->raiseVersion($major, $minor))
         {
-	        $this->validateVersions();
+            $this->validateVersions();
         }
     }
 
@@ -299,7 +299,7 @@ 
      */  
     public function raiseResponseVersion($major, $minor) {
         if($this->requiredMinResponseVersion->raiseVersion($major, $minor)){
-	        $this->validateVersions();
+            $this->validateVersions();
         }
 
     }
@@ -810,7 +810,7 @@ 
     public function getResponseVersion()
     {
 
-	    return $this->requiredMinResponseVersion;
+        return $this->requiredMinResponseVersion;
     }
 
     /**
@@ -838,7 +838,7 @@ 
     {
         if (is_null(self::$_knownDataServiceVersions)) {
             self::$_knownDataServiceVersions = array(
-	            new Version(1, 0),
+                new Version(1, 0),
                 new Version(2, 0),
                 new Version(3, 0)
             );
@@ -867,32 +867,32 @@ 
      */
     public function validateVersions() {
 
-	    //If the request version is below the minimum version required by supplied request arguments..throw an exception
+        //If the request version is below the minimum version required by supplied request arguments..throw an exception
         if ($this->requestVersion->compare($this->requiredMinRequestVersion) < 0) {
-			throw ODataException::createBadRequestError(
+            throw ODataException::createBadRequestError(
                 Messages::requestVersionTooLow(
-	                $this->requestVersion->toString(),
-	                $this->requiredMinRequestVersion->toString()
+                    $this->requestVersion->toString(),
+                    $this->requiredMinRequestVersion->toString()
                 )
             );
         }
 
-	    //If the requested max version is below the version required to fulfill the response...throw an exception
+        //If the requested max version is below the version required to fulfill the response...throw an exception
         if ($this->requestMaxVersion->compare($this->requiredMinResponseVersion) < 0) {
-			throw ODataException::createBadRequestError(
+            throw ODataException::createBadRequestError(
                 Messages::requestVersionTooLow(
-	                $this->requestMaxVersion->toString(),
-	                $this->requiredMinResponseVersion->toString()
+                    $this->requestMaxVersion->toString(),
+                    $this->requiredMinResponseVersion->toString()
                 )
             );
         }
 
         //If the max version supported by the service is below the version required to fulfill the response..throw an exception
         if ($this->maxServiceVersion->compare($this->requiredMinResponseVersion) < 0) {
-			throw ODataException::createBadRequestError(
+            throw ODataException::createBadRequestError(
                 Messages::requestVersionIsBiggerThanProtocolVersion(
-	                $this->requiredMinResponseVersion->toString(),
-	                $this->maxServiceVersion->toString()
+                    $this->requiredMinResponseVersion->toString(),
+                    $this->maxServiceVersion->toString()
                 )
             );
         }
@@ -923,9 +923,9 @@ 
         for ($i = 0; $i < $libNameIndex; $i++) {
             if ($versionHeader[$i] == '.') {
 
-	            //Throw an exception if we find more than 1 dot
-	            if ($dotIndex != -1) {
-					throw ODataException::createBadRequestError(
+                //Throw an exception if we find more than 1 dot
+                if ($dotIndex != -1) {
+                    throw ODataException::createBadRequestError(
                         Messages::requestDescriptionInvalidVersionHeader(
                             $versionHeader,
                             $headerName
@@ -935,7 +935,7 @@ 
 
                 $dotIndex = $i;
             } else if ($versionHeader[$i] < '0' || $versionHeader[$i] > '9') {
-				throw ODataException::createBadRequestError(
+                throw ODataException::createBadRequestError(
                     Messages::requestDescriptionInvalidVersionHeader(
                         $versionHeader,
                         $headerName
@@ -945,14 +945,14 @@ 
         }
 
 
-	    $major = intval(substr($versionHeader, 0, $dotIndex));
-	    $minor = 0;
+        $major = intval(substr($versionHeader, 0, $dotIndex));
+        $minor = 0;
 
-	   //Apparently the . is optional
+        //Apparently the . is optional
         if ($dotIndex != -1) {
             if ($dotIndex == 0) {
-	            //If it starts with a ., throw an exception
-				throw ODataException::createBadRequestError(
+                //If it starts with a ., throw an exception
+                throw ODataException::createBadRequestError(
                     Messages::requestDescriptionInvalidVersionHeader(
                         $versionHeader,
                         $headerName
@@ -965,8 +965,8 @@ 
 
         $version = new Version($major, $minor);
 
-	    //TODO: move this somewhere...
-	    /*
+        //TODO: move this somewhere...
+        /*
         $isSupportedVersion = false;
         foreach (self::getKnownDataServiceVersions() as $version1) {
             if ($version->compare($version1) == 0) {

src/POData/UriProcessor/ResourcePathProcessor/ResourcePathProcessor.php

Indentation +9 added lines, -9 removed lines

@@ -31,7 +31,7 @@ 
      *                        or in case of any version incompatibility.
      */
     public static function process(IService $service) {
-	    $host = $service->getHost();
+        $host = $service->getHost();
         $absoluteRequestUri = $host->getAbsoluteRequestUri();
         $absoluteServiceUri = $host->getAbsoluteServiceUri();
 
@@ -49,15 +49,15 @@ 
         $request = new RequestDescription(
             $segments,
             $absoluteRequestUri,
-	        $service->getConfiguration()->getMaxDataServiceVersion(),
-	        $host->getRequestVersion(),
-	        $host->getRequestMaxVersion()
+            $service->getConfiguration()->getMaxDataServiceVersion(),
+            $host->getRequestVersion(),
+            $host->getRequestMaxVersion()
         );
         $kind = $request->getTargetKind();
 
-	    if ($kind == TargetKind::METADATA() || $kind == TargetKind::BATCH() || $kind == TargetKind::SERVICE_DIRECTORY()){
-		    return $request;
-	    }
+        if ($kind == TargetKind::METADATA() || $kind == TargetKind::BATCH() || $kind == TargetKind::SERVICE_DIRECTORY()){
+            return $request;
+        }
 
 
 
@@ -68,7 +68,7 @@ 
             // http://odata/NW.svc/Employees(1)/ThumbNail_48X48/$value
             $request->setContainerName($segments[count($segments) - 2]->getIdentifier());
         } else {
-	        $request->setContainerName($request->getIdentifier());
+            $request->setContainerName($request->getIdentifier());
         }
 
         if ($request->getIdentifier() === ODataConstants::URI_COUNT_SEGMENT) {
@@ -76,7 +76,7 @@ 
                 throw ODataException::createBadRequestError(Messages::configurationCountNotAccepted());
             }
 
-	        $request->queryType = QueryType::COUNT();
+            $request->queryType = QueryType::COUNT();
             // use of $count requires request DataServiceVersion
             // and MaxDataServiceVersion greater than or equal to 2.0
 

src/POData/UriProcessor/ResourcePathProcessor/SegmentParser/KeyDescriptor.php

Indentation +1 added lines, -1 removed lines

@@ -175,7 +175,7 @@
      */
     public function isEmpty()
     {
-         return empty($this->_namedValues) 
+            return empty($this->_namedValues) 
              && empty($this->_positionalValues);
     }
 

src/POData/UriProcessor/ResourcePathProcessor/SegmentParser/SegmentParser.php

Indentation +19 added lines, -19 removed lines

@@ -92,7 +92,7 @@ 
 
         $segmentLength = strlen($segment);
         if (strrpos($segment, ')') !== $segmentLength - 1) {
-			throw ODataException::createSyntaxError(Messages::syntaxError());
+            throw ODataException::createSyntaxError(Messages::syntaxError());
         }
 
         $identifier = substr($segment, 0, $predicateStart);
@@ -112,8 +112,8 @@ 
     {        
         if (empty($segments)) {
             //If there's no segments, then it's the service root
-	        $descriptor = new SegmentDescriptor();
-	        $descriptor->setTargetKind(TargetKind::SERVICE_DIRECTORY());
+            $descriptor = new SegmentDescriptor();
+            $descriptor->setTargetKind(TargetKind::SERVICE_DIRECTORY());
             $this->_segmentDescriptors[] = $descriptor;
             return;
         }
@@ -121,13 +121,13 @@ 
         $segmentCount = count($segments);
         $identifier = $keyPredicate = null;
         $this->extractSegmentIdentifierAndKeyPredicate($segments[0], $identifier, $keyPredicate);
-	    $previous = $this->_createFirstSegmentDescriptor(
+        $previous = $this->_createFirstSegmentDescriptor(
             $identifier, $keyPredicate, $checkRights
         );
         $this->_segmentDescriptors[0] = $previous;
 
         for ($i = 1; $i < $segmentCount; $i++) {
-	        $current = $this->createNextSegment($previous, $segments[$i], $checkRights);
+            $current = $this->createNextSegment($previous, $segments[$i], $checkRights);
 
             
             $current->setPrevious($previous);
@@ -138,7 +138,7 @@ 
 
         //At this point $previous is the final segment..which cannot be a $link
         if ($previous->getTargetKind() == TargetKind::LINK()) {
-			throw ODataException::createBadRequestError(Messages::segmentParserMissingSegmentAfterLink());
+            throw ODataException::createBadRequestError(Messages::segmentParserMissingSegmentAfterLink());
         }
     }
 
@@ -151,7 +151,7 @@ 
             || $previousKind == TargetKind::MEDIA_RESOURCE()
         ) {
             //All these targets are terminal segments, there cannot be anything after them.
-			throw ODataException::resourceNotFoundError(
+            throw ODataException::resourceNotFoundError(
                 Messages::segmentParserMustBeLeafSegment($previous->getIdentifier())
             );
         }
@@ -162,7 +162,7 @@ 
         $current = null;
         if ($previousKind == TargetKind::PRIMITIVE()) {
             if ($identifier !== ODataConstants::URI_VALUE_SEGMENT) {
-				throw ODataException::resourceNotFoundError(
+                throw ODataException::resourceNotFoundError(
                     Messages::segmentParserOnlyValueSegmentAllowedAfterPrimitivePropertySegment(
                         $identifier, $previous->getIdentifier()
                     )
@@ -175,7 +175,7 @@ 
             $current->setTargetKind(TargetKind::PRIMITIVE_VALUE());
             $current->setSingleResult(true);
         } else if (!is_null($previous->getPrevious()) && $previous->getPrevious()->getIdentifier() === ODataConstants::URI_LINK_SEGMENT && $identifier !== ODataConstants::URI_COUNT_SEGMENT) {
-			throw ODataException::createBadRequestError(
+            throw ODataException::createBadRequestError(
                 Messages::segmentParserNoSegmentAllowedAfterPostLinkSegment($identifier)
             );
         } else if ($previousKind == TargetKind::RESOURCE()
@@ -198,7 +198,7 @@ 
             }
 
             if (!$previous->isSingleResult() && $identifier !== ODataConstants::URI_COUNT_SEGMENT) {
-				throw ODataException::createBadRequestError(
+                throw ODataException::createBadRequestError(
                     Messages::segmentParserCannotQueryCollection($previous->getIdentifier())
                 );
             }
@@ -211,13 +211,13 @@ 
 
             if ($identifier === ODataConstants::URI_COUNT_SEGMENT) {
                 if ($previousKind != TargetKind::RESOURCE()) {
-					throw ODataException::createBadRequestError(
+                    throw ODataException::createBadRequestError(
                         Messages::segmentParserCountCannotBeApplied($previous->getIdentifier())
                     );
                 }
 
                 if ($previous->isSingleResult()) {
-					throw ODataException::createBadRequestError(
+                    throw ODataException::createBadRequestError(
                         Messages::segmentParserCountCannotFollowSingleton($previous->getIdentifier())
                     );
                 }
@@ -248,7 +248,7 @@ 
                         $previous->getTargetResourceType()
                     );
                 } else {
-					throw ODataException::createResourceNotFoundError($identifier);
+                    throw ODataException::createResourceNotFoundError($identifier);
                 }
             } else {
                 $current->setTargetResourceType($projectedProperty->getResourceType());
@@ -256,7 +256,7 @@ 
                 if ($previousKind == TargetKind::LINK()
                     && $projectedProperty->getTypeKind() != ResourceTypeKind::ENTITY
                 ) {
-					throw ODataException::createBadRequestError(
+                    throw ODataException::createBadRequestError(
                         Messages::segmentParserLinkSegmentMustBeFollowedByEntitySegment(
                             $identifier
                         )
@@ -276,14 +276,14 @@ 
                         $current->setTargetKind(TargetKind::RESOURCE());
                         $resourceSetWrapper = $this->providerWrapper->getResourceSetWrapperForNavigationProperty($previous->getTargetResourceSetWrapper(), $previous->getTargetResourceType(), $projectedProperty);
                         if (is_null($resourceSetWrapper)) {
-							throw ODataException::createResourceNotFoundError($projectedProperty->getName());
+                            throw ODataException::createResourceNotFoundError($projectedProperty->getName());
                         }
 
                         $current->setTargetResourceSetWrapper($resourceSetWrapper);
                         break;
                     default:
                         if (!$projectedProperty->isKindOf(ResourcePropertyKind::PRIMITIVE)) {
-							throw ODataException::createInternalServerError(
+                            throw ODataException::createInternalServerError(
                                 Messages::segmentParserUnExpectedPropertyKind(
                                     'Primitive'
                                 )
@@ -347,7 +347,7 @@ 
         }
 
         if ($segmentIdentifier === ODataConstants::URI_COUNT_SEGMENT) {
-			throw ODataException::createBadRequestError(
+            throw ODataException::createBadRequestError(
                 Messages::segmentParserSegmentNotAllowedOnRoot(
                     ODataConstants::URI_COUNT_SEGMENT
                 )
@@ -355,7 +355,7 @@ 
         }
 
         if ($segmentIdentifier === ODataConstants::URI_LINK_SEGMENT) {
-			throw ODataException::createBadRequestError(
+            throw ODataException::createBadRequestError(
                 Messages::segmentParserSegmentNotAllowedOnRoot(
                     ODataConstants::URI_LINK_SEGMENT
                 )
@@ -364,7 +364,7 @@ 
 
         $resourceSetWrapper = $this->providerWrapper->resolveResourceSet($segmentIdentifier);
         if ($resourceSetWrapper === null) {
-			throw ODataException::createResourceNotFoundError($segmentIdentifier);
+            throw ODataException::createResourceNotFoundError($segmentIdentifier);
         }
 
         $descriptor->setTargetResourceSetWrapper($resourceSetWrapper);

src/POData/UriProcessor/UriProcessor.php

Indentation +73 added lines, -73 removed lines

@@ -98,7 +98,7 @@ 
         $absoluteServiceUri = $service->getHost()->getAbsoluteServiceUri();
         
         if (!$absoluteServiceUri->isBaseOf($absoluteRequestUri)) {
-			throw ODataException::createInternalServerError(
+            throw ODataException::createInternalServerError(
                 Messages::uriProcessorRequestUriDoesNotHaveTheRightBaseUri(
                     $absoluteRequestUri->getUrlAsString(), 
                     $absoluteServiceUri->getUrlAsString()
@@ -108,9 +108,9 @@ 
 
         $uriProcessor = new UriProcessor($service);
         //Parse the resource path part of the request Uri.
-		$uriProcessor->request = ResourcePathProcessor::process($service);
+        $uriProcessor->request = ResourcePathProcessor::process($service);
 
-	    $uriProcessor->request->setUriProcessor($uriProcessor);
+        $uriProcessor->request->setUriProcessor($uriProcessor);
 
 
         //Parse the query string options of the request Uri.
@@ -140,11 +140,11 @@ 
 
             $requestTargetKind = $segment->getTargetKind();
 
-	        if ($segment->getTargetSource() == TargetSource::ENTITY_SET) {
+            if ($segment->getTargetSource() == TargetSource::ENTITY_SET) {
                 $this->handleSegmentTargetsToResourceSet($segment);
             } else if ($requestTargetKind == TargetKind::RESOURCE()) {
                 if (is_null($segment->getPrevious()->getResult())) {
-					throw ODataException::createResourceNotFoundError(
+                    throw ODataException::createResourceNotFoundError(
                         $segment->getPrevious()->getIdentifier()
                     );
                 }
@@ -159,7 +159,7 @@ 
             } else {
                 if ($requestTargetKind == TargetKind::MEDIA_RESOURCE()) {
                     if (is_null($segment->getPrevious()->getResult())) {
-						throw ODataException::createResourceNotFoundError(
+                        throw ODataException::createResourceNotFoundError(
                             $segment->getPrevious()->getIdentifier()
                         );
                     }
@@ -172,14 +172,14 @@ 
                     break;
                 }
 
-	            $value = $segment->getPrevious()->getResult();
+                $value = $segment->getPrevious()->getResult();
                 while (!is_null($segment)) {
-	                //TODO: what exactly is this doing here?  Once a null's found it seems everything will be null
+                    //TODO: what exactly is this doing here?  Once a null's found it seems everything will be null
                     if (!is_null($value)) {
                         $value = null;
                     } else {
                         try {
-	                        //see #88
+                            //see #88
                             $property = new \ReflectionProperty($value, $segment->getIdentifier());
                             $value = $property->getValue($value);
                         } catch (\ReflectionException $reflectionException) {
@@ -204,9 +204,9 @@ 
             }
         }
 
-         // Apply $select and $expand options to result set, this function will be always applied
-         // irrespective of return value of IDSQP2::canApplyQueryOptions which means library will
-         // not delegate $expand/$select operation to IDSQP2 implementation
+            // Apply $select and $expand options to result set, this function will be always applied
+            // irrespective of return value of IDSQP2::canApplyQueryOptions which means library will
+            // not delegate $expand/$select operation to IDSQP2 implementation
         $this->handleExpansion();
     }
 
@@ -229,7 +229,7 @@ 
         } else {
 
             $queryResult = $this->providers->getResourceSet(
-	            $this->request->queryType,
+                $this->request->queryType,
                 $segment->getTargetResourceSetWrapper(),
                 $this->request->getFilterInfo(),
                 $this->request->getInternalOrderByInfo(),
@@ -266,13 +266,13 @@ 
                 $segment->setResult($entityInstance);
             } else {
                 $queryResult = $this->providers->getRelatedResourceSet(
-	                $this->request->queryType,
+                    $this->request->queryType,
                     $segment->getPrevious()->getTargetResourceSetWrapper(),
                     $segment->getPrevious()->getResult(),
                     $segment->getTargetResourceSetWrapper(),
                     $segment->getProjectedProperty(),
                     $this->request->getFilterInfo(),
-	                //TODO: why are these null?  see #98
+                    //TODO: why are these null?  see #98
                     null, // $orderby
                     null, // $top
                     null  // $skip
@@ -302,19 +302,19 @@ 
      */
     private function applyQueryOptions(SegmentDescriptor $segment)
     {
-	    //TODO: I'm not really happy with this..i think i'd rather keep the result the QueryResult
-	    //not even bother with the setCountValue stuff (shouldn't counts be on segments?)
-	    //and just work with the QueryResult in the object model serializer
-	    $result = $segment->getResult();
-
-	    if(!$result instanceof QueryResult){
-		    //If the segment isn't a query result, then there's no paging or counting to be done
-		    return;
+        //TODO: I'm not really happy with this..i think i'd rather keep the result the QueryResult
+        //not even bother with the setCountValue stuff (shouldn't counts be on segments?)
+        //and just work with the QueryResult in the object model serializer
+        $result = $segment->getResult();
+
+        if(!$result instanceof QueryResult){
+            //If the segment isn't a query result, then there's no paging or counting to be done
+            return;
         }
 
 
         // Note $inlinecount=allpages means include the total count regardless of paging..so we set the counts first
-	    // regardless if POData does the paging or not.
+        // regardless if POData does the paging or not.
         if ($this->request->queryType == QueryType::ENTITIES_WITH_COUNT()) {
             if ($this->providers->handlesOrderedPaging()) {
                 $this->request->setCountValue($result->count);
@@ -323,57 +323,57 @@ 
             }
         }
 
-	    //Have POData perform paging if necessary
-	    if(!$this->providers->handlesOrderedPaging() && !empty($result->results)){
-			$result->results = $this->performPaging($result->results);
-	    }
-
-	    //a bit surprising, but $skip and $top affects $count so update it here, not above
-	    //IE  data.svc/Collection/$count?$top=10 returns 10 even if Collection has 11+ entries
-	    if ($this->request->queryType == QueryType::COUNT()) {
-		    if ($this->providers->handlesOrderedPaging()) {
-			    $this->request->setCountValue($result->count);
-		    } else {
-			    $this->request->setCountValue(count($result->results));
-		    }
-	    }
+        //Have POData perform paging if necessary
+        if(!$this->providers->handlesOrderedPaging() && !empty($result->results)){
+            $result->results = $this->performPaging($result->results);
+        }
+
+        //a bit surprising, but $skip and $top affects $count so update it here, not above
+        //IE  data.svc/Collection/$count?$top=10 returns 10 even if Collection has 11+ entries
+        if ($this->request->queryType == QueryType::COUNT()) {
+            if ($this->providers->handlesOrderedPaging()) {
+                $this->request->setCountValue($result->count);
+            } else {
+                $this->request->setCountValue(count($result->results));
+            }
+        }
 
         $segment->setResult($result->results);
     }
 
-	/**
-	 * If the provider does not perform the paging (ordering, top, skip) then this method does it
-	 *
-	 * @param array $result
-	 * @return array
-	 */
-	private function performPaging(array $result)
-	{
-		//Apply (implicit and explicit) $orderby option
-		$internalOrderByInfo = $this->request->getInternalOrderByInfo();
-		if (!is_null($internalOrderByInfo)) {
-			$orderByFunction = $internalOrderByInfo->getSorterFunction()->getReference();
-			usort($result, $orderByFunction);
-		}
-
-		//Apply $skiptoken option
-		$internalSkipTokenInfo = $this->request->getInternalSkipTokenInfo();
-		if (!is_null($internalSkipTokenInfo)) {
-			$matchingIndex = $internalSkipTokenInfo->getIndexOfFirstEntryInTheNextPage($result);
-			$result = array_slice($result, $matchingIndex);
-		}
-
-		//Apply $top and $skip option
-		if (!empty($result)) {
-			$top  = $this->request->getTopCount();
-			$skip = $this->request->getSkipCount();
-			if(is_null($skip)) $skip = 0;
-
-			$result = array_slice($result, $skip, $top);
-		}
-
-		return $result;
-	}
+    /**
+     * If the provider does not perform the paging (ordering, top, skip) then this method does it
+     *
+     * @param array $result
+     * @return array
+     */
+    private function performPaging(array $result)
+    {
+        //Apply (implicit and explicit) $orderby option
+        $internalOrderByInfo = $this->request->getInternalOrderByInfo();
+        if (!is_null($internalOrderByInfo)) {
+            $orderByFunction = $internalOrderByInfo->getSorterFunction()->getReference();
+            usort($result, $orderByFunction);
+        }
+
+        //Apply $skiptoken option
+        $internalSkipTokenInfo = $this->request->getInternalSkipTokenInfo();
+        if (!is_null($internalSkipTokenInfo)) {
+            $matchingIndex = $internalSkipTokenInfo->getIndexOfFirstEntryInTheNextPage($result);
+            $result = array_slice($result, $matchingIndex);
+        }
+
+        //Apply $top and $skip option
+        if (!empty($result)) {
+            $top  = $this->request->getTopCount();
+            $skip = $this->request->getSkipCount();
+            if(is_null($skip)) $skip = 0;
+
+            $result = array_slice($result, $skip, $top);
+        }
+
+        return $result;
+    }
 
 
     /**
@@ -416,7 +416,7 @@ 
                         $resourceSetOfProjectedProperty = $expandedProjectionNode->getResourceSetWrapper()->getResourceSet();
                         $projectedProperty1 = $expandedProjectionNode->getResourceProperty();
                         $result1 = $this->providers->getRelatedResourceSet(
-	                        QueryType::ENTITIES(), //it's always entities for an expansion
+                            QueryType::ENTITIES(), //it's always entities for an expansion
                             $currentResourceSet,
                             $entry,
                             $resourceSetOfProjectedProperty,
@@ -475,7 +475,7 @@ 
                     $resourceSetOfProjectedProperty2 = $expandedProjectionNode->getResourceSetWrapper()->getResourceSet();
                     $projectedProperty4 = $expandedProjectionNode->getResourceProperty();
                     $result1 = $this->providers->getRelatedResourceSet(
-	                    QueryType::ENTITIES(), //it's always entities for an expansion
+                        QueryType::ENTITIES(), //it's always entities for an expansion
                         $currentResourceSet2,
                         $result,
                         $resourceSetOfProjectedProperty2,

src/POData/Writers/Atom/AtomODataWriter.php

Indentation +252 added lines, -252 removed lines

@@ -31,12 +31,12 @@ 
      */
     public $xmlWriter;
 
-	/**
-	 *
-	 * The service base uri
-	 * @var string
-	 */
-	protected $baseUri;
+    /**
+     *
+     * The service base uri
+     * @var string
+     */
+    protected $baseUri;
 
     /**
      * Construct a new instance of AtomODataWriter.
@@ -45,7 +45,7 @@ 
      */
     public function __construct($absoluteServiceUri)
     {
-	    $this->baseUri = $absoluteServiceUri;
+        $this->baseUri = $absoluteServiceUri;
 
         $this->xmlWriter = new \XMLWriter();
         $this->xmlWriter->openMemory();
@@ -53,67 +53,67 @@ 
         $this->xmlWriter->setIndent(4);
     }
 
-	/**
-	 * Determines if the given writer is capable of writing the response or not
-	 * @param Version $responseVersion the OData version of the response
-	 * @param string $contentType the Content Type of the response
-	 * @return boolean true if the writer can handle the response, false otherwise
-	 */
-	public function canHandle(Version $responseVersion, $contentType)
-	{
-
-		$parts = explode(";", $contentType);
-
-		//first 2 parts are for service documents, second part is for Resources
-		//TODO: i'm not sold about this first part not being constrained to v1 (or maybe v2)..but it's how WS DS works. See #94
-		return in_array(MimeTypes::MIME_APPLICATION_XML, $parts) || in_array(MimeTypes::MIME_APPLICATION_ATOMSERVICE, $parts) || in_array(MimeTypes::MIME_APPLICATION_ATOM, $parts);
-	}
-
-	/**
-	 * Write the given OData model in a specific response format
-	 *
-	 * @param  ODataURL|ODataURLCollection|ODataPropertyContent|ODataFeed|ODataEntry $model Object of requested content.
-	 *
-	 * @return AtomODataWriter
-	 */
-	public function write($model)
-	{
-		if ($model instanceof ODataURL) {
-			return $this->writeURL($model);
-		}
-
-		if ($model instanceof ODataURLCollection) {
-			return $this->writeURLCollection($model);
-		}
-
-		if ($model instanceof ODataPropertyContent) {
-			return $this->writeProperties($model, true);
-		}
-
-		if ($model instanceof ODataFeed) {
-			return $this->writeFeed($model, true);
-		}
-
-		if ($model instanceof ODataEntry) {
-			return $this->writeEntry($model, true);
-		}
-
-		return $this;
-	}
+    /**
+     * Determines if the given writer is capable of writing the response or not
+     * @param Version $responseVersion the OData version of the response
+     * @param string $contentType the Content Type of the response
+     * @return boolean true if the writer can handle the response, false otherwise
+     */
+    public function canHandle(Version $responseVersion, $contentType)
+    {
+
+        $parts = explode(";", $contentType);
+
+        //first 2 parts are for service documents, second part is for Resources
+        //TODO: i'm not sold about this first part not being constrained to v1 (or maybe v2)..but it's how WS DS works. See #94
+        return in_array(MimeTypes::MIME_APPLICATION_XML, $parts) || in_array(MimeTypes::MIME_APPLICATION_ATOMSERVICE, $parts) || in_array(MimeTypes::MIME_APPLICATION_ATOM, $parts);
+    }
+
+    /**
+     * Write the given OData model in a specific response format
+     *
+     * @param  ODataURL|ODataURLCollection|ODataPropertyContent|ODataFeed|ODataEntry $model Object of requested content.
+     *
+     * @return AtomODataWriter
+     */
+    public function write($model)
+    {
+        if ($model instanceof ODataURL) {
+            return $this->writeURL($model);
+        }
+
+        if ($model instanceof ODataURLCollection) {
+            return $this->writeURLCollection($model);
+        }
+
+        if ($model instanceof ODataPropertyContent) {
+            return $this->writeProperties($model, true);
+        }
+
+        if ($model instanceof ODataFeed) {
+            return $this->writeFeed($model, true);
+        }
+
+        if ($model instanceof ODataEntry) {
+            return $this->writeEntry($model, true);
+        }
+
+        return $this;
+    }
 
     /** 
      * @param ODataUrl $url the url to write.
      * 
      * @return AtomODataWriter
      */
-	protected function writeURL(ODataURL $url)
+    protected function writeURL(ODataURL $url)
     {
         $this->xmlWriter->startElement(ODataConstants::ATOM_URI_ELEMENT_NAME);
         $this->xmlWriter->writeAttribute(ODataConstants::XMLNS_NAMESPACE_PREFIX, ODataConstants::ODATA_NAMESPACE);
         $this->xmlWriter->text($url->url);
         $this->xmlWriter->endElement();
 
-	    return $this;
+        return $this;
     }
 
     /**
@@ -152,12 +152,12 @@ 
         }
 
 
-	    if ($urls->nextPageLink!=null) {
-		    $this->writeLinkNode($urls->nextPageLink, false);
-	    }
-	    $this->xmlWriter->endElement();
+        if ($urls->nextPageLink!=null) {
+            $this->writeLinkNode($urls->nextPageLink, false);
+        }
+        $this->xmlWriter->endElement();
 
-	    return $this;
+        return $this;
         
     }
 
@@ -176,65 +176,65 @@ 
             $this->writeBaseUriAndDefaultNamespaces();
         }
 
-	    $this
-		    ->writeNodeAttributeValue(
-			    ODataConstants::ATOM_TITLE_ELELMET_NAME,
-			    ODataConstants::ATOM_TYPE_ATTRIBUTE_NAME,
-			    MimeTypes::MIME_TEXTTYPE,
-			    $feed->title
-		    )
-		    ->writeNodeValue(ODataConstants::ATOM_ID_ELEMENT_NAME, $feed->id)
-		    ->writeNodeValue(ODataConstants::ATOM_UPDATED_ELEMENT_NAME, date(DATE_ATOM) )
-		    ->writeLinkNode($feed->selfLink, false);
-
-	    if ($feed->rowCount != null) {
-		    $this->xmlWriter->startElementNs(
-			    ODataConstants::ODATA_METADATA_NAMESPACE_PREFIX,
-			    ODataConstants::ROWCOUNT_ELEMENT, null
-		    );
-		    $this->xmlWriter->text($feed->rowCount);
-		    $this->xmlWriter->endElement();
-	    }
-
-	    foreach ($feed->entries as $entry) {
-		    $this->writeEntry($entry);
-	    }
-
-	    if ($feed->nextPageLink != null) {
-		    $this->writeLinkNode($feed->nextPageLink, false);
-	    }
-	    $this->xmlWriter->endElement();
-
-
-	    return $this;
+        $this
+            ->writeNodeAttributeValue(
+                ODataConstants::ATOM_TITLE_ELELMET_NAME,
+                ODataConstants::ATOM_TYPE_ATTRIBUTE_NAME,
+                MimeTypes::MIME_TEXTTYPE,
+                $feed->title
+            )
+            ->writeNodeValue(ODataConstants::ATOM_ID_ELEMENT_NAME, $feed->id)
+            ->writeNodeValue(ODataConstants::ATOM_UPDATED_ELEMENT_NAME, date(DATE_ATOM) )
+            ->writeLinkNode($feed->selfLink, false);
+
+        if ($feed->rowCount != null) {
+            $this->xmlWriter->startElementNs(
+                ODataConstants::ODATA_METADATA_NAMESPACE_PREFIX,
+                ODataConstants::ROWCOUNT_ELEMENT, null
+            );
+            $this->xmlWriter->text($feed->rowCount);
+            $this->xmlWriter->endElement();
+        }
+
+        foreach ($feed->entries as $entry) {
+            $this->writeEntry($entry);
+        }
+
+        if ($feed->nextPageLink != null) {
+            $this->writeLinkNode($feed->nextPageLink, false);
+        }
+        $this->xmlWriter->endElement();
+
+
+        return $this;
     }
 
 
-	/**
-	 * Write top level entry
-	 *
-	 * @param ODataEntry $entry Object of ODataEntry
-	 * @param boolean $isTopLevel
-	 *
-	 * @return AtomODataWriter
-	 */
-	protected function writeEntry(ODataEntry $entry, $isTopLevel = false)
-	{
-		$this->writeBeginEntry($entry, $isTopLevel);
-		foreach ($entry->links as $link) {
-			$this->writeLink($link);
-		}
+    /**
+     * Write top level entry
+     *
+     * @param ODataEntry $entry Object of ODataEntry
+     * @param boolean $isTopLevel
+     *
+     * @return AtomODataWriter
+     */
+    protected function writeEntry(ODataEntry $entry, $isTopLevel = false)
+    {
+        $this->writeBeginEntry($entry, $isTopLevel);
+        foreach ($entry->links as $link) {
+            $this->writeLink($link);
+        }
 
-		$this
-			->preWriteProperties($entry)
-			->writeProperties($entry->propertyContent)
-			->postWriteProperties($entry);
+        $this
+            ->preWriteProperties($entry)
+            ->writeProperties($entry->propertyContent)
+            ->postWriteProperties($entry);
 
-		$this->xmlWriter->endElement();
+        $this->xmlWriter->endElement();
 
 
-		return $this;
-	}
+        return $this;
+    }
 
 
     /**
@@ -262,155 +262,155 @@ 
             $this->xmlWriter->endAttribute();
         }
 
-	    $this
-		    ->writeNodeValue(ODataConstants::ATOM_ID_ELEMENT_NAME, $entry->id)
-		    ->writeNodeAttributeValue(
-			    ODataConstants::ATOM_TITLE_ELELMET_NAME,
-			    ODataConstants::ATOM_TYPE_ATTRIBUTE_NAME,
-			    MimeTypes::MIME_TEXTTYPE,
-			    $entry->title
-		    )
-		    ->writeNodeValue(ODataConstants::ATOM_UPDATED_ELEMENT_NAME, date(DATE_ATOM));
-
-	    $this->xmlWriter->startElement(ODataConstants::ATOM_AUTHOR_ELEMENT_NAME);
-	    $this->xmlWriter->startElement(ODataConstants::ATOM_NAME_ELEMENT_NAME);
-	    $this->xmlWriter->endElement();
-	    $this->xmlWriter->endElement();
-	    if ($entry->isMediaLinkEntry) {
-		    $this->xmlWriter->startElement(ODataConstants::ATOM_LINK_ELEMENT_NAME);
-		    if ($entry->mediaLink->eTag != null) {
-			    $this->xmlWriter->startAttributeNs(
-				    ODataConstants::ODATA_METADATA_NAMESPACE_PREFIX,
-				    ODataConstants::ATOM_ETAG_ATTRIBUTE_NAME,
-				    null
-			    );
-			    $this->xmlWriter->text($entry->mediaLink->eTag);
-			    $this->xmlWriter->endAttribute();
-		    }
-		    $this->xmlWriter->startAttribute(
-			    ODataConstants::ATOM_LINK_RELATION_ATTRIBUTE_NAME
-		    );
-		    $this->xmlWriter->text(ODataConstants::ATOM_EDIT_MEDIA_RELATION_ATTRIBUTE_VALUE);
-		    $this->xmlWriter->endAttribute();
-
-		    $this->xmlWriter->startAttribute(ODataConstants::ATOM_TYPE_ATTRIBUTE_NAME);
-		    $this->xmlWriter->text($entry->mediaLink->contentType);
-		    $this->xmlWriter->endAttribute();
-
-		    $this->xmlWriter->startAttribute(ODataConstants::ATOM_TITLE_ELELMET_NAME);
-		    $this->xmlWriter->text($entry->mediaLink->name);
-		    $this->xmlWriter->endAttribute();
-
-		    $this->xmlWriter->startAttribute(ODataConstants::ATOM_HREF_ATTRIBUTE_NAME);
-		    $this->xmlWriter->text($entry->mediaLink->editLink);
-		    $this->xmlWriter->endAttribute();
-		    $this->xmlWriter->endElement();
-
-		    foreach ($entry->mediaLinks as $mediaLink) {
-			    $this->xmlWriter->startElement(ODataConstants::ATOM_LINK_ELEMENT_NAME);
-			    if ($mediaLink->eTag != null) {
-				    $this->xmlWriter->startAttributeNs(
-					    ODataConstants::ODATA_METADATA_NAMESPACE_PREFIX,
-					    ODataConstants::ATOM_ETAG_ATTRIBUTE_NAME,
-					    null
-				    );
-				    $this->xmlWriter->text($mediaLink->eTag);
-				    $this->xmlWriter->endAttribute();
-			    }
-			    $this->xmlWriter->startAttribute(ODataConstants::ATOM_LINK_RELATION_ATTRIBUTE_NAME);
-			    $this->xmlWriter->text(
-				    "http://schemas.microsoft.com/ado/2007/08/dataservices/mediaresource/"
-				    .$mediaLink->name
-			    );
-			    $this->xmlWriter->endAttribute();
-
-			    $this->xmlWriter->startAttribute(ODataConstants::ATOM_TYPE_ATTRIBUTE_NAME);
-			    $this->xmlWriter->text($mediaLink->contentType);
-			    $this->xmlWriter->endAttribute();
-
-			    $this->xmlWriter->startAttribute(ODataConstants::ATOM_TITLE_ELELMET_NAME);
-			    $this->xmlWriter->text($mediaLink->name);
-			    $this->xmlWriter->endAttribute();
-
-			    $this->xmlWriter->startAttribute(ODataConstants::ATOM_HREF_ATTRIBUTE_NAME);
-			    $this->xmlWriter->text($mediaLink->editLink);
-			    $this->xmlWriter->endAttribute();
-			    $this->xmlWriter->endElement();
-		    }
-	    }
-
-	    return $this;
+        $this
+            ->writeNodeValue(ODataConstants::ATOM_ID_ELEMENT_NAME, $entry->id)
+            ->writeNodeAttributeValue(
+                ODataConstants::ATOM_TITLE_ELELMET_NAME,
+                ODataConstants::ATOM_TYPE_ATTRIBUTE_NAME,
+                MimeTypes::MIME_TEXTTYPE,
+                $entry->title
+            )
+            ->writeNodeValue(ODataConstants::ATOM_UPDATED_ELEMENT_NAME, date(DATE_ATOM));
+
+        $this->xmlWriter->startElement(ODataConstants::ATOM_AUTHOR_ELEMENT_NAME);
+        $this->xmlWriter->startElement(ODataConstants::ATOM_NAME_ELEMENT_NAME);
+        $this->xmlWriter->endElement();
+        $this->xmlWriter->endElement();
+        if ($entry->isMediaLinkEntry) {
+            $this->xmlWriter->startElement(ODataConstants::ATOM_LINK_ELEMENT_NAME);
+            if ($entry->mediaLink->eTag != null) {
+                $this->xmlWriter->startAttributeNs(
+                    ODataConstants::ODATA_METADATA_NAMESPACE_PREFIX,
+                    ODataConstants::ATOM_ETAG_ATTRIBUTE_NAME,
+                    null
+                );
+                $this->xmlWriter->text($entry->mediaLink->eTag);
+                $this->xmlWriter->endAttribute();
+            }
+            $this->xmlWriter->startAttribute(
+                ODataConstants::ATOM_LINK_RELATION_ATTRIBUTE_NAME
+            );
+            $this->xmlWriter->text(ODataConstants::ATOM_EDIT_MEDIA_RELATION_ATTRIBUTE_VALUE);
+            $this->xmlWriter->endAttribute();
+
+            $this->xmlWriter->startAttribute(ODataConstants::ATOM_TYPE_ATTRIBUTE_NAME);
+            $this->xmlWriter->text($entry->mediaLink->contentType);
+            $this->xmlWriter->endAttribute();
+
+            $this->xmlWriter->startAttribute(ODataConstants::ATOM_TITLE_ELELMET_NAME);
+            $this->xmlWriter->text($entry->mediaLink->name);
+            $this->xmlWriter->endAttribute();
+
+            $this->xmlWriter->startAttribute(ODataConstants::ATOM_HREF_ATTRIBUTE_NAME);
+            $this->xmlWriter->text($entry->mediaLink->editLink);
+            $this->xmlWriter->endAttribute();
+            $this->xmlWriter->endElement();
+
+            foreach ($entry->mediaLinks as $mediaLink) {
+                $this->xmlWriter->startElement(ODataConstants::ATOM_LINK_ELEMENT_NAME);
+                if ($mediaLink->eTag != null) {
+                    $this->xmlWriter->startAttributeNs(
+                        ODataConstants::ODATA_METADATA_NAMESPACE_PREFIX,
+                        ODataConstants::ATOM_ETAG_ATTRIBUTE_NAME,
+                        null
+                    );
+                    $this->xmlWriter->text($mediaLink->eTag);
+                    $this->xmlWriter->endAttribute();
+                }
+                $this->xmlWriter->startAttribute(ODataConstants::ATOM_LINK_RELATION_ATTRIBUTE_NAME);
+                $this->xmlWriter->text(
+                    "http://schemas.microsoft.com/ado/2007/08/dataservices/mediaresource/"
+                    .$mediaLink->name
+                );
+                $this->xmlWriter->endAttribute();
+
+                $this->xmlWriter->startAttribute(ODataConstants::ATOM_TYPE_ATTRIBUTE_NAME);
+                $this->xmlWriter->text($mediaLink->contentType);
+                $this->xmlWriter->endAttribute();
+
+                $this->xmlWriter->startAttribute(ODataConstants::ATOM_TITLE_ELELMET_NAME);
+                $this->xmlWriter->text($mediaLink->name);
+                $this->xmlWriter->endAttribute();
+
+                $this->xmlWriter->startAttribute(ODataConstants::ATOM_HREF_ATTRIBUTE_NAME);
+                $this->xmlWriter->text($mediaLink->editLink);
+                $this->xmlWriter->endAttribute();
+                $this->xmlWriter->endElement();
+            }
+        }
+
+        return $this;
     }
 
 
 
 
-	/**
-	 *
-	 * @param ODataLink $link Link to write.
-	 *
-	 * @return AtomODataWriter
-	 */
-	protected function writeLink(ODataLink $link)
+    /**
+     *
+     * @param ODataLink $link Link to write.
+     *
+     * @return AtomODataWriter
+     */
+    protected function writeLink(ODataLink $link)
     {
         $this->writeLinkNode($link, $link->isExpanded);
 
-	    if ($link->isExpanded) {
-		    $this->xmlWriter->startElementNS(
-			    ODataConstants::ODATA_METADATA_NAMESPACE_PREFIX,
-			    ODataConstants::ATOM_INLINE_ELEMENT_NAME,
-			    null
-		    );
+        if ($link->isExpanded) {
+            $this->xmlWriter->startElementNS(
+                ODataConstants::ODATA_METADATA_NAMESPACE_PREFIX,
+                ODataConstants::ATOM_INLINE_ELEMENT_NAME,
+                null
+            );
 
 
-	        if (!is_null($link->expandedResult)) {
-		        if ($link->isCollection) {
-			        $this->writeFeed($link->expandedResult);
-		        } else {
-			        $this->writeEntry($link->expandedResult);
-		        }
-	        }
+            if (!is_null($link->expandedResult)) {
+                if ($link->isCollection) {
+                    $this->writeFeed($link->expandedResult);
+                } else {
+                    $this->writeEntry($link->expandedResult);
+                }
+            }
 
 
-		    $this->xmlWriter->endElement();
-		    $this->xmlWriter->endElement();
-	    }
+            $this->xmlWriter->endElement();
+            $this->xmlWriter->endElement();
+        }
 
-	    return $this;
+        return $this;
     }
 
 
 
 
-	/**
-	 * Write the given collection of properties.
-	 * (properties of an entity or complex type)
-	 *
-	 * @param ODataPropertyContent $properties Collection of properties.
-	 * @param bool $topLevel indicates if this property content is the top level response to be written
-	 * @return AtomODataWriter
-	 */
-	protected function writeProperties(ODataPropertyContent $properties, $topLevel = false)
-	{
-		foreach ($properties->properties as $property) {
-			$this->beginWriteProperty($property, $topLevel);
-
-			if ($property->value == null) {
-				$this->writeNullValue($property);
-			} elseif ($property->value instanceof ODataPropertyContent) {
-				$this->writeProperties($property->value, false);
-			} elseif ($property->value instanceof ODataBagContent) {
-				$this->writeBagContent($property->value);
-			} else {
-				$value = $this->beforeWriteValue($property->value, $property->typeName);
-				$this->xmlWriter->text($value);
-			}
+    /**
+     * Write the given collection of properties.
+     * (properties of an entity or complex type)
+     *
+     * @param ODataPropertyContent $properties Collection of properties.
+     * @param bool $topLevel indicates if this property content is the top level response to be written
+     * @return AtomODataWriter
+     */
+    protected function writeProperties(ODataPropertyContent $properties, $topLevel = false)
+    {
+        foreach ($properties->properties as $property) {
+            $this->beginWriteProperty($property, $topLevel);
+
+            if ($property->value == null) {
+                $this->writeNullValue($property);
+            } elseif ($property->value instanceof ODataPropertyContent) {
+                $this->writeProperties($property->value, false);
+            } elseif ($property->value instanceof ODataBagContent) {
+                $this->writeBagContent($property->value);
+            } else {
+                $value = $this->beforeWriteValue($property->value, $property->typeName);
+                $this->xmlWriter->text($value);
+            }
 
-			$this->xmlWriter->endElement();
-		}
+            $this->xmlWriter->endElement();
+        }
 
-		return $this;
-	}
+        return $this;
+    }
 
     /**
      * XML write a basic data type (string, number, boolean, null)
@@ -472,7 +472,7 @@ 
         } else {
             $this->xmlWriter->writeAttribute(
                 ODataConstants::ATOM_TYPE_ATTRIBUTE_NAME,
-	            MimeTypes::MIME_APPLICATION_XML
+                MimeTypes::MIME_APPLICATION_XML
             );
             $this->xmlWriter->startElementNS(
                 ODataConstants::ODATA_METADATA_NAMESPACE_PREFIX,
@@ -481,7 +481,7 @@ 
             );
         }
 
-	    return $this;
+        return $this;
     }
 
     /**
@@ -519,7 +519,7 @@ 
             $this->xmlWriter->endAttribute();
         }
 
-	    return $this;
+        return $this;
     }
 
 
@@ -538,7 +538,7 @@ 
         }
         $this->xmlWriter->endElement();
 
-	    return $this;
+        return $this;
     }
 
     /**
@@ -571,7 +571,7 @@ 
             }
         }
 
-	    return $this;
+        return $this;
     }
 
 
@@ -594,7 +594,7 @@ 
                 ODataConstants::XML_TRUE_LITERAL
             );
         }
-	    return $this;
+        return $this;
     }
 
 
@@ -665,7 +665,7 @@ 
         $this->xmlWriter->text($value);
         $this->xmlWriter->endElement();
 
-	    return $this;
+        return $this;
     }
 
     /**
@@ -689,7 +689,7 @@ 
         $this->xmlWriter->text($nodeValue);
         $this->xmlWriter->endElement();
 
-	    return $this;
+        return $this;
     }
 
     /**
@@ -727,7 +727,7 @@ 
             $this->xmlWriter->endElement();
         }
 
-	    return $this;
+        return $this;
     }
 
     /**
@@ -758,7 +758,7 @@ 
             ODataConstants::ATOM_NAMESPACE
         );
 
-	    return $this;
+        return $this;
     }
 
 

src/POData/Writers/IODataWriter.php

Indentation +17 added lines, -17 removed lines

@@ -20,23 +20,23 @@
 interface IODataWriter
 {
 
-	/**
-	 * Determines if the given writer is capable of writing the response or not
-	 * @param Version $responseVersion the OData version of the response
-	 * @param string $contentType the Content Type of the response
-	 * @return boolean true if the writer can handle the response, false otherwise
-	 */
-	public function canHandle(Version $responseVersion, $contentType);
-
-	/**
-	 * Create OData object model from the request description and transform it to required content type form
-	 *
-	 *
-	 * @param  ODataURL|ODataURLCollection|ODataPropertyContent|ODataFeed|ODataEntry $model Object of requested content.
-	 *
-	 * @return IODataWriter
-	 */
-	public function write($model);
+    /**
+     * Determines if the given writer is capable of writing the response or not
+     * @param Version $responseVersion the OData version of the response
+     * @param string $contentType the Content Type of the response
+     * @return boolean true if the writer can handle the response, false otherwise
+     */
+    public function canHandle(Version $responseVersion, $contentType);
+
+    /**
+     * Create OData object model from the request description and transform it to required content type form
+     *
+     *
+     * @param  ODataURL|ODataURLCollection|ODataPropertyContent|ODataFeed|ODataEntry $model Object of requested content.
+     *
+     * @return IODataWriter
+     */
+    public function write($model);
 
 
     /**