balint777 / POData

src/POData/HttpProcessUtility.php

Indentation +4 added lines, -4 removed lines

@@ -103,7 +103,7 @@ 
                 //the rest look like QSPs..kinda so we can do this
                 parse_str(implode("&", $candidateParts), $candidateParts);
                 if(array_key_exists('odata', $candidateParts)){
-                   $candidateODataValue = $candidateParts['odata'];
+                    $candidateODataValue = $candidateParts['odata'];
                 }
             }
 
@@ -696,7 +696,7 @@ 
         return $c == ',' || $c == ' ' || $c == '\t';
     }
 
-	/**
+    /**
      * Get server key by header
      * @param string $headerName Name of header
      */
@@ -717,6 +717,6 @@ 
             case 'MAXDATASERVICEVERSION':
                 return 'HTTP_' . $name;
         }
-		return $name;
-	}
+        return $name;
+    }
 }

src/POData/OperationContext/Web/Illuminate/IncomingIlluminateRequest.php

Indentation +112 added lines, -112 removed lines

@@ -10,116 +10,116 @@
 
 class IncomingIlluminateRequest implements IHTTPRequest
 {
-	/**
-	 * The Illuminate request
-	 *
-	 * @var Request
-	 */
-	private $request;
-
-	/**
-	 * The request headers
-	 *
-	 * @var array
-	 */
-	private $_headers;
-
-	/**
-	 * The incoming url in raw format
-	 *
-	 * @var string
-	 */
-	private $_rawUrl  = null;
-
-
-	/**
-	 * The request method (GET, POST, PUT, DELETE or MERGE)
-	 *
-	 * @var HTTPRequestMethod HttpVerb
-	 */
-	private $_method;
-
-	/**
-	 * The query options as key value.
-	 *
-	 * @var array(string, string);
-	 */
-	private $_queryOptions;
-
-	/**
-	 * A collection that represents mapping between query
-	 * option and its count.
-	 *
-	 * @var array(string, int)
-	 */
-	private $_queryOptionsCount;
-
-	/**
-	 * IncomingIlluminateRequest constructor.
-	 * @param Request $request
-	 */
-	public function __construct(Request $request)
-	{
-		$this->request = $request;
-		$this->_headers = null;
-		$this->_queryOptions = null;
-		$this->_queryOptionsCount = null;
-		$this->_method = new HTTPRequestMethod($this->request->getMethod());
-	}
-
-	/**
-	 * @return string RequestURI called by User with the value of QueryString
-	 */
-	public function getRawUrl()
-	{
-		$this->_rawUrl = $this->request->fullUrl();
-
-		return $this->_rawUrl;
-	}
-
-	/**
-	 * @param string $key The header name
-	 * @return array|null|string
-	 */
-	public function getRequestHeader($key)
-	{
-		$result = $this->request->header($key);
-		//Zend returns false for a missing header...POData needs a null
-		if($result === false || $result === ''){
-			return null;
-		}
-		return $result;
-	}
-
-	/**
-	 * Returns the Query String Parameters (QSPs) as an array of KEY-VALUE pairs.  If a QSP appears twice
-	 * it will have two entries in this array
-	 *
-	 * @return array
-	 */
-	public function getQueryParameters()
-	{
-		//TODO: the contract is more specific than this, it requires the name and values to be decoded
-		//not sure how to test that...
-		//TODO: another issue.  This may not be the right thing to return...since POData only really understands GET requests today
-		//Have to convert to the stranger format known to POData that deals with multiple query strings.
-		//this makes this request a bit non compliant as it doesn't expose duplicate keys, something POData will check for
-		//instead whatever parameter was last in the query string is set.  IE
-		//odata.svc/?$format=xml&$format=json the format will be json
-		$this->_queryOptions = [];
-		$this->_queryOptionsCount = 0;
-		foreach($this->request->all() as $key => $value){
-			$this->_queryOptions[] = [$key => $value];
-			$this->_queryOptionsCount++;
-		}
-		return $this->_queryOptions;
-	}
-
-	/**
-	 * @return HTTPRequestMethod
-	 */
-	public function getMethod()
-	{
-		return $this->_method;
-	}
+    /**
+     * The Illuminate request
+     *
+     * @var Request
+     */
+    private $request;
+
+    /**
+     * The request headers
+     *
+     * @var array
+     */
+    private $_headers;
+
+    /**
+     * The incoming url in raw format
+     *
+     * @var string
+     */
+    private $_rawUrl  = null;
+
+
+    /**
+     * The request method (GET, POST, PUT, DELETE or MERGE)
+     *
+     * @var HTTPRequestMethod HttpVerb
+     */
+    private $_method;
+
+    /**
+     * The query options as key value.
+     *
+     * @var array(string, string);
+     */
+    private $_queryOptions;
+
+    /**
+     * A collection that represents mapping between query
+     * option and its count.
+     *
+     * @var array(string, int)
+     */
+    private $_queryOptionsCount;
+
+    /**
+     * IncomingIlluminateRequest constructor.
+     * @param Request $request
+     */
+    public function __construct(Request $request)
+    {
+        $this->request = $request;
+        $this->_headers = null;
+        $this->_queryOptions = null;
+        $this->_queryOptionsCount = null;
+        $this->_method = new HTTPRequestMethod($this->request->getMethod());
+    }
+
+    /**
+     * @return string RequestURI called by User with the value of QueryString
+     */
+    public function getRawUrl()
+    {
+        $this->_rawUrl = $this->request->fullUrl();
+
+        return $this->_rawUrl;
+    }
+
+    /**
+     * @param string $key The header name
+     * @return array|null|string
+     */
+    public function getRequestHeader($key)
+    {
+        $result = $this->request->header($key);
+        //Zend returns false for a missing header...POData needs a null
+        if($result === false || $result === ''){
+            return null;
+        }
+        return $result;
+    }
+
+    /**
+     * Returns the Query String Parameters (QSPs) as an array of KEY-VALUE pairs.  If a QSP appears twice
+     * it will have two entries in this array
+     *
+     * @return array
+     */
+    public function getQueryParameters()
+    {
+        //TODO: the contract is more specific than this, it requires the name and values to be decoded
+        //not sure how to test that...
+        //TODO: another issue.  This may not be the right thing to return...since POData only really understands GET requests today
+        //Have to convert to the stranger format known to POData that deals with multiple query strings.
+        //this makes this request a bit non compliant as it doesn't expose duplicate keys, something POData will check for
+        //instead whatever parameter was last in the query string is set.  IE
+        //odata.svc/?$format=xml&$format=json the format will be json
+        $this->_queryOptions = [];
+        $this->_queryOptionsCount = 0;
+        foreach($this->request->all() as $key => $value){
+            $this->_queryOptions[] = [$key => $value];
+            $this->_queryOptionsCount++;
+        }
+        return $this->_queryOptions;
+    }
+
+    /**
+     * @return HTTPRequestMethod
+     */
+    public function getMethod()
+    {
+        return $this->_method;
+    }
 }

