Qeti / POData

services/NorthWind/NorthWindDSExpressionProvider.php

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

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

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/WordPressDSExpressionProvider.php

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

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

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',

services/WordPress/WordPressQueryProvider.php

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

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 = ',';

src/POData/Common/ErrorHandler.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
             $exception = new ODataException($exception->getMessage(), HttpStatus::CODE_INTERNAL_SERVER_ERROR);
         }
 
-        $service->getHost()->setResponseVersion(ODataConstants::DATASERVICEVERSION_1_DOT_0 . ';');
+        $service->getHost()->setResponseVersion(ODataConstants::DATASERVICEVERSION_1_DOT_0.';');
 
         // At this point all kind of exceptions will be converted 
         //to 'ODataException'