Qeti / POData

services/NorthWind/NorthWindMetadata.php

Unused Use Statements -9 removed lines

@@ -1,17 +1,8 @@
 <?php
 
 use POData\Providers\Metadata\ResourceStreamInfo;
-use POData\Providers\Metadata\ResourceAssociationSetEnd;
-use POData\Providers\Metadata\ResourceAssociationSet;
-use POData\Common\NotImplementedException;
 use POData\Providers\Metadata\Type\EdmPrimitiveType;
-use POData\Providers\Metadata\ResourceSet;
-use POData\Providers\Metadata\ResourcePropertyKind;
-use POData\Providers\Metadata\ResourceProperty;
-use POData\Providers\Metadata\ResourceTypeKind;
-use POData\Providers\Metadata\ResourceType;
 use POData\Common\InvalidOperationException;
-use POData\Providers\Metadata\IMetadataProvider;
 require_once 'POData\Providers\Metadata\IDataServiceMetadataProvider.php';
 use POData\Providers\Metadata\SimpleMetadataProvider;
 //Begin Resource Classes

Indentation +43 added lines, -43 removed lines

@@ -117,49 +117,49 @@
 class Employee
 {
     //Key Edm.Int32
-     public $EmployeeID;
-     //Edm.String
-     public $FirstName;
-     //Edm.String
-     public $LastName;
-     //Edm.String
-     public $Title;
-     //Edm.String
-     public $TitleOfCourtesy;
-     //Edm.DateTime
-     public $BirthDate;
-     //Edm.DateTime
-     public $HireDate;
-     //Edm.String
-     public $Address;
-     //Edm.String
-     public $City;
-     //Edm.String
-     public $Region;
-     //Edm.String
-     public $PostalCode;
-     //Edm.String
-     public $Country;
-     //Edm.String
-     public $HomePhone;
-     //Edm.String
-     public $Extension;
-     //Edm.String
-     public $Notes;
-     //Bag of strings
-     public $Emails;
-     //Edm.Int32
-     public $ReportsTo;
-     //Edm.Binary
-     public $Photo;
-     //Edm.String
-     public $PhotoPath;
-     //Navigation Property to associated instance of Employee instance 
-     //representing manager (ResourceReference)
-     //public $Manager; 
-     //Navigation Property to associated instance of Employee instances 
-     //representing subordinates (ResourceSetReference)
-     //public $Subordinates;
+        public $EmployeeID;
+        //Edm.String
+        public $FirstName;
+        //Edm.String
+        public $LastName;
+        //Edm.String
+        public $Title;
+        //Edm.String
+        public $TitleOfCourtesy;
+        //Edm.DateTime
+        public $BirthDate;
+        //Edm.DateTime
+        public $HireDate;
+        //Edm.String
+        public $Address;
+        //Edm.String
+        public $City;
+        //Edm.String
+        public $Region;
+        //Edm.String
+        public $PostalCode;
+        //Edm.String
+        public $Country;
+        //Edm.String
+        public $HomePhone;
+        //Edm.String
+        public $Extension;
+        //Edm.String
+        public $Notes;
+        //Bag of strings
+        public $Emails;
+        //Edm.Int32
+        public $ReportsTo;
+        //Edm.Binary
+        public $Photo;
+        //Edm.String
+        public $PhotoPath;
+        //Navigation Property to associated instance of Employee instance 
+        //representing manager (ResourceReference)
+        //public $Manager; 
+        //Navigation Property to associated instance of Employee instances 
+        //representing subordinates (ResourceSetReference)
+        //public $Subordinates;
 }
 //End Resource Classes
 

services/WordPress/WordPressDataService.php

Unused Use Statements -5 removed lines

@@ -8,11 +8,6 @@
 use POData\Configuration\ProtocolVersion;
 use POData\Configuration\ServiceConfiguration;
 use POData\BaseService;
-use POData\OperationContext\ServiceHost;
-use POData\Common\ODataException;
-use POData\Common\ODataConstants;
-use POData\Common\Messages;
-use POData\UriProcessor\UriProcessor;
 require_once 'WordPressMetadata.php';
 require_once 'WordPressQueryProvider.php';
 require_once 'WordPressDSExpressionProvider.php';

Indentation +2 added lines, -2 removed lines