src/POData/BaseService.php

Indentation +171 added lines, -171 removed lines

@@ -99,7 +99,7 @@ 
     }
 
 
-	//TODO: shouldn't we hide this from the interface..if we need it at all.
+    //TODO: shouldn't we hide this from the interface..if we need it at all.
     /**
      * Get the wrapper over developer's IQueryProvider and IMetadataProvider implementation.
      *
@@ -107,7 +107,7 @@ 
      */
     public function getProvidersWrapper()
     {
-          return $this->providersWrapper;
+            return $this->providersWrapper;
     }
 
     /**
@@ -230,33 +230,33 @@ 
         }
     }
 
-	/**
-	 * @return IQueryProvider
-	 */
-	public abstract function getQueryProvider();
+    /**
+     * @return IQueryProvider
+     */
+    public abstract function getQueryProvider();
 
-	/**
-	 * @return IMetadataProvider
-	 */
-	public abstract function getMetadataProvider();
+    /**
+     * @return IMetadataProvider
+     */
+    public abstract function getMetadataProvider();
 
-	/**
-	 * @return \POData\Providers\Stream\IStreamProvider
-	 */
-	public abstract function getStreamProviderX();
+    /**
+     * @return \POData\Providers\Stream\IStreamProvider
+     */
+    public abstract function getStreamProviderX();
 
 
-	/** @var  ODataWriterRegistry */
-	private $writerRegistry;
+    /** @var  ODataWriterRegistry */
+    private $writerRegistry;
 
