@@ -78,11 +78,11 @@ |
||
| 78 | 78 | */ |
| 79 | 79 | public $isMediaLinkEntry; |
| 80 | 80 | |
| 81 | - /** |
|
| 82 | - * The name of the resource set this entry belongs to, use in metadata output |
|
| 83 | - * @var string |
|
| 84 | - */ |
|
| 85 | - public $resourceSetName; |
|
| 81 | + /** |
|
| 82 | + * The name of the resource set this entry belongs to, use in metadata output |
|
| 83 | + * @var string |
|
| 84 | + */ |
|
| 85 | + public $resourceSetName; |
|
| 86 | 86 | |
| 87 | 87 | |
| 88 | 88 | } |
| 89 | 89 | \ No newline at end of file |
@@ -61,7 +61,7 @@ |
||
| 61 | 61 | * @param string $contentType Mime type for Media content |
| 62 | 62 | * @param string $eTag eTag for media content |
| 63 | 63 | */ |
| 64 | - function __construct ($name, $editLink, $srcLink, $contentType, $eTag) |
|
| 64 | + function __construct($name, $editLink, $srcLink, $contentType, $eTag) |
|
| 65 | 65 | { |
| 66 | 66 | $this->contentType = $contentType; |
| 67 | 67 | $this->editLink = $editLink; |
@@ -19,10 +19,10 @@ |
||
| 19 | 19 | */ |
| 20 | 20 | class HTTPRequestMethod extends Enum { |
| 21 | 21 | |
| 22 | - const GET = "GET"; |
|
| 23 | - const POST = "POST"; |
|
| 24 | - const PUT = "PUT"; |
|
| 25 | - const DELETE = "DELETE"; |
|
| 26 | - const PATCH = "PATCH"; |
|
| 27 | - const MERGE = "MERGE"; |
|
| 22 | + const GET = "GET"; |
|
| 23 | + const POST = "POST"; |
|
| 24 | + const PUT = "PUT"; |
|
| 25 | + const DELETE = "DELETE"; |
|
| 26 | + const PATCH = "PATCH"; |
|
| 27 | + const MERGE = "MERGE"; |
|
| 28 | 28 | } |
| 29 | 29 | \ No newline at end of file |
@@ -14,7 +14,7 @@ |
||
| 14 | 14 | interface IExpressionProvider |
| 15 | 15 | { |
| 16 | 16 | |
| 17 | - //TODO: does this really need to be part of this interface? see #89 |
|
| 17 | + //TODO: does this really need to be part of this interface? see #89 |
|
| 18 | 18 | /** |
| 19 | 19 | * Get the name of the iterator |
| 20 | 20 | * |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | */ |
| 49 | 49 | public function __construct() |
| 50 | 50 | { |
| 51 | - $this->entityMapping = array(); |
|
| 51 | + $this->entityMapping = array(); |
|
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | */ |
| 71 | 71 | public function setResourceType(ResourceType $resourceType) |
| 72 | 72 | { |
| 73 | - $this->resourceType = $resourceType; |
|
| 73 | + $this->resourceType = $resourceType; |
|
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | /** |
@@ -85,14 +85,14 @@ discard block |
||
| 85 | 85 | public function onLogicalExpression($expressionType, $left, $right) |
| 86 | 86 | { |
| 87 | 87 | switch($expressionType) { |
| 88 | - case ExpressionType::AND_LOGICAL: |
|
| 89 | - return $this->_prepareBinaryExpression(self::LOGICAL_AND, $left, $right); |
|
| 88 | + case ExpressionType::AND_LOGICAL: |
|
| 89 | + return $this->_prepareBinaryExpression(self::LOGICAL_AND, $left, $right); |
|
| 90 | 90 | |
| 91 | - case ExpressionType::OR_LOGICAL: |
|
| 92 | - return $this->_prepareBinaryExpression(self::LOGICAL_OR, $left, $right); |
|
| 91 | + case ExpressionType::OR_LOGICAL: |
|
| 92 | + return $this->_prepareBinaryExpression(self::LOGICAL_OR, $left, $right); |
|
| 93 | 93 | |
| 94 | - default: |
|
| 95 | - throw new \InvalidArgumentException('onLogicalExpression'); |
|
| 94 | + default: |
|
| 95 | + throw new \InvalidArgumentException('onLogicalExpression'); |
|
| 96 | 96 | } |
| 97 | 97 | } |
| 98 | 98 | |
@@ -108,23 +108,23 @@ discard block |
||
| 108 | 108 | public function onArithmeticExpression($expressionType, $left, $right) |
| 109 | 109 | { |
| 110 | 110 | switch($expressionType) { |
| 111 | - case ExpressionType::MULTIPLY: |
|
| 112 | - return $this->_prepareBinaryExpression(self::MULTIPLY, $left, $right); |
|
| 111 | + case ExpressionType::MULTIPLY: |
|
| 112 | + return $this->_prepareBinaryExpression(self::MULTIPLY, $left, $right); |
|
| 113 | 113 | |
| 114 | - case ExpressionType::DIVIDE: |
|
| 115 | - return $this->_prepareBinaryExpression(self::DIVIDE, $left, $right); |
|
| 114 | + case ExpressionType::DIVIDE: |
|
| 115 | + return $this->_prepareBinaryExpression(self::DIVIDE, $left, $right); |
|
| 116 | 116 | |
| 117 | - case ExpressionType::MODULO: |
|
| 118 | - return $this->_prepareBinaryExpression(self::MODULO, $left, $right); |
|
| 117 | + case ExpressionType::MODULO: |
|
| 118 | + return $this->_prepareBinaryExpression(self::MODULO, $left, $right); |
|
| 119 | 119 | |
| 120 | - case ExpressionType::ADD: |
|
| 121 | - return $this->_prepareBinaryExpression(self::ADD, $left, $right); |
|
| 120 | + case ExpressionType::ADD: |
|
| 121 | + return $this->_prepareBinaryExpression(self::ADD, $left, $right); |
|
| 122 | 122 | |
| 123 | - case ExpressionType::SUBTRACT: |
|
| 124 | - return $this->_prepareBinaryExpression(self::SUBTRACT, $left, $right); |
|
| 123 | + case ExpressionType::SUBTRACT: |
|
| 124 | + return $this->_prepareBinaryExpression(self::SUBTRACT, $left, $right); |
|
| 125 | 125 | |
| 126 | - default: |
|
| 127 | - throw new \InvalidArgumentException('onArithmeticExpression'); |
|
| 126 | + default: |
|
| 127 | + throw new \InvalidArgumentException('onArithmeticExpression'); |
|
| 128 | 128 | } |
| 129 | 129 | } |
| 130 | 130 | |
@@ -140,26 +140,26 @@ discard block |
||
| 140 | 140 | public function onRelationalExpression($expressionType, $left, $right) |
| 141 | 141 | { |
| 142 | 142 | switch($expressionType) { |
| 143 | - case ExpressionType::GREATERTHAN: |
|
| 144 | - return $this->_prepareBinaryExpression(self::GREATER_THAN, $left, $right); |
|
| 143 | + case ExpressionType::GREATERTHAN: |
|
| 144 | + return $this->_prepareBinaryExpression(self::GREATER_THAN, $left, $right); |
|
| 145 | 145 | |
| 146 | - case ExpressionType::GREATERTHAN_OR_EQUAL: |
|
| 147 | - return $this->_prepareBinaryExpression(self::GREATER_THAN_OR_EQUAL, $left, $right); |
|
| 146 | + case ExpressionType::GREATERTHAN_OR_EQUAL: |
|
| 147 | + return $this->_prepareBinaryExpression(self::GREATER_THAN_OR_EQUAL, $left, $right); |
|
| 148 | 148 | |
| 149 | - case ExpressionType::LESSTHAN: |
|
| 150 | - return $this->_prepareBinaryExpression(self::LESS_THAN, $left, $right); |
|
| 149 | + case ExpressionType::LESSTHAN: |
|
| 150 | + return $this->_prepareBinaryExpression(self::LESS_THAN, $left, $right); |
|
| 151 | 151 | |
| 152 | - case ExpressionType::LESSTHAN_OR_EQUAL: |
|
| 153 | - return $this->_prepareBinaryExpression(self::LESS_THAN_OR_EQUAL, $left, $right); |
|
| 152 | + case ExpressionType::LESSTHAN_OR_EQUAL: |
|
| 153 | + return $this->_prepareBinaryExpression(self::LESS_THAN_OR_EQUAL, $left, $right); |
|
| 154 | 154 | |
| 155 | - case ExpressionType::EQUAL: |
|
| 156 | - return $this->_prepareBinaryExpression(self::EQUAL, $left, $right); |
|
| 155 | + case ExpressionType::EQUAL: |
|
| 156 | + return $this->_prepareBinaryExpression(self::EQUAL, $left, $right); |
|
| 157 | 157 | |
| 158 | - case ExpressionType::NOTEQUAL: |
|
| 159 | - return $this->_prepareBinaryExpression(self::NOT_EQUAL, $left, $right); |
|
| 158 | + case ExpressionType::NOTEQUAL: |
|
| 159 | + return $this->_prepareBinaryExpression(self::NOT_EQUAL, $left, $right); |
|
| 160 | 160 | |
| 161 | - default: |
|
| 162 | - throw new \InvalidArgumentException('onArithmeticExpression'); |
|
| 161 | + default: |
|
| 162 | + throw new \InvalidArgumentException('onArithmeticExpression'); |
|
| 163 | 163 | } |
| 164 | 164 | } |
| 165 | 165 | |
@@ -174,14 +174,14 @@ discard block |
||
| 174 | 174 | public function onUnaryExpression($expressionType, $child) |
| 175 | 175 | { |
| 176 | 176 | switch($expressionType) { |
| 177 | - case ExpressionType::NEGATE: |
|
| 178 | - return $this->_prepareUnaryExpression(self::NEGATE, $child); |
|
| 177 | + case ExpressionType::NEGATE: |
|
| 178 | + return $this->_prepareUnaryExpression(self::NEGATE, $child); |
|
| 179 | 179 | |
| 180 | - case ExpressionType::NOT_LOGICAL: |
|
| 181 | - return $this->_prepareUnaryExpression(self::LOGICAL_NOT, $child); |
|
| 180 | + case ExpressionType::NOT_LOGICAL: |
|
| 181 | + return $this->_prepareUnaryExpression(self::LOGICAL_NOT, $child); |
|
| 182 | 182 | |
| 183 | - default: |
|
| 184 | - throw new \InvalidArgumentException('onUnaryExpression'); |
|
| 183 | + default: |
|
| 184 | + throw new \InvalidArgumentException('onUnaryExpression'); |
|
| 185 | 185 | } |
| 186 | 186 | } |
| 187 | 187 | |
@@ -219,11 +219,11 @@ discard block |
||
| 219 | 219 | $entityTypeName = $this->resourceType->getName(); |
| 220 | 220 | $propertyName = $parent->getResourceProperty()->getName(); |
| 221 | 221 | if (is_array($this->entityMapping)) { |
| 222 | - if (array_key_exists($entityTypeName, $this->entityMapping)) { |
|
| 223 | - if (array_key_exists($propertyName, $this->entityMapping[$entityTypeName])) { |
|
| 224 | - return $this->entityMapping[$entityTypeName][$propertyName]; |
|
| 225 | - } |
|
| 226 | - } |
|
| 222 | + if (array_key_exists($entityTypeName, $this->entityMapping)) { |
|
| 223 | + if (array_key_exists($propertyName, $this->entityMapping[$entityTypeName])) { |
|
| 224 | + return $this->entityMapping[$entityTypeName][$propertyName]; |
|
| 225 | + } |
|
| 226 | + } |
|
| 227 | 227 | } |
| 228 | 228 | |
| 229 | 229 | return $propertyName; |
@@ -240,85 +240,85 @@ discard block |
||
| 240 | 240 | public function onFunctionCallExpression($functionDescription, $params) |
| 241 | 241 | { |
| 242 | 242 | switch($functionDescription->name) { |
| 243 | - case ODataConstants::STRFUN_COMPARE: |
|
| 244 | - return "STRCMP($params[0], $params[1])"; |
|
| 243 | + case ODataConstants::STRFUN_COMPARE: |
|
| 244 | + return "STRCMP($params[0], $params[1])"; |
|
| 245 | 245 | |
| 246 | - case ODataConstants::STRFUN_ENDSWITH: |
|
| 247 | - return "(STRCMP($params[1],RIGHT($params[0],LENGTH($params[1]))) = 0)"; |
|
| 246 | + case ODataConstants::STRFUN_ENDSWITH: |
|
| 247 | + return "(STRCMP($params[1],RIGHT($params[0],LENGTH($params[1]))) = 0)"; |
|
| 248 | 248 | |
| 249 | - case ODataConstants::STRFUN_INDEXOF: |
|
| 250 | - return "INSTR($params[0], $params[1]) - 1"; |
|
| 249 | + case ODataConstants::STRFUN_INDEXOF: |
|
| 250 | + return "INSTR($params[0], $params[1]) - 1"; |
|
| 251 | 251 | |
| 252 | - case ODataConstants::STRFUN_REPLACE: |
|
| 253 | - return "REPLACE($params[0],$params[1],$params[2])"; |
|
| 252 | + case ODataConstants::STRFUN_REPLACE: |
|
| 253 | + return "REPLACE($params[0],$params[1],$params[2])"; |
|
| 254 | 254 | |
| 255 | - case ODataConstants::STRFUN_STARTSWITH: |
|
| 256 | - return "(STRCMP($params[1],LEFT($params[0],LENGTH($params[1]))) = 0)"; |
|
| 255 | + case ODataConstants::STRFUN_STARTSWITH: |
|
| 256 | + return "(STRCMP($params[1],LEFT($params[0],LENGTH($params[1]))) = 0)"; |
|
| 257 | 257 | |
| 258 | - case ODataConstants::STRFUN_TOLOWER: |
|
| 259 | - return "LOWER($params[0])"; |
|
| 258 | + case ODataConstants::STRFUN_TOLOWER: |
|
| 259 | + return "LOWER($params[0])"; |
|
| 260 | 260 | |
| 261 | - case ODataConstants::STRFUN_TOUPPER: |
|
| 262 | - return "UPPER($params[0])"; |
|
| 261 | + case ODataConstants::STRFUN_TOUPPER: |
|
| 262 | + return "UPPER($params[0])"; |
|
| 263 | 263 | |
| 264 | - case ODataConstants::STRFUN_TRIM: |
|
| 265 | - return "TRIM($params[0])"; |
|
| 264 | + case ODataConstants::STRFUN_TRIM: |
|
| 265 | + return "TRIM($params[0])"; |
|
| 266 | 266 | |
| 267 | - case ODataConstants::STRFUN_SUBSTRING: |
|
| 268 | - return count($params) == 3 ? |
|
| 269 | - "SUBSTRING($params[0], $params[1] + 1, $params[2])" : |
|
| 270 | - "SUBSTRING($params[0], $params[1] + 1)"; |
|
| 267 | + case ODataConstants::STRFUN_SUBSTRING: |
|
| 268 | + return count($params) == 3 ? |
|
| 269 | + "SUBSTRING($params[0], $params[1] + 1, $params[2])" : |
|
| 270 | + "SUBSTRING($params[0], $params[1] + 1)"; |
|
| 271 | 271 | |
| 272 | - case ODataConstants::STRFUN_SUBSTRINGOF: |
|
| 273 | - return "(LOCATE($params[0], $params[1]) > 0)"; |
|
| 272 | + case ODataConstants::STRFUN_SUBSTRINGOF: |
|
| 273 | + return "(LOCATE($params[0], $params[1]) > 0)"; |
|
| 274 | 274 | |
| 275 | - case ODataConstants::STRFUN_CONCAT: |
|
| 276 | - return "CONCAT($params[0],$params[1])"; |
|
| 275 | + case ODataConstants::STRFUN_CONCAT: |
|
| 276 | + return "CONCAT($params[0],$params[1])"; |
|
| 277 | 277 | |
| 278 | - case ODataConstants::STRFUN_LENGTH: |
|
| 279 | - return "LENGTH($params[0])"; |
|
| 278 | + case ODataConstants::STRFUN_LENGTH: |
|
| 279 | + return "LENGTH($params[0])"; |
|
| 280 | 280 | |
| 281 | - case ODataConstants::GUIDFUN_EQUAL: |
|
| 282 | - return "STRCMP($params[0], $params[1])"; |
|
| 281 | + case ODataConstants::GUIDFUN_EQUAL: |
|
| 282 | + return "STRCMP($params[0], $params[1])"; |
|
| 283 | 283 | |
| 284 | - case ODataConstants::DATETIME_COMPARE: |
|
| 285 | - return "DATETIMECMP($params[0]; $params[1])"; |
|
| 284 | + case ODataConstants::DATETIME_COMPARE: |
|
| 285 | + return "DATETIMECMP($params[0]; $params[1])"; |
|
| 286 | 286 | |
| 287 | - case ODataConstants::DATETIME_YEAR: |
|
| 288 | - return "EXTRACT(YEAR from ".$params[0].")"; |
|
| 287 | + case ODataConstants::DATETIME_YEAR: |
|
| 288 | + return "EXTRACT(YEAR from ".$params[0].")"; |
|
| 289 | 289 | |
| 290 | - case ODataConstants::DATETIME_MONTH: |
|
| 291 | - return "EXTRACT(MONTH from ".$params[0].")"; |
|
| 290 | + case ODataConstants::DATETIME_MONTH: |
|
| 291 | + return "EXTRACT(MONTH from ".$params[0].")"; |
|
| 292 | 292 | |
| 293 | - case ODataConstants::DATETIME_DAY: |
|
| 294 | - return "EXTRACT(DAY from ".$params[0].")"; |
|
| 293 | + case ODataConstants::DATETIME_DAY: |
|
| 294 | + return "EXTRACT(DAY from ".$params[0].")"; |
|
| 295 | 295 | |
| 296 | - case ODataConstants::DATETIME_HOUR: |
|
| 297 | - return "EXTRACT(HOUR from ".$params[0].")"; |
|
| 296 | + case ODataConstants::DATETIME_HOUR: |
|
| 297 | + return "EXTRACT(HOUR from ".$params[0].")"; |
|
| 298 | 298 | |
| 299 | - case ODataConstants::DATETIME_MINUTE: |
|
| 300 | - return "EXTRACT(MINUTE from ".$params[0].")"; |
|
| 299 | + case ODataConstants::DATETIME_MINUTE: |
|
| 300 | + return "EXTRACT(MINUTE from ".$params[0].")"; |
|
| 301 | 301 | |
| 302 | - case ODataConstants::DATETIME_SECOND: |
|
| 303 | - return "EXTRACT(SECOND from ".$params[0].")"; |
|
| 302 | + case ODataConstants::DATETIME_SECOND: |
|
| 303 | + return "EXTRACT(SECOND from ".$params[0].")"; |
|
| 304 | 304 | |
| 305 | - case ODataConstants::MATHFUN_ROUND: |
|
| 306 | - return "ROUND($params[0])"; |
|
| 305 | + case ODataConstants::MATHFUN_ROUND: |
|
| 306 | + return "ROUND($params[0])"; |
|
| 307 | 307 | |
| 308 | - case ODataConstants::MATHFUN_CEILING: |
|
| 309 | - return "CEIL($params[0])"; |
|
| 308 | + case ODataConstants::MATHFUN_CEILING: |
|
| 309 | + return "CEIL($params[0])"; |
|
| 310 | 310 | |
| 311 | - case ODataConstants::MATHFUN_FLOOR: |
|
| 312 | - return "FLOOR($params[0])"; |
|
| 311 | + case ODataConstants::MATHFUN_FLOOR: |
|
| 312 | + return "FLOOR($params[0])"; |
|
| 313 | 313 | |
| 314 | - case ODataConstants::BINFUL_EQUAL: |
|
| 315 | - return "($params[0] = $params[1])"; |
|
| 314 | + case ODataConstants::BINFUL_EQUAL: |
|
| 315 | + return "($params[0] = $params[1])"; |
|
| 316 | 316 | |
| 317 | - case 'is_null': |
|
| 318 | - return "is_null($params[0])"; |
|
| 317 | + case 'is_null': |
|
| 318 | + return "is_null($params[0])"; |
|
| 319 | 319 | |
| 320 | - default: |
|
| 321 | - throw new \InvalidArgumentException('onFunctionCallExpression'); |
|
| 320 | + default: |
|
| 321 | + throw new \InvalidArgumentException('onFunctionCallExpression'); |
|
| 322 | 322 | } |
| 323 | 323 | } |
| 324 | 324 | |
@@ -333,14 +333,14 @@ discard block |
||
| 333 | 333 | */ |
| 334 | 334 | private function _prepareBinaryExpression($operator, $left, $right) |
| 335 | 335 | { |
| 336 | - //DATETIMECMP |
|
| 337 | - if (!substr_compare($left, "DATETIMECMP", 0, 11)) { |
|
| 338 | - $str = explode(';', $left, 2); |
|
| 339 | - $str[0] = str_replace('DATETIMECMP', '', $str[0]); |
|
| 340 | - return self::OPEN_BRACKET |
|
| 341 | - . $str[0] . ' ' . $operator |
|
| 342 | - . ' ' . $str[1] . self::CLOSE_BRACKET; |
|
| 343 | - } |
|
| 336 | + //DATETIMECMP |
|
| 337 | + if (!substr_compare($left, "DATETIMECMP", 0, 11)) { |
|
| 338 | + $str = explode(';', $left, 2); |
|
| 339 | + $str[0] = str_replace('DATETIMECMP', '', $str[0]); |
|
| 340 | + return self::OPEN_BRACKET |
|
| 341 | + . $str[0] . ' ' . $operator |
|
| 342 | + . ' ' . $str[1] . self::CLOSE_BRACKET; |
|
| 343 | + } |
|
| 344 | 344 | |
| 345 | 345 | return self::OPEN_BRACKET . $left . ' ' . $operator . ' ' . $right . self::CLOSE_BRACKET; |
| 346 | 346 | } |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | const MULTIPLY = '*'; |
| 32 | 32 | const NEGATE = '-'; |
| 33 | 33 | const NOT_EQUAL = '!='; |
| 34 | - const OPEN_BRACKET = '('; |
|
| 34 | + const OPEN_BRACKET = '('; |
|
| 35 | 35 | |
| 36 | 36 | /** |
| 37 | 37 | * The type of the resource pointed by the resource path segment |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | */ |
| 85 | 85 | public function onLogicalExpression($expressionType, $left, $right) |
| 86 | 86 | { |
| 87 | - switch($expressionType) { |
|
| 87 | + switch ($expressionType) { |
|
| 88 | 88 | case ExpressionType::AND_LOGICAL: |
| 89 | 89 | return $this->_prepareBinaryExpression(self::LOGICAL_AND, $left, $right); |
| 90 | 90 | |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | */ |
| 108 | 108 | public function onArithmeticExpression($expressionType, $left, $right) |
| 109 | 109 | { |
| 110 | - switch($expressionType) { |
|
| 110 | + switch ($expressionType) { |
|
| 111 | 111 | case ExpressionType::MULTIPLY: |
| 112 | 112 | return $this->_prepareBinaryExpression(self::MULTIPLY, $left, $right); |
| 113 | 113 | |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | */ |
| 140 | 140 | public function onRelationalExpression($expressionType, $left, $right) |
| 141 | 141 | { |
| 142 | - switch($expressionType) { |
|
| 142 | + switch ($expressionType) { |
|
| 143 | 143 | case ExpressionType::GREATERTHAN: |
| 144 | 144 | return $this->_prepareBinaryExpression(self::GREATER_THAN, $left, $right); |
| 145 | 145 | |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | */ |
| 174 | 174 | public function onUnaryExpression($expressionType, $child) |
| 175 | 175 | { |
| 176 | - switch($expressionType) { |
|
| 176 | + switch ($expressionType) { |
|
| 177 | 177 | case ExpressionType::NEGATE: |
| 178 | 178 | return $this->_prepareUnaryExpression(self::NEGATE, $child); |
| 179 | 179 | |
@@ -239,7 +239,7 @@ discard block |
||
| 239 | 239 | */ |
| 240 | 240 | public function onFunctionCallExpression($functionDescription, $params) |
| 241 | 241 | { |
| 242 | - switch($functionDescription->name) { |
|
| 242 | + switch ($functionDescription->name) { |
|
| 243 | 243 | case ODataConstants::STRFUN_COMPARE: |
| 244 | 244 | return "STRCMP($params[0], $params[1])"; |
| 245 | 245 | |
@@ -266,8 +266,7 @@ discard block |
||
| 266 | 266 | |
| 267 | 267 | case ODataConstants::STRFUN_SUBSTRING: |
| 268 | 268 | return count($params) == 3 ? |
| 269 | - "SUBSTRING($params[0], $params[1] + 1, $params[2])" : |
|
| 270 | - "SUBSTRING($params[0], $params[1] + 1)"; |
|
| 269 | + "SUBSTRING($params[0], $params[1] + 1, $params[2])" : "SUBSTRING($params[0], $params[1] + 1)"; |
|
| 271 | 270 | |
| 272 | 271 | case ODataConstants::STRFUN_SUBSTRINGOF: |
| 273 | 272 | return "(LOCATE($params[0], $params[1]) > 0)"; |
@@ -338,11 +337,11 @@ discard block |
||
| 338 | 337 | $str = explode(';', $left, 2); |
| 339 | 338 | $str[0] = str_replace('DATETIMECMP', '', $str[0]); |
| 340 | 339 | return self::OPEN_BRACKET |
| 341 | - . $str[0] . ' ' . $operator |
|
| 342 | - . ' ' . $str[1] . self::CLOSE_BRACKET; |
|
| 340 | + . $str[0].' '.$operator |
|
| 341 | + . ' '.$str[1].self::CLOSE_BRACKET; |
|
| 343 | 342 | } |
| 344 | 343 | |
| 345 | - return self::OPEN_BRACKET . $left . ' ' . $operator . ' ' . $right . self::CLOSE_BRACKET; |
|
| 344 | + return self::OPEN_BRACKET.$left.' '.$operator.' '.$right.self::CLOSE_BRACKET; |
|
| 346 | 345 | } |
| 347 | 346 | |
| 348 | 347 | /** |
@@ -355,6 +354,6 @@ discard block |
||
| 355 | 354 | */ |
| 356 | 355 | private function _prepareUnaryExpression($operator, $child) |
| 357 | 356 | { |
| 358 | - return $operator . self::OPEN_BRACKET . $child . self::CLOSE_BRACKET; |
|
| 357 | + return $operator.self::OPEN_BRACKET.$child.self::CLOSE_BRACKET; |
|
| 359 | 358 | } |
| 360 | 359 | } |
| 361 | 360 | \ No newline at end of file |
@@ -48,7 +48,7 @@ |
||
| 48 | 48 | ) { |
| 49 | 49 | $this->_name = $name; |
| 50 | 50 | $this->_fullName = !is_null($namespaceName) |
| 51 | - ? $namespaceName . '.' . $name : $name; |
|
| 51 | + ? $namespaceName.'.'.$name : $name; |
|
| 52 | 52 | $this->_end1 = $end1; |
| 53 | 53 | $this->_end2 = $end2; |
| 54 | 54 | } |
@@ -172,7 +172,7 @@ |
||
| 172 | 172 | private function _isValidResourcePropertyKind($kind) |
| 173 | 173 | { |
| 174 | 174 | return |
| 175 | - !($kind != ResourcePropertyKind::RESOURCE_REFERENCE && |
|
| 175 | + !($kind != ResourcePropertyKind::RESOURCE_REFERENCE && |
|
| 176 | 176 | $kind != ResourcePropertyKind::RESOURCESET_REFERENCE && |
| 177 | 177 | $kind != ResourcePropertyKind::COMPLEX_TYPE && |
| 178 | 178 | ($kind != (ResourcePropertyKind::COMPLEX_TYPE | ResourcePropertyKind::BAG)) && |
@@ -176,7 +176,7 @@ |
||
| 176 | 176 | $kind != ResourcePropertyKind::RESOURCESET_REFERENCE && |
| 177 | 177 | $kind != ResourcePropertyKind::COMPLEX_TYPE && |
| 178 | 178 | ($kind != (ResourcePropertyKind::COMPLEX_TYPE | ResourcePropertyKind::BAG)) && |
| 179 | - $kind != ResourcePropertyKind::PRIMITIVE && |
|
| 179 | + $kind != ResourcePropertyKind::PRIMITIVE && |
|
| 180 | 180 | ($kind != (ResourcePropertyKind::PRIMITIVE | ResourcePropertyKind::BAG)) && |
| 181 | 181 | ($kind != (ResourcePropertyKind::PRIMITIVE | ResourcePropertyKind::KEY)) && |
| 182 | 182 | ($kind != (ResourcePropertyKind::PRIMITIVE | ResourcePropertyKind::ETAG))); |
@@ -125,10 +125,10 @@ discard block |
||
| 125 | 125 | return false; |
| 126 | 126 | } |
| 127 | 127 | |
| 128 | - if (!ctype_xdigit($value)){ |
|
| 129 | - $outValue = null; |
|
| 130 | - return false; |
|
| 131 | - } |
|
| 128 | + if (!ctype_xdigit($value)){ |
|
| 129 | + $outValue = null; |
|
| 130 | + return false; |
|
| 131 | + } |
|
| 132 | 132 | |
| 133 | 133 | $outValue = array(); |
| 134 | 134 | $outValIndex = 0; |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | */ |
| 156 | 156 | public static function binaryEqual($binary1, $binary2) |
| 157 | 157 | { |
| 158 | - //str cmp will return true if they are both null, so check short circuit that.. |
|
| 158 | + //str cmp will return true if they are both null, so check short circuit that.. |
|
| 159 | 159 | if (is_null($binary1) || is_null($binary2)) { |
| 160 | 160 | return false; |
| 161 | 161 | } |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | */ |
| 108 | 108 | public function convertToOData($value) |
| 109 | 109 | { |
| 110 | - return 'binary\'' . bin2hex($value). '\''; |
|
| 110 | + return 'binary\''.bin2hex($value).'\''; |
|
| 111 | 111 | } |
| 112 | 112 | |
| 113 | 113 | /** |
@@ -125,7 +125,7 @@ discard block |
||
| 125 | 125 | return false; |
| 126 | 126 | } |
| 127 | 127 | |
| 128 | - if (!ctype_xdigit($value)){ |
|
| 128 | + if (!ctype_xdigit($value)) { |
|
| 129 | 129 | $outValue = null; |
| 130 | 130 | return false; |
| 131 | 131 | } |
@@ -45,9 +45,9 @@ |
||
| 45 | 45 | public function isCompatibleWith(IType $type) |
| 46 | 46 | { |
| 47 | 47 | switch ($type->getTypeCode()) { |
| 48 | - case TypeCode::BYTE: |
|
| 49 | - case TypeCode::CHAR: |
|
| 50 | - return true; |
|
| 48 | + case TypeCode::BYTE: |
|
| 49 | + case TypeCode::CHAR: |
|
| 50 | + return true; |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | return false; |