@@ -53,13 +53,13 @@
      */
     public function getService($serviceType)
     {
-      if(($serviceType === 'IMetadataProvider') ||
+        if(($serviceType === 'IMetadataProvider') ||
         ($serviceType === 'IQueryProvider') ||
         ($serviceType === 'IStreamProvider')) {
         if (is_null($this->_wordPressExpressionProvider)) {
         $this->_wordPressExpressionProvider = new WordPressDSExpressionProvider();    			
         }    	
-      }
+        }
         if ($serviceType === 'IMetadataProvider') {
             if (is_null($this->_wordPressMetadata)) {
                 $this->_wordPressMetadata = CreateWordPressMetadata::create();

services/WordPress/WordPressDSExpressionProvider.php

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 
 use POData\UriProcessor\QueryProcessor\ExpressionParser\Expressions\ExpressionType;
 use POData\Providers\Metadata\Type\IType;
-use POData\Common\NotImplementedException;
 use POData\Common\ODataConstants;
 use POData\Providers\Expression\IExpressionProvider;
 use POData\Providers\Metadata\ResourceType;

Indentation +11 added lines, -11 removed lines

@@ -49,7 +49,7 @@ 
      */
     public function __construct()
     {
-      $this->_entityMapping = CreateWordPressMetadata::getEntityMapping();
+        $this->_entityMapping = CreateWordPressMetadata::getEntityMapping();
     }
 
     /**
@@ -70,7 +70,7 @@ 
      */
     public function setResourceType(ResourceType $resourceType)
     {
-      $this->_resourceType = $resourceType;
+        $this->_resourceType = $resourceType;
     }
 
     /**
@@ -223,11 +223,11 @@ 
         $entityTypeName = $this->_resourceType->getName();
         $propertyName = $parent->getResourceProperty()->getName();
         if (is_array($this->_entityMapping)) {
-          if (array_key_exists($entityTypeName, $this->_entityMapping)) {
+            if (array_key_exists($entityTypeName, $this->_entityMapping)) {
             if (array_key_exists($propertyName, $this->_entityMapping[$entityTypeName])) {
-              return $this->_entityMapping[$entityTypeName][$propertyName];
+                return $this->_entityMapping[$entityTypeName][$propertyName];
+            }
             }
-          }
         }
      
         return $propertyName;
@@ -283,7 +283,7 @@ 
             return "LENGTH($params[0])";
             break;
         case ODataConstants::GUIDFUN_EQUAL:
-        	return "STRCMP($params[0], $params[1])";
+            return "STRCMP($params[0], $params[1])";
             break;
         case ODataConstants::DATETIME_COMPARE:
             return "DATETIMECMP($params[0]; $params[1])";
@@ -338,14 +338,14 @@ 
      */
     private function _prepareBinaryExpression($operator, $left, $right)
     {
-      // Special handling for DATETIMECMP
-      if (!substr_compare($left, "DATETIMECMP", 0, 11)) {
+        // Special handling for DATETIMECMP
+        if (!substr_compare($left, "DATETIMECMP", 0, 11)) {
         $str = explode(';', $left, 2);
         $str[0] = str_replace('DATETIMECMP', '', $str[0]);
         return self::OPEN_BRAKET
-          . $str[0] . ' ' . $operator
-          . ' ' . $str[1] . self::CLOSE_BRACKET;
-      }
+            . $str[0] . ' ' . $operator
+            . ' ' . $str[1] . self::CLOSE_BRACKET;
+        }
 
         return 
             self::OPEN_BRAKET 

services/WordPress/WordPressMetadata.php

Unused Use Statements -11 removed lines

@@ -1,20 +1,9 @@
 <?php
 
-use POData\Providers\Metadata\ResourceStreamInfo;
-use POData\Providers\Metadata\ResourceAssociationSetEnd;
-use POData\Providers\Metadata\ResourceAssociationSet;
-use POData\Common\NotImplementedException;
 use POData\Providers\Metadata\Type\EdmPrimitiveType;
-use POData\Providers\Metadata\ResourceSet;
-use POData\Providers\Metadata\ResourcePropertyKind;
-use POData\Providers\Metadata\ResourceProperty;
-use POData\Providers\Metadata\ResourceTypeKind;
-use POData\Providers\Metadata\ResourceType;
 use POData\Common\InvalidOperationException;
-use POData\Providers\Metadata\IMetadataProvider;
 require_once 'POData\Providers\Metadata\IDataServiceMetadataProvider.php';
 use POData\Providers\Metadata\SimpleMetadataProvider;
-use POData\Providers\Metadata\MetadataMapping;
 
 //Begin Resource Classes
 

Indentation +11 added lines, -11 removed lines

@@ -178,11 +178,11 @@ 
 class CreateWordPressMetadata
 {
 
-	/**
-	 * Array holding the mapping between the entity properties and coulmns.
-	 * 
-	 * @var array
-	 */
+    /**
+     * Array holding the mapping between the entity properties and coulmns.
+     * 
+     * @var array
+     */
     private static $_entityMapping = array();
 
     /**
@@ -295,8 +295,8 @@ 
      * @return array(string, array(string, string))
      */
     public static function getEntityMapping() {
-      if (!is_null(self::$_entityMapping))
-      {
+        if (!is_null(self::$_entityMapping))
+        {
         self::$_entityMapping = array (
             'Post' => array (
                 '$MappedTable$' => 'wp_posts',
@@ -322,7 +322,7 @@ 
                 'Type' => 'post_type',
                 'MimeType' => 'post_mime_type',
                 'CommentCount' => 'comment_count'
-              ),
+                ),
           
             'Tag' => array (
                 '$MappedTable$' => 'wp_terms',
@@ -369,9 +369,9 @@ 
                 'Status' => 'user_status',
                 'DisplayName' => 'display_name'
             )
-          );
-      }
+            );
+        }
       
-      return self::$_entityMapping;
+        return self::$_entityMapping;
     }
 }

src/POData/BaseService.php

Unused Use Statements -3 removed lines

@@ -5,7 +5,6 @@ 
 use POData\Common\MimeTypes;
 use POData\Common\Version;
 use POData\OperationContext\HTTPRequestMethod;
-use POData\Providers\Metadata\ResourceTypeKind;
 use POData\Common\ErrorHandler;
 use POData\Common\Messages;
 use POData\Common\ODataException;
@@ -30,11 +29,9 @@ 
 use POData\Writers\Json\JsonODataV1Writer;
 use POData\Writers\Json\JsonODataV2Writer;
 use POData\Writers\ResponseWriter;
-
 use POData\Providers\Query\IQueryProvider;
 use POData\Providers\Metadata\IMetadataProvider;
 use POData\OperationContext\IOperationContext;
-
 use POData\Writers\ODataWriterRegistry;
 
 /**

Indentation +172 added lines, -172 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;
     }
 
     /**
@@ -228,33 +228,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;
+    }
 
 
     /**
@@ -300,32 +300,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.
@@ -349,12 +349,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
         //
@@ -395,7 +395,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()
                         );
                     }
@@ -405,7 +405,7 @@ 
                     if (!is_null($this->_serviceHost->getRequestIfMatch())
                         && !is_null($this->_serviceHost->getRequestIfNoneMatch())
                     ) {
-						throw ODataException::createBadRequestError(
+                        throw ODataException::createBadRequestError(
                             Messages::bothIfMatchAndIfNoneMatchHeaderSpecified()
                         );
                     }
@@ -441,22 +441,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()) {
@@ -474,10 +474,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';
             }
         }
@@ -505,7 +505,7 @@ 
      * @throws ODataException, HttpHeaderFailure
      */
     public static function getResponseContentType(
-	    RequestDescription $request,
+        RequestDescription $request,
         UriProcessor $uriProcessor,
         IService $service
     ) {
@@ -513,12 +513,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()){
@@ -527,127 +527,127 @@ 
                 $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,
-				    )
-			    );
-
-		    case TargetKind::RESOURCE():
-			    return HttpProcessUtility::selectMimeType(
-				    $requestAcceptText,
-				    array(
-					    MimeTypes::MIME_APPLICATION_ATOM,
-					    MimeTypes::MIME_APPLICATION_JSON,
+                        MimeTypes::MIME_APPLICATION_JSON_VERBOSE,
+                    )
+                );
+
+            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 );
 
     }
