Qeti / POData

services/NorthWind/NorthWindDSExpressionProvider.php

Indentation +79 added lines, -79 removed lines

@@ -63,7 +63,7 @@ 
      */
     public function getIteratorName()
     {
-      return null;
+        return null;
     }
 
     /**
@@ -74,7 +74,7 @@ 
      */
     public function setResourceType(ResourceType $resourceType)
     {
-    	$this->_resourceType = $resourceType;
+        $this->_resourceType = $resourceType;
     }
 
     /**
@@ -225,66 +225,66 @@ 
         $variable = null;
         $isFirstLevelPrimitive = is_null($parent->getParent());
         if (!$isFirstLevelPrimitive) {
-        	// This propery access sub-expression in the $filter need access
-        	// to level 2 or greater property of a complex or resource reference
-        	// property.
-        	// e.g. Customers?$filter=Address/City eq 'Kottayam'
-        	//          Level_2 property access [Complex]
-        	//      Customers?$filter=Address/AltAddress/City eq 'Seattle'
-        	//          Level_3 property access [Complex]
-        	//      Orders?$filter=Customer/CustomerID eq 'ALFKI'
-        	//          Level_2 property access [Resource Reference]
-        	$parent2 = null;
-        	do {
-        		$parent2 = $parent;
-        		$parent = $parent->getParent();
-        	} while ($parent != null);
+            // This propery access sub-expression in the $filter need access
+            // to level 2 or greater property of a complex or resource reference
+            // property.
+            // e.g. Customers?$filter=Address/City eq 'Kottayam'
+            //          Level_2 property access [Complex]
+            //      Customers?$filter=Address/AltAddress/City eq 'Seattle'
+            //          Level_3 property access [Complex]
+            //      Orders?$filter=Customer/CustomerID eq 'ALFKI'
+            //          Level_2 property access [Resource Reference]
+            $parent2 = null;
+            do {
+                $parent2 = $parent;
+                $parent = $parent->getParent();
+            } while ($parent != null);
         	
-        	$resourceProperty = $parent2->getResourceProperty();
-        	if ($resourceProperty->isKindOf(ResourcePropertyKind::RESOURCE_REFERENCE)) {
-        		// Orders?$filter=Customer/CustomerID eq 'ALFKI'
-        		throw new NotImplementedException(
-        				'This implementation not supports Resource reference in the filter',
-        				500,
-        				NULL
-        		);
-        	} else {
-        		// Customers?$filter=Address/AltAddress/City eq 'Seattle'
-        		// Customers?$filter=Address/City eq 'Seattle'
-        		$propertyName = $parent2->getResourceProperty()->getName();
-        		if ("Address" == $propertyName) {
-        			$child = $parent2->getChild();
-        			$propertyName = $child->getResourceProperty()->getName();
-        			if ("AltAddress" != $propertyName) {
-        				return $propertyName;
-        			}
+            $resourceProperty = $parent2->getResourceProperty();
+            if ($resourceProperty->isKindOf(ResourcePropertyKind::RESOURCE_REFERENCE)) {
+                // Orders?$filter=Customer/CustomerID eq 'ALFKI'
+                throw new NotImplementedException(
+                        'This implementation not supports Resource reference in the filter',
+                        500,
+                        NULL
+                );
+            } else {
+                // Customers?$filter=Address/AltAddress/City eq 'Seattle'
+                // Customers?$filter=Address/City eq 'Seattle'
+                $propertyName = $parent2->getResourceProperty()->getName();
+                if ("Address" == $propertyName) {
+                    $child = $parent2->getChild();
+                    $propertyName = $child->getResourceProperty()->getName();
+                    if ("AltAddress" != $propertyName) {
+                        return $propertyName;
+                    }
         			
-        			throw new NotImplementedException(
-        					'This implementation not supports Customer::Address::AltAddress in the filter',
-        					500,
-        					NULL
-        			);
-        		}
-        	}
+                    throw new NotImplementedException(
+                            'This implementation not supports Customer::Address::AltAddress in the filter',
+                            500,
+                            NULL
+                    );
+                }
+            }
 
         } else {
-        	// This is a first level property access
-        	$resourceProperty = $parent->getResourceProperty();
-        	if ($resourceProperty->isKindOf(ResourcePropertyKind::COMPLEX_TYPE)
-        	    || $resourceProperty->isKindOf(ResourcePropertyKind::RESOURCE_REFERENCE)) {
-        		// Customers?$filter=Address eq null
-        		// Orders?$filter=Customer ne null
-        		// First level property access to a complex or resource reference
-        		// which is not supported by $this [this implementation of IDSQP2]
-        		throw new NotImplementedException(
+            // This is a first level property access
+            $resourceProperty = $parent->getResourceProperty();
+            if ($resourceProperty->isKindOf(ResourcePropertyKind::COMPLEX_TYPE)
+                || $resourceProperty->isKindOf(ResourcePropertyKind::RESOURCE_REFERENCE)) {
+                // Customers?$filter=Address eq null
+                // Orders?$filter=Customer ne null
+                // First level property access to a complex or resource reference
+                // which is not supported by $this [this implementation of IDSQP2]
+                throw new NotImplementedException(
                     'First level complex and Resource reference are not supported in the filter', 
-        		    500, 
-        		    NULL
+                    500, 
+                    NULL
                 );
-        	} else {
-        		// First level property access to primitive property
-        		return $parent->getResourceProperty()->getName();
-        	}
+            } else {
+                // First level property access to primitive property
+                return $parent->getResourceProperty()->getName();
+            }
         }
     }
     /**
@@ -330,8 +330,8 @@ 
         case ODataConstants::STRFUN_SUBSTRING:
           if (count($params) == 3) {
             // 3 Param version of OData substring
-              return "SUBSTRING($params[0], $params[1] + 1, $params[2])";
-          } else {
+                return "SUBSTRING($params[0], $params[1] + 1, $params[2])";
+            } else {
             // 2 Params version of OData substring
             // We don't have the same function for SQL Server, we have only:
             //
@@ -342,7 +342,7 @@ 
             // in value_expression, the whole value expression beginning at start_expression is returned
             // In OData substring function the index start from 0, in SQL Server its from 1
             return "SUBSTRING($params[0], $params[1] + 1, LEN($params[0]))";        	    
-          }
+            }
             break;
         case ODataConstants::STRFUN_SUBSTRINGOF:
           return "(CHARINDEX($params[0], $params[1]) != 0)";
@@ -389,7 +389,7 @@ 
         case ODataConstants::BINFUL_EQUAL:
             return "($params[0] = $params[1])";
             break;
-         case 'is_null':
+            case 'is_null':
             return "is_null($params[0])";
             break;
 
@@ -409,20 +409,20 @@ 
      */
     private function _prepareBinaryExpression($operator, $left, $right)
     {
-      if (!substr_compare($left, "STRCMP", 0, 6)) {
+        if (!substr_compare($left, "STRCMP", 0, 6)) {
             $str = explode(';', $left, 2);
             $str[0] = str_replace('STRCMP', '', $str[0]);
             if ($right == 'false' and $right != '0') {
-              if (!substr_compare($operator, '!', 0, 1)) {
-                  $operator = str_replace('!', '', $operator);
-              } else if ($operator == '>=') {
-                  $operator = '<';
-              } else if ($operator == '<=') {
-                  $operator = '>';
-              } else {
+                if (!substr_compare($operator, '!', 0, 1)) {
+                    $operator = str_replace('!', '', $operator);
+                } else if ($operator == '>=') {
+                    $operator = '<';
+                } else if ($operator == '<=') {
+                    $operator = '>';
+                } else {
                     $operator = "!".$operator;
-              }
-              return self::OPEN_BRAKET 
+                }
+                return self::OPEN_BRAKET 
                     . $str[0] . ' ' . $operator 
                     . ' ' . $str[1] . self::CLOSE_BRACKET;
             } else {
@@ -434,26 +434,26 @@ 
         
         //DATETIMECMP
         if (!substr_compare($left, "DATETIMECMP", 0, 11)) {
-          $str = explode(';', $left, 2);
-          $str[0] = str_replace('DATETIMECMP', '', $str[0]);
-          if ($right == 'false' and $right != '0') {
+            $str = explode(';', $left, 2);
+            $str[0] = str_replace('DATETIMECMP', '', $str[0]);
+            if ($right == 'false' and $right != '0') {
             if (!substr_compare($operator, '!', 0, 1)) {
-              $operator = str_replace('!', '', $operator);
+                $operator = str_replace('!', '', $operator);
             } else if ($operator == '>=') {
-              $operator = '<';
+                $operator = '<';
             } else if ($operator == '<=') {
-              $operator = '>';
+                $operator = '>';
             } else {
-              $operator = "!".$operator;
+                $operator = "!".$operator;
             }
             return self::OPEN_BRAKET
             . $str[0] . ' ' . $operator
             . ' ' . $str[1] . self::CLOSE_BRACKET;
-          } else {
+            } else {
             return self::OPEN_BRAKET
             . $str[0] . ' ' . $operator
             . ' ' . $str[1] . self::CLOSE_BRACKET;
-          }
+            }
         }
 
         return 

services/NorthWind/NorthWindMetadata.php

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/NorthWind/NorthWindQueryProvider.php

Indentation +41 added lines, -41 removed lines

@@ -40,17 +40,17 @@ 
      */
     public function __construct()
     {
-    	$connectionInfo = array("Database" => DATABASE);
+        $connectionInfo = array("Database" => DATABASE);
         if (defined('UID')) {
-        	$connectionInfo['UID'] = UID;
-        	$connectionInfo['PWD'] = PWD;    		
-    	}
+            $connectionInfo['UID'] = UID;
+            $connectionInfo['PWD'] = PWD;    		
+        }
 
         $this->_connectionHandle = sqlsrv_connect(SERVER, $connectionInfo);
         if ( $this->_connectionHandle ) {        	
         } else {
             $errorAsString = self::_getSQLSRVError();
-        	throw ODataException::createInternalServerError($errorAsString);
+            throw ODataException::createInternalServerError($errorAsString);
         }
 
         $this->_northWindSQLSRVExpressionProvider = null;
@@ -71,11 +71,11 @@ 
      */
     public function getExpressionProvider()
     {
-    	if (is_null($this->_northWindSQLSRVExpressionProvider)) {
-    		$this->_northWindSQLSRVExpressionProvider = new NorthWindDSExpressionProvider();
-    	}
+        if (is_null($this->_northWindSQLSRVExpressionProvider)) {
+            $this->_northWindSQLSRVExpressionProvider = new NorthWindDSExpressionProvider();
+        }
 
-    	return $this->_northWindSQLSRVExpressionProvider;
+        return $this->_northWindSQLSRVExpressionProvider;
     }
 
     /**
@@ -100,7 +100,7 @@ 
             && $resourceSetName !== 'Order_Details'
             && $resourceSetName !== 'Employees'
         ) {
-        	throw ODataException::createInternalServerError('(NorthWindQueryProvider) Unknown resource set ' . $resourceSetName . '! Contact service provider');
+            throw ODataException::createInternalServerError('(NorthWindQueryProvider) Unknown resource set ' . $resourceSetName . '! Contact service provider');
         }
 
         if ($resourceSetName === 'Order_Details') {
@@ -114,7 +114,7 @@ 
         $stmt = sqlsrv_query($this->_connectionHandle, $query);
         if ($stmt === false) {
             $errorAsString = self::_getSQLSRVError();
-        	throw ODataException::createInternalServerError($errorAsString);
+            throw ODataException::createInternalServerError($errorAsString);
         }
         $returnResult = array();
         switch ($resourceSetName) {
@@ -172,7 +172,7 @@ 
         $stmt = sqlsrv_query($this->_connectionHandle, $query);
         if ($stmt === false) {
             $errorAsString = self::_getSQLSRVError();
-        	throw ODataException::createInternalServerError($errorAsString);
+            throw ODataException::createInternalServerError($errorAsString);
         }
 
         //If resource not found return null to the library
@@ -237,7 +237,7 @@ 
                 $stmt = sqlsrv_query($this->_connectionHandle, $query);
                 if ($stmt === false) {            
                     $errorAsString = self::_getSQLSRVError();
-        	        throw ODataException::createInternalServerError($errorAsString);
+                    throw ODataException::createInternalServerError($errorAsString);
                 }
 
                 $result = $this->_serializeOrders($stmt);
@@ -250,7 +250,7 @@ 
                 $stmt = sqlsrv_query($this->_connectionHandle, $query);
                 if ($stmt === false) {            
                     $errorAsString = self::_getSQLSRVError();
-        	        throw ODataException::createInternalServerError($errorAsString);
+                    throw ODataException::createInternalServerError($errorAsString);
                 }
 
                 $result = $this->_serializeOrderDetails($stmt);
@@ -301,7 +301,7 @@ 
                 $stmt = sqlsrv_query($this->_connectionHandle, $query);
                 if ($stmt === false) {
                     $errorAsString = self::_getSQLSRVError();
-        	        throw ODataException::createInternalServerError($errorAsString);
+                    throw ODataException::createInternalServerError($errorAsString);
                 }
 
                 $result = $this->_serializeOrders($stmt);
@@ -317,7 +317,7 @@ 
                 $stmt = sqlsrv_query($this->_connectionHandle, $query);
                 if ($stmt === false) {            
                     $errorAsString = self::_getSQLSRVError();
-        	        throw ODataException::createInternalServerError($errorAsString);
+                    throw ODataException::createInternalServerError($errorAsString);
                 }
 
                 $result = $this->_serializeOrderDetails($stmt);
@@ -358,7 +358,7 @@ 
                     $stmt = sqlsrv_query($this->_connectionHandle, $query);
                     if ($stmt === false) {
                         $errorAsString = self::_getSQLSRVError();
-        	            throw ODataException::createInternalServerError($errorAsString);
+                        throw ODataException::createInternalServerError($errorAsString);
                     }
 
                     if (!sqlsrv_has_rows($stmt)) {
@@ -379,7 +379,7 @@ 
                     $stmt = sqlsrv_query($this->_connectionHandle, $query);
                     if ($stmt === false) {
                         $errorAsString = self::_getSQLSRVError();
-        	            throw ODataException::createInternalServerError($errorAsString);
+                        throw ODataException::createInternalServerError($errorAsString);
                     }
                     
                     if (!sqlsrv_has_rows($stmt)) {
@@ -407,7 +407,7 @@ 
     {
         $customers = array();
         while ($record = sqlsrv_fetch_array($result, SQLSRV_FETCH_ASSOC)) {         
-             $customers[] = $this->_serializeCustomer($record);
+                $customers[] = $this->_serializeCustomer($record);
         }
 
         return $customers;
@@ -456,15 +456,15 @@ 
         return $customer;
     }
     
-     /**
-     * copy address
-     * 
-     * @param Object &$src    source
-     * @param Object &$target target
-     * @param Object $tag     tag
-     * 
-     * @return void
-     */
+        /**
+         * copy address
+         * 
+         * @param Object &$src    source
+         * @param Object &$target target
+         * @param Object $tag     tag
+         * 
+         * @return void
+         */
     private function _copyAddress(&$src, &$target, $tag)
     {
         $target->StreetName = $src->StreetName . $tag;
@@ -492,7 +492,7 @@ 
     {
         $orders = array();
         while ( $record = sqlsrv_fetch_array($result, SQLSRV_FETCH_ASSOC)) {
-             $orders[] = $this->_serializeOrder($record);
+                $orders[] = $this->_serializeOrder($record);
         }
 
         return $orders;
@@ -536,7 +536,7 @@ 
     {
         $employees = array();
         while ($record = sqlsrv_fetch_array($result, SQLSRV_FETCH_ASSOC)) {
-             $employees[] = $this->_serializeEmployee($record);
+                $employees[] = $this->_serializeEmployee($record);
         }
 
         return $employees;
@@ -616,10 +616,10 @@ 
      */
     private static function _getSQLSRVError()
     {
-    	$result = null;
-    	$errors = sqlsrv_errors();
-    	self::_getSQLSRVError1($errors, $result);
-    	return $result;
+        $result = null;
+        $errors = sqlsrv_errors();
+        self::_getSQLSRVError1($errors, $result);
+        return $result;
     }
     
     /**
@@ -630,13 +630,13 @@ 
      */
     private static function _getSQLSRVError1($errors, &$result)
     {
-    	if (is_array($errors)) {
-    		foreach ($errors as $error) {
-    			self::_getSQLSRVError1($error, $result);
-    		}
-    	} else {
-    		$result .= $errors;
-    	}
+        if (is_array($errors)) {
+            foreach ($errors as $error) {
+                self::_getSQLSRVError1($error, $result);
+            }
+        } else {
+            $result .= $errors;
+        }
     }
 
     /**

services/NorthWind/NorthWindStreamProvider.php

Indentation +1 added lines, -1 removed lines

@@ -230,7 +230,7 @@
                 400
             );
         }
-        **/
+         **/
 
         if (!($entity instanceof Employee)) {
             throw new ODataException('Internal Server Error.', 500);

services/WordPress/WordPressDSExpressionProvider.php

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/WordPressDataService.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/WordPressMetadata.php

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;
     }
 }

services/WordPress/WordPressQueryProvider.php

Indentation +121 added lines, -121 removed lines

@@ -43,7 +43,7 @@ 
         $this->_connectionHandle = @mysql_connect(DB_HOST, DB_USER, DB_PASSWORD, true);
         if ( $this->_connectionHandle ) {
         } else {             
-             die(print_r(mysql_error(), true));
+                die(print_r(mysql_error(), true));
         } 
 
         mysql_select_db(DB_NAME, $this->_connectionHandle);
@@ -64,11 +64,11 @@ 
      */
     public function getExpressionProvider()
     {
-    	if (is_null($this->_wordPressMySQLExpressionProvider)) {
-    		$this->_wordPressMySQLExpressionProvider = new WordPressDSExpressionProvider();
-    	}
+        if (is_null($this->_wordPressMySQLExpressionProvider)) {
+            $this->_wordPressMySQLExpressionProvider = new WordPressDSExpressionProvider();
+        }
     	
-    	return $this->_wordPressMySQLExpressionProvider;
+        return $this->_wordPressMySQLExpressionProvider;
     }
     
     /**
@@ -101,8 +101,8 @@ 
         switch ($resourceSetName) {
         case 'Posts':
             $query = "SELECT * FROM `wp_posts` WHERE"
-                   ." wp_posts.post_type = 'post'"
-                   ." AND wp_posts.post_status = 'publish'";
+                    ." wp_posts.post_type = 'post'"
+                    ." AND wp_posts.post_status = 'publish'";
             if ($filter !== null) {
                 $query .= " AND $filter";
             }
@@ -111,9 +111,9 @@ 
             break;                   
         case 'Tags':
             $query = "SELECT t.*, tt.description"
-                   ." FROM `wp_terms` AS t INNER JOIN `wp_term_taxonomy` as tt"
-                   ." ON tt.term_id = t.term_id"
-                   ." WHERE tt.taxonomy = 'post_tag'";
+                    ." FROM `wp_terms` AS t INNER JOIN `wp_term_taxonomy` as tt"
+                    ." ON tt.term_id = t.term_id"
+                    ." WHERE tt.taxonomy = 'post_tag'";
             if ($filter !== null) {
                 $query .= " AND $filter";
             }
@@ -122,9 +122,9 @@ 
             break;
         case 'Categories':
             $query = "SELECT t.*, tt.description"
-                   ." FROM `wp_terms` AS t INNER JOIN `wp_term_taxonomy` as tt"
-                   ." ON tt.term_id = t.term_id"
-                   ." WHERE tt.taxonomy = 'category'";
+                    ." FROM `wp_terms` AS t INNER JOIN `wp_term_taxonomy` as tt"
+                    ." ON tt.term_id = t.term_id"
+                    ." WHERE tt.taxonomy = 'category'";
             if ($filter !== null) {
                 $query .= " AND $filter";
             }
@@ -133,7 +133,7 @@ 
             break;
         case 'Comments':
             $query = "SELECT * FROM `wp_comments` WHERE"
-                   ." wp_comments.comment_approved = 1";
+                    ." wp_comments.comment_approved = 1";
             if ($filter !== null) {
                 $query .= " AND $filter";
             }
@@ -187,9 +187,9 @@ 
         switch ($resourceSetName) {
         case 'Posts':
             $query = "SELECT * FROM `wp_posts` WHERE"
-                   ." wp_posts.post_type = 'post'"
-                   ." AND wp_posts.post_status = 'publish'"
-                   ." AND wp_posts.ID = ".$namedKeyValues['PostID'][0];
+                    ." wp_posts.post_type = 'post'"
+                    ." AND wp_posts.post_status = 'publish'"
+                    ." AND wp_posts.ID = ".$namedKeyValues['PostID'][0];
             $stmt = mysql_query($query);
               
             //If resource not found return null to the library
@@ -202,10 +202,10 @@ 
             break;
         case 'Tags':
             $query = "SELECT t.*, tt.description"
-                   ." FROM `wp_terms` AS t INNER JOIN `wp_term_taxonomy` as tt"
-                   ." ON tt.term_id = t.term_id"
-                   ." WHERE tt.taxonomy = 'post_tag'"
-                   ." AND t.term_id = ".$namedKeyValues['TagID'][0];
+                    ." FROM `wp_terms` AS t INNER JOIN `wp_term_taxonomy` as tt"
+                    ." ON tt.term_id = t.term_id"
+                    ." WHERE tt.taxonomy = 'post_tag'"
+                    ." AND t.term_id = ".$namedKeyValues['TagID'][0];
             $stmt = mysql_query($query);
               
             //If resource not found return null to the library
@@ -218,10 +218,10 @@ 
             break;
         case 'Categories':
             $query = "SELECT t.*, tt.description"
-                   ." FROM `wp_terms` AS t INNER JOIN `wp_term_taxonomy` as tt"
-                   ." ON tt.term_id = t.term_id"
-                   ." WHERE tt.taxonomy = 'category'"
-                   ." AND t.term_id = ".$namedKeyValues['CategoryID'][0];
+                    ." FROM `wp_terms` AS t INNER JOIN `wp_term_taxonomy` as tt"
+                    ." ON tt.term_id = t.term_id"
+                    ." WHERE tt.taxonomy = 'category'"
+                    ." AND t.term_id = ".$namedKeyValues['CategoryID'][0];
             $stmt = mysql_query($query);
               
             //If resource not found return null to the library
@@ -234,8 +234,8 @@ 
             break;
         case 'Comments':
             $query = "SELECT * FROM `wp_comments`"
-                   ." WHERE comment_approved = 1" 
-                   ." AND comment_ID = ".$namedKeyValues['CommentID'][0];
+                    ." WHERE comment_approved = 1" 
+                    ." AND comment_ID = ".$namedKeyValues['CommentID'][0];
             $stmt = mysql_query($query);
               
             //If resource not found return null to the library
@@ -296,13 +296,13 @@ 
         case ($srcClass == 'Post'):
             if ($navigationPropName == 'Tags') {
                 $query = "SELECT t.*, tt.description"
-                       ." FROM wp_terms AS t"
-                       ." INNER JOIN wp_term_taxonomy AS tt"
-                       ." ON tt.term_id = t.term_id"
-                       ." INNER JOIN wp_term_relationships AS tr"
-                       ." ON tr.term_taxonomy_id = tt.term_taxonomy_id"
-                       ." WHERE tt.taxonomy IN ('post_tag')"
-                       ." AND tr.object_id IN ($sourceEntityInstance->PostID)";
+                        ." FROM wp_terms AS t"
+                        ." INNER JOIN wp_term_taxonomy AS tt"
+                        ." ON tt.term_id = t.term_id"
+                        ." INNER JOIN wp_term_relationships AS tr"
+                        ." ON tr.term_taxonomy_id = tt.term_taxonomy_id"
+                        ." WHERE tt.taxonomy IN ('post_tag')"
+                        ." AND tr.object_id IN ($sourceEntityInstance->PostID)";
                 if ($filter !== null) {
                     $query .= " AND $filter";
                 }
@@ -314,26 +314,26 @@ 
                 $result = $this->_serializeTags($stmt);
             } elseif ($navigationPropName == 'Categories') {
                 $query = "SELECT t.*, tt.description"
-                       ." FROM wp_terms AS t"
-                       ." INNER JOIN wp_term_taxonomy AS tt"
-                       ." ON tt.term_id = t.term_id"
-                       ." INNER JOIN wp_term_relationships AS tr"
-                       ." ON tr.term_taxonomy_id = tt.term_taxonomy_id"
-                       ." WHERE tt.taxonomy IN ('category')"
-                       ." AND tr.object_id IN ($sourceEntityInstance->PostID)";
+                        ." FROM wp_terms AS t"
+                        ." INNER JOIN wp_term_taxonomy AS tt"
+                        ." ON tt.term_id = t.term_id"
+                        ." INNER JOIN wp_term_relationships AS tr"
+                        ." ON tr.term_taxonomy_id = tt.term_taxonomy_id"
+                        ." WHERE tt.taxonomy IN ('category')"
+                        ." AND tr.object_id IN ($sourceEntityInstance->PostID)";
                 if ($filter !== null) {
                     $query .= " AND $filter";
                 }
                 $stmt = mysql_query($query);
                 if ( $stmt === false) {            
-                       die(mysql_error());
+                        die(mysql_error());
                 }
                         
                 $result = $this->_serializeCategories($stmt);
             } else if ($navigationPropName == 'Comments') {
                 $query = "SELECT * FROM `wp_comments`"
-                       ." WHERE comment_approved = 1" 
-                       ." AND comment_post_ID = $sourceEntityInstance->PostID";
+                        ." WHERE comment_approved = 1" 
+                        ." AND comment_post_ID = $sourceEntityInstance->PostID";
                 if ($filter !== null) {
                     $query .= " AND $filter";
                 }
@@ -351,14 +351,14 @@ 
         case ($srcClass == 'Tag'):
             if ($navigationPropName == 'Posts') {
                 $query = "SELECT p . *" 
-                         ." FROM wp_posts AS p"
-                         ." INNER JOIN wp_term_relationships AS tr"
-                         ." ON p.ID = tr.object_id"
-                         ." INNER JOIN wp_term_taxonomy AS tt"
-                         ." ON tr.term_taxonomy_id = tt.term_taxonomy_id"
-                         ." WHERE tt.term_id = $sourceEntityInstance->TagID"
-                         ." AND p.post_type = 'post'"
-                         ." AND p.post_status = 'publish'";
+                            ." FROM wp_posts AS p"
+                            ." INNER JOIN wp_term_relationships AS tr"
+                            ." ON p.ID = tr.object_id"
+                            ." INNER JOIN wp_term_taxonomy AS tt"
+                            ." ON tr.term_taxonomy_id = tt.term_taxonomy_id"
+                            ." WHERE tt.term_id = $sourceEntityInstance->TagID"
+                            ." AND p.post_type = 'post'"
+                            ." AND p.post_status = 'publish'";
                 if ($filter !== null) {
                     $query .= " AND $filter";
                 }
@@ -367,7 +367,7 @@ 
                             die(mysql_error());
                 }
                         
-                      $result = $this->_serializePosts($stmt);
+                        $result = $this->_serializePosts($stmt);
             } else {
                 die('Tag does not have navigation porperty with name: ' . $navigationPropName);
             }
@@ -376,14 +376,14 @@ 
         case ($srcClass == 'Category'):
             if ($navigationPropName == 'Posts') {
                 $query = "SELECT p . *" 
-                         ." FROM wp_posts AS p"
-                         ." INNER JOIN wp_term_relationships AS tr"
-                         ." ON p.ID = tr.object_id"
-                         ." INNER JOIN wp_term_taxonomy AS tt"
-                         ." ON tr.term_taxonomy_id = tt.term_taxonomy_id"
-                         ." WHERE tt.term_id = $sourceEntityInstance->CategoryID"
-                         ." AND p.post_type = 'post'"
-                         ." AND p.post_status = 'publish'";
+                            ." FROM wp_posts AS p"
+                            ." INNER JOIN wp_term_relationships AS tr"
+                            ." ON p.ID = tr.object_id"
+                            ." INNER JOIN wp_term_taxonomy AS tt"
+                            ." ON tr.term_taxonomy_id = tt.term_taxonomy_id"
+                            ." WHERE tt.term_id = $sourceEntityInstance->CategoryID"
+                            ." AND p.post_type = 'post'"
+                            ." AND p.post_status = 'publish'";
                 if ($filter !== null) {
                     $query .= " AND $filter";
                 }
@@ -405,9 +405,9 @@ 
         case ($srcClass == 'User'):
             if ($navigationPropName == 'Posts') {
                 $query = "SELECT * FROM `wp_posts` WHERE"
-                       ." wp_posts.post_type = 'post'"
-                       ." AND wp_posts.post_status = 'publish'"
-                       ." AND wp_posts.post_author = $sourceEntityInstance->UserID";
+                        ." wp_posts.post_type = 'post'"
+                        ." AND wp_posts.post_status = 'publish'"
+                        ." AND wp_posts.post_author = $sourceEntityInstance->UserID";
                 if ($filter !== null) {
                     $query .= " AND $filter";
                 }
@@ -419,8 +419,8 @@ 
                 $result = $this->_serializePosts($stmt);
             } elseif ($navigationPropName == 'Comments') {
                 $query = "SELECT * FROM `wp_comments`"
-                     ." WHERE comment_approved = 1" 
-                     ." AND wp_comments.user_id = $sourceEntityInstance->UserID";
+                        ." WHERE comment_approved = 1" 
+                        ." AND wp_comments.user_id = $sourceEntityInstance->UserID";
                 if ($filter !== null) {
                     $query .= " AND $filter";
                 }
@@ -476,33 +476,33 @@ 
         case ($srcClass == 'Post'):
             if ($navigationPropName == 'Tags') {
                 $query = "SELECT t.*, tt.description"
-                       ." FROM wp_terms AS t"
-                       ." INNER JOIN wp_term_taxonomy AS tt"
-                       ." ON tt.term_id = t.term_id"
-                       ." INNER JOIN wp_term_relationships AS tr"
-                       ." ON tr.term_taxonomy_id = tt.term_taxonomy_id"
-                       ." WHERE tt.taxonomy IN ('post_tag')"
-                       ." AND tr.object_id IN ($sourceEntityInstance->PostID)"
-                       ." AND tt.term_id = ".$namedKeyValues['TagID'][0];
+                        ." FROM wp_terms AS t"
+                        ." INNER JOIN wp_term_taxonomy AS tt"
+                        ." ON tt.term_id = t.term_id"
+                        ." INNER JOIN wp_term_relationships AS tr"
+                        ." ON tr.term_taxonomy_id = tt.term_taxonomy_id"
+                        ." WHERE tt.taxonomy IN ('post_tag')"
+                        ." AND tr.object_id IN ($sourceEntityInstance->PostID)"
+                        ." AND tt.term_id = ".$namedKeyValues['TagID'][0];
                 $stmt = mysql_query($query);
                 $result = $this->_serializeTags($stmt);
             } elseif ($navigationPropName == 'Categories') {
                 $query = "SELECT t.*, tt.description"
-                       ." FROM wp_terms AS t"
-                       ." INNER JOIN wp_term_taxonomy AS tt"
-                       ." ON tt.term_id = t.term_id"
-                       ." INNER JOIN wp_term_relationships AS tr"
-                       ." ON tr.term_taxonomy_id = tt.term_taxonomy_id"
-                       ." WHERE tt.taxonomy IN ('category')"
-                       ." AND tr.object_id IN ($sourceEntityInstance->PostID)"
-                       ." AND tt.term_id = ".$namedKeyValues['CategoryID'][0];
+                        ." FROM wp_terms AS t"
+                        ." INNER JOIN wp_term_taxonomy AS tt"
+                        ." ON tt.term_id = t.term_id"
+                        ." INNER JOIN wp_term_relationships AS tr"
+                        ." ON tr.term_taxonomy_id = tt.term_taxonomy_id"
+                        ." WHERE tt.taxonomy IN ('category')"
+                        ." AND tr.object_id IN ($sourceEntityInstance->PostID)"
+                        ." AND tt.term_id = ".$namedKeyValues['CategoryID'][0];
                 $stmt = mysql_query($query);
                 $result = $this->_serializeCategories($stmt);
             } else if ($navigationPropName == 'Comments') {
                 $query = "SELECT * FROM `wp_comments`"
-                       ." WHERE comment_approved = 1" 
-                       ." AND comment_post_ID = $sourceEntityInstance->PostID"
-                       ." AND comment_ID = ".$namedKeyValues['CommentID'][0];
+                        ." WHERE comment_approved = 1" 
+                        ." AND comment_post_ID = $sourceEntityInstance->PostID"
+                        ." AND comment_ID = ".$namedKeyValues['CommentID'][0];
                 $stmt = mysql_query($query);
                 $result = $this->_serializeComments($stmt);
             } else {
@@ -513,15 +513,15 @@ 
         case ($srcClass == 'Tag'):
             if ($navigationPropName == 'Posts') {
                 $query = "SELECT p . *" 
-                         ." FROM wp_posts AS p"
-                         ." INNER JOIN wp_term_relationships AS tr"
-                         ." ON p.ID = tr.object_id"
-                         ." INNER JOIN wp_term_taxonomy AS tt"
-                         ." ON tr.term_taxonomy_id = tt.term_taxonomy_id"
-                         ." WHERE tt.term_id = $sourceEntityInstance->TagID"
-                         ." AND p.post_type = 'post'"
-                         ." AND p.post_status = 'publish'"
-                         ." AND p.ID = ".$namedKeyValues['PostID'][0];
+                            ." FROM wp_posts AS p"
+                            ." INNER JOIN wp_term_relationships AS tr"
+                            ." ON p.ID = tr.object_id"
+                            ." INNER JOIN wp_term_taxonomy AS tt"
+                            ." ON tr.term_taxonomy_id = tt.term_taxonomy_id"
+                            ." WHERE tt.term_id = $sourceEntityInstance->TagID"
+                            ." AND p.post_type = 'post'"
+                            ." AND p.post_status = 'publish'"
+                            ." AND p.ID = ".$namedKeyValues['PostID'][0];
                 $stmt = mysql_query($query);
                 $result = $this->_serializePosts($stmt);
             } else {
@@ -532,15 +532,15 @@ 
         case ($srcClass == 'Category'):
             if ($navigationPropName == 'Posts') {
                 $query = "SELECT p . *" 
-                         ." FROM wp_posts AS p"
-                         ." INNER JOIN wp_term_relationships AS tr"
-                         ." ON p.ID = tr.object_id"
-                         ." INNER JOIN wp_term_taxonomy AS tt"
-                         ." ON tr.term_taxonomy_id = tt.term_taxonomy_id"
-                         ." WHERE tt.term_id = $sourceEntityInstance->CategoryID"
-                         ." AND p.post_type = 'post'"
-                         ." AND p.post_status = 'publish'"
-                         ." AND p.ID = ".$namedKeyValues['PostID'][0];
+                            ." FROM wp_posts AS p"
+                            ." INNER JOIN wp_term_relationships AS tr"
+                            ." ON p.ID = tr.object_id"
+                            ." INNER JOIN wp_term_taxonomy AS tt"
+                            ." ON tr.term_taxonomy_id = tt.term_taxonomy_id"
+                            ." WHERE tt.term_id = $sourceEntityInstance->CategoryID"
+                            ." AND p.post_type = 'post'"
+                            ." AND p.post_status = 'publish'"
+                            ." AND p.ID = ".$namedKeyValues['PostID'][0];
                 $stmt = mysql_query($query);
                 $result = $this->_serializePosts($stmt);
             } else {
@@ -554,22 +554,22 @@ 
                     
         case ($srcClass == 'User'):
             if ($navigationPropName == 'Posts') {
-                 $query = "SELECT * FROM `wp_posts` WHERE"
+                    $query = "SELECT * FROM `wp_posts` WHERE"
                         ." wp_posts.post_type = 'post'"
                         ." AND wp_posts.post_status = 'publish'"
                         ." AND wp_posts.post_author = $sourceEntityInstance->UserID"
                         ." AND wp_posts.ID = ".$namedKeyValues['PostID'][0];
-                 $stmt = mysql_query($query);
-                 $result = $this->_serializePosts($stmt);
+                    $stmt = mysql_query($query);
+                    $result = $this->_serializePosts($stmt);
             } elseif ($navigationPropName == 'Comments') {
-                 $query = "SELECT * FROM `wp_comments`"
-                      ." WHERE comment_approved = 1" 
-                      ." AND wp_comments.user_id = $sourceEntityInstance->UserID"
-                      ." AND wp_comments.comment_ID = ".$namedKeyValues['CommentID'][0];
-                 $stmt = mysql_query($query);
-                 $result = $this->_serializeComments($stmt);
+                    $query = "SELECT * FROM `wp_comments`"
+                        ." WHERE comment_approved = 1" 
+                        ." AND wp_comments.user_id = $sourceEntityInstance->UserID"
+                        ." AND wp_comments.comment_ID = ".$namedKeyValues['CommentID'][0];
+                    $stmt = mysql_query($query);
+                    $result = $this->_serializeComments($stmt);
             } else {
-                 die('User does not have navigation porperty with name: ' . $navigationPropName);
+                    die('User does not have navigation porperty with name: ' . $navigationPropName);
             }
             break;
         }
@@ -635,9 +635,9 @@ 
                       
             } elseif ($navigationPropName == 'Post') {
                 $query = "SELECT * FROM `wp_posts` WHERE"
-                       ." wp_posts.post_type = 'post'"
-                       ." AND wp_posts.post_status = 'publish'"
-                       ." AND wp_posts.ID = $sourceEntityInstance->PostID";
+                        ." wp_posts.post_type = 'post'"
+                        ." AND wp_posts.post_status = 'publish'"
+                        ." AND wp_posts.ID = $sourceEntityInstance->PostID";
                 $stmt = mysql_query($query);
                 if ( $stmt === false) {            
                     die(mysql_error());
@@ -670,7 +670,7 @@ 
     {
         $posts = array();
         while ($record = mysql_fetch_array($result, MYSQL_ASSOC)) {
-             $posts[] = $this->_serializePost($record);
+                $posts[] = $this->_serializePost($record);
         }
 
         return $posts;
@@ -749,7 +749,7 @@ 
     {
         $tags = array();
         while ($record = mysql_fetch_array($result, MYSQL_ASSOC)) {         
-             $tags[] = $this->_serializeTag($record);
+                $tags[] = $this->_serializeTag($record);
         }
 
         return $tags;
@@ -783,7 +783,7 @@ 
     {
         $cats = array();
         while ($record = mysql_fetch_array($result, MYSQL_ASSOC)) {         
-             $cats[] = $this->_serializeCategory($record);
+                $cats[] = $this->_serializeCategory($record);
         }
 
         return $cats;
@@ -817,7 +817,7 @@ 
     {
         $comments = array();
         while ( $record = mysql_fetch_array($result, MYSQL_ASSOC)) {         
-             $comments[] = $this->_serializeComment($record);
+                $comments[] = $this->_serializeComment($record);
         }
 
         return $comments;
@@ -875,7 +875,7 @@ 
     {
         $users = array();
         while ($record = mysql_fetch_array($result, MYSQL_ASSOC)) {         
-             $users[] = $this->_serializeUser($record);
+                $users[] = $this->_serializeUser($record);
         }
 
         return $users;

src/POData/BaseService.php

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) {