@@ -106,10 +106,10 @@ |
||
| 106 | 106 | |
| 107 | 107 | $resultSet = $sourceEntityInstance->get(); |
| 108 | 108 | |
| 109 | - if(isset($filterInfo)){ |
|
| 110 | - $method = "return " . $filterInfo->getExpressionAsString() . ";"; |
|
| 111 | - $clln = "$" . $resourceSet->getResourceType()->getName(); |
|
| 112 | - $isvalid = create_function($clln,$method ); |
|
| 109 | + if (isset($filterInfo)) { |
|
| 110 | + $method = "return ".$filterInfo->getExpressionAsString().";"; |
|
| 111 | + $clln = "$".$resourceSet->getResourceType()->getName(); |
|
| 112 | + $isvalid = create_function($clln, $method); |
|
| 113 | 113 | $resultSet = $resultSet->filter($isvalid); |
| 114 | 114 | } |
| 115 | 115 | |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | */ |
| 68 | 68 | public function setResourceType(ResourceType $resourceType) |
| 69 | 69 | { |
| 70 | - $this->iteratorName = "$" . $resourceType->getName(); |
|
| 70 | + $this->iteratorName = "$".$resourceType->getName(); |
|
| 71 | 71 | $this->_resourceType = $resourceType; |
| 72 | 72 | } |
| 73 | 73 | /** |
@@ -192,11 +192,11 @@ discard block |
||
| 192 | 192 | $parent = $expression; |
| 193 | 193 | $variable = null; |
| 194 | 194 | do { |
| 195 | - $variable = $parent->getResourceProperty()->getName() . self::MEMBER_ACCESS . $variable; |
|
| 195 | + $variable = $parent->getResourceProperty()->getName().self::MEMBER_ACCESS.$variable; |
|
| 196 | 196 | $parent = $parent->getParent(); |
| 197 | 197 | } while ($parent != null); |
| 198 | 198 | $variable = rtrim($variable, self::MEMBER_ACCESS); |
| 199 | - $variable = $this->getIteratorName() . self::MEMBER_ACCESS . $variable; |
|
| 199 | + $variable = $this->getIteratorName().self::MEMBER_ACCESS.$variable; |
|
| 200 | 200 | return $variable; |
| 201 | 201 | } |
| 202 | 202 | /** |
@@ -232,25 +232,25 @@ discard block |
||
| 232 | 232 | case ODataConstants::STRFUN_SUBSTRINGOF: |
| 233 | 233 | return "(strpos($params[1], $params[0]) !== false)"; |
| 234 | 234 | case ODataConstants::STRFUN_CONCAT: |
| 235 | - return $params[0] . ' . ' . $params[1]; |
|
| 235 | + return $params[0].' . '.$params[1]; |
|
| 236 | 236 | case ODataConstants::STRFUN_LENGTH: |
| 237 | 237 | return "strlen($params[0])"; |
| 238 | 238 | case ODataConstants::GUIDFUN_EQUAL: |
| 239 | - return self::TYPE_NAMESPACE . "Guid::guidEqual($params[0], $params[1])"; |
|
| 239 | + return self::TYPE_NAMESPACE."Guid::guidEqual($params[0], $params[1])"; |
|
| 240 | 240 | case ODataConstants::DATETIME_COMPARE: |
| 241 | - return self::TYPE_NAMESPACE . "DateTime::dateTimeCmp($params[0], $params[1])"; |
|
| 241 | + return self::TYPE_NAMESPACE."DateTime::dateTimeCmp($params[0], $params[1])"; |
|
| 242 | 242 | case ODataConstants::DATETIME_YEAR: |
| 243 | - return self::TYPE_NAMESPACE . "DateTime::year($params[0])"; |
|
| 243 | + return self::TYPE_NAMESPACE."DateTime::year($params[0])"; |
|
| 244 | 244 | case ODataConstants::DATETIME_MONTH: |
| 245 | - return self::TYPE_NAMESPACE . "DateTime::month($params[0])"; |
|
| 245 | + return self::TYPE_NAMESPACE."DateTime::month($params[0])"; |
|
| 246 | 246 | case ODataConstants::DATETIME_DAY: |
| 247 | - return self::TYPE_NAMESPACE . "DateTime::day($params[0])"; |
|
| 247 | + return self::TYPE_NAMESPACE."DateTime::day($params[0])"; |
|
| 248 | 248 | case ODataConstants::DATETIME_HOUR: |
| 249 | - return self::TYPE_NAMESPACE . "DateTime::hour($params[0])"; |
|
| 249 | + return self::TYPE_NAMESPACE."DateTime::hour($params[0])"; |
|
| 250 | 250 | case ODataConstants::DATETIME_MINUTE: |
| 251 | - return self::TYPE_NAMESPACE . "DateTime::minute($params[0])"; |
|
| 251 | + return self::TYPE_NAMESPACE."DateTime::minute($params[0])"; |
|
| 252 | 252 | case ODataConstants::DATETIME_SECOND: |
| 253 | - return self::TYPE_NAMESPACE . "DateTime::second($params[0])"; |
|
| 253 | + return self::TYPE_NAMESPACE."DateTime::second($params[0])"; |
|
| 254 | 254 | case ODataConstants::MATHFUN_ROUND: |
| 255 | 255 | return "round($params[0])"; |
| 256 | 256 | case ODataConstants::MATHFUN_CEILING: |
@@ -258,7 +258,7 @@ discard block |
||
| 258 | 258 | case ODataConstants::MATHFUN_FLOOR: |
| 259 | 259 | return "floor($params[0])"; |
| 260 | 260 | case ODataConstants::BINFUL_EQUAL: |
| 261 | - return self::TYPE_NAMESPACE . "Binary::binaryEqual($params[0], $params[1])"; |
|
| 261 | + return self::TYPE_NAMESPACE."Binary::binaryEqual($params[0], $params[1])"; |
|
| 262 | 262 | case 'is_null': |
| 263 | 263 | return "is_null($params[0])"; |
| 264 | 264 | default: |
@@ -277,7 +277,7 @@ discard block |
||
| 277 | 277 | private function _prepareBinaryExpression($operator, $left, $right) |
| 278 | 278 | { |
| 279 | 279 | return |
| 280 | - self::OPEN_BRACKET . $left . ' ' . $operator . ' ' . $right . self::CLOSE_BRACKET; |
|
| 280 | + self::OPEN_BRACKET.$left.' '.$operator.' '.$right.self::CLOSE_BRACKET; |
|
| 281 | 281 | } |
| 282 | 282 | /** |
| 283 | 283 | * To format unary expression. |
@@ -289,6 +289,6 @@ discard block |
||
| 289 | 289 | */ |
| 290 | 290 | private function _prepareUnaryExpression($operator, $child) |
| 291 | 291 | { |
| 292 | - return $operator . self::OPEN_BRACKET . $child . self::CLOSE_BRACKET; |
|
| 292 | + return $operator.self::OPEN_BRACKET.$child.self::CLOSE_BRACKET; |
|
| 293 | 293 | } |
| 294 | 294 | } |