@@ -689,7 +689,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()
                 );
             }
@@ -776,7 +776,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/Common/ErrorHandler.php

Unused Use Statements -2 removed lines

@@ -4,9 +4,7 @@
 
 
 use POData\Writers\Json\JsonODataV2Writer;
-
 use POData\Writers\Atom\AtomODataWriter;
-use POData\BaseService;
 use POData\HttpProcessUtility;
 use POData\IService;
 

Indentation +2 added lines, -2 removed lines

@@ -32,8 +32,8 @@
             $responseContentType = HttpProcessUtility::selectMimeType(
                 $acceptTypesText, 
                 array(
-	                MimeTypes::MIME_APPLICATION_XML,
-	                MimeTypes::MIME_APPLICATION_JSON
+                    MimeTypes::MIME_APPLICATION_XML,
+                    MimeTypes::MIME_APPLICATION_JSON
                 )
             );
         } catch (HttpHeaderFailure $exception) {

src/POData/ObjectModel/ObjectModelSerializerBase.php

Unused Use Statements -1 removed lines

@@ -5,7 +5,6 @@
 
 use POData\Common\ODataConstants;
 use POData\IService;
-use POData\Providers\ProvidersWrapper;
 use POData\Providers\Metadata\ResourceSetWrapper;
 use POData\Providers\Metadata\ResourceProperty;
 use POData\Providers\Metadata\ResourceTypeKind;

Indentation +4 added lines, -4 removed lines

@@ -159,9 +159,9 @@ 
     protected function getPropertyValue($entity, ResourceType $resourceType, ResourceProperty $resourceProperty)
     {
         try {
-	        //Is this slow?  See #88
-			$reflectionProperty = new \ReflectionProperty($entity, $resourceProperty->getName());
-	        return $reflectionProperty->getValue($entity);
+            //Is this slow?  See #88
+            $reflectionProperty = new \ReflectionProperty($entity, $resourceProperty->getName());
+            return $reflectionProperty->getValue($entity);
         } catch (\ReflectionException $reflectionException) {
             throw ODataException::createInternalServerError(
                 Messages::objectModelSerializerFailedToAccessProperty(
@@ -558,7 +558,7 @@ 
             //presence of $top option affect next link for root container
             $topValueCount = $this->request->getTopOptionCount();
             if (!is_null($topValueCount) && ($topValueCount <= $pageSize)) {
-                 return false;
+                    return false;
             }            
         }
 

src/POData/OperationContext/ServiceHost.php

Unused Use Statements -1 removed lines

@@ -8,7 +8,6 @@
 use POData\Common\Url;
 use POData\Common\UrlFormatException;
 use POData\Common\ODataException;
-use POData\Common\InvalidOperationException;
 use POData\OperationContext\Web\WebOperationContext;
 use POData\OperationContext\IOperationContext;
 use POData\Common\Version;

Indentation +39 added lines, -39 removed lines

@@ -80,16 +80,16 @@ 
         return $this->_operationContext;
     }
 
-	/**
-	 * @param IOperationContext $context the OperationContext implementation to use.  If null the WebOperationContext
-	 * will be used.  Defaults to null.
-	 */
-	public function __construct(IOperationContext $context = null)
+    /**
+     * @param IOperationContext $context the OperationContext implementation to use.  If null the WebOperationContext
+     * will be used.  Defaults to null.
+     */
+    public function __construct(IOperationContext $context = null)
     {
         if(is_null($context)){
-	        $this->_operationContext = new WebOperationContext();
+            $this->_operationContext = new WebOperationContext();
         } else {
-	        $this->_operationContext = $context;
+            $this->_operationContext = $context;
         }
 
         // getAbsoluteRequestUri can throw UrlFormatException 
@@ -99,13 +99,13 @@ 
     }
 
     /**
-      * Gets the absolute request Uri as Url instance
-      * Note: This method will be called first time from constructor.
-      * 
-      * @throws ODataException if AbsoluteRequestUri is not a valid URI
-      * 
-      * @return Url
-      */
+     * Gets the absolute request Uri as Url instance
+     * Note: This method will be called first time from constructor.
+     * 
+     * @throws ODataException if AbsoluteRequestUri is not a valid URI
+     * 
+     * @return Url
+     */
     public function getAbsoluteRequestUri()
     {
         if (is_null($this->_absoluteRequestUri)) {
@@ -114,7 +114,7 @@ 
             try {
                 new Url($this->_absoluteRequestUriAsString);
             } catch (UrlFormatException $exception) {
-				throw ODataException::createBadRequestError($exception->getMessage());
+                throw ODataException::createBadRequestError($exception->getMessage());
             }
 
             $queryStartIndex = strpos($this->_absoluteRequestUriAsString, '?');
@@ -194,7 +194,7 @@ 
                 $j = count($segments) - 1;
                 $k = $i;
                 if ($j > $i) {
-					throw ODataException::createBadRequestError(
+                    throw ODataException::createBadRequestError(
                         Messages::hostRequestUriIsNotBasedOnRelativeUriInConfig(
                             $this->_absoluteRequestUriAsString,
                             $serviceUri
@@ -207,7 +207,7 @@ 
                 }
 
                 if ($j != -1) {
-					throw ODataException::createBadRequestError(
+                    throw ODataException::createBadRequestError(
                         Messages::hostRequestUriIsNotBasedOnRelativeUriInConfig(
                             $this->_absoluteRequestUriAsString,
                             $serviceUri
@@ -280,13 +280,13 @@ 
                 if (!empty($optionValue)) {
                     if ($optionValue[0] == '$') {
                         if ($this->_isODataQueryOption($optionValue)) {
-							throw ODataException::createBadRequestError(
+                            throw ODataException::createBadRequestError(
                                 Messages::hostODataQueryOptionFoundWithoutValue(
                                     $optionValue
                                 )
                             );
                         } else {
-							throw ODataException::createBadRequestError(
+                            throw ODataException::createBadRequestError(
                                 Messages::hostNonODataOptionBeginsWithSystemCharacter(
                                     $optionValue
                                 )
@@ -297,7 +297,7 @@ 
             } else {
                 if ($optionName[0] == '$') {
                     if (!$this->_isODataQueryOption($optionName)) {
-						throw ODataException::createBadRequestError(
+                        throw ODataException::createBadRequestError(
                             Messages::hostNonODataOptionBeginsWithSystemCharacter(
                                 $optionName
                             )
@@ -305,7 +305,7 @@ 
                     }
 
                     if (array_search($optionName, $namesFound) !== false) {
-						throw ODataException::createBadRequestError(
+                        throw ODataException::createBadRequestError(
                             Messages::hostODataQueryOptionCannotBeSpecifiedMoreThanOnce(
                                 $optionName
                             )
@@ -313,7 +313,7 @@ 
                     }
                     
                     if (empty($optionValue) && $optionValue !== '0') {
-						throw ODataException::createBadRequestError(
+                        throw ODataException::createBadRequestError(
                             Messages::hostODataQueryOptionFoundWithoutValue(
                                 $optionName
                             )
@@ -629,29 +629,29 @@ 
             ->outgoingResponse()->addHeader($headerName, $headerValue);
     }
 
-	/**
-	 * Translates the short $format forms into the full mime type forms
-	 * @param Version $responseVersion the version scheme to interpret the short form with
-	 * @param string $format the short $format form
-	 * @return string the full mime type corresponding to the short format form for the given version
-	 */
-	public static function translateFormatToMime(Version $responseVersion, $format){
+    /**
+     * Translates the short $format forms into the full mime type forms
+     * @param Version $responseVersion the version scheme to interpret the short form with
+     * @param string $format the short $format form
+     * @return string the full mime type corresponding to the short format form for the given version
+     */
+    public static function translateFormatToMime(Version $responseVersion, $format){
         //TODO: should the version switches be off of the requestVersion, not the response version? see #91
 
         switch($format) {
 
-	        case ODataConstants::FORMAT_XML:
-		        $format = MimeTypes::MIME_APPLICATION_XML;
-		        break;
+            case ODataConstants::FORMAT_XML:
+                $format = MimeTypes::MIME_APPLICATION_XML;
+                break;
 
             case ODataConstants::FORMAT_ATOM:
-	            $format = MimeTypes::MIME_APPLICATION_ATOM ;
-		        break;
+                $format = MimeTypes::MIME_APPLICATION_ATOM ;
+                break;
 
             case ODataConstants::FORMAT_VERBOSE_JSON:
                 if($responseVersion == Version::v3()){
-	                //only translatable in 3.0 systems
-	                $format = MimeTypes::MIME_APPLICATION_JSON_VERBOSE;
+                    //only translatable in 3.0 systems
+                    $format = MimeTypes::MIME_APPLICATION_JSON_VERBOSE;
                 }
                 break;
 
@@ -659,13 +659,13 @@ 
                 if($responseVersion == Version::v3()){
                     $format = MimeTypes::MIME_APPLICATION_JSON_MINIMAL_META;
                 } else{
-	                $format = MimeTypes::MIME_APPLICATION_JSON;
+                    $format = MimeTypes::MIME_APPLICATION_JSON;
                 }
-		        break;
+                break;
 
         }
 
-	    return $format . ';q=1.0';
+        return $format . ';q=1.0';
     }
 
 

src/POData/OperationContext/Web/IncomingRequest.php

Unused Use Statements -2 removed lines

@@ -2,9 +2,7 @@
 
 namespace POData\OperationContext\Web;
 
-use POData\Common\ODataException;
 use POData\Common\ODataConstants;
-use POData\Common\Url;
 use POData\HttpProcessUtility;
 use POData\OperationContext\HTTPRequestMethod;
 use POData\OperationContext\IHTTPRequest;

Indentation +3 added lines, -3 removed lines

@@ -152,10 +152,10 @@
      */
     public function getRequestHeader($key)
     {
-	    //PHP normalizes header keys
-	    $trimmedKey = HttpProcessUtility::headerToServerKey(trim($key));
+        //PHP normalizes header keys
+        $trimmedKey = HttpProcessUtility::headerToServerKey(trim($key));
 
-	    if (array_key_exists($trimmedKey, $this->_headers)) {
+        if (array_key_exists($trimmedKey, $this->_headers)) {
             return $this->_headers[$trimmedKey];
         }