@@ -229,7 +229,7 @@ |
||
229 | 229 | $this->_name = $name; |
230 | 230 | $this->_baseType = $baseType; |
231 | 231 | $this->_namespaceName = $namespaceName; |
232 | - $this->_fullName = is_null($namespaceName) ? $name : $namespaceName.'.'.$name; |
|
232 | + $this->_fullName = is_null($namespaceName) ? $name : $namespaceName . '.' . $name; |
|
233 | 233 | $this->_abstractType = $isAbstract; |
234 | 234 | $this->_isMediaLinkEntry = false; |
235 | 235 | $this->_customState = null; |
@@ -431,11 +431,11 @@ |
||
431 | 431 | */ |
432 | 432 | public function getDefaultStreamEditMediaUri($mediaLinkEntryUri, $resourceStreamInfo) |
433 | 433 | { |
434 | - $base = rtrim($mediaLinkEntryUri, '/').'/'; |
|
434 | + $base = rtrim($mediaLinkEntryUri, '/') . '/'; |
|
435 | 435 | $end = (null == $resourceStreamInfo) ? ODataConstants::URI_VALUE_SEGMENT |
436 | 436 | : ltrim($resourceStreamInfo->getName(), '/'); |
437 | 437 | |
438 | - return $base.$end; |
|
438 | + return $base . $end; |
|
439 | 439 | } |
440 | 440 | |
441 | 441 | /** |
@@ -236,12 +236,12 @@ discard block |
||
236 | 236 | $variable = null; |
237 | 237 | |
238 | 238 | do { |
239 | - $variable = $parent->getResourceProperty()->getName().self::MEMBER_ACCESS.$variable; |
|
239 | + $variable = $parent->getResourceProperty()->getName() . self::MEMBER_ACCESS . $variable; |
|
240 | 240 | $parent = $parent->getParent(); |
241 | 241 | } while ($parent != null); |
242 | 242 | |
243 | 243 | $variable = rtrim($variable, self::MEMBER_ACCESS); |
244 | - $variable = $this->getIteratorName().self::MEMBER_ACCESS.$variable; |
|
244 | + $variable = $this->getIteratorName() . self::MEMBER_ACCESS . $variable; |
|
245 | 245 | |
246 | 246 | return $variable; |
247 | 247 | } |
@@ -289,34 +289,34 @@ discard block |
||
289 | 289 | return "(strpos($params[1], $params[0]) !== false)"; |
290 | 290 | |
291 | 291 | case ODataConstants::STRFUN_CONCAT: |
292 | - return $params[0].' . '.$params[1]; |
|
292 | + return $params[0] . ' . ' . $params[1]; |
|
293 | 293 | |
294 | 294 | case ODataConstants::STRFUN_LENGTH: |
295 | 295 | return "strlen($params[0])"; |
296 | 296 | |
297 | 297 | case ODataConstants::GUIDFUN_EQUAL: |
298 | - return self::TYPE_NAMESPACE."Guid::guidEqual($params[0], $params[1])"; |
|
298 | + return self::TYPE_NAMESPACE . "Guid::guidEqual($params[0], $params[1])"; |
|
299 | 299 | |
300 | 300 | case ODataConstants::DATETIME_COMPARE: |
301 | - return self::TYPE_NAMESPACE."DateTime::dateTimeCmp($params[0], $params[1])"; |
|
301 | + return self::TYPE_NAMESPACE . "DateTime::dateTimeCmp($params[0], $params[1])"; |
|
302 | 302 | |
303 | 303 | case ODataConstants::DATETIME_YEAR: |
304 | - return self::TYPE_NAMESPACE."DateTime::year($params[0])"; |
|
304 | + return self::TYPE_NAMESPACE . "DateTime::year($params[0])"; |
|
305 | 305 | |
306 | 306 | case ODataConstants::DATETIME_MONTH: |
307 | - return self::TYPE_NAMESPACE."DateTime::month($params[0])"; |
|
307 | + return self::TYPE_NAMESPACE . "DateTime::month($params[0])"; |
|
308 | 308 | |
309 | 309 | case ODataConstants::DATETIME_DAY: |
310 | - return self::TYPE_NAMESPACE."DateTime::day($params[0])"; |
|
310 | + return self::TYPE_NAMESPACE . "DateTime::day($params[0])"; |
|
311 | 311 | |
312 | 312 | case ODataConstants::DATETIME_HOUR: |
313 | - return self::TYPE_NAMESPACE."DateTime::hour($params[0])"; |
|
313 | + return self::TYPE_NAMESPACE . "DateTime::hour($params[0])"; |
|
314 | 314 | |
315 | 315 | case ODataConstants::DATETIME_MINUTE: |
316 | - return self::TYPE_NAMESPACE."DateTime::minute($params[0])"; |
|
316 | + return self::TYPE_NAMESPACE . "DateTime::minute($params[0])"; |
|
317 | 317 | |
318 | 318 | case ODataConstants::DATETIME_SECOND: |
319 | - return self::TYPE_NAMESPACE."DateTime::second($params[0])"; |
|
319 | + return self::TYPE_NAMESPACE . "DateTime::second($params[0])"; |
|
320 | 320 | |
321 | 321 | case ODataConstants::MATHFUN_ROUND: |
322 | 322 | return "round($params[0])"; |
@@ -328,7 +328,7 @@ discard block |
||
328 | 328 | return "floor($params[0])"; |
329 | 329 | |
330 | 330 | case ODataConstants::BINFUL_EQUAL: |
331 | - return self::TYPE_NAMESPACE."Binary::binaryEqual($params[0], $params[1])"; |
|
331 | + return self::TYPE_NAMESPACE . "Binary::binaryEqual($params[0], $params[1])"; |
|
332 | 332 | |
333 | 333 | case 'is_null': |
334 | 334 | return "is_null($params[0])"; |
@@ -350,7 +350,7 @@ discard block |
||
350 | 350 | private function _prepareBinaryExpression($operator, $left, $right) |
351 | 351 | { |
352 | 352 | return |
353 | - self::OPEN_BRACKET.$left.' '.$operator.' '.$right.self::CLOSE_BRACKET; |
|
353 | + self::OPEN_BRACKET . $left . ' ' . $operator . ' ' . $right . self::CLOSE_BRACKET; |
|
354 | 354 | } |
355 | 355 | |
356 | 356 | /** |
@@ -363,6 +363,6 @@ discard block |
||
363 | 363 | */ |
364 | 364 | private function _prepareUnaryExpression($operator, $child) |
365 | 365 | { |
366 | - return $operator.self::OPEN_BRACKET.$child.self::CLOSE_BRACKET; |
|
366 | + return $operator . self::OPEN_BRACKET . $child . self::CLOSE_BRACKET; |
|
367 | 367 | } |
368 | 368 | } |
@@ -292,22 +292,22 @@ discard block |
||
292 | 292 | return "DATETIMECMP($params[0]; $params[1])"; |
293 | 293 | |
294 | 294 | case ODataConstants::DATETIME_YEAR: |
295 | - return 'EXTRACT(YEAR from '.$params[0].')'; |
|
295 | + return 'EXTRACT(YEAR from ' . $params[0] . ')'; |
|
296 | 296 | |
297 | 297 | case ODataConstants::DATETIME_MONTH: |
298 | - return 'EXTRACT(MONTH from '.$params[0].')'; |
|
298 | + return 'EXTRACT(MONTH from ' . $params[0] . ')'; |
|
299 | 299 | |
300 | 300 | case ODataConstants::DATETIME_DAY: |
301 | - return 'EXTRACT(DAY from '.$params[0].')'; |
|
301 | + return 'EXTRACT(DAY from ' . $params[0] . ')'; |
|
302 | 302 | |
303 | 303 | case ODataConstants::DATETIME_HOUR: |
304 | - return 'EXTRACT(HOUR from '.$params[0].')'; |
|
304 | + return 'EXTRACT(HOUR from ' . $params[0] . ')'; |
|
305 | 305 | |
306 | 306 | case ODataConstants::DATETIME_MINUTE: |
307 | - return 'EXTRACT(MINUTE from '.$params[0].')'; |
|
307 | + return 'EXTRACT(MINUTE from ' . $params[0] . ')'; |
|
308 | 308 | |
309 | 309 | case ODataConstants::DATETIME_SECOND: |
310 | - return 'EXTRACT(SECOND from '.$params[0].')'; |
|
310 | + return 'EXTRACT(SECOND from ' . $params[0] . ')'; |
|
311 | 311 | |
312 | 312 | case ODataConstants::MATHFUN_ROUND: |
313 | 313 | return "ROUND($params[0])"; |
@@ -346,11 +346,11 @@ discard block |
||
346 | 346 | $str[0] = str_replace('DATETIMECMP', '', $str[0]); |
347 | 347 | |
348 | 348 | return self::OPEN_BRACKET |
349 | - .$str[0].' '.$operator |
|
350 | - .' '.$str[1].self::CLOSE_BRACKET; |
|
349 | + .$str[0] . ' ' . $operator |
|
350 | + .' ' . $str[1] . self::CLOSE_BRACKET; |
|
351 | 351 | } |
352 | 352 | |
353 | - return self::OPEN_BRACKET.$left.' '.$operator.' '.$right.self::CLOSE_BRACKET; |
|
353 | + return self::OPEN_BRACKET . $left . ' ' . $operator . ' ' . $right . self::CLOSE_BRACKET; |
|
354 | 354 | } |
355 | 355 | |
356 | 356 | /** |
@@ -363,6 +363,6 @@ discard block |
||
363 | 363 | */ |
364 | 364 | private function _prepareUnaryExpression($operator, $child) |
365 | 365 | { |
366 | - return $operator.self::OPEN_BRACKET.$child.self::CLOSE_BRACKET; |
|
366 | + return $operator . self::OPEN_BRACKET . $child . self::CLOSE_BRACKET; |
|
367 | 367 | } |
368 | 368 | } |
@@ -330,7 +330,7 @@ discard block |
||
330 | 330 | $type = $this->getResourceTypeWherePropertyIsDeclared($type, $property); |
331 | 331 | // usage below requires $type to not be null - so kaboom as early as possible |
332 | 332 | assert(null != $type, 'Resource type obtained from property must not be null.'); |
333 | - $cacheKey = $set->getName().'_'.$type->getName().'_'.$property->getName(); |
|
333 | + $cacheKey = $set->getName() . '_' . $type->getName() . '_' . $property->getName(); |
|
334 | 334 | |
335 | 335 | if (array_key_exists($cacheKey, $this->associationSetCache)) { |
336 | 336 | return $this->associationSetCache[$cacheKey]; |
@@ -442,7 +442,7 @@ discard block |
||
442 | 442 | return $resourceType->getAllProperties(); |
443 | 443 | } |
444 | 444 | //TODO: move this to doctrine annotations |
445 | - $cacheKey = $setWrapper->getName().'_'.$resourceType->getFullName(); |
|
445 | + $cacheKey = $setWrapper->getName() . '_' . $resourceType->getFullName(); |
|
446 | 446 | if (!array_key_exists($cacheKey, $this->propertyCache)) { |
447 | 447 | //Fill the cache |
448 | 448 | $this->propertyCache[$cacheKey] = []; |
@@ -231,11 +231,11 @@ discard block |
||
231 | 231 | if (($requestUriScheme == 'http' && $requestUriPort != '80') || |
232 | 232 | ($requestUriScheme == 'https' && $requestUriPort != '443') |
233 | 233 | ) { |
234 | - $serviceUri .= ':'.$requestUriPort; |
|
234 | + $serviceUri .= ':' . $requestUriPort; |
|
235 | 235 | } |
236 | 236 | |
237 | 237 | for ($l = 0; $l <= $k; ++$l) { |
238 | - $serviceUri .= '/'.$requestUriSegments[$l]; |
|
238 | + $serviceUri .= '/' . $requestUriSegments[$l]; |
|
239 | 239 | } |
240 | 240 | |
241 | 241 | $this->_absoluteServiceUri = new Url($serviceUri); |
@@ -569,17 +569,17 @@ discard block |
||
569 | 569 | */ |
570 | 570 | public function setResponseStatusCode($value) |
571 | 571 | { |
572 | - $floor = floor($value / 100); |
|
572 | + $floor = floor($value/100); |
|
573 | 573 | if ($floor >= 1 && $floor <= 5) { |
574 | 574 | $statusDescription = HttpStatus::getStatusDescription($value); |
575 | 575 | if (!is_null($statusDescription)) { |
576 | - $statusDescription = ' '.$statusDescription; |
|
576 | + $statusDescription = ' ' . $statusDescription; |
|
577 | 577 | } |
578 | 578 | |
579 | - $this->getOperationContext()->outgoingResponse()->setStatusCode($value.$statusDescription); |
|
579 | + $this->getOperationContext()->outgoingResponse()->setStatusCode($value . $statusDescription); |
|
580 | 580 | } else { |
581 | 581 | throw ODataException::createInternalServerError( |
582 | - 'Invalid Status Code'.$value |
|
582 | + 'Invalid Status Code' . $value |
|
583 | 583 | ); |
584 | 584 | } |
585 | 585 | } |
@@ -673,6 +673,6 @@ discard block |
||
673 | 673 | break; |
674 | 674 | } |
675 | 675 | |
676 | - return $format.';q=1.0'; |
|
676 | + return $format . ';q=1.0'; |
|
677 | 677 | } |
678 | 678 | } |
@@ -20,7 +20,7 @@ |
||
20 | 20 | */ |
21 | 21 | public function getRawUrl() |
22 | 22 | { |
23 | - return $_SERVER['REQUEST_SCHEME'].'://'.$_SERVER['HTTP_HOST'].'/'.$_SERVER['REQUEST_URI']; |
|
23 | + return $_SERVER['REQUEST_SCHEME'] . '://' . $_SERVER['HTTP_HOST'] . '/' . $_SERVER['REQUEST_URI']; |
|
24 | 24 | } |
25 | 25 | |
26 | 26 | /** |
@@ -131,7 +131,7 @@ |
||
131 | 131 | $this->_rawUrl = ODataConstants::HTTPREQUEST_PROTOCOL_HTTPS; |
132 | 132 | } |
133 | 133 | |
134 | - $this->_rawUrl .= '://'.$_SERVER[HttpProcessUtility::headerToServerKey(ODataConstants::HTTPREQUEST_HEADER_HOST)]; |
|
134 | + $this->_rawUrl .= '://' . $_SERVER[HttpProcessUtility::headerToServerKey(ODataConstants::HTTPREQUEST_HEADER_HOST)]; |
|
135 | 135 | $this->_rawUrl .= utf8_decode(urldecode($_SERVER[ODataConstants::HTTPREQUEST_URI])); |
136 | 136 | } |
137 | 137 |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | */ |
59 | 59 | public function getMimeType() |
60 | 60 | { |
61 | - return $this->_type.'/'.$this->_subType; |
|
61 | + return $this->_type . '/' . $this->_subType; |
|
62 | 62 | } |
63 | 63 | |
64 | 64 | /** |
@@ -707,7 +707,7 @@ discard block |
||
707 | 707 | case 'ACCEPT_LANGUAGE': |
708 | 708 | case 'DATASERVICEVERSION': |
709 | 709 | case 'MAXDATASERVICEVERSION': |
710 | - return 'HTTP_'.$name; |
|
710 | + return 'HTTP_' . $name; |
|
711 | 711 | } |
712 | 712 | |
713 | 713 | return $name; |