-	/**
-	 * Returns the ODataWriterRegistry to use when writing the response to a service document or resource request
-	 * @return ODataWriterRegistry
-	 */
-	public function getODataWriterRegistry()
-	{
-		return $this->writerRegistry;
-	}
+    /**
+     * Returns the ODataWriterRegistry to use when writing the response to a service document or resource request
+     * @return ODataWriterRegistry
+     */
+    public function getODataWriterRegistry()
+    {
+        return $this->writerRegistry;
+    }
 
 
     /**
@@ -302,32 +302,32 @@ 
 
         $this->initialize($this->config);
 
-	    //TODO: this seems like a bad spot to do this
-	    $this->writerRegistry = new ODataWriterRegistry();
-	    $this->registerWriters();
+        //TODO: this seems like a bad spot to do this
+        $this->writerRegistry = new ODataWriterRegistry();
+        $this->registerWriters();
     }
 
-	//TODO: i don't want this to be public..but it's the only way to test it right now...
-	public function registerWriters()
-	{
-		$registry = $this->getODataWriterRegistry();
-		$serviceVersion = $this->getConfiguration()->getMaxDataServiceVersion();
-		$serviceURI = $this->getHost()->getAbsoluteServiceUri()->getUrlAsString();
+    //TODO: i don't want this to be public..but it's the only way to test it right now...
+    public function registerWriters()
+    {
+        $registry = $this->getODataWriterRegistry();
+        $serviceVersion = $this->getConfiguration()->getMaxDataServiceVersion();
+        $serviceURI = $this->getHost()->getAbsoluteServiceUri()->getUrlAsString();
 
-		//We always register the v1 stuff
-		$registry->register(new JsonODataV1Writer());
-		$registry->register(new AtomODataWriter($serviceURI));
+        //We always register the v1 stuff
+        $registry->register(new JsonODataV1Writer());
+        $registry->register(new AtomODataWriter($serviceURI));
 
-		if($serviceVersion->compare(Version::v2()) > -1){
-			$registry->register(new JsonODataV2Writer());
-		}
+        if($serviceVersion->compare(Version::v2()) > -1){
+            $registry->register(new JsonODataV2Writer());
+        }
 
-		if($serviceVersion->compare(Version::v3()) > -1){
-			$registry->register(new JsonLightODataWriter(JsonLightMetadataLevel::NONE(), $serviceURI));
-			$registry->register(new JsonLightODataWriter(JsonLightMetadataLevel::MINIMAL(), $serviceURI));
-			$registry->register(new JsonLightODataWriter(JsonLightMetadataLevel::FULL(), $serviceURI));
-		}
-	}
+        if($serviceVersion->compare(Version::v3()) > -1){
+            $registry->register(new JsonLightODataWriter(JsonLightMetadataLevel::NONE(), $serviceURI));
+            $registry->register(new JsonLightODataWriter(JsonLightMetadataLevel::MINIMAL(), $serviceURI));
+            $registry->register(new JsonLightODataWriter(JsonLightMetadataLevel::FULL(), $serviceURI));
+        }
+    }
 
     /**
      * Serialize the requested resource.
@@ -351,12 +351,12 @@ 
 
         $responseContentType = self::getResponseContentType($request, $uriProcessor, $this);
 
-	    if (is_null($responseContentType) && $request->getTargetKind() != TargetKind::MEDIA_RESOURCE()) {
-		    //the responseContentType can ONLY be null if it's a stream (media resource) and that stream is storing null as the content type
-		    throw new ODataException( Messages::unsupportedMediaType(), 415 );
-	    }
+        if (is_null($responseContentType) && $request->getTargetKind() != TargetKind::MEDIA_RESOURCE()) {
+            //the responseContentType can ONLY be null if it's a stream (media resource) and that stream is storing null as the content type
+            throw new ODataException( Messages::unsupportedMediaType(), 415 );
+        }
 
-	    $odataModelInstance = null;
+        $odataModelInstance = null;
         $hasResponseBody = true;
         // Execution required at this point if request target to any resource other than
         //
@@ -407,7 +407,7 @@ 
                     // In the query 'Orders(1245)/$links/Customer', the targeted
                     // Customer might be null
                     if (is_null($result)) {
-						throw ODataException::createResourceNotFoundError(
+                        throw ODataException::createResourceNotFoundError(
                             $request->getIdentifier()
                         );
                     }
@@ -417,7 +417,7 @@ 
                     if (!is_null($this->_serviceHost->getRequestIfMatch())
                         && !is_null($this->_serviceHost->getRequestIfNoneMatch())
                     ) {
-						throw ODataException::createBadRequestError(
+                        throw ODataException::createBadRequestError(
                             Messages::bothIfMatchAndIfNoneMatchHeaderSpecified()
                         );
                     }
@@ -453,22 +453,22 @@ 
                     }
                 } else if ($requestTargetKind == TargetKind::COMPLEX_OBJECT()) {
 
-	                $odataModelInstance = $objectModelSerializer->writeTopLevelComplexObject(
+                    $odataModelInstance = $objectModelSerializer->writeTopLevelComplexObject(
                         $result,
                         $request->getProjectedProperty()->getName(),
-	                    $request->getTargetResourceType()
-	                );
+                        $request->getTargetResourceType()
+                    );
                 } else if ($requestTargetKind == TargetKind::BAG()) {
                     $odataModelInstance = $objectModelSerializer->writeTopLevelBagObject(
                         $result,
                         $request->getProjectedProperty()->getName(),
-	                    $request->getTargetResourceType(),
+                        $request->getTargetResourceType(),
                         $odataModelInstance
                     );
                 } else if ($requestTargetKind == TargetKind::PRIMITIVE()) {
                     $odataModelInstance = $objectModelSerializer->writeTopLevelPrimitive(
                         $result,
-	                    $request->getProjectedProperty(),
+                        $request->getProjectedProperty(),
                         $odataModelInstance
                     );
                 } else if ($requestTargetKind == TargetKind::PRIMITIVE_VALUE()) {
@@ -486,10 +486,10 @@ 
         //Note: Response content type can be null for named stream
         if ($hasResponseBody && !is_null($responseContentType)) {
             if ($request->getTargetKind() != TargetKind::MEDIA_RESOURCE() && $responseContentType != MimeTypes::MIME_APPLICATION_OCTETSTREAM) {
-	            //append charset for everything except:
-	            //stream resources as they have their own content type
-	            //binary properties (they content type will be App Octet for those...is this a good way? we could also decide based upon the projected property
-	            //
+                //append charset for everything except:
+                //stream resources as they have their own content type
+                //binary properties (they content type will be App Octet for those...is this a good way? we could also decide based upon the projected property
+                //
                 $responseContentType .= ';charset=utf-8';
             }
         }
@@ -517,7 +517,7 @@ 
      * @throws ODataException, HttpHeaderFailure
      */
     public static function getResponseContentType(
-	    RequestDescription $request,
+        RequestDescription $request,
         UriProcessor $uriProcessor,
         IService $service
     ) {
@@ -525,12 +525,12 @@ 
         // The Accept request-header field specifies media types which are acceptable for the response
 
         $host = $service->getHost();
-	    $requestAcceptText = $host->getRequestAccept();
+        $requestAcceptText = $host->getRequestAccept();
         $requestVersion = $request->getResponseVersion();
 
-	    //if the $format header is present it overrides the accepts header
-	    $format = $host->getQueryStringItem(ODataConstants::HTTPQUERY_STRING_FORMAT);
-	    if(!is_null($format)){
+        //if the $format header is present it overrides the accepts header
+        $format = $host->getQueryStringItem(ODataConstants::HTTPQUERY_STRING_FORMAT);
+        if(!is_null($format)){
 
             //There's a strange edge case..if application/json is supplied and it's V3
             if($format == MimeTypes::MIME_APPLICATION_JSON && $requestVersion == Version::v3()){
@@ -539,128 +539,128 @@ 
                 $format = MimeTypes::MIME_APPLICATION_JSON_MINIMAL_META;
             }
 
-		    $requestAcceptText = ServiceHost::translateFormatToMime($requestVersion, $format);
-	    }
+            $requestAcceptText = ServiceHost::translateFormatToMime($requestVersion, $format);
+        }
 
 
 
 
-	    //The response format can be dictated by the target resource kind. IE a $value will be different then expected
-	    //getTargetKind doesn't deal with link resources directly and this can change things
-	    $targetKind = $request->isLinkUri() ? TargetKind::LINK() : $request->getTargetKind();
+        //The response format can be dictated by the target resource kind. IE a $value will be different then expected
+        //getTargetKind doesn't deal with link resources directly and this can change things
+        $targetKind = $request->isLinkUri() ? TargetKind::LINK() : $request->getTargetKind();
 
-	    switch($targetKind){
-		    case TargetKind::METADATA():
-			    return HttpProcessUtility::selectMimeType(
-				    $requestAcceptText,
-				    array(MimeTypes::MIME_APPLICATION_XML)
-			    );
+        switch($targetKind){
+            case TargetKind::METADATA():
+                return HttpProcessUtility::selectMimeType(
+                    $requestAcceptText,
+                    array(MimeTypes::MIME_APPLICATION_XML)
+                );
 
-		    case TargetKind::SERVICE_DIRECTORY():
-			    return HttpProcessUtility::selectMimeType(
-				    $requestAcceptText,
-				    array(
-					    MimeTypes::MIME_APPLICATION_XML,
-					    MimeTypes::MIME_APPLICATION_ATOMSERVICE,
-					    MimeTypes::MIME_APPLICATION_JSON,
+            case TargetKind::SERVICE_DIRECTORY():
+                return HttpProcessUtility::selectMimeType(
+                    $requestAcceptText,
+                    array(
+                        MimeTypes::MIME_APPLICATION_XML,
+                        MimeTypes::MIME_APPLICATION_ATOMSERVICE,
+                        MimeTypes::MIME_APPLICATION_JSON,
                         MimeTypes::MIME_APPLICATION_JSON_FULL_META,
                         MimeTypes::MIME_APPLICATION_JSON_NO_META,
                         MimeTypes::MIME_APPLICATION_JSON_MINIMAL_META,
-					    MimeTypes::MIME_APPLICATION_JSON_VERBOSE,
+                        MimeTypes::MIME_APPLICATION_JSON_VERBOSE,
 
                     )
-			    );
-
-		    case TargetKind::PRIMITIVE_VALUE():
-			    $supportedResponseMimeTypes = array(MimeTypes::MIME_TEXTPLAIN);
-
-			    if ($request->getIdentifier() != '$count') {
-				    $projectedProperty = $request->getProjectedProperty();
-				    self::assert(
-					    !is_null($projectedProperty),
-					    '!is_null($projectedProperty)'
-				    );
-				    $type = $projectedProperty->getInstanceType();
-				    self::assert(
-					    !is_null($type) && $type instanceof IType,
-					    '!is_null($type) && $type instanceof IType'
-				    );
-				    if ($type instanceof Binary) {
-					    $supportedResponseMimeTypes = array(MimeTypes::MIME_APPLICATION_OCTETSTREAM);
-				    }
-			    }
-
-			    return HttpProcessUtility::selectMimeType(
-				    $requestAcceptText,
-				    $supportedResponseMimeTypes
-			    );
-
-		    case TargetKind::PRIMITIVE():
-		    case TargetKind::COMPLEX_OBJECT():
-		    case TargetKind::BAG():
-		    case TargetKind::LINK():
-			    return HttpProcessUtility::selectMimeType(
-				    $requestAcceptText,
-				    array(
-					    MimeTypes::MIME_APPLICATION_XML,
-					    MimeTypes::MIME_TEXTXML,
-					    MimeTypes::MIME_APPLICATION_JSON,
+                );
+
+            case TargetKind::PRIMITIVE_VALUE():
+                $supportedResponseMimeTypes = array(MimeTypes::MIME_TEXTPLAIN);
+
+                if ($request->getIdentifier() != '$count') {
+                    $projectedProperty = $request->getProjectedProperty();
+                    self::assert(
+                        !is_null($projectedProperty),
+                        '!is_null($projectedProperty)'
+                    );
+                    $type = $projectedProperty->getInstanceType();
+                    self::assert(
+                        !is_null($type) && $type instanceof IType,
+                        '!is_null($type) && $type instanceof IType'
+                    );
+                    if ($type instanceof Binary) {
+                        $supportedResponseMimeTypes = array(MimeTypes::MIME_APPLICATION_OCTETSTREAM);
+                    }
+                }
+
+                return HttpProcessUtility::selectMimeType(
+                    $requestAcceptText,
+                    $supportedResponseMimeTypes
+                );
+
+            case TargetKind::PRIMITIVE():
+            case TargetKind::COMPLEX_OBJECT():
+            case TargetKind::BAG():
+            case TargetKind::LINK():
+                return HttpProcessUtility::selectMimeType(
+                    $requestAcceptText,
+                    array(
+                        MimeTypes::MIME_APPLICATION_XML,
+                        MimeTypes::MIME_TEXTXML,
+                        MimeTypes::MIME_APPLICATION_JSON,
                         MimeTypes::MIME_APPLICATION_JSON_FULL_META,
                         MimeTypes::MIME_APPLICATION_JSON_NO_META,
                         MimeTypes::MIME_APPLICATION_JSON_MINIMAL_META,
-					    MimeTypes::MIME_APPLICATION_JSON_VERBOSE,
-				    )
-			    );
+                        MimeTypes::MIME_APPLICATION_JSON_VERBOSE,
+                    )
+                );
 
             case TargetKind::BATCH():
-		    case TargetKind::RESOURCE():
-			    return HttpProcessUtility::selectMimeType(
-				    $requestAcceptText,
-				    array(
-					    MimeTypes::MIME_APPLICATION_ATOM,
-					    MimeTypes::MIME_APPLICATION_JSON,
+            case TargetKind::RESOURCE():
+                return HttpProcessUtility::selectMimeType(
+                    $requestAcceptText,
+                    array(
+                        MimeTypes::MIME_APPLICATION_ATOM,
+                        MimeTypes::MIME_APPLICATION_JSON,
                         MimeTypes::MIME_APPLICATION_JSON_FULL_META,
                         MimeTypes::MIME_APPLICATION_JSON_NO_META,
                         MimeTypes::MIME_APPLICATION_JSON_MINIMAL_META,
-					    MimeTypes::MIME_APPLICATION_JSON_VERBOSE,
-				    )
-			    );
-
-		    case TargetKind::MEDIA_RESOURCE():
-			    if (!$request->isNamedStream() && !$request->getTargetResourceType()->isMediaLinkEntry()){
-					throw ODataException::createBadRequestError(
-					    Messages::badRequestInvalidUriForMediaResource(
-						    $host->getAbsoluteRequestUri()->getUrlAsString()
-					    )
-				    );
-			    }
-
-			    $uriProcessor->execute();
-			    $request->setExecuted();
-			    // DSSW::getStreamContentType can throw error in 2 cases
-			    // 1. If the required stream implementation not found
-			    // 2. If IDSSP::getStreamContentType returns NULL for MLE
-			    $responseContentType = $service->getStreamProviderWrapper()
-				    ->getStreamContentType(
-					    $request->getTargetResult(),
-					    $request->getResourceStreamInfo()
-				    );
-
-
-			    // Note StreamWrapper::getStreamContentType can return NULL if the requested named stream has not
-			    // yet been uploaded. But for an MLE if IDSSP::getStreamContentType returns NULL then StreamWrapper will throw error
-			    if (!is_null($responseContentType)) {
-				    $responseContentType = HttpProcessUtility::selectMimeType(
-					    $requestAcceptText,
-					    array($responseContentType)
-				    );
-			    }
-
-			    return $responseContentType;
-	    }
-
-
-	    //If we got here, we just don't know what it is...
+                        MimeTypes::MIME_APPLICATION_JSON_VERBOSE,
+                    )
+                );
+
+            case TargetKind::MEDIA_RESOURCE():
+                if (!$request->isNamedStream() && !$request->getTargetResourceType()->isMediaLinkEntry()){
+                    throw ODataException::createBadRequestError(
+                        Messages::badRequestInvalidUriForMediaResource(
+                            $host->getAbsoluteRequestUri()->getUrlAsString()
+                        )
+                    );
+                }
+
+                $uriProcessor->execute();
+                $request->setExecuted();
+                // DSSW::getStreamContentType can throw error in 2 cases
+                // 1. If the required stream implementation not found
+                // 2. If IDSSP::getStreamContentType returns NULL for MLE
+                $responseContentType = $service->getStreamProviderWrapper()
+                    ->getStreamContentType(
+                        $request->getTargetResult(),
+                        $request->getResourceStreamInfo()
+                    );
+
+
+                // Note StreamWrapper::getStreamContentType can return NULL if the requested named stream has not
+                // yet been uploaded. But for an MLE if IDSSP::getStreamContentType returns NULL then StreamWrapper will throw error
+                if (!is_null($responseContentType)) {
+                    $responseContentType = HttpProcessUtility::selectMimeType(
+                        $requestAcceptText,
+                        array($responseContentType)
+                    );
+                }
+
+                return $responseContentType;
+        }
+
+
+        //If we got here, we just don't know what it is...
         throw new ODataException( Messages::unsupportedMediaType(), 415 );
 
     }
@@ -702,7 +702,7 @@ 
         if ($this->config->getValidateETagHeader() && !$resourceType->hasETagProperties()) {
             if (!is_null($ifMatch) || !is_null($ifNoneMatch)) {
                 // No eTag properties but request has eTag headers, bad request
-				throw ODataException::createBadRequestError(
+                throw ODataException::createBadRequestError(
                     Messages::noETagPropertiesForType()
                 );
             }
@@ -789,7 +789,7 @@ 
             $value = null;
             try {
 
-	            //TODO #88...also this seems like dupe work
+                //TODO #88...also this seems like dupe work
                 $reflectionProperty  = new \ReflectionProperty($entryObject, $eTagProperty->getName() );
                 $value = $reflectionProperty->getValue($entryObject);
             } catch (\ReflectionException $reflectionException) {

src/POData/UriProcessor/RequestDescription.php

Indentation +52 added lines, -52 removed lines

@@ -78,8 +78,8 @@ 
      */
     private $requiredMinRequestVersion;
 
-	/** @var Version */
-	private $maxServiceVersion;
+    /** @var Version */
+    private $maxServiceVersion;
 
     /**
      * Collection of known data service versions.
@@ -117,12 +117,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.
@@ -226,47 +226,47 @@ 
      * Reference to the service
      * @var IService
      */
-     private $_service;
+        private $_service;
 
     /**
      * The parts of a multipart request
      * @var array
      */
-     private $_parts;
+        private $_parts;
 
-	/**
-	 * @param SegmentDescriptor[] $segmentDescriptors Description of segments in the resource path.
-	 * @param Url $requestUri
-	 * @param Version $serviceMaxVersion
-	 * @param $requestVersion
-	 * @param $maxRequestVersion
+    /**
+     * @param SegmentDescriptor[] $segmentDescriptors Description of segments in the resource path.
+     * @param Url $requestUri
+     * @param Version $serviceMaxVersion
+     * @param $requestVersion
+     * @param $maxRequestVersion
      * @param string $dataType
-	 */
-	public function __construct($segmentDescriptors, Url $requestUri, Version $serviceMaxVersion, $requestVersion, $maxRequestVersion, $dataType = null, IService $service = null)
+     */
+    public function __construct($segmentDescriptors, Url $requestUri, Version $serviceMaxVersion, $requestVersion, $maxRequestVersion, $dataType = null, IService $service = null)
     {
         $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();
         $this->_service = $service;
         $this->_parts = array();
 
         //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()){
@@ -404,7 +404,7 @@ 
     public function raiseMinVersionRequirement($major, $minor) {
         if($this->requiredMinRequestVersion->raiseVersion($major, $minor))
         {
-	        $this->validateVersions();
+            $this->validateVersions();
         }
     }
 
@@ -419,7 +419,7 @@ 
      */
     public function raiseResponseVersion($major, $minor) {
         if($this->requiredMinResponseVersion->raiseVersion($major, $minor)){
-	        $this->validateVersions();
+            $this->validateVersions();
         }
 
     }
@@ -947,7 +947,7 @@ 
     public function getResponseVersion()
     {
 
-	    return $this->requiredMinResponseVersion;
+        return $this->requiredMinResponseVersion;
     }
 
     /**
@@ -975,7 +975,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)
             );
@@ -1004,32 +1004,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()
                 )
             );
         }
@@ -1060,9 +1060,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
@@ -1072,7 +1072,7 @@ 
 
                 $dotIndex = $i;
             } else if ($versionHeader[$i] < '0' || $versionHeader[$i] > '9') {
-				throw ODataException::createBadRequestError(
+                throw ODataException::createBadRequestError(
                     Messages::requestDescriptionInvalidVersionHeader(
                         $versionHeader,
                         $headerName
@@ -1082,14 +1082,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
@@ -1102,8 +1102,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) {