Qeti / POData

services/NorthWind/NorthWindDSExpressionProvider.php

Doc Comments -1 removed lines

@@ -50,7 +50,6 @@
     /**
      * Constructs new instance of SQLSrverExpressionProvider for NorthWind DB
      * 
-     * @param string $iterName The name of the iterator
      */
     public function __construct()
     {

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 

Switch Indentation +150 added lines, -150 removed lines

@@ -89,14 +89,14 @@ 
     public function onLogicalExpression($expressionType, $left, $right)
     {
         switch($expressionType) {
-        case ExpressionType::AND_LOGICAL:
-            return $this->_prepareBinaryExpression(self::LOGICAL_AND, $left, $right);
-            break;
-        case ExpressionType::OR_LOGICAL:
-            return $this->_prepareBinaryExpression(self::LOGICAL_OR, $left, $right);
-            break;
-        default:
-            throw new \InvalidArgumentException('onLogicalExpression');
+            case ExpressionType::AND_LOGICAL:
+                return $this->_prepareBinaryExpression(self::LOGICAL_AND, $left, $right);
+                break;
+            case ExpressionType::OR_LOGICAL:
+                return $this->_prepareBinaryExpression(self::LOGICAL_OR, $left, $right);
+                break;
+            default:
+                throw new \InvalidArgumentException('onLogicalExpression');
         }
     }
 
@@ -112,23 +112,23 @@ 
     public function onArithmeticExpression($expressionType, $left, $right)
     {
         switch($expressionType) {
-        case ExpressionType::MULTIPLY:
-            return $this->_prepareBinaryExpression(self::MULTIPLY, $left, $right);
-            break;
-        case ExpressionType::DIVIDE:
-            return $this->_prepareBinaryExpression(self::DIVIDE, $left, $right);
-            break;
-        case ExpressionType::MODULO:
-            return $this->_prepareBinaryExpression(self::MODULO, $left, $right);
-            break;
-        case ExpressionType::ADD:
-            return $this->_prepareBinaryExpression(self::ADD, $left, $right);
-            break;
-        case ExpressionType::SUBTRACT:
-            return $this->_prepareBinaryExpression(self::SUBTRACT, $left, $right);
-            break;
-        default:
-            throw new \InvalidArgumentException('onArithmeticExpression');
+            case ExpressionType::MULTIPLY:
+                return $this->_prepareBinaryExpression(self::MULTIPLY, $left, $right);
+                break;
+            case ExpressionType::DIVIDE:
+                return $this->_prepareBinaryExpression(self::DIVIDE, $left, $right);
+                break;
+            case ExpressionType::MODULO:
+                return $this->_prepareBinaryExpression(self::MODULO, $left, $right);
+                break;
+            case ExpressionType::ADD:
+                return $this->_prepareBinaryExpression(self::ADD, $left, $right);
+                break;
+            case ExpressionType::SUBTRACT:
+                return $this->_prepareBinaryExpression(self::SUBTRACT, $left, $right);
+                break;
+            default:
+                throw new \InvalidArgumentException('onArithmeticExpression');
         }
     }
 
@@ -144,30 +144,30 @@ 
     public function onRelationalExpression($expressionType, $left, $right)
     {
         switch($expressionType) {
-        case ExpressionType::GREATERTHAN:
-            return $this->_prepareBinaryExpression(self::GREATERTHAN, $left, $right);
-            break;
-        case ExpressionType::GREATERTHAN_OR_EQUAL:
-            return $this->_prepareBinaryExpression(
-                self::GREATERTHAN_OR_EQUAL, $left, $right
-            );
-            break;
-        case ExpressionType::LESSTHAN:
-            return $this->_prepareBinaryExpression(self::LESSTHAN, $left, $right);
-            break;
-        case ExpressionType::LESSTHAN_OR_EQUAL:
-            return $this->_prepareBinaryExpression(
-                self::LESSTHAN_OR_EQUAL, $left, $right
-            );
-            break;
-        case ExpressionType::EQUAL:
-            return $this->_prepareBinaryExpression(self::EQUAL, $left, $right);
-            break;
-        case ExpressionType::NOTEQUAL:
-            return $this->_prepareBinaryExpression(self::NOTEQUAL, $left, $right);
-            break;
-        default:
-            throw new \InvalidArgumentException('onArithmeticExpression');
+            case ExpressionType::GREATERTHAN:
+                return $this->_prepareBinaryExpression(self::GREATERTHAN, $left, $right);
+                break;
+            case ExpressionType::GREATERTHAN_OR_EQUAL:
+                return $this->_prepareBinaryExpression(
+                    self::GREATERTHAN_OR_EQUAL, $left, $right
+                );
+                break;
+            case ExpressionType::LESSTHAN:
+                return $this->_prepareBinaryExpression(self::LESSTHAN, $left, $right);
+                break;
+            case ExpressionType::LESSTHAN_OR_EQUAL:
+                return $this->_prepareBinaryExpression(
+                    self::LESSTHAN_OR_EQUAL, $left, $right
+                );
+                break;
+            case ExpressionType::EQUAL:
+                return $this->_prepareBinaryExpression(self::EQUAL, $left, $right);
+                break;
+            case ExpressionType::NOTEQUAL:
+                return $this->_prepareBinaryExpression(self::NOTEQUAL, $left, $right);
+                break;
+            default:
+                throw new \InvalidArgumentException('onArithmeticExpression');
         }
     }
 
@@ -182,14 +182,14 @@ 
     public function onUnaryExpression($expressionType, $child)
     {
         switch($expressionType) {
-        case ExpressionType::NEGATE:
-            return $this->_prepareUnaryExpression(self::NEGATE, $child);
-            break;
-        case ExpressionType::NOT_LOGICAL:
-            return $this->_prepareUnaryExpression(self::LOGICAL_NOT, $child);
-            break;
-        default:
-            throw new \InvalidArgumentException('onUnaryExpression');
+            case ExpressionType::NEGATE:
+                return $this->_prepareUnaryExpression(self::NEGATE, $child);
+                break;
+            case ExpressionType::NOT_LOGICAL:
+                return $this->_prepareUnaryExpression(self::LOGICAL_NOT, $child);
+                break;
+            default:
+                throw new \InvalidArgumentException('onUnaryExpression');
         }
     }
 
@@ -298,103 +298,103 @@ 
     public function onFunctionCallExpression($functionDescription, $params)
     {
         switch($functionDescription->functionName) {
-        case ODataConstants::STRFUN_COMPARE:
-            return "STRCMP($params[0]; $params[1])";
-            break;
-        case ODataConstants::STRFUN_ENDSWITH:
-          return "(($params[1]) = RIGHT(($params[0]), LEN($params[1])))";
-            break;
-        case ODataConstants::STRFUN_INDEXOF:
-          // In SQLServer the index of string starts from 1, but in OData
-          // the string start with index 0, so the below subtraction of 1
-          return "(CHARINDEX($params[1], $params[0]) - 1)";
-            break;
-        case ODataConstants::STRFUN_REPLACE:
-          return "REPLACE($params[0], $params[1], $params[2])";
-            break;
-        case ODataConstants::STRFUN_STARTSWITH:
-          return "(($params[1]) = LEFT(($params[0]), LEN($params[1])))";
-            break;
-        case ODataConstants::STRFUN_TOLOWER:
-          return "LOWER($params[0])";
-            break;
-        case ODataConstants::STRFUN_TOUPPER:
-          return "UPPER($params[0])";
-            break;
-        case ODataConstants::STRFUN_TRIM:
-          // OData supports trim function
-          // We don't have the same function SQL Server, so use SQL functions LTRIM and RTRIM together
-          // to achieve TRIM functionality.
-          return "RTRIM(LTRIM($params[0]))";
-            break;
-        case ODataConstants::STRFUN_SUBSTRING:
-          if (count($params) == 3) {
-            // 3 Param version of OData substring
-              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:
-            //
-            // SUBSTRING ( value_expression , start_expression , length_expression )
-            // http://msdn.microsoft.com/en-us/library/ms187748.aspx
-            //
-            // If the sum of start_expression and length_expression is greater than the number of characters 
-            // 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)";
-            break;
-        case ODataConstants::STRFUN_CONCAT:
-            return "$params[0] + $params[1]";
-            break;
-        case ODataConstants::STRFUN_LENGTH:
-            return "LEN($params[0])";
-            break;
-        case ODataConstants::GUIDFUN_EQUAL:
-            return "($params[0] = $params[1])";
-            break;
-        case ODataConstants::DATETIME_COMPARE:
-            return "DATETIMECMP($params[0]; $params[1])";
-            break;
-        case ODataConstants::DATETIME_YEAR:
-            return "YEAR($params[0])";
-            break;
-        case ODataConstants::DATETIME_MONTH:
-            return "MONTH($params[0])";
-            break;
-        case ODataConstants::DATETIME_DAY:
-            return "DAY($params[0])";
-            break;
-        case ODataConstants::DATETIME_HOUR:
-            return "DATENAME(HOUR, $params[0])";
-            break;
-        case ODataConstants::DATETIME_MINUTE:
-            return "DATENAME(MINUTE, $params[0])";
-            break;
-        case ODataConstants::DATETIME_SECOND:
-            return "DATENAME(SECOND, $params[0])";
-            break;                
-        case ODataConstants::MATHFUN_ROUND:
-            return "ROUND($params[0], $this->_default_round)";
-            break;
-        case ODataConstants::MATHFUN_CEILING:
-            return "CEILING($params[0])";
-            break;
-        case ODataConstants::MATHFUN_FLOOR:
-            return "FLOOR($params[0])";
-            break;
-        case ODataConstants::BINFUL_EQUAL:
-            return "($params[0] = $params[1])";
-            break;
+            case ODataConstants::STRFUN_COMPARE:
+                return "STRCMP($params[0]; $params[1])";
+                break;
+            case ODataConstants::STRFUN_ENDSWITH:
+              return "(($params[1]) = RIGHT(($params[0]), LEN($params[1])))";
+                break;
+            case ODataConstants::STRFUN_INDEXOF:
+              // In SQLServer the index of string starts from 1, but in OData
+              // the string start with index 0, so the below subtraction of 1
+              return "(CHARINDEX($params[1], $params[0]) - 1)";
+                break;
+            case ODataConstants::STRFUN_REPLACE:
+              return "REPLACE($params[0], $params[1], $params[2])";
+                break;
+            case ODataConstants::STRFUN_STARTSWITH:
+              return "(($params[1]) = LEFT(($params[0]), LEN($params[1])))";
+                break;
+            case ODataConstants::STRFUN_TOLOWER:
+              return "LOWER($params[0])";
+                break;
+            case ODataConstants::STRFUN_TOUPPER:
+              return "UPPER($params[0])";
+                break;
+            case ODataConstants::STRFUN_TRIM:
+              // OData supports trim function
+              // We don't have the same function SQL Server, so use SQL functions LTRIM and RTRIM together
+              // to achieve TRIM functionality.
+              return "RTRIM(LTRIM($params[0]))";
+                break;
+            case ODataConstants::STRFUN_SUBSTRING:
+              if (count($params) == 3) {
+                // 3 Param version of OData substring
+                  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:
+                //
+                // SUBSTRING ( value_expression , start_expression , length_expression )
+                // http://msdn.microsoft.com/en-us/library/ms187748.aspx
+                //
+                // If the sum of start_expression and length_expression is greater than the number of characters 
+                // 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)";
+                break;
+            case ODataConstants::STRFUN_CONCAT:
+                return "$params[0] + $params[1]";
+                break;
+            case ODataConstants::STRFUN_LENGTH:
+                return "LEN($params[0])";
+                break;
+            case ODataConstants::GUIDFUN_EQUAL:
+                return "($params[0] = $params[1])";
+                break;
+            case ODataConstants::DATETIME_COMPARE:
+                return "DATETIMECMP($params[0]; $params[1])";
+                break;
+            case ODataConstants::DATETIME_YEAR:
+                return "YEAR($params[0])";
+                break;
+            case ODataConstants::DATETIME_MONTH:
+                return "MONTH($params[0])";
+                break;
+            case ODataConstants::DATETIME_DAY:
+                return "DAY($params[0])";
+                break;
+            case ODataConstants::DATETIME_HOUR:
+                return "DATENAME(HOUR, $params[0])";
+                break;
+            case ODataConstants::DATETIME_MINUTE:
+                return "DATENAME(MINUTE, $params[0])";
+                break;
+            case ODataConstants::DATETIME_SECOND:
+                return "DATENAME(SECOND, $params[0])";
+                break;                
+            case ODataConstants::MATHFUN_ROUND:
+                return "ROUND($params[0], $this->_default_round)";
+                break;
+            case ODataConstants::MATHFUN_CEILING:
+                return "CEILING($params[0])";
+                break;
+            case ODataConstants::MATHFUN_FLOOR:
+                return "FLOOR($params[0])";
+                break;
+            case ODataConstants::BINFUL_EQUAL:
+                return "($params[0] = $params[1])";
+                break;
          case 'is_null':
             return "is_null($params[0])";
             break;
 
-        default:
-            throw new \InvalidArgumentException('onFunctionCallExpression');
+            default:
+                throw new \InvalidArgumentException('onFunctionCallExpression');
         }
     }
 

Spacing +16 added lines, -16 removed lines

@@ -88,7 +88,7 @@ 
      */
     public function onLogicalExpression($expressionType, $left, $right)
     {
-        switch($expressionType) {
+        switch ($expressionType) {
         case ExpressionType::AND_LOGICAL:
             return $this->_prepareBinaryExpression(self::LOGICAL_AND, $left, $right);
             break;
@@ -111,7 +111,7 @@ 
      */
     public function onArithmeticExpression($expressionType, $left, $right)
     {
-        switch($expressionType) {
+        switch ($expressionType) {
         case ExpressionType::MULTIPLY:
             return $this->_prepareBinaryExpression(self::MULTIPLY, $left, $right);
             break;
@@ -143,7 +143,7 @@ 
      */
     public function onRelationalExpression($expressionType, $left, $right)
     {
-        switch($expressionType) {
+        switch ($expressionType) {
         case ExpressionType::GREATERTHAN:
             return $this->_prepareBinaryExpression(self::GREATERTHAN, $left, $right);
             break;
@@ -181,7 +181,7 @@ 
      */
     public function onUnaryExpression($expressionType, $child)
     {
-        switch($expressionType) {
+        switch ($expressionType) {
         case ExpressionType::NEGATE:
             return $this->_prepareUnaryExpression(self::NEGATE, $child);
             break;
@@ -297,7 +297,7 @@ 
      */
     public function onFunctionCallExpression($functionDescription, $params)
     {
-        switch($functionDescription->functionName) {
+        switch ($functionDescription->functionName) {
         case ODataConstants::STRFUN_COMPARE:
             return "STRCMP($params[0]; $params[1])";
             break;
@@ -423,12 +423,12 @@ 
                     $operator = "!".$operator;
               }
               return self::OPEN_BRAKET 
-                    . $str[0] . ' ' . $operator 
-                    . ' ' . $str[1] . self::CLOSE_BRACKET;
+                    . $str[0].' '.$operator 
+                    . ' '.$str[1].self::CLOSE_BRACKET;
             } else {
                 return self::OPEN_BRAKET 
-                    . $str[0] . ' ' . $operator 
-                    . ' ' . $str[1] . self::CLOSE_BRACKET;
+                    . $str[0].' '.$operator 
+                    . ' '.$str[1].self::CLOSE_BRACKET;
             }
         }
         
@@ -447,19 +447,19 @@ 
               $operator = "!".$operator;
             }
             return self::OPEN_BRAKET
-            . $str[0] . ' ' . $operator
-            . ' ' . $str[1] . self::CLOSE_BRACKET;
+            . $str[0].' '.$operator
+            . ' '.$str[1].self::CLOSE_BRACKET;
           } else {
             return self::OPEN_BRAKET
-            . $str[0] . ' ' . $operator
-            . ' ' . $str[1] . self::CLOSE_BRACKET;
+            . $str[0].' '.$operator
+            . ' '.$str[1].self::CLOSE_BRACKET;
           }
         }
 
         return 
             self::OPEN_BRAKET 
-            . $left . ' ' . $operator 
-            . ' ' . $right . self::CLOSE_BRACKET;
+            . $left.' '.$operator 
+            . ' '.$right.self::CLOSE_BRACKET;
     }
 
     /**
@@ -472,6 +472,6 @@ 
      */
     private function _prepareUnaryExpression($operator, $child)
     {
-        return $operator . self::OPEN_BRAKET . $child . self::CLOSE_BRACKET;
+        return $operator.self::OPEN_BRAKET.$child.self::CLOSE_BRACKET;
     }
 }

services/NorthWind/NorthWindMetadata.php

Doc Comments +1 added lines, -1 removed lines

@@ -172,7 +172,7 @@
      * 
      * @throws InvalidOperationException
      * 
-     * @return NorthWindMetadata
+     * @return SimpleMetadataProvider
      */
     public static function create()
     {

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

Doc Comments +6 added lines, -5 removed lines

@@ -418,7 +418,7 @@ 
      * 
      * @param array $record each row of customer
      * 
-     * @return object
+     * @return Customer
      */
     private function _serializeCustomer($record)
     {
@@ -461,7 +461,8 @@ 
      * 
      * @param Object &$src    source
      * @param Object &$target target
-     * @param Object $tag     tag
+     * @param integer $tag     tag
+     * @param Address $target
      * 
      * @return void
      */
@@ -503,7 +504,7 @@ 
      * 
      * @param array $record each row of customer
      * 
-     * @return object
+     * @return Order
      */
     private function _serializeOrder($record)
     {
@@ -547,7 +548,7 @@ 
      * 
      * @param array $record each row of employee
      * 
-     * @return object
+     * @return Employee
      */
     private function _serializeEmployee($record)
     {
@@ -595,7 +596,7 @@ 
      * 
      * @param array $record each row of order detail
      * 
-     * @return object
+     * @return Order_Details
      */
     private function _serializeOrderDetail($record)
     {

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;
+        }
     }
 
     /**

Switch Indentation +24 added lines, -24 removed lines

@@ -118,18 +118,18 @@ 
         }
         $returnResult = array();
         switch ($resourceSetName) {
-        case 'Customers':
-            $returnResult = $this->_serializeCustomers($stmt);
-            break;
-        case 'Orders':
-            $returnResult = $this->_serializeOrders($stmt);
-            break;
-        case 'Order Details':
-            $returnResult = $this->_serializeOrderDetails($stmt);
-            break;
-        case 'Employees':
-            $returnResult = $this->_serializeEmployees($stmt);
-            break;
+            case 'Customers':
+                $returnResult = $this->_serializeCustomers($stmt);
+                break;
+            case 'Orders':
+                $returnResult = $this->_serializeOrders($stmt);
+                break;
+            case 'Order Details':
+                $returnResult = $this->_serializeOrderDetails($stmt);
+                break;
+            case 'Employees':
+                $returnResult = $this->_serializeEmployees($stmt);
+                break;
         }
         sqlsrv_free_stmt($stmt);
         return $returnResult;
@@ -183,18 +183,18 @@ 
         $result = null;
         while ( $record = sqlsrv_fetch_array($stmt, SQLSRV_FETCH_ASSOC)) {
             switch ($resourceSetName) {
-            case 'Customers':
-                $result = $this->_serializeCustomer($record);
-                break;
-            case 'Orders':                    
-                $result = $this->_serializeOrder($record);
-                break;
-            case 'Order Details':                    
-                $result = $this->_serializeOrderDetail($record);
-                break;
-            case 'Employees':
-                $result = $this->_serializeEmployee($record);
-                break;
+                case 'Customers':
+                    $result = $this->_serializeCustomer($record);
+                    break;
+                case 'Orders':                    
+                    $result = $this->_serializeOrder($record);
+                    break;
+                case 'Order Details':                    
+                    $result = $this->_serializeOrderDetail($record);
+                    break;
+                case 'Employees':
+                    $result = $this->_serializeEmployee($record);
+                    break;
             }
         }
         sqlsrv_free_stmt($stmt);

Spacing +44 added lines, -44 removed lines

@@ -47,7 +47,7 @@ 
     	}
 
         $this->_connectionHandle = sqlsrv_connect(SERVER, $connectionInfo);
-        if ( $this->_connectionHandle ) {        	
+        if ($this->_connectionHandle) {        	
         } else {
             $errorAsString = self::_getSQLSRVError();
         	throw ODataException::createInternalServerError($errorAsString);
@@ -92,15 +92,15 @@ 
      * @return array(Object)
      */
     public function getResourceSet(ResourceSet $resourceSet, $filterOption = null, 
-        $select=null, $orderby=null, $top=null, $skip=null
+        $select = null, $orderby = null, $top = null, $skip = null
     ) {
-        $resourceSetName =  $resourceSet->getName();
+        $resourceSetName = $resourceSet->getName();
         if ($resourceSetName !== 'Customers' 
             && $resourceSetName !== 'Orders' 
             && $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') {
@@ -109,7 +109,7 @@ 
 
         $query = "SELECT * FROM [$resourceSetName]";
         if ($filterOption != null) {
-            $query .= ' WHERE ' . $filterOption;
+            $query .= ' WHERE '.$filterOption;
         }
         $stmt = sqlsrv_query($this->_connectionHandle, $query);
         if ($stmt === false) {
@@ -146,14 +146,14 @@ 
      */
     public function getResourceFromResourceSet(ResourceSet $resourceSet, KeyDescriptor $keyDescriptor)
     {   
-        $resourceSetName =  $resourceSet->getName();
+        $resourceSetName = $resourceSet->getName();
         if ($resourceSetName !== 'Customers' 
             && $resourceSetName !== 'Orders' 
             && $resourceSetName !== 'Order_Details' 
             && $resourceSetName !== 'Products' 
             && $resourceSetName !== 'Employees'
         ) {
-            die('(NorthWindQueryProvider) Unknown resource set ' . $resourceSetName);    
+            die('(NorthWindQueryProvider) Unknown resource set '.$resourceSetName);    
         }
 
         if ($resourceSetName === 'Order_Details') {
@@ -163,7 +163,7 @@ 
         $namedKeyValues = $keyDescriptor->getValidatedNamedValues();
         $condition = null;
         foreach ($namedKeyValues as $key => $value) {
-            $condition .= $key . ' = ' . $value[0] . ' and ';
+            $condition .= $key.' = '.$value[0].' and ';
         }
 
         $len = strlen($condition);
@@ -181,7 +181,7 @@ 
         }
 
         $result = null;
-        while ( $record = sqlsrv_fetch_array($stmt, SQLSRV_FETCH_ASSOC)) {
+        while ($record = sqlsrv_fetch_array($stmt, SQLSRV_FETCH_ASSOC)) {
             switch ($resourceSetName) {
             case 'Customers':
                 $result = $this->_serializeCustomer($record);
@@ -227,7 +227,7 @@ 
         $navigationPropName = $targetProperty->getName();
         $key = null;
         foreach ($keyDescriptor->getValidatedNamedValues() as $keyName => $valueDescription) {
-            $key = $key . $keyName . '=' . $valueDescription[0] . ' and ';
+            $key = $key.$keyName.'='.$valueDescription[0].' and ';
         }
 
         $key = rtrim($key, ' and ');
@@ -242,7 +242,7 @@ 
 
                 $result = $this->_serializeOrders($stmt);
             } else {
-                die('Customer does not have navigation porperty with name: ' . $navigationPropName);
+                die('Customer does not have navigation porperty with name: '.$navigationPropName);
             }            
         } else if ($srcClass === 'Order') {
             if ($navigationPropName === 'Order_Details') {
@@ -255,7 +255,7 @@ 
 
                 $result = $this->_serializeOrderDetails($stmt);
             } else {
-                die('Order does not have navigation porperty with name: ' . $navigationPropName);
+                die('Order does not have navigation porperty with name: '.$navigationPropName);
             }
         } 
 
@@ -287,7 +287,7 @@ 
         ResourceSet $targetResourceSet,
         ResourceProperty $targetProperty, 
         $filterOption = null,
-        $select=null, $orderby=null, $top=null, $skip=null
+        $select = null, $orderby = null, $top = null, $skip = null
     ) {    
         $result = array();
         $srcClass = get_class($sourceEntityInstance);
@@ -296,7 +296,7 @@ 
             if ($navigationPropName === 'Orders') {                
                 $query = "SELECT * FROM Orders WHERE CustomerID = '$sourceEntityInstance->CustomerID'";
                 if ($filterOption != null) {
-                    $query .= ' AND ' . $filterOption;
+                    $query .= ' AND '.$filterOption;
                 }
                 $stmt = sqlsrv_query($this->_connectionHandle, $query);
                 if ($stmt === false) {
@@ -306,13 +306,13 @@ 
 
                 $result = $this->_serializeOrders($stmt);
             } else {
-                die('Customer does not have navigation porperty with name: ' . $navigationPropName);
+                die('Customer does not have navigation porperty with name: '.$navigationPropName);
             }            
         } else if ($srcClass === 'Order') {
             if ($navigationPropName === 'Order_Details') {
                 $query = "SELECT * FROM [Order Details] WHERE OrderID = $sourceEntityInstance->OrderID";
                 if ($filterOption != null) {
-                    $query .= ' AND ' . $filterOption;
+                    $query .= ' AND '.$filterOption;
                 }
                 $stmt = sqlsrv_query($this->_connectionHandle, $query);
                 if ($stmt === false) {            
@@ -322,7 +322,7 @@ 
 
                 $result = $this->_serializeOrderDetails($stmt);
             } else {
-                die('Order does not have navigation porperty with name: ' . $navigationPropName);
+                die('Order does not have navigation porperty with name: '.$navigationPropName);
             }
         }
 
@@ -362,13 +362,13 @@ 
                     }
 
                     if (!sqlsrv_has_rows($stmt)) {
-                        $result =  null;
+                        $result = null;
                     }
 
                     $result = $this->_serializeCustomer(sqlsrv_fetch_array($stmt, SQLSRV_FETCH_ASSOC));
                 }
             } else {
-                die('Customer does not have navigation porperty with name: ' . $navigationPropName);
+                die('Customer does not have navigation porperty with name: '.$navigationPropName);
             }            
         } else if ($srcClass === 'Order_Details') {
             if ($navigationPropName === 'Order') {
@@ -383,13 +383,13 @@ 
                     }
                     
                     if (!sqlsrv_has_rows($stmt)) {
-                        $result =  null;
+                        $result = null;
                     }
                     
                     $result = $this->_serializeOrder(sqlsrv_fetch_array($stmt, SQLSRV_FETCH_ASSOC));
                 }
             } else {
-                die('Order_Details does not have navigation porperty with name: ' . $navigationPropName);
+                die('Order_Details does not have navigation porperty with name: '.$navigationPropName);
             }
         } 
 
@@ -437,14 +437,14 @@ 
         $customer->Address->Country = $record['Country'];
         //Set alternate address
         $customer->Address->AltAddress = new Address();
-        $customer->Address->AltAddress->StreetName = 'ALT_' . $customer->Address->StreetName;
-        $customer->Address->AltAddress->City = 'ALT_' . $customer->Address->City;
-        $customer->Address->AltAddress->Region = 'ALT_' . $customer->Address->Region;
-        $customer->Address->AltAddress->PostalCode = 'ALT_' . $customer->Address->PostalCode;
-        $customer->Address->AltAddress->Country = 'ALT_' . $customer->Address->Country;
+        $customer->Address->AltAddress->StreetName = 'ALT_'.$customer->Address->StreetName;
+        $customer->Address->AltAddress->City = 'ALT_'.$customer->Address->City;
+        $customer->Address->AltAddress->Region = 'ALT_'.$customer->Address->Region;
+        $customer->Address->AltAddress->PostalCode = 'ALT_'.$customer->Address->PostalCode;
+        $customer->Address->AltAddress->Country = 'ALT_'.$customer->Address->Country;
         $customer->EmailAddresses = array();
         for ($i = 1; $i < 4; $i++) {
-            $customer->EmailAddresses[] = $customer->CustomerID . $i . '@live.com'; 
+            $customer->EmailAddresses[] = $customer->CustomerID.$i.'@live.com'; 
         }
 
         $customer->OtherAddresses = array();
@@ -467,18 +467,18 @@ 
      */
     private function _copyAddress(&$src, &$target, $tag)
     {
-        $target->StreetName = $src->StreetName . $tag;
-        $target->City = $src->City . $tag;
-        $target->Region = $src->Region . $tag;
-        $target->PostalCode = $src->PostalCode . $tag;
-        $target->Country = $src->Country . $tag;
+        $target->StreetName = $src->StreetName.$tag;
+        $target->City = $src->City.$tag;
+        $target->Region = $src->Region.$tag;
+        $target->PostalCode = $src->PostalCode.$tag;
+        $target->Country = $src->Country.$tag;
         
         $target->AltAddress = new Address();
-        $target->AltAddress->StreetName = $target->AltAddress->StreetName . $tag;
-        $target->AltAddress->City = $target->AltAddress->City . $tag;
-        $target->AltAddress->Region = $target->AltAddress->Region . $tag;
-        $target->AltAddress->PostalCode = $target->AltAddress->PostalCode . $tag;
-        $target->AltAddress->Country = $target->AltAddress->Country . $tag;
+        $target->AltAddress->StreetName = $target->AltAddress->StreetName.$tag;
+        $target->AltAddress->City = $target->AltAddress->City.$tag;
+        $target->AltAddress->Region = $target->AltAddress->Region.$tag;
+        $target->AltAddress->PostalCode = $target->AltAddress->PostalCode.$tag;
+        $target->AltAddress->Country = $target->AltAddress->Country.$tag;
     }
 
     /**
@@ -491,7 +491,7 @@ 
     private function _serializeOrders($result)
     {
         $orders = array();
-        while ( $record = sqlsrv_fetch_array($result, SQLSRV_FETCH_ASSOC)) {
+        while ($record = sqlsrv_fetch_array($result, SQLSRV_FETCH_ASSOC)) {
              $orders[] = $this->_serializeOrder($record);
         }
 
@@ -511,9 +511,9 @@ 
         $order->OrderID = $record['OrderID'];
         $order->CustomerID = $record['CustomerID'];
         $order->EmployeeID = $record['EmployeeID'];
-        $order->OrderDate = !is_null($record['OrderDate']) ? $record['OrderDate']->format('Y-m-d\TH:i:s'): null;
-        $order->RequiredDate = !is_null($record['RequiredDate']) ? $record['RequiredDate']->format('Y-m-d\TH:i:s'): null;
-        $order->ShippedDate = !is_null($record['ShippedDate']) ? $record['ShippedDate']->format('Y-m-d\TH:i:s'): null;
+        $order->OrderDate = !is_null($record['OrderDate']) ? $record['OrderDate']->format('Y-m-d\TH:i:s') : null;
+        $order->RequiredDate = !is_null($record['RequiredDate']) ? $record['RequiredDate']->format('Y-m-d\TH:i:s') : null;
+        $order->ShippedDate = !is_null($record['ShippedDate']) ? $record['ShippedDate']->format('Y-m-d\TH:i:s') : null;
         $order->ShipVia = $record['ShipVia'];
         $order->Freight = $record['Freight'];
         $order->ShipName = $record['ShipName'];
@@ -557,8 +557,8 @@ 
         $employee->LastName = $record['LastName'];
         $employee->Title = $record['Title'];
         $employee->TitleOfCourtesy = $record['TitleOfCourtesy'];
-        $employee->BirthDate = !is_null($record['BirthDate']) ? $record['BirthDate']->format('Y-m-d\TH:i:s'): null;
-        $employee->HireDate = !is_null($record['HireDate']) ? $record['HireDate']->format('Y-m-d\TH:i:s'): null;        
+        $employee->BirthDate = !is_null($record['BirthDate']) ? $record['BirthDate']->format('Y-m-d\TH:i:s') : null;
+        $employee->HireDate = !is_null($record['HireDate']) ? $record['HireDate']->format('Y-m-d\TH:i:s') : null;        
         $employee->Address = $record['Address'];
         $employee->City = $record['City'];
         $employee->Region = $record['Region'];
@@ -569,7 +569,7 @@ 
         $employee->Notes = $record['Notes'];
         $employee->ReportsTo = $record['ReportsTo'];
         //$employee->Photo = $record['Photo'];
-        $employee->Emails = array ($employee->FirstName . '@hotmail.com', $employee->FirstName . '@live.com');
+        $employee->Emails = array($employee->FirstName.'@hotmail.com', $employee->FirstName.'@live.com');
         return $employee;
     }
 

services/NorthWind/NorthWindStreamProvider.php

Doc Comments +2 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
      * @param WebOperationContext $operationContext     A reference to the context
      *                                                  for the current operation.
      *
-     * @return mixed A valid  default stream which is associated with the entity, 
+     * @return string A valid  default stream which is associated with the entity, 
      * Null should never be returned from this method.
      *
      * @throws ODataException if a valid stream cannot be returned.  
@@ -212,7 +212,7 @@ 
      *                                                  conditional request.
      * @param WebOperationContext $operationContext     A reference to the context for the current operation.
      *
-     * @return mixed A valid stream the data service use to query/read a named stream which is
+     * @return string A valid stream the data service use to query/read a named stream which is
      * associated with the $entity. Null may be returned from this method if the requested named
      * stream has not been created since the creation of $entity. The data service will respond 
      * with 204 if this method returns null.

Indentation +1 added lines, -1 removed lines

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

Spacing +3 added lines, -3 removed lines

@@ -76,7 +76,7 @@ 
         }
 
         $filePath = self::IMAGE_PATH_ROOT 
-            . 'Employee_' . $entity->EmployeeID 
+            . 'Employee_'.$entity->EmployeeID 
             . '.jpg';
         if (file_exists($filePath)) {
             $handle = fopen($filePath, 'r');
@@ -152,7 +152,7 @@ 
         }
 
         $lastModifiedTime = null;
-        $filePath = self::IMAGE_PATH_ROOT . 'Employee_' . $entity->EmployeeID . '.jpg';
+        $filePath = self::IMAGE_PATH_ROOT.'Employee_'.$entity->EmployeeID.'.jpg';
         if (file_exists($filePath)) {
             $lastModifiedTime = date("\"m-d-Y H:i:s\"", filemtime($filePath));
         } else {
@@ -236,7 +236,7 @@ 
             throw new ODataException('Internal Server Error.', 500);
         }
         
-        $filePath = self::IMAGE_PATH_ROOT . 'Employee_' 
+        $filePath = self::IMAGE_PATH_ROOT.'Employee_' 
             . $entity->EmployeeID 
             . '_' 
             . $resourceStreamInfo->getName() 

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();

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
      */
     public function getService($serviceType)
     {
-      if(($serviceType === 'IMetadataProvider') ||
+      if (($serviceType === 'IMetadataProvider') ||
         ($serviceType === 'IQueryProvider') ||
         ($serviceType === 'IStreamProvider')) {
         if (is_null($this->_wordPressExpressionProvider)) {

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 

Switch Indentation +136 added lines, -136 removed lines

@@ -85,14 +85,14 @@ 
     public function onLogicalExpression($expressionType, $left, $right)
     {
         switch($expressionType) {
-        case ExpressionType::AND_LOGICAL:
-            return $this->_prepareBinaryExpression(self::LOGICAL_AND, $left, $right);
-            break;
-        case ExpressionType::OR_LOGICAL:
-            return $this->_prepareBinaryExpression(self::LOGICAL_OR, $left, $right);
-            break;
-        default:
-            throw new \InvalidArgumentException('onLogicalExpression');
+            case ExpressionType::AND_LOGICAL:
+                return $this->_prepareBinaryExpression(self::LOGICAL_AND, $left, $right);
+                break;
+            case ExpressionType::OR_LOGICAL:
+                return $this->_prepareBinaryExpression(self::LOGICAL_OR, $left, $right);
+                break;
+            default:
+                throw new \InvalidArgumentException('onLogicalExpression');
         }
     }
 
@@ -108,23 +108,23 @@ 
     public function onArithmeticExpression($expressionType, $left, $right)
     {
         switch($expressionType) {
-        case ExpressionType::MULTIPLY:
-            return $this->_prepareBinaryExpression(self::MULTIPLY, $left, $right);
-            break;
-        case ExpressionType::DIVIDE:
-            return $this->_prepareBinaryExpression(self::DIVIDE, $left, $right);
-            break;
-        case ExpressionType::MODULO:
-            return $this->_prepareBinaryExpression(self::MODULO, $left, $right);
-            break;
-        case ExpressionType::ADD:
-            return $this->_prepareBinaryExpression(self::ADD, $left, $right);
-            break;
-        case ExpressionType::SUBTRACT:
-            return $this->_prepareBinaryExpression(self::SUBTRACT, $left, $right);
-            break;
-        default:
-            throw new \InvalidArgumentException('onArithmeticExpression');
+            case ExpressionType::MULTIPLY:
+                return $this->_prepareBinaryExpression(self::MULTIPLY, $left, $right);
+                break;
+            case ExpressionType::DIVIDE:
+                return $this->_prepareBinaryExpression(self::DIVIDE, $left, $right);
+                break;
+            case ExpressionType::MODULO:
+                return $this->_prepareBinaryExpression(self::MODULO, $left, $right);
+                break;
+            case ExpressionType::ADD:
+                return $this->_prepareBinaryExpression(self::ADD, $left, $right);
+                break;
+            case ExpressionType::SUBTRACT:
+                return $this->_prepareBinaryExpression(self::SUBTRACT, $left, $right);
+                break;
+            default:
+                throw new \InvalidArgumentException('onArithmeticExpression');
         }
     }
 
@@ -140,30 +140,30 @@ 
     public function onRelationalExpression($expressionType, $left, $right)
     {
         switch($expressionType) {
-        case ExpressionType::GREATERTHAN:
-            return $this->_prepareBinaryExpression(self::GREATERTHAN, $left, $right);
-            break;
-        case ExpressionType::GREATERTHAN_OR_EQUAL:
-            return $this->_prepareBinaryExpression(
-                self::GREATERTHAN_OR_EQUAL, $left, $right
-            );
-            break;
-        case ExpressionType::LESSTHAN:
-            return $this->_prepareBinaryExpression(self::LESSTHAN, $left, $right);
-            break;
-        case ExpressionType::LESSTHAN_OR_EQUAL:
-            return $this->_prepareBinaryExpression(
-                self::LESSTHAN_OR_EQUAL, $left, $right
-            );
-            break;
-        case ExpressionType::EQUAL:
-            return $this->_prepareBinaryExpression(self::EQUAL, $left, $right);
-            break;
-        case ExpressionType::NOTEQUAL:
-            return $this->_prepareBinaryExpression(self::NOTEQUAL, $left, $right);
-            break;
-        default:
-            throw new \InvalidArgumentException('onArithmeticExpression');
+            case ExpressionType::GREATERTHAN:
+                return $this->_prepareBinaryExpression(self::GREATERTHAN, $left, $right);
+                break;
+            case ExpressionType::GREATERTHAN_OR_EQUAL:
+                return $this->_prepareBinaryExpression(
+                    self::GREATERTHAN_OR_EQUAL, $left, $right
+                );
+                break;
+            case ExpressionType::LESSTHAN:
+                return $this->_prepareBinaryExpression(self::LESSTHAN, $left, $right);
+                break;
+            case ExpressionType::LESSTHAN_OR_EQUAL:
+                return $this->_prepareBinaryExpression(
+                    self::LESSTHAN_OR_EQUAL, $left, $right
+                );
+                break;
+            case ExpressionType::EQUAL:
+                return $this->_prepareBinaryExpression(self::EQUAL, $left, $right);
+                break;
+            case ExpressionType::NOTEQUAL:
+                return $this->_prepareBinaryExpression(self::NOTEQUAL, $left, $right);
+                break;
+            default:
+                throw new \InvalidArgumentException('onArithmeticExpression');
         }
     }
 
@@ -178,14 +178,14 @@ 
     public function onUnaryExpression($expressionType, $child)
     {
         switch($expressionType) {
-        case ExpressionType::NEGATE:
-            return $this->_prepareUnaryExpression(self::NEGATE, $child);
-            break;
-        case ExpressionType::NOT_LOGICAL:
-            return $this->_prepareUnaryExpression(self::LOGICAL_NOT, $child);
-            break;
-        default:
-            throw new \InvalidArgumentException('onUnaryExpression');
+            case ExpressionType::NEGATE:
+                return $this->_prepareUnaryExpression(self::NEGATE, $child);
+                break;
+            case ExpressionType::NOT_LOGICAL:
+                return $this->_prepareUnaryExpression(self::LOGICAL_NOT, $child);
+                break;
+            default:
+                throw new \InvalidArgumentException('onUnaryExpression');
         }
     }
 
@@ -244,86 +244,86 @@ 
     public function onFunctionCallExpression($functionDescription, $params)
     {
         switch($functionDescription->functionName) {
-        case ODataConstants::STRFUN_COMPARE:
-            return "STRCMP($params[0], $params[1])";
-            break;
-        case ODataConstants::STRFUN_ENDSWITH:
-          return "(STRCMP($params[1],RIGHT($params[0],LENGTH($params[1]))) = 0)";
-            break;
-        case ODataConstants::STRFUN_INDEXOF:
-            return "INSTR($params[0], $params[1]) - 1";
-            break;
-        case ODataConstants::STRFUN_REPLACE:
-          return "REPLACE($params[0],$params[1],$params[2])";
-            break;
-        case ODataConstants::STRFUN_STARTSWITH:
-          return "(STRCMP($params[1],LEFT($params[0],LENGTH($params[1]))) = 0)";
-            break; 
-        case ODataConstants::STRFUN_TOLOWER:
-          return "LOWER($params[0])";
-            break;
-        case ODataConstants::STRFUN_TOUPPER:
-          return "UPPER($params[0])";
-            break;
-        case ODataConstants::STRFUN_TRIM:
-          return "TRIM($params[0])";
-            break;
-        case ODataConstants::STRFUN_SUBSTRING:
-            return count($params) == 3 ?
-                "SUBSTRING($params[0], $params[1] + 1, $params[2])" :
-                "SUBSTRING($params[0], $params[1] + 1)";
-            break;
-        case ODataConstants::STRFUN_SUBSTRINGOF:
-            return "(LOCATE($params[0], $params[1]) > 0)";
-            break;
-        case ODataConstants::STRFUN_CONCAT:
-            return "CONCAT($params[0],$params[1])";
-            break;
-        case ODataConstants::STRFUN_LENGTH:
-            return "LENGTH($params[0])";
-            break;
-        case ODataConstants::GUIDFUN_EQUAL:
-        	return "STRCMP($params[0], $params[1])";
-            break;
-        case ODataConstants::DATETIME_COMPARE:
-            return "DATETIMECMP($params[0]; $params[1])";
-            break;
-        case ODataConstants::DATETIME_YEAR:
-            return "EXTRACT(YEAR from ".$params[0].")";
-            break;
-        case ODataConstants::DATETIME_MONTH:
-            return "EXTRACT(MONTH from ".$params[0].")";
-            break;
-        case ODataConstants::DATETIME_DAY:
-            return "EXTRACT(DAY from ".$params[0].")";
-            break;
-        case ODataConstants::DATETIME_HOUR:
-            return "EXTRACT(HOUR from ".$params[0].")";
-            break;
-        case ODataConstants::DATETIME_MINUTE:
-            return "EXTRACT(MINUTE from ".$params[0].")";
-            break;
-        case ODataConstants::DATETIME_SECOND:
-            return "EXTRACT(SECOND from ".$params[0].")";
-            break;                
-        case ODataConstants::MATHFUN_ROUND:
-            return "ROUND($params[0])";
-            break;
-        case ODataConstants::MATHFUN_CEILING:
-            return "CEIL($params[0])";
-            break;
-        case ODataConstants::MATHFUN_FLOOR:
-            return "FLOOR($params[0])";
-            break;
-        case ODataConstants::BINFUL_EQUAL:
-            return "($params[0] = $params[1])";
-            break;
-        case 'is_null':
-            return "is_null($params[0])";
-            break;
+            case ODataConstants::STRFUN_COMPARE:
+                return "STRCMP($params[0], $params[1])";
+                break;
+            case ODataConstants::STRFUN_ENDSWITH:
+              return "(STRCMP($params[1],RIGHT($params[0],LENGTH($params[1]))) = 0)";
+                break;
+            case ODataConstants::STRFUN_INDEXOF:
+                return "INSTR($params[0], $params[1]) - 1";
+                break;
+            case ODataConstants::STRFUN_REPLACE:
+              return "REPLACE($params[0],$params[1],$params[2])";
+                break;
+            case ODataConstants::STRFUN_STARTSWITH:
+              return "(STRCMP($params[1],LEFT($params[0],LENGTH($params[1]))) = 0)";
+                break; 
+            case ODataConstants::STRFUN_TOLOWER:
+              return "LOWER($params[0])";
+                break;
+            case ODataConstants::STRFUN_TOUPPER:
+              return "UPPER($params[0])";
+                break;
+            case ODataConstants::STRFUN_TRIM:
+              return "TRIM($params[0])";
+                break;
+            case ODataConstants::STRFUN_SUBSTRING:
+                return count($params) == 3 ?
+                    "SUBSTRING($params[0], $params[1] + 1, $params[2])" :
+                    "SUBSTRING($params[0], $params[1] + 1)";
+                break;
+            case ODataConstants::STRFUN_SUBSTRINGOF:
+                return "(LOCATE($params[0], $params[1]) > 0)";
+                break;
+            case ODataConstants::STRFUN_CONCAT:
+                return "CONCAT($params[0],$params[1])";
+                break;
+            case ODataConstants::STRFUN_LENGTH:
+                return "LENGTH($params[0])";
+                break;
+            case ODataConstants::GUIDFUN_EQUAL:
+        	    return "STRCMP($params[0], $params[1])";
+                break;
+            case ODataConstants::DATETIME_COMPARE:
+                return "DATETIMECMP($params[0]; $params[1])";
+                break;
+            case ODataConstants::DATETIME_YEAR:
+                return "EXTRACT(YEAR from ".$params[0].")";
+                break;
+            case ODataConstants::DATETIME_MONTH:
+                return "EXTRACT(MONTH from ".$params[0].")";
+                break;
+            case ODataConstants::DATETIME_DAY:
+                return "EXTRACT(DAY from ".$params[0].")";
+                break;
+            case ODataConstants::DATETIME_HOUR:
+                return "EXTRACT(HOUR from ".$params[0].")";
+                break;
+            case ODataConstants::DATETIME_MINUTE:
+                return "EXTRACT(MINUTE from ".$params[0].")";
+                break;
+            case ODataConstants::DATETIME_SECOND:
+                return "EXTRACT(SECOND from ".$params[0].")";
+                break;                
+            case ODataConstants::MATHFUN_ROUND:
+                return "ROUND($params[0])";
+                break;
+            case ODataConstants::MATHFUN_CEILING:
+                return "CEIL($params[0])";
+                break;
+            case ODataConstants::MATHFUN_FLOOR:
+                return "FLOOR($params[0])";
+                break;
+            case ODataConstants::BINFUL_EQUAL:
+                return "($params[0] = $params[1])";
+                break;
+            case 'is_null':
+                return "is_null($params[0])";
+                break;
             
-        default:
-            throw new \InvalidArgumentException('onFunctionCallExpression');
+            default:
+                throw new \InvalidArgumentException('onFunctionCallExpression');
         }
     }
 

Spacing +11 added lines, -12 removed lines

@@ -84,7 +84,7 @@ 
      */
     public function onLogicalExpression($expressionType, $left, $right)
     {
-        switch($expressionType) {
+        switch ($expressionType) {
         case ExpressionType::AND_LOGICAL:
             return $this->_prepareBinaryExpression(self::LOGICAL_AND, $left, $right);
             break;
@@ -107,7 +107,7 @@ 
      */
     public function onArithmeticExpression($expressionType, $left, $right)
     {
-        switch($expressionType) {
+        switch ($expressionType) {
         case ExpressionType::MULTIPLY:
             return $this->_prepareBinaryExpression(self::MULTIPLY, $left, $right);
             break;
@@ -139,7 +139,7 @@ 
      */
     public function onRelationalExpression($expressionType, $left, $right)
     {
-        switch($expressionType) {
+        switch ($expressionType) {
         case ExpressionType::GREATERTHAN:
             return $this->_prepareBinaryExpression(self::GREATERTHAN, $left, $right);
             break;
@@ -177,7 +177,7 @@ 
      */
     public function onUnaryExpression($expressionType, $child)
     {
-        switch($expressionType) {
+        switch ($expressionType) {
         case ExpressionType::NEGATE:
             return $this->_prepareUnaryExpression(self::NEGATE, $child);
             break;
@@ -243,7 +243,7 @@ 
      */
     public function onFunctionCallExpression($functionDescription, $params)
     {
-        switch($functionDescription->functionName) {
+        switch ($functionDescription->functionName) {
         case ODataConstants::STRFUN_COMPARE:
             return "STRCMP($params[0], $params[1])";
             break;
@@ -270,8 +270,7 @@ 
             break;
         case ODataConstants::STRFUN_SUBSTRING:
             return count($params) == 3 ?
-                "SUBSTRING($params[0], $params[1] + 1, $params[2])" :
-                "SUBSTRING($params[0], $params[1] + 1)";
+                "SUBSTRING($params[0], $params[1] + 1, $params[2])" : "SUBSTRING($params[0], $params[1] + 1)";
             break;
         case ODataConstants::STRFUN_SUBSTRINGOF:
             return "(LOCATE($params[0], $params[1]) > 0)";
@@ -343,14 +342,14 @@ 
         $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 
-            . $left . ' ' . $operator 
-            . ' ' . $right . self::CLOSE_BRACKET;
+            . $left.' '.$operator 
+            . ' '.$right.self::CLOSE_BRACKET;
     }
 
     /**
@@ -363,6 +362,6 @@ 
      */
     private function _prepareUnaryExpression($operator, $child)
     {
-        return $operator . self::OPEN_BRAKET . $child . self::CLOSE_BRACKET;
+        return $operator.self::OPEN_BRAKET.$child.self::CLOSE_BRACKET;
     }
 }

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

Spacing +6 added lines, -6 removed lines

@@ -297,8 +297,8 @@ 
     public static function getEntityMapping() {
       if (!is_null(self::$_entityMapping))
       {
-        self::$_entityMapping = array (
-            'Post' => array (
+        self::$_entityMapping = array(
+            'Post' => array(
                 '$MappedTable$' => 'wp_posts',
                 'PostID' => 'ID',
                 'Author' => 'post_author',
@@ -324,7 +324,7 @@ 
                 'CommentCount' => 'comment_count'
               ),
           
-            'Tag' => array (
+            'Tag' => array(
                 '$MappedTable$' => 'wp_terms',
                 'TagID' =>'t.term_id',
                 'Name' =>'t.name',
@@ -332,7 +332,7 @@ 
                 'Description' =>'tt.description'
             ),
           
-            'Category' => array (
+            'Category' => array(
                 '$MappedTable$' => 'wp_terms',
                 'CategoryID' =>'t.term_id',
                 'Name' =>'t.name',
@@ -340,7 +340,7 @@ 
                 'Description' =>'tt.description'
             ),
           
-            'Comment' => array (
+            'Comment' => array(
                 '$MappedTable$' => 'wp_comments',
                 'CommentID', 'comment_id',
                 'PostID', 'comment_post_id',
@@ -358,7 +358,7 @@ 
                 'UserID', 'user_id'
             ),
           
-            'User' => array (
+            'User' => array(
                 '$MappedTable$' => 'wp_users',
                 'UserID' => 'ID',
                 'Login' => 'user_login',

Doc Comments +1 added lines, -1 removed lines

@@ -172,7 +172,7 @@
      * 
      * @throws InvalidOperationException
      * 
-     * @return NorthWindMetadata
+     * @return SimpleMetadataProvider
      */
     public static function create()
     {

services/WordPress/WordPressQueryProvider.php

Doc Comments +10 added lines, -12 removed lines

@@ -76,7 +76,6 @@ 
      * 
      * @param ResourceSet      $resourceSet   The entity set whose 
      *                                        entities needs to be fetched
-     * @param string           $filterOption  Contains the filter condition
      * @param string           $select        For future purpose,no need to pass it
      * @param string           $orderby       For future purpose,no need to pass it
      * @param string           $top           For future purpose,no need to pass it
@@ -273,7 +272,6 @@ 
      *                                               the navigation property
      * @param ResourceProperty $targetProperty       The navigation property to be 
      *                                               retrieved
-     * @param string           $filterOption         Contains the filter condition
      * @param string           $select               For future purpose,no need to pass it
      * @param string           $orderby              For future purpose,no need to pass it
      * @param string           $top                  For future purpose,no need to pass it
@@ -662,7 +660,7 @@ 
     /**
      * Serialize the mysql result array into Post objects
      * 
-     * @param array(array) $result result of the mysql query
+     * @param resource $result result of the mysql query
      * 
      * @return array(Object)
      */
@@ -681,7 +679,7 @@ 
      * 
      * @param array $record each post row
      * 
-     * @return object
+     * @return Post
      */
     private function _serializePost($record)
     {
@@ -741,7 +739,7 @@ 
     /**
      * Serialize the mysql result array into Tag objects
      * 
-     * @param array(array) $result result of the mysql query
+     * @param resource $result result of the mysql query
      * 
      * @return array(Object)
      */
@@ -760,7 +758,7 @@ 
      * 
      * @param array $record each tag row
      * 
-     * @return object
+     * @return Tag
      */
     private function _serializeTag($record)
     {
@@ -775,7 +773,7 @@ 
     /**
      * Serialize the mysql result array into Category objects
      * 
-     * @param array(array) $result result of the mysql query
+     * @param resource $result result of the mysql query
      * 
      * @return array(Object)
      */
@@ -794,7 +792,7 @@ 
      * 
      * @param array $record each category row
      * 
-     * @return object
+     * @return Category
      */
     private function _serializeCategory($record)
     {
@@ -809,7 +807,7 @@ 
     /**
      * Serialize the mysql result array into Comment objects
      * 
-     * @param array(array) $result mysql query result
+     * @param resource $result mysql query result
      * 
      * @return array(Object)
      */
@@ -828,7 +826,7 @@ 
      * 
      * @param array $record each comment row
      * 
-     * @return object
+     * @return Comment
      */
     private function _serializeComment($record)
     {
@@ -867,7 +865,7 @@ 
     /**
      * Serialize the mysql result array into User objects
      * 
-     * @param array(array) $result result of the mysql query
+     * @param resource $result result of the mysql query
      * 
      * @return array(Object)
      */
@@ -886,7 +884,7 @@ 
      * 
      * @param array $record each user row
      * 
-     * @return object
+     * @return User
      */
     private function _serializeUser($record)
     {

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;

Switch Indentation +385 added lines, -385 removed lines

@@ -99,57 +99,57 @@ 
        
         $returnResult = array();
         switch ($resourceSetName) {
-        case 'Posts':
-            $query = "SELECT * FROM `wp_posts` WHERE"
-                   ." wp_posts.post_type = 'post'"
-                   ." AND wp_posts.post_status = 'publish'";
-            if ($filter !== null) {
-                $query .= " AND $filter";
-            }
-            $stmt = mysql_query($query); 
-            $returnResult = $this->_serializePosts($stmt);     
-            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'";
-            if ($filter !== null) {
-                $query .= " AND $filter";
-            }
-            $stmt = mysql_query($query);
-            $returnResult = $this->_serializeTags($stmt);       
-            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'";
-            if ($filter !== null) {
-                $query .= " AND $filter";
-            }
-            $stmt = mysql_query($query);
-            $returnResult = $this->_serializeCategories($stmt);       
-            break;
-        case 'Comments':
-            $query = "SELECT * FROM `wp_comments` WHERE"
-                   ." wp_comments.comment_approved = 1";
-            if ($filter !== null) {
-                $query .= " AND $filter";
-            }
-            $stmt = mysql_query($query);
-            $returnResult = $this->_serializeComments($stmt);       
-            break;
-        case 'Users':
-            $query = "SELECT * FROM `wp_users`";
-            //print "<br>Filter:".$filter;
-            if ($filter !== null) {
-                $query .= " AND $filter";
-            }
-            $stmt = mysql_query($query);
-            //$data = mysql_fetch_assoc($stmt);
-            $returnResult = $this->_serializeUsers($stmt);
-            break;
+            case 'Posts':
+                $query = "SELECT * FROM `wp_posts` WHERE"
+                       ." wp_posts.post_type = 'post'"
+                       ." AND wp_posts.post_status = 'publish'";
+                if ($filter !== null) {
+                    $query .= " AND $filter";
+                }
+                $stmt = mysql_query($query); 
+                $returnResult = $this->_serializePosts($stmt);     
+                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'";
+                if ($filter !== null) {
+                    $query .= " AND $filter";
+                }
+                $stmt = mysql_query($query);
+                $returnResult = $this->_serializeTags($stmt);       
+                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'";
+                if ($filter !== null) {
+                    $query .= " AND $filter";
+                }
+                $stmt = mysql_query($query);
+                $returnResult = $this->_serializeCategories($stmt);       
+                break;
+            case 'Comments':
+                $query = "SELECT * FROM `wp_comments` WHERE"
+                       ." wp_comments.comment_approved = 1";
+                if ($filter !== null) {
+                    $query .= " AND $filter";
+                }
+                $stmt = mysql_query($query);
+                $returnResult = $this->_serializeComments($stmt);       
+                break;
+            case 'Users':
+                $query = "SELECT * FROM `wp_users`";
+                //print "<br>Filter:".$filter;
+                if ($filter !== null) {
+                    $query .= " AND $filter";
+                }
+                $stmt = mysql_query($query);
+                //$data = mysql_fetch_assoc($stmt);
+                $returnResult = $this->_serializeUsers($stmt);
+                break;
         }
         mysql_free_result($stmt);
         return $returnResult;
@@ -185,79 +185,79 @@ 
         $conditionStr = implode(' AND ', $keys);
         
         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];
-            $stmt = mysql_query($query);
+            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];
+                $stmt = mysql_query($query);
               
-            //If resource not found return null to the library
-            if (!mysql_num_rows($stmt)) {
-                return null;
-            } 
+                //If resource not found return null to the library
+                if (!mysql_num_rows($stmt)) {
+                    return null;
+                } 
               
-            $data = mysql_fetch_assoc($stmt);
-            $result = $this->_serializePost($data);
-            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];
-            $stmt = mysql_query($query);
+                $data = mysql_fetch_assoc($stmt);
+                $result = $this->_serializePost($data);
+                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];
+                $stmt = mysql_query($query);
               
-            //If resource not found return null to the library
-            if (!mysql_num_rows($stmt)) {
-                return null;
-            }
+                //If resource not found return null to the library
+                if (!mysql_num_rows($stmt)) {
+                    return null;
+                }
               
-            $data = mysql_fetch_assoc($stmt);
-            $result = $this->_serializeTag($data);
-            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];
-            $stmt = mysql_query($query);
+                $data = mysql_fetch_assoc($stmt);
+                $result = $this->_serializeTag($data);
+                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];
+                $stmt = mysql_query($query);
               
-            //If resource not found return null to the library
-            if (!mysql_num_rows($stmt)) {
-                return null;
-            }
+                //If resource not found return null to the library
+                if (!mysql_num_rows($stmt)) {
+                    return null;
+                }
               
-            $data = mysql_fetch_assoc($stmt);
-            $result = $this->_serializeCategory($data);
-            break;
-        case 'Comments':
-            $query = "SELECT * FROM `wp_comments`"
-                   ." WHERE comment_approved = 1" 
-                   ." AND comment_ID = ".$namedKeyValues['CommentID'][0];
-            $stmt = mysql_query($query);
+                $data = mysql_fetch_assoc($stmt);
+                $result = $this->_serializeCategory($data);
+                break;
+            case 'Comments':
+                $query = "SELECT * FROM `wp_comments`"
+                       ." WHERE comment_approved = 1" 
+                       ." AND comment_ID = ".$namedKeyValues['CommentID'][0];
+                $stmt = mysql_query($query);
               
-            //If resource not found return null to the library
-            if (!mysql_num_rows($stmt)) {
-                return null;
-            }
+                //If resource not found return null to the library
+                if (!mysql_num_rows($stmt)) {
+                    return null;
+                }
               
-            $data = mysql_fetch_assoc($stmt);
-            $result = $this->_serializeComment($data);
-            break;
-        case 'Users':
-            $query = "SELECT * FROM `wp_users` WHERE ID = ".$namedKeyValues['UserID'][0];
-            $stmt = mysql_query($query);
+                $data = mysql_fetch_assoc($stmt);
+                $result = $this->_serializeComment($data);
+                break;
+            case 'Users':
+                $query = "SELECT * FROM `wp_users` WHERE ID = ".$namedKeyValues['UserID'][0];
+                $stmt = mysql_query($query);
               
-            //If resource not found return null to the library
-            if (!mysql_num_rows($stmt)) {
-                return null;
-            }
+                //If resource not found return null to the library
+                if (!mysql_num_rows($stmt)) {
+                    return null;
+                }
               
-            $data = mysql_fetch_assoc($stmt);
-            $result = $this->_serializeUser($data);
-            break;
+                $data = mysql_fetch_assoc($stmt);
+                $result = $this->_serializeUser($data);
+                break;
         }
         
         mysql_free_result($stmt);
@@ -293,147 +293,147 @@ 
         $navigationPropName = $targetProperty->getName();
         
         switch (true) {
-        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)";
-                if ($filter !== null) {
-                    $query .= " AND $filter";
-                }
-                $stmt = mysql_query($query);
-                if ( $stmt === false) {
-                    die(mysql_error());
-                }
+            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)";
+                    if ($filter !== null) {
+                        $query .= " AND $filter";
+                    }
+                    $stmt = mysql_query($query);
+                    if ( $stmt === false) {
+                        die(mysql_error());
+                    }
                         
-                $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)";
-                if ($filter !== null) {
-                    $query .= " AND $filter";
-                }
-                $stmt = mysql_query($query);
-                if ( $stmt === false) {            
-                       die(mysql_error());
-                }
+                    $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)";
+                    if ($filter !== null) {
+                        $query .= " AND $filter";
+                    }
+                    $stmt = mysql_query($query);
+                    if ( $stmt === false) {            
+                           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";
-                if ($filter !== null) {
-                    $query .= " AND $filter";
-                }
-                $stmt = mysql_query($query);
-                if ( $stmt === false) {
-                    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";
+                    if ($filter !== null) {
+                        $query .= " AND $filter";
+                    }
+                    $stmt = mysql_query($query);
+                    if ( $stmt === false) {
+                        die(mysql_error());
+                    }
                         
-                $result = $this->_serializeComments($stmt);
-            } else {
-                die('Post does not have navigation porperty with name: ' . $navigationPropName);
-            }
-            break;
-
-        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'";
-                if ($filter !== null) {
-                    $query .= " AND $filter";
-                }
-                $stmt = mysql_query($query);
-                if ( $stmt === false) {
-                            die(mysql_error());
+                    $result = $this->_serializeComments($stmt);
+                } else {
+                    die('Post does not have navigation porperty with name: ' . $navigationPropName);
                 }
+                break;
+
+            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'";
+                    if ($filter !== null) {
+                        $query .= " AND $filter";
+                    }
+                    $stmt = mysql_query($query);
+                    if ( $stmt === false) {
+                                die(mysql_error());
+                    }
                         
-                      $result = $this->_serializePosts($stmt);
-            } else {
-                die('Tag does not have navigation porperty with name: ' . $navigationPropName);
-            }
-            break;
-                    
-        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'";
-                if ($filter !== null) {
-                    $query .= " AND $filter";
-                }
-                $stmt = mysql_query($query);
-                if ( $stmt === false) {
-                    die(mysql_error());
+                          $result = $this->_serializePosts($stmt);
+                } else {
+                    die('Tag does not have navigation porperty with name: ' . $navigationPropName);
                 }
+                break;
+                    
+            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'";
+                    if ($filter !== null) {
+                        $query .= " AND $filter";
+                    }
+                    $stmt = mysql_query($query);
+                    if ( $stmt === false) {
+                        die(mysql_error());
+                    }
                         
-                $result = $this->_serializePosts($stmt);
-            } else {
-                die('Category does not have navigation porperty with name: ' . $navigationPropName);
-            }
-            break;
+                    $result = $this->_serializePosts($stmt);
+                } else {
+                    die('Category does not have navigation porperty with name: ' . $navigationPropName);
+                }
+                break;
                  
-        case ($srcClass == 'Comment'):
-            die('Comment does not have navigation porperty with name: ' . $navigationPropName);
-            break;
+            case ($srcClass == 'Comment'):
+                die('Comment does not have navigation porperty with name: ' . $navigationPropName);
+                break;
                     
-        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";
-                if ($filter !== null) {
-                    $query .= " AND $filter";
-                }
-                $stmt = mysql_query($query);
-                if ( $stmt === false) {
-                    die(mysql_error());
-                }
+            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";
+                    if ($filter !== null) {
+                        $query .= " AND $filter";
+                    }
+                    $stmt = mysql_query($query);
+                    if ( $stmt === false) {
+                        die(mysql_error());
+                    }
                             
-                $result = $this->_serializePosts($stmt);
-            } elseif ($navigationPropName == 'Comments') {
-                $query = "SELECT * FROM `wp_comments`"
-                     ." WHERE comment_approved = 1" 
-                     ." AND wp_comments.user_id = $sourceEntityInstance->UserID";
-                if ($filter !== null) {
-                    $query .= " AND $filter";
-                }
-                $stmt = mysql_query($query);
-                if ( $stmt === false) {            
-                    die(mysql_error());
-                }
+                    $result = $this->_serializePosts($stmt);
+                } elseif ($navigationPropName == 'Comments') {
+                    $query = "SELECT * FROM `wp_comments`"
+                         ." WHERE comment_approved = 1" 
+                         ." AND wp_comments.user_id = $sourceEntityInstance->UserID";
+                    if ($filter !== null) {
+                        $query .= " AND $filter";
+                    }
+                    $stmt = mysql_query($query);
+                    if ( $stmt === false) {            
+                        die(mysql_error());
+                    }
                         
-                $result = $this->_serializeComments($stmt);
-            } else {
-                die('User does not have navigation porperty with name: ' . $navigationPropName);
-            }
-            break;
+                    $result = $this->_serializeComments($stmt);
+                } else {
+                    die('User does not have navigation porperty with name: ' . $navigationPropName);
+                }
+                break;
         }
         
         mysql_free_result($stmt);
@@ -473,105 +473,105 @@ 
         $conditionStr = implode(' AND ', $keys);
         
         switch (true) {
-        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];
-                $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];
-                $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];
-                $stmt = mysql_query($query);
-                $result = $this->_serializeComments($stmt);
-            } else {
-                die('Post does not have navigation porperty with name: ' . $navigationPropName);
-            }
-            break;
+            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];
+                    $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];
+                    $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];
+                    $stmt = mysql_query($query);
+                    $result = $this->_serializeComments($stmt);
+                } else {
+                    die('Post does not have navigation porperty with name: ' . $navigationPropName);
+                }
+                break;
 
-        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];
-                $stmt = mysql_query($query);
-                $result = $this->_serializePosts($stmt);
-            } else {
-                die('Tag does not have navigation porperty with name: ' . $navigationPropName);
-            }
-            break;
+            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];
+                    $stmt = mysql_query($query);
+                    $result = $this->_serializePosts($stmt);
+                } else {
+                    die('Tag does not have navigation porperty with name: ' . $navigationPropName);
+                }
+                break;
                     
-        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];
-                $stmt = mysql_query($query);
-                $result = $this->_serializePosts($stmt);
-            } else {
-                die('Category does not have navigation porperty with name: ' . $navigationPropName);
-            }
-            break;
+            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];
+                    $stmt = mysql_query($query);
+                    $result = $this->_serializePosts($stmt);
+                } else {
+                    die('Category does not have navigation porperty with name: ' . $navigationPropName);
+                }
+                break;
                  
-        case ($srcClass == 'Comment'):
-            die('Comment does not have navigation porperty with name: ' . $navigationPropName);
-            break;
+            case ($srcClass == 'Comment'):
+                die('Comment does not have navigation porperty with name: ' . $navigationPropName);
+                break;
                     
-        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"
-                        ." AND wp_posts.ID = ".$namedKeyValues['PostID'][0];
-                 $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);
-            } else {
-                 die('User does not have navigation porperty with name: ' . $navigationPropName);
-            }
-            break;
+            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"
+                            ." AND wp_posts.ID = ".$namedKeyValues['PostID'][0];
+                     $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);
+                } else {
+                     die('User does not have navigation porperty with name: ' . $navigationPropName);
+                }
+                break;
         }
         
         mysql_free_result($stmt);
@@ -599,60 +599,60 @@ 
         $navigationPropName = $targetProperty->getName();
         
         switch (true) {
-        case ($srcClass == 'Post'):
-            if ($navigationPropName == 'User') {
-                $query = "SELECT * FROM `wp_users` WHERE ID = $sourceEntityInstance->Author";
-                $stmt = mysql_query($query);
-                $stmt = mysql_query($query);
-                $data = mysql_fetch_assoc($stmt);
-                $result = $this->_serializeUser($data);
-                if ( $stmt === false) {            
-                    die(mysql_error());
-                }
+            case ($srcClass == 'Post'):
+                if ($navigationPropName == 'User') {
+                    $query = "SELECT * FROM `wp_users` WHERE ID = $sourceEntityInstance->Author";
+                    $stmt = mysql_query($query);
+                    $stmt = mysql_query($query);
+                    $data = mysql_fetch_assoc($stmt);
+                    $result = $this->_serializeUser($data);
+                    if ( $stmt === false) {            
+                        die(mysql_error());
+                    }
                         
-                if (!mysql_num_rows($stmt)) {
-                    $result =  null;
+                    if (!mysql_num_rows($stmt)) {
+                        $result =  null;
+                    }
+                } else {
+                    die('Post does not have navigation porperty with name: ' . $navigationPropName);
                 }
-            } else {
-                die('Post does not have navigation porperty with name: ' . $navigationPropName);
-            }
-            break;
+                break;
 
-        case ($srcClass == 'Comment'):
-            if ($navigationPropName == 'User') {
-                $query = "SELECT * FROM `wp_users` WHERE ID = $sourceEntityInstance->UserID";
-                $stmt = mysql_query($query);
-                if ( $stmt === false) {
-                    die(mysql_error());
-                }
+            case ($srcClass == 'Comment'):
+                if ($navigationPropName == 'User') {
+                    $query = "SELECT * FROM `wp_users` WHERE ID = $sourceEntityInstance->UserID";
+                    $stmt = mysql_query($query);
+                    if ( $stmt === false) {
+                        die(mysql_error());
+                    }
                         
-                if (!mysql_num_rows($stmt)) {
-                    $result =  null;
-                }
+                    if (!mysql_num_rows($stmt)) {
+                        $result =  null;
+                    }
                         
-                $data = mysql_fetch_assoc($stmt);
-                $result = $this->_serializeUser($data);
+                    $data = mysql_fetch_assoc($stmt);
+                    $result = $this->_serializeUser($data);
                       
-            } 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";
-                $stmt = mysql_query($query);
-                if ( $stmt === false) {            
-                    die(mysql_error());
-                }
+                } 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";
+                    $stmt = mysql_query($query);
+                    if ( $stmt === false) {            
+                        die(mysql_error());
+                    }
                         
-                if (!mysql_num_rows($stmt)) {
-                    $result =  null;
-                }
+                    if (!mysql_num_rows($stmt)) {
+                        $result =  null;
+                    }
                         
-                $data = mysql_fetch_assoc($stmt);
-                $result = $this->_serializePost($data);
-            } else {
-                die('Comment does not have navigation porperty with name: ' . $navigationPropName);
-            }
-            break;
+                    $data = mysql_fetch_assoc($stmt);
+                    $result = $this->_serializePost($data);
+                } else {
+                    die('Comment does not have navigation porperty with name: ' . $navigationPropName);
+                }
+                break;
         }
         
         mysql_free_result($stmt);

Spacing +33 added lines, -33 removed lines

@@ -41,7 +41,7 @@ 
     public function __construct()
     {
         $this->_connectionHandle = @mysql_connect(DB_HOST, DB_USER, DB_PASSWORD, true);
-        if ( $this->_connectionHandle ) {
+        if ($this->_connectionHandle) {
         } else {             
              die(print_r(mysql_error(), true));
         } 
@@ -84,16 +84,16 @@ 
      * 
      * @return array(Object)
      */
-    public function getResourceSet(ResourceSet $resourceSet,$filter=null,$select=null,$orderby=null,$top=null,$skip=null)
+    public function getResourceSet(ResourceSet $resourceSet, $filter = null, $select = null, $orderby = null, $top = null, $skip = null)
     {   
-        $resourceSetName =  $resourceSet->getName();
+        $resourceSetName = $resourceSet->getName();
         if ($resourceSetName !== 'Posts' 
             && $resourceSetName !== 'Tags' 
             && $resourceSetName !== 'Categories' 
             && $resourceSetName !== 'Comments' 
             && $resourceSetName !== 'Users'
         ) {
-            die('(WordPressQueryProvider) Unknown resource set ' . $resourceSetName);
+            die('(WordPressQueryProvider) Unknown resource set '.$resourceSetName);
         }
 
        
@@ -167,14 +167,14 @@ 
      */
     public function getResourceFromResourceSet(ResourceSet $resourceSet, KeyDescriptor $keyDescriptor)
     {
-        $resourceSetName =  $resourceSet->getName();
+        $resourceSetName = $resourceSet->getName();
         if ($resourceSetName !== 'Posts' 
             && $resourceSetName !== 'Tags' 
             && $resourceSetName !== 'Categories' 
             && $resourceSetName !== 'Comments' 
             && $resourceSetName !== 'Users'
         ) {
-            die('(WordPressQueryProvider) Unknown resource set ' . $resourceSetName);
+            die('(WordPressQueryProvider) Unknown resource set '.$resourceSetName);
         }
 
         $namedKeyValues = $keyDescriptor->getValidatedNamedValues();
@@ -286,7 +286,7 @@ 
         $sourceEntityInstance, 
         ResourceSet $targetResourceSet,
         ResourceProperty $targetProperty,
-        $filter=null ,$select=null, $orderby=null, $top=null, $skip=null
+        $filter = null, $select = null, $orderby = null, $top = null, $skip = null
     ) {
         $result = array();
         $srcClass = get_class($sourceEntityInstance);
@@ -307,7 +307,7 @@ 
                     $query .= " AND $filter";
                 }
                 $stmt = mysql_query($query);
-                if ( $stmt === false) {
+                if ($stmt === false) {
                     die(mysql_error());
                 }
                         
@@ -325,7 +325,7 @@ 
                     $query .= " AND $filter";
                 }
                 $stmt = mysql_query($query);
-                if ( $stmt === false) {            
+                if ($stmt === false) {            
                        die(mysql_error());
                 }
                         
@@ -338,13 +338,13 @@ 
                     $query .= " AND $filter";
                 }
                 $stmt = mysql_query($query);
-                if ( $stmt === false) {
+                if ($stmt === false) {
                     die(mysql_error());
                 }
                         
                 $result = $this->_serializeComments($stmt);
             } else {
-                die('Post does not have navigation porperty with name: ' . $navigationPropName);
+                die('Post does not have navigation porperty with name: '.$navigationPropName);
             }
             break;
 
@@ -363,13 +363,13 @@ 
                     $query .= " AND $filter";
                 }
                 $stmt = mysql_query($query);
-                if ( $stmt === false) {
+                if ($stmt === false) {
                             die(mysql_error());
                 }
                         
                       $result = $this->_serializePosts($stmt);
             } else {
-                die('Tag does not have navigation porperty with name: ' . $navigationPropName);
+                die('Tag does not have navigation porperty with name: '.$navigationPropName);
             }
             break;
                     
@@ -388,18 +388,18 @@ 
                     $query .= " AND $filter";
                 }
                 $stmt = mysql_query($query);
-                if ( $stmt === false) {
+                if ($stmt === false) {
                     die(mysql_error());
                 }
                         
                 $result = $this->_serializePosts($stmt);
             } else {
-                die('Category does not have navigation porperty with name: ' . $navigationPropName);
+                die('Category does not have navigation porperty with name: '.$navigationPropName);
             }
             break;
                  
         case ($srcClass == 'Comment'):
-            die('Comment does not have navigation porperty with name: ' . $navigationPropName);
+            die('Comment does not have navigation porperty with name: '.$navigationPropName);
             break;
                     
         case ($srcClass == 'User'):
@@ -412,7 +412,7 @@ 
                     $query .= " AND $filter";
                 }
                 $stmt = mysql_query($query);
-                if ( $stmt === false) {
+                if ($stmt === false) {
                     die(mysql_error());
                 }
                             
@@ -425,13 +425,13 @@ 
                     $query .= " AND $filter";
                 }
                 $stmt = mysql_query($query);
-                if ( $stmt === false) {            
+                if ($stmt === false) {            
                     die(mysql_error());
                 }
                         
                 $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;
         }
@@ -506,7 +506,7 @@ 
                 $stmt = mysql_query($query);
                 $result = $this->_serializeComments($stmt);
             } else {
-                die('Post does not have navigation porperty with name: ' . $navigationPropName);
+                die('Post does not have navigation porperty with name: '.$navigationPropName);
             }
             break;
 
@@ -525,7 +525,7 @@ 
                 $stmt = mysql_query($query);
                 $result = $this->_serializePosts($stmt);
             } else {
-                die('Tag does not have navigation porperty with name: ' . $navigationPropName);
+                die('Tag does not have navigation porperty with name: '.$navigationPropName);
             }
             break;
                     
@@ -544,12 +544,12 @@ 
                 $stmt = mysql_query($query);
                 $result = $this->_serializePosts($stmt);
             } else {
-                die('Category does not have navigation porperty with name: ' . $navigationPropName);
+                die('Category does not have navigation porperty with name: '.$navigationPropName);
             }
             break;
                  
         case ($srcClass == 'Comment'):
-            die('Comment does not have navigation porperty with name: ' . $navigationPropName);
+            die('Comment does not have navigation porperty with name: '.$navigationPropName);
             break;
                     
         case ($srcClass == 'User'):
@@ -569,7 +569,7 @@ 
                  $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;
         }
@@ -606,15 +606,15 @@ 
                 $stmt = mysql_query($query);
                 $data = mysql_fetch_assoc($stmt);
                 $result = $this->_serializeUser($data);
-                if ( $stmt === false) {            
+                if ($stmt === false) {            
                     die(mysql_error());
                 }
                         
                 if (!mysql_num_rows($stmt)) {
-                    $result =  null;
+                    $result = null;
                 }
             } else {
-                die('Post does not have navigation porperty with name: ' . $navigationPropName);
+                die('Post does not have navigation porperty with name: '.$navigationPropName);
             }
             break;
 
@@ -622,12 +622,12 @@ 
             if ($navigationPropName == 'User') {
                 $query = "SELECT * FROM `wp_users` WHERE ID = $sourceEntityInstance->UserID";
                 $stmt = mysql_query($query);
-                if ( $stmt === false) {
+                if ($stmt === false) {
                     die(mysql_error());
                 }
                         
                 if (!mysql_num_rows($stmt)) {
-                    $result =  null;
+                    $result = null;
                 }
                         
                 $data = mysql_fetch_assoc($stmt);
@@ -639,18 +639,18 @@ 
                        ." AND wp_posts.post_status = 'publish'"
                        ." AND wp_posts.ID = $sourceEntityInstance->PostID";
                 $stmt = mysql_query($query);
-                if ( $stmt === false) {            
+                if ($stmt === false) {            
                     die(mysql_error());
                 }
                         
                 if (!mysql_num_rows($stmt)) {
-                    $result =  null;
+                    $result = null;
                 }
                         
                 $data = mysql_fetch_assoc($stmt);
                 $result = $this->_serializePost($data);
             } else {
-                die('Comment does not have navigation porperty with name: ' . $navigationPropName);
+                die('Comment does not have navigation porperty with name: '.$navigationPropName);
             }
             break;
         }
@@ -816,7 +816,7 @@ 
     private function _serializeComments($result)
     {
         $comments = array();
-        while ( $record = mysql_fetch_array($result, MYSQL_ASSOC)) {         
+        while ($record = mysql_fetch_array($result, MYSQL_ASSOC)) {         
              $comments[] = $this->_serializeComment($record);
         }
 

src/POData/BaseService.php

Doc Comments +1 added lines

@@ -665,6 +665,7 @@
      * @param boolean      &$needToSerializeResponse On return, this will contain 
      *                                               True if response needs to be
      *                                               serialized, False otherwise.
+     * @param boolean $needToSerializeResponse
      *                                              
      * @return string|null The ETag for the entry object if it has eTag properties 
      *                     NULL otherwise.

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

Spacing +16 added lines, -16 removed lines

@@ -316,11 +316,11 @@ 
 		$registry->register(new JsonODataV1Writer());
 		$registry->register(new AtomODataWriter($serviceURI));
 
-		if($serviceVersion->compare(Version::v2()) > -1){
+		if ($serviceVersion->compare(Version::v2()) > -1) {
 			$registry->register(new JsonODataV2Writer());
 		}
 
-		if($serviceVersion->compare(Version::v3()) > -1){
+		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));
@@ -351,7 +351,7 @@ 
 
 	    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 );
+		    throw new ODataException(Messages::unsupportedMediaType(), 415);
 	    }
 
 	    $odataModelInstance = null;
@@ -518,10 +518,10 @@ 
 
 	    //if the $format header is present it overrides the accepts header
 	    $format = $host->getQueryStringItem(ODataConstants::HTTPQUERY_STRING_FORMAT);
-	    if(!is_null($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()){
+            if ($format == MimeTypes::MIME_APPLICATION_JSON && $requestVersion == Version::v3()) {
                 //then it's actual minimalmetadata
                 //TODO: should this be done with the header text too?
                 $format = MimeTypes::MIME_APPLICATION_JSON_MINIMAL_META;
@@ -537,7 +537,7 @@ 
 	    //getTargetKind doesn't deal with link resources directly and this can change things
 	    $targetKind = $request->isLinkUri() ? TargetKind::LINK() : $request->getTargetKind();
 
-	    switch($targetKind){
+	    switch ($targetKind) {
 		    case TargetKind::METADATA():
 			    return HttpProcessUtility::selectMimeType(
 				    $requestAcceptText,
@@ -614,7 +614,7 @@ 
 			    );
 
 		    case TargetKind::MEDIA_RESOURCE():
-			    if (!$request->isNamedStream() && !$request->getTargetResourceType()->isMediaLinkEntry()){
+			    if (!$request->isNamedStream() && !$request->getTargetResourceType()->isMediaLinkEntry()) {
 					throw ODataException::createBadRequestError(
 					    Messages::badRequestInvalidUriForMediaResource(
 						    $host->getAbsoluteRequestUri()->getUrlAsString()
@@ -648,7 +648,7 @@ 
 
 
 	    //If we got here, we just don't know what it is...
-        throw new ODataException( Messages::unsupportedMediaType(), 415 );
+        throw new ODataException(Messages::unsupportedMediaType(), 415);
 
     }
 
@@ -669,7 +669,7 @@ 
      * @return string|null The ETag for the entry object if it has eTag properties 
      *                     NULL otherwise.
      */
-    protected function compareETag(&$entryObject, ResourceType &$resourceType, 
+    protected function compareETag(&$entryObject, ResourceType & $resourceType, 
         &$needToSerializeResponse
     ) {      
         $needToSerializeResponse = true;
@@ -720,7 +720,7 @@ 
             // but that is causing an issue in Linux env where the 
             // firefix browser is unable to parse the ETag in this case.
             // Need to follow up PHP core devs for this. 
-            $eTag = ODataConstants::HTTP_WEAK_ETAG_PREFIX . $eTag . '"';
+            $eTag = ODataConstants::HTTP_WEAK_ETAG_PREFIX.$eTag.'"';
             if (!is_null($ifMatch)) {
                 if (strcmp($eTag, $ifMatch) != 0) {
                     // Requested If-Match value does not match with current 
@@ -743,7 +743,7 @@ 
             // but that is causing an issue in Linux env where the 
             // firefix browser is unable to parse the ETag in this case.
             // Need to follow up PHP core devs for this. 
-            $eTag = ODataConstants::HTTP_WEAK_ETAG_PREFIX . $eTag . '"';
+            $eTag = ODataConstants::HTTP_WEAK_ETAG_PREFIX.$eTag.'"';
         }
 
         return $eTag;
@@ -762,7 +762,7 @@ 
      *                     for use in a URI) there are etag properties, NULL if 
      *                     there is no etag property.
      */
-    protected function getETagForEntry(&$entryObject, ResourceType &$resourceType)
+    protected function getETagForEntry(&$entryObject, ResourceType & $resourceType)
     {
         $eTag = null;
         $comma = null;
@@ -777,18 +777,18 @@ 
             try {
 
 	            //TODO #88...also this seems like dupe work
-                $reflectionProperty  = new \ReflectionProperty($entryObject, $eTagProperty->getName() );
+                $reflectionProperty = new \ReflectionProperty($entryObject, $eTagProperty->getName());
                 $value = $reflectionProperty->getValue($entryObject);
             } catch (\ReflectionException $reflectionException) {
                 throw ODataException::createInternalServerError(
-                    Messages::failedToAccessProperty($eTagProperty->getName(), $resourceType->getName() )
+                    Messages::failedToAccessProperty($eTagProperty->getName(), $resourceType->getName())
                 );
             }
 
             if (is_null($value)) {
-                $eTag = $eTag . $comma. 'null';
+                $eTag = $eTag.$comma.'null';
             } else {
-                $eTag = $eTag . $comma . $type->convertToOData($value);
+                $eTag = $eTag.$comma.$type->convertToOData($value);
             }
 
             $comma = ',';