@@ -12,8 +12,8 @@ |
||
| 12 | 12 | */ |
| 13 | 13 | class QueryType extends Enum { |
| 14 | 14 | |
| 15 | - const ENTITIES = "ENTITIES"; |
|
| 16 | - const COUNT = "COUNT"; |
|
| 17 | - const ENTITIES_WITH_COUNT = "ENTITIES_WITH_COUNT"; |
|
| 15 | + const ENTITIES = "ENTITIES"; |
|
| 16 | + const COUNT = "COUNT"; |
|
| 17 | + const ENTITIES_WITH_COUNT = "ENTITIES_WITH_COUNT"; |
|
| 18 | 18 | |
| 19 | 19 | } |
| 20 | 20 | \ No newline at end of file |
@@ -125,7 +125,7 @@ |
||
| 125 | 125 | * of its associated entity. The returned string MUST be formatted such that it is |
| 126 | 126 | * directly usable as the value of an HTTP ETag response header. If null is returned |
| 127 | 127 | * the data service framework will assume that no ETag is associated with the stream. |
| 128 | - * |
|
| 128 | + * |
|
| 129 | 129 | * NOTE: Altering properties on the $operationContext parameter may corrupt the response |
| 130 | 130 | * from the data service. |
| 131 | 131 | * |
@@ -195,7 +195,7 @@ discard block |
||
| 195 | 195 | $expandSubPathSegment |
| 196 | 196 | ); |
| 197 | 197 | if (is_null($resourceProperty)) { |
| 198 | - throw ODataException::createSyntaxError( |
|
| 198 | + throw ODataException::createSyntaxError( |
|
| 199 | 199 | Messages::expandProjectionParserPropertyNotFound( |
| 200 | 200 | $resourceType->getFullName(), |
| 201 | 201 | $expandSubPathSegment, |
@@ -203,7 +203,7 @@ discard block |
||
| 203 | 203 | ) |
| 204 | 204 | ); |
| 205 | 205 | } else if ($resourceProperty->getTypeKind() != ResourceTypeKind::ENTITY) { |
| 206 | - throw ODataException::createBadRequestError( |
|
| 206 | + throw ODataException::createBadRequestError( |
|
| 207 | 207 | Messages::expandProjectionParserExpandCanOnlyAppliedToEntity( |
| 208 | 208 | $resourceType->getFullName(), |
| 209 | 209 | $expandSubPathSegment |
@@ -218,7 +218,7 @@ discard block |
||
| 218 | 218 | $resourceProperty |
| 219 | 219 | ); |
| 220 | 220 | if (is_null($resourceSetWrapper)) { |
| 221 | - throw ODataException::createBadRequestError( |
|
| 221 | + throw ODataException::createBadRequestError( |
|
| 222 | 222 | Messages::badRequestInvalidPropertyNameSpecified( |
| 223 | 223 | $resourceType->getFullName(), |
| 224 | 224 | $expandSubPathSegment |
@@ -295,7 +295,7 @@ discard block |
||
| 295 | 295 | if (!($currentNode instanceof RootProjectionNode) |
| 296 | 296 | && !($currentNode instanceof ExpandedProjectionNode) |
| 297 | 297 | ) { |
| 298 | - throw ODataException::createBadRequestError( |
|
| 298 | + throw ODataException::createBadRequestError( |
|
| 299 | 299 | Messages::expandProjectionParserPropertyWithoutMatchingExpand( |
| 300 | 300 | $currentNode->getPropertyName() |
| 301 | 301 | ) |
@@ -326,21 +326,21 @@ discard block |
||
| 326 | 326 | |
| 327 | 327 | if (!$isLastSegment) { |
| 328 | 328 | if ($resourceProperty->isKindOf(ResourcePropertyKind::BAG)) { |
| 329 | - throw ODataException::createBadRequestError( |
|
| 329 | + throw ODataException::createBadRequestError( |
|
| 330 | 330 | Messages::expandProjectionParserBagPropertyAsInnerSelectSegment( |
| 331 | 331 | $currentResourceType->getFullName(), |
| 332 | 332 | $selectSubPathSegment |
| 333 | 333 | ) |
| 334 | 334 | ); |
| 335 | 335 | } else if ($resourceProperty->isKindOf(ResourcePropertyKind::PRIMITIVE)) { |
| 336 | - throw ODataException::createBadRequestError( |
|
| 336 | + throw ODataException::createBadRequestError( |
|
| 337 | 337 | Messages::expandProjectionParserPrimitivePropertyUsedAsNavigationProperty( |
| 338 | 338 | $currentResourceType->getFullName(), |
| 339 | 339 | $selectSubPathSegment |
| 340 | 340 | ) |
| 341 | 341 | ); |
| 342 | 342 | } else if ($resourceProperty->isKindOf(ResourcePropertyKind::COMPLEX_TYPE)) { |
| 343 | - throw ODataException::createBadRequestError( |
|
| 343 | + throw ODataException::createBadRequestError( |
|
| 344 | 344 | Messages::expandProjectionParserComplexPropertyAsInnerSelectSegment( |
| 345 | 345 | $currentResourceType->getFullName(), |
| 346 | 346 | $selectSubPathSegment |
@@ -356,7 +356,7 @@ discard block |
||
| 356 | 356 | $node = $currentNode->findNode($selectSubPathSegment); |
| 357 | 357 | if (is_null($node)) { |
| 358 | 358 | if (!$isLastSegment) { |
| 359 | - throw ODataException::createBadRequestError( |
|
| 359 | + throw ODataException::createBadRequestError( |
|
| 360 | 360 | Messages::expandProjectionParserPropertyWithoutMatchingExpand( |
| 361 | 361 | $selectSubPathSegment |
| 362 | 362 | ) |
@@ -413,7 +413,7 @@ |
||
| 413 | 413 | $this->_selectAllImmediateProperties = false; |
| 414 | 414 | foreach ($this->_childNodes as $node) { |
| 415 | 415 | if ($node instanceof ExpandedProjectionNode) { |
| 416 | - $node->markSubtreeAsSelected(); |
|
| 416 | + $node->markSubtreeAsSelected(); |
|
| 417 | 417 | } |
| 418 | 418 | } |
| 419 | 419 | } |
@@ -166,111 +166,111 @@ |
||
| 166 | 166 | $t = null; |
| 167 | 167 | $tokenPos = $this->_textPos; |
| 168 | 168 | switch ($this->_ch) { |
| 169 | - case '(': |
|
| 170 | - $this->_nextChar(); |
|
| 171 | - $t = ExpressionTokenId::OPENPARAM; |
|
| 172 | - break; |
|
| 173 | - case ')': |
|
| 174 | - $this->_nextChar(); |
|
| 175 | - $t = ExpressionTokenId::CLOSEPARAM; |
|
| 176 | - break; |
|
| 177 | - case ',': |
|
| 178 | - $this->_nextChar(); |
|
| 179 | - $t = ExpressionTokenId::COMMA; |
|
| 180 | - break; |
|
| 181 | - case '-': |
|
| 182 | - $hasNext = $this->_textPos + 1 < $this->_textLen; |
|
| 183 | - if ($hasNext && Char::isDigit($this->_text[$this->_textPos + 1])) { |
|
| 184 | - $this->_nextChar(); |
|
| 185 | - $t = $this->_parseFromDigit(); |
|
| 186 | - if (self::isNumeric($t)) { |
|
| 187 | - break; |
|
| 188 | - } |
|
| 189 | - |
|
| 190 | - $this->_setTextPos($tokenPos); |
|
| 191 | - } else if ($hasNext && $this->_text[$tokenPos + 1] == 'I') { |
|
| 192 | - $this->_nextChar(); |
|
| 193 | - $this->_parseIdentifier(); |
|
| 194 | - $currentIdentifier = substr($this->_text, $tokenPos + 1, $this->_textPos - $tokenPos - 1); |
|
| 195 | - |
|
| 196 | - if (self::_isInfinityLiteralDouble($currentIdentifier)) { |
|
| 197 | - $t = ExpressionTokenId::DOUBLE_LITERAL; |
|
| 198 | - break; |
|
| 199 | - } else if (self::_isInfinityLiteralSingle($currentIdentifier)) { |
|
| 200 | - $t = ExpressionTokenId::SINGLE_LITERAL; |
|
| 201 | - break; |
|
| 202 | - } |
|
| 203 | - |
|
| 204 | - // If it looked like '-INF' but wasn't we'll rewind and fall |
|
| 205 | - // through to a simple '-' token. |
|
| 206 | - $this->_setTextPos($tokenPos); |
|
| 207 | - } |
|
| 208 | - |
|
| 209 | - $this->_nextChar(); |
|
| 210 | - $t = ExpressionTokenId::MINUS; |
|
| 211 | - break; |
|
| 212 | - case '=': |
|
| 213 | - $this->_nextChar(); |
|
| 214 | - $t = ExpressionTokenId::EQUAL; |
|
| 215 | - break; |
|
| 216 | - case '/': |
|
| 217 | - $this->_nextChar(); |
|
| 218 | - $t = ExpressionTokenId::SLASH; |
|
| 219 | - break; |
|
| 220 | - case '?': |
|
| 221 | - $this->_nextChar(); |
|
| 222 | - $t = ExpressionTokenId::QUESTION; |
|
| 223 | - break; |
|
| 224 | - case '.': |
|
| 225 | - $this->_nextChar(); |
|
| 226 | - $t = ExpressionTokenId::DOT; |
|
| 227 | - break; |
|
| 228 | - case '\'': |
|
| 229 | - $quote = $this->_ch; |
|
| 230 | - do { |
|
| 231 | - $this->_nextChar(); |
|
| 232 | - while ($this->_textPos < $this->_textLen && $this->_ch != $quote) { |
|
| 233 | - $this->_nextChar(); |
|
| 234 | - } |
|
| 235 | - |
|
| 236 | - if ($this->_textPos == $this->_textLen) { |
|
| 237 | - $this->_parseError( |
|
| 238 | - Messages::expressionLexerUnterminatedStringLiteral( |
|
| 239 | - $this->_textPos, $this->_text |
|
| 240 | - ) |
|
| 241 | - ); |
|
| 242 | - } |
|
| 243 | - |
|
| 244 | - $this->_nextChar(); |
|
| 245 | - } while ($this->_ch == $quote); |
|
| 246 | - $t = ExpressionTokenId::STRING_LITERAL; |
|
| 247 | - break; |
|
| 248 | - case '*': |
|
| 249 | - $this->_nextChar(); |
|
| 250 | - $t = ExpressionTokenId::STAR; |
|
| 251 | - break; |
|
| 252 | - default: |
|
| 253 | - if (Char::isLetter($this->_ch) || $this->_ch == '_') { |
|
| 254 | - $this->_parseIdentifier(); |
|
| 255 | - $t = ExpressionTokenId::IDENTIFIER; |
|
| 256 | - break; |
|
| 257 | - } |
|
| 258 | - |
|
| 259 | - if (Char::isDigit($this->_ch)) { |
|
| 260 | - $t = $this->_parseFromDigit(); |
|
| 261 | - break; |
|
| 262 | - } |
|
| 263 | - |
|
| 264 | - if ($this->_textPos == $this->_textLen) { |
|
| 265 | - $t = ExpressionTokenId::END; |
|
| 266 | - break; |
|
| 267 | - } |
|
| 268 | - |
|
| 269 | - $this->_parseError( |
|
| 270 | - Messages::expressionLexerInvalidCharacter( |
|
| 271 | - $this->_ch, $this->_textPos |
|
| 272 | - ) |
|
| 273 | - ); |
|
| 169 | + case '(': |
|
| 170 | + $this->_nextChar(); |
|
| 171 | + $t = ExpressionTokenId::OPENPARAM; |
|
| 172 | + break; |
|
| 173 | + case ')': |
|
| 174 | + $this->_nextChar(); |
|
| 175 | + $t = ExpressionTokenId::CLOSEPARAM; |
|
| 176 | + break; |
|
| 177 | + case ',': |
|
| 178 | + $this->_nextChar(); |
|
| 179 | + $t = ExpressionTokenId::COMMA; |
|
| 180 | + break; |
|
| 181 | + case '-': |
|
| 182 | + $hasNext = $this->_textPos + 1 < $this->_textLen; |
|
| 183 | + if ($hasNext && Char::isDigit($this->_text[$this->_textPos + 1])) { |
|
| 184 | + $this->_nextChar(); |
|
| 185 | + $t = $this->_parseFromDigit(); |
|
| 186 | + if (self::isNumeric($t)) { |
|
| 187 | + break; |
|
| 188 | + } |
|
| 189 | + |
|
| 190 | + $this->_setTextPos($tokenPos); |
|
| 191 | + } else if ($hasNext && $this->_text[$tokenPos + 1] == 'I') { |
|
| 192 | + $this->_nextChar(); |
|
| 193 | + $this->_parseIdentifier(); |
|
| 194 | + $currentIdentifier = substr($this->_text, $tokenPos + 1, $this->_textPos - $tokenPos - 1); |
|
| 195 | + |
|
| 196 | + if (self::_isInfinityLiteralDouble($currentIdentifier)) { |
|
| 197 | + $t = ExpressionTokenId::DOUBLE_LITERAL; |
|
| 198 | + break; |
|
| 199 | + } else if (self::_isInfinityLiteralSingle($currentIdentifier)) { |
|
| 200 | + $t = ExpressionTokenId::SINGLE_LITERAL; |
|
| 201 | + break; |
|
| 202 | + } |
|
| 203 | + |
|
| 204 | + // If it looked like '-INF' but wasn't we'll rewind and fall |
|
| 205 | + // through to a simple '-' token. |
|
| 206 | + $this->_setTextPos($tokenPos); |
|
| 207 | + } |
|
| 208 | + |
|
| 209 | + $this->_nextChar(); |
|
| 210 | + $t = ExpressionTokenId::MINUS; |
|
| 211 | + break; |
|
| 212 | + case '=': |
|
| 213 | + $this->_nextChar(); |
|
| 214 | + $t = ExpressionTokenId::EQUAL; |
|
| 215 | + break; |
|
| 216 | + case '/': |
|
| 217 | + $this->_nextChar(); |
|
| 218 | + $t = ExpressionTokenId::SLASH; |
|
| 219 | + break; |
|
| 220 | + case '?': |
|
| 221 | + $this->_nextChar(); |
|
| 222 | + $t = ExpressionTokenId::QUESTION; |
|
| 223 | + break; |
|
| 224 | + case '.': |
|
| 225 | + $this->_nextChar(); |
|
| 226 | + $t = ExpressionTokenId::DOT; |
|
| 227 | + break; |
|
| 228 | + case '\'': |
|
| 229 | + $quote = $this->_ch; |
|
| 230 | + do { |
|
| 231 | + $this->_nextChar(); |
|
| 232 | + while ($this->_textPos < $this->_textLen && $this->_ch != $quote) { |
|
| 233 | + $this->_nextChar(); |
|
| 234 | + } |
|
| 235 | + |
|
| 236 | + if ($this->_textPos == $this->_textLen) { |
|
| 237 | + $this->_parseError( |
|
| 238 | + Messages::expressionLexerUnterminatedStringLiteral( |
|
| 239 | + $this->_textPos, $this->_text |
|
| 240 | + ) |
|
| 241 | + ); |
|
| 242 | + } |
|
| 243 | + |
|
| 244 | + $this->_nextChar(); |
|
| 245 | + } while ($this->_ch == $quote); |
|
| 246 | + $t = ExpressionTokenId::STRING_LITERAL; |
|
| 247 | + break; |
|
| 248 | + case '*': |
|
| 249 | + $this->_nextChar(); |
|
| 250 | + $t = ExpressionTokenId::STAR; |
|
| 251 | + break; |
|
| 252 | + default: |
|
| 253 | + if (Char::isLetter($this->_ch) || $this->_ch == '_') { |
|
| 254 | + $this->_parseIdentifier(); |
|
| 255 | + $t = ExpressionTokenId::IDENTIFIER; |
|
| 256 | + break; |
|
| 257 | + } |
|
| 258 | + |
|
| 259 | + if (Char::isDigit($this->_ch)) { |
|
| 260 | + $t = $this->_parseFromDigit(); |
|
| 261 | + break; |
|
| 262 | + } |
|
| 263 | + |
|
| 264 | + if ($this->_textPos == $this->_textLen) { |
|
| 265 | + $t = ExpressionTokenId::END; |
|
| 266 | + break; |
|
| 267 | + } |
|
| 268 | + |
|
| 269 | + $this->_parseError( |
|
| 270 | + Messages::expressionLexerInvalidCharacter( |
|
| 271 | + $this->_ch, $this->_textPos |
|
| 272 | + ) |
|
| 273 | + ); |
|
| 274 | 274 | } |
| 275 | 275 | |
| 276 | 276 | $this->_token->Id = $t; |
@@ -690,81 +690,81 @@ |
||
| 690 | 690 | |
| 691 | 691 | $null = new Null1(); |
| 692 | 692 | if ($left->typeIs($null) || $right->typeIs($null)) { |
| 693 | - // If the end user is responsible for implementing IExpressionProvider |
|
| 694 | - // then the sub-tree for a nullability check would be: |
|
| 695 | - // |
|
| 696 | - // RelationalExpression(EQ/NE) |
|
| 697 | - // | |
|
| 698 | - // ------------ |
|
| 699 | - // | | |
|
| 700 | - // | | |
|
| 701 | - // CustomerID NULL |
|
| 702 | - // |
|
| 703 | - // Otherwise (In case of default PHPExpressionProvider): |
|
| 704 | - // |
|
| 705 | - // CustomerID eq null |
|
| 706 | - // ================== |
|
| 707 | - // |
|
| 708 | - // FunctionCallExpression(is_null) |
|
| 709 | - // | |
|
| 710 | - // |- Signature => bool (typeof(CustomerID)) |
|
| 711 | - // |- args => {CustomerID} |
|
| 712 | - // |
|
| 713 | - // |
|
| 714 | - // CustomerID ne null |
|
| 715 | - // ================== |
|
| 716 | - // |
|
| 717 | - // UnaryExpression (not) |
|
| 718 | - // | |
|
| 719 | - // FunctionCallExpression(is_null) |
|
| 720 | - // | |
|
| 721 | - // |- Signature => bool (typeof(CustomerID)) |
|
| 722 | - // |- args => {CustomerID} |
|
| 723 | - // |
|
| 693 | + // If the end user is responsible for implementing IExpressionProvider |
|
| 694 | + // then the sub-tree for a nullability check would be: |
|
| 695 | + // |
|
| 696 | + // RelationalExpression(EQ/NE) |
|
| 697 | + // | |
|
| 698 | + // ------------ |
|
| 699 | + // | | |
|
| 700 | + // | | |
|
| 701 | + // CustomerID NULL |
|
| 702 | + // |
|
| 703 | + // Otherwise (In case of default PHPExpressionProvider): |
|
| 704 | + // |
|
| 705 | + // CustomerID eq null |
|
| 706 | + // ================== |
|
| 707 | + // |
|
| 708 | + // FunctionCallExpression(is_null) |
|
| 709 | + // | |
|
| 710 | + // |- Signature => bool (typeof(CustomerID)) |
|
| 711 | + // |- args => {CustomerID} |
|
| 712 | + // |
|
| 713 | + // |
|
| 714 | + // CustomerID ne null |
|
| 715 | + // ================== |
|
| 716 | + // |
|
| 717 | + // UnaryExpression (not) |
|
| 718 | + // | |
|
| 719 | + // FunctionCallExpression(is_null) |
|
| 720 | + // | |
|
| 721 | + // |- Signature => bool (typeof(CustomerID)) |
|
| 722 | + // |- args => {CustomerID} |
|
| 723 | + // |
|
| 724 | 724 | if ($isPHPExpressionProvider) { |
| 725 | 725 | $arg = $left->typeIs($null) ? $right : $left; |
| 726 | 726 | $isNullFunctionDescription = new FunctionDescription('is_null', new Boolean(), array($arg->getType())); |
| 727 | 727 | switch ($expressionToken->Text) { |
| 728 | - case ODataConstants::KEYWORD_EQUAL: |
|
| 729 | - return new FunctionCallExpression($isNullFunctionDescription, array($arg)); |
|
| 730 | - break; |
|
| 731 | - |
|
| 732 | - case ODataConstants::KEYWORD_NOT_EQUAL: |
|
| 733 | - return new UnaryExpression( |
|
| 734 | - new FunctionCallExpression($isNullFunctionDescription, array($arg)), |
|
| 735 | - ExpressionType::NOT_LOGICAL, |
|
| 736 | - new Boolean() |
|
| 737 | - ); |
|
| 738 | - break; |
|
| 728 | + case ODataConstants::KEYWORD_EQUAL: |
|
| 729 | + return new FunctionCallExpression($isNullFunctionDescription, array($arg)); |
|
| 730 | + break; |
|
| 731 | + |
|
| 732 | + case ODataConstants::KEYWORD_NOT_EQUAL: |
|
| 733 | + return new UnaryExpression( |
|
| 734 | + new FunctionCallExpression($isNullFunctionDescription, array($arg)), |
|
| 735 | + ExpressionType::NOT_LOGICAL, |
|
| 736 | + new Boolean() |
|
| 737 | + ); |
|
| 738 | + break; |
|
| 739 | 739 | } |
| 740 | 740 | } |
| 741 | 741 | } |
| 742 | 742 | |
| 743 | 743 | switch ($expressionToken->Text) { |
| 744 | - case ODataConstants::KEYWORD_EQUAL: |
|
| 745 | - return new RelationalExpression( |
|
| 746 | - $left, $right, ExpressionType::EQUAL |
|
| 747 | - ); |
|
| 748 | - case ODataConstants::KEYWORD_NOT_EQUAL: |
|
| 749 | - return new RelationalExpression( |
|
| 750 | - $left, $right, ExpressionType::NOTEQUAL |
|
| 751 | - ); |
|
| 752 | - case ODataConstants::KEYWORD_GREATERTHAN: |
|
| 753 | - return new RelationalExpression( |
|
| 754 | - $left, $right, ExpressionType::GREATERTHAN |
|
| 755 | - ); |
|
| 756 | - case ODataConstants::KEYWORD_GREATERTHAN_OR_EQUAL: |
|
| 757 | - return new RelationalExpression( |
|
| 758 | - $left, $right, ExpressionType::GREATERTHAN_OR_EQUAL |
|
| 759 | - ); |
|
| 760 | - case ODataConstants::KEYWORD_LESSTHAN: |
|
| 761 | - return new RelationalExpression( |
|
| 762 | - $left, $right, ExpressionType::LESSTHAN |
|
| 763 | - ); |
|
| 764 | - default: |
|
| 765 | - return new RelationalExpression( |
|
| 766 | - $left, $right, ExpressionType::LESSTHAN_OR_EQUAL |
|
| 767 | - ); |
|
| 744 | + case ODataConstants::KEYWORD_EQUAL: |
|
| 745 | + return new RelationalExpression( |
|
| 746 | + $left, $right, ExpressionType::EQUAL |
|
| 747 | + ); |
|
| 748 | + case ODataConstants::KEYWORD_NOT_EQUAL: |
|
| 749 | + return new RelationalExpression( |
|
| 750 | + $left, $right, ExpressionType::NOTEQUAL |
|
| 751 | + ); |
|
| 752 | + case ODataConstants::KEYWORD_GREATERTHAN: |
|
| 753 | + return new RelationalExpression( |
|
| 754 | + $left, $right, ExpressionType::GREATERTHAN |
|
| 755 | + ); |
|
| 756 | + case ODataConstants::KEYWORD_GREATERTHAN_OR_EQUAL: |
|
| 757 | + return new RelationalExpression( |
|
| 758 | + $left, $right, ExpressionType::GREATERTHAN_OR_EQUAL |
|
| 759 | + ); |
|
| 760 | + case ODataConstants::KEYWORD_LESSTHAN: |
|
| 761 | + return new RelationalExpression( |
|
| 762 | + $left, $right, ExpressionType::LESSTHAN |
|
| 763 | + ); |
|
| 764 | + default: |
|
| 765 | + return new RelationalExpression( |
|
| 766 | + $left, $right, ExpressionType::LESSTHAN_OR_EQUAL |
|
| 767 | + ); |
|
| 768 | 768 | } |
| 769 | 769 | } |
| 770 | 770 | |
@@ -308,7 +308,7 @@ discard block |
||
| 308 | 308 | } |
| 309 | 309 | |
| 310 | 310 | if ($resultExpression == null) { |
| 311 | - return null; |
|
| 311 | + return null; |
|
| 312 | 312 | } |
| 313 | 313 | |
| 314 | 314 | if ($parentExpression == null) { |
@@ -389,7 +389,7 @@ discard block |
||
| 389 | 389 | } |
| 390 | 390 | |
| 391 | 391 | if ($resultExpression == null) { |
| 392 | - return null; |
|
| 392 | + return null; |
|
| 393 | 393 | } |
| 394 | 394 | |
| 395 | 395 | if ($parentExpression == null) { |
@@ -12,19 +12,19 @@ discard block |
||
| 12 | 12 | class FilterInfo |
| 13 | 13 | { |
| 14 | 14 | |
| 15 | - /** |
|
| 16 | - * Collection of navigation properties specified in the filter |
|
| 17 | - * clause, if no navigation (resource reference) property used |
|
| 18 | - * in the clause then this property will be null. |
|
| 19 | - * |
|
| 20 | - * e.g. $filter=NaviProp1/NaviProp2/PrimitiveProp eq 12 |
|
| 21 | - * $filter=NaviPropA/NaviPropB/PrimitiveProp gt 56.3 |
|
| 22 | - * In this case array will be as follows: |
|
| 23 | - * array(array(NaviProp1, NaviProp2), array(NaviPropA, NaviPropB)) |
|
| 24 | - * |
|
| 25 | - * @var array(array(ResourceProperty))/NULL |
|
| 26 | - */ |
|
| 27 | - private $_navigationPropertiesUsedInTheFilterClause; |
|
| 15 | + /** |
|
| 16 | + * Collection of navigation properties specified in the filter |
|
| 17 | + * clause, if no navigation (resource reference) property used |
|
| 18 | + * in the clause then this property will be null. |
|
| 19 | + * |
|
| 20 | + * e.g. $filter=NaviProp1/NaviProp2/PrimitiveProp eq 12 |
|
| 21 | + * $filter=NaviPropA/NaviPropB/PrimitiveProp gt 56.3 |
|
| 22 | + * In this case array will be as follows: |
|
| 23 | + * array(array(NaviProp1, NaviProp2), array(NaviPropA, NaviPropB)) |
|
| 24 | + * |
|
| 25 | + * @var array(array(ResourceProperty))/NULL |
|
| 26 | + */ |
|
| 27 | + private $_navigationPropertiesUsedInTheFilterClause; |
|
| 28 | 28 | |
| 29 | 29 | |
| 30 | 30 | /** |
@@ -47,15 +47,15 @@ discard block |
||
| 47 | 47 | */ |
| 48 | 48 | public function __construct($navigationPropertiesUsedInTheFilterClause, $filterExpAsDataSourceExp) |
| 49 | 49 | { |
| 50 | - $this->_navigationPropertiesUsedInTheFilterClause = $navigationPropertiesUsedInTheFilterClause; |
|
| 50 | + $this->_navigationPropertiesUsedInTheFilterClause = $navigationPropertiesUsedInTheFilterClause; |
|
| 51 | 51 | $this->_filterExpressionAsDataSourceExpression = $filterExpAsDataSourceExp; |
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | |
| 55 | - public function getNavigationPropertiesUsed() |
|
| 56 | - { |
|
| 57 | - return $this->_navigationPropertiesUsedInTheFilterClause; |
|
| 58 | - } |
|
| 55 | + public function getNavigationPropertiesUsed() |
|
| 56 | + { |
|
| 57 | + return $this->_navigationPropertiesUsedInTheFilterClause; |
|
| 58 | + } |
|
| 59 | 59 | |
| 60 | 60 | |
| 61 | 61 | /** |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | { |
| 72 | 72 | $str = $this->returnType->getFullTypeName() . ' ' . $this->name . '('; |
| 73 | 73 | |
| 74 | - foreach ($this->argumentTypes as $argumentType) { |
|
| 74 | + foreach ($this->argumentTypes as $argumentType) { |
|
| 75 | 75 | $str .= $argumentType->getFullTypeName() . ', '; |
| 76 | 76 | } |
| 77 | 77 | |
@@ -247,7 +247,7 @@ discard block |
||
| 247 | 247 | array(new Double()) |
| 248 | 248 | ) |
| 249 | 249 | ) |
| 250 | - ); |
|
| 250 | + ); |
|
| 251 | 251 | |
| 252 | 252 | return $functions; |
| 253 | 253 | } |