Qeti / POData

src/POData/UriProcessor/QueryProcessor/FunctionDescription.php

Doc Comments +12 added lines, -12 removed lines

@@ -255,7 +255,7 @@ 
     /** 
      * Get function description for string comparison
      * 
-     * @return \POData\UriProcessor\QueryProcessor\FunctionDescription[]
+     * @return FunctionDescription[]
      */
     public static function stringComparisonFunctions()
     {
@@ -270,7 +270,7 @@ 
     /**
      * Get function description for datetime comparison
      * 
-     * @return \POData\UriProcessor\QueryProcessor\FunctionDescription[]
+     * @return FunctionDescription[]
      */
     public static function dateTimeComparisonFunctions()
     {
@@ -285,7 +285,7 @@ 
     /**
      * Get function description for guid equality check
      * 
-     * @return \POData\UriProcessor\QueryProcessor\FunctionDescription[]
+     * @return FunctionDescription[]
      */
     public static function guidEqualityFunctions()
     {
@@ -300,7 +300,7 @@ 
     /**
      * Get function description for binary equality check
      * 
-     * @return \POData\UriProcessor\QueryProcessor\FunctionDescription[]
+     * @return FunctionDescription[]
      */
     public static function binaryEqualityFunctions()
     {
@@ -315,7 +315,7 @@ 
     /**
      * Get function descriptions for arithmetic operations
      * 
-     * @return \POData\UriProcessor\QueryProcessor\FunctionDescription[]
+     * @return FunctionDescription[]
      */
     public static function arithmeticOperationFunctions()
     {      
@@ -350,7 +350,7 @@ 
     /**      
      * Get function descriptions for arithmetic add operations
      * 
-     * @return \POData\UriProcessor\QueryProcessor\FunctionDescription[] indexed by function name
+     * @return FunctionDescription[] indexed by function name
      */
     public static function addOperationFunctions()
     {
@@ -360,7 +360,7 @@ 
     /**
      * Get function descriptions for arithmetic subtract operations
      * 
-     * @return \POData\UriProcessor\QueryProcessor\FunctionDescription[] indexed by function name
+     * @return FunctionDescription[] indexed by function name
      */
     public static function subtractOperationFunctions()
     {
@@ -370,7 +370,7 @@ 
     /**      
      * Get function descriptions for logical operations
      * 
-     * @return \POData\UriProcessor\QueryProcessor\FunctionDescription[]
+     * @return FunctionDescription[]
      */
     public static function logicalOperationFunctions()
     {
@@ -385,7 +385,7 @@ 
     /**
      * Get function descriptions for relational operations
      * 
-     * @return \POData\UriProcessor\QueryProcessor\FunctionDescription[]
+     * @return FunctionDescription[]
      */
     public static function relationalOperationFunctions()
     {
@@ -415,7 +415,7 @@ 
     /**
      * Get function descriptions for unary not operation
      * 
-     * @return \POData\UriProcessor\QueryProcessor\FunctionDescription[]
+     * @return FunctionDescription[]
      */
     public static function notOperationFunctions()
     {
@@ -442,7 +442,7 @@ 
     /**      
      * Get function description for unary negate operator
      * 
-     * @return \POData\UriProcessor\QueryProcessor\FunctionDescription[]
+     * @return FunctionDescription[]
      */
     public static function negateOperationFunctions()
     {
@@ -657,7 +657,7 @@ 
      * 
      * @throws ODataException
      * 
-     * @return \POData\UriProcessor\QueryProcessor\FunctionDescription[] Array of matching functions
+     * @return FunctionDescription[] Array of matching functions
      */
     public static function verifyFunctionExists($expressionToken)
     {

Indentation +2 added lines, -2 removed lines

@@ -71,7 +71,7 @@ 
     {
         $str = $this->returnType->getFullTypeName() . ' ' . $this->name . '(';
 
-	    foreach ($this->argumentTypes as $argumentType) {
+        foreach ($this->argumentTypes as $argumentType) {
             $str .= $argumentType->getFullTypeName() . ', ';
         }
 
@@ -247,7 +247,7 @@ 
                         array(new Double())
                     )
                 )
-          );
+            );
 
         return $functions;
     }

Spacing +7 added lines, -7 removed lines

@@ -69,13 +69,13 @@ 
      */
     public function getPrototypeAsString()
     {
-        $str = $this->returnType->getFullTypeName() . ' ' . $this->name . '(';
+        $str = $this->returnType->getFullTypeName().' '.$this->name.'(';
 
 	    foreach ($this->argumentTypes as $argumentType) {
-            $str .= $argumentType->getFullTypeName() . ', ';
+            $str .= $argumentType->getFullTypeName().', ';
         }
 
-        return rtrim($str, ', ') . ')';
+        return rtrim($str, ', ').')';
     }
 
     /**      
@@ -469,7 +469,7 @@ 
     {
         $string = null;
         foreach ($argExpressions as $argExpression) {
-            $string .= $argExpression->getType()->getFullTypeName() . ', ';
+            $string .= $argExpression->getType()->getFullTypeName().', ';
         }
 
         $string = rtrim($string, ', ');
@@ -630,7 +630,7 @@ 
     public static function validateUnaryOpArguments($expressionToken, $argExpression)
     {
         //Unary not
-        if (strcmp($expressionToken->Text, ODataConstants::KEYWORD_NOT) == 0 ) {
+        if (strcmp($expressionToken->Text, ODataConstants::KEYWORD_NOT) == 0) {
             $function = self::findFunctionWithPromotion(
                 self::notOperationFunctions(), 
                 array($argExpression)
@@ -671,7 +671,7 @@ 
             
         }
 
-        $filterFunctions =  self::filterFunctionDescriptions();
+        $filterFunctions = self::filterFunctionDescriptions();
         return $filterFunctions[$expressionToken->Text];
     }
 
@@ -695,7 +695,7 @@ 
         if ($function == null) {
             $protoTypes = null;
             foreach ($functions as $function) {
-                $protoTypes .=  $function->getPrototypeAsString() . '; ';
+                $protoTypes .= $function->getPrototypeAsString().'; ';
             }
 
             throw ODataException::createSyntaxError(

Unused Use Statements -3 removed lines

@@ -6,7 +6,6 @@ 
 use POData\Common\Messages;
 use POData\Common\ODataConstants;
 use POData\Providers\Metadata\Type\Null1;
-use POData\Providers\Metadata\Type\INavigationType;
 use POData\Providers\Metadata\Type\Int64;
 use POData\Providers\Metadata\Type\Int16;
 use POData\Providers\Metadata\Type\Guid;
@@ -17,10 +16,8 @@ 
 use POData\Providers\Metadata\Type\Int32;
 use POData\Providers\Metadata\Type\StringType;
 use POData\Providers\Metadata\Type\Boolean;
-use POData\Providers\Metadata\Type\VoidType;
 use POData\Providers\Metadata\Type\Binary;
 use POData\Providers\Metadata\Type\IType;
-use POData\UriProcessor\QueryProcessor\ExpressionParser\Expressions\ExpressionType;
 use POData\UriProcessor\QueryProcessor\ExpressionParser\Expressions\AbstractExpression;
 use POData\UriProcessor\QueryProcessor\ExpressionParser\ExpressionToken;
 

src/POData/UriProcessor/QueryProcessor/OrderByParser/OrderByInfo.php

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 
 namespace POData\UriProcessor\QueryProcessor\OrderByParser;
 use POData\Common\Messages;
-use POData\Common\InvalidOperationException;
 
 /**
  * Class OrderByInfo

src/POData/UriProcessor/QueryProcessor/OrderByParser/OrderByLeafNode.php

Doc Comments +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
      * 
      * @see library/POData/QueryProcessorOrderByParser.OrderByBaseNode::getResourceType()
      * 
-     * @return void
+     * @return \POData\Providers\Metadata\ResourceType
      */
     public function getResourceType()
     {

Spacing +12 added lines, -12 removed lines

@@ -111,25 +111,25 @@
         
         foreach ($ancestors as $i => $anscestor) {
             if ($i == 0) {
-                $parameterNames = array (
-                    '$' . $anscestor . 'A', '$' . $anscestor . 'B'
+                $parameterNames = array(
+                    '$'.$anscestor.'A', '$'.$anscestor.'B'
                 );
                 $accessor1 = $parameterNames[0];
                 $accessor2 = $parameterNames[1];
-                $flag1 = '$flag1 = ' . 'is_null(' . $accessor1. ') || ';
-                $flag2 = '$flag2 = ' . 'is_null(' . $accessor2. ') || '; 
+                $flag1 = '$flag1 = '.'is_null('.$accessor1.') || ';
+                $flag2 = '$flag2 = '.'is_null('.$accessor2.') || '; 
             } else {
-                $accessor1 .= '->' . $anscestor;
-                $accessor2 .= '->' . $anscestor;
-                $flag1 .= 'is_null(' .$accessor1 . ')' . ' || ';
-                $flag2 .= 'is_null(' .$accessor2 . ')' . ' || ';
+                $accessor1 .= '->'.$anscestor;
+                $accessor2 .= '->'.$anscestor;
+                $flag1 .= 'is_null('.$accessor1.')'.' || ';
+                $flag2 .= 'is_null('.$accessor2.')'.' || ';
             }
         }
 
-        $accessor1 .= '->' . $this->propertyName;
-        $accessor2 .= '->' . $this->propertyName;
-        $flag1 .= 'is_null(' . $accessor1 . ')';
-        $flag2 .= 'is_null(' . $accessor2 . ')';
+        $accessor1 .= '->'.$this->propertyName;
+        $accessor2 .= '->'.$this->propertyName;
+        $flag1 .= 'is_null('.$accessor1.')';
+        $flag2 .= 'is_null('.$accessor2.')';
 
         $code = "$flag1; 
              $flag2; 

src/POData/UriProcessor/QueryProcessor/OrderByParser/OrderByNode.php

Doc Comments +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
      * 
      * @see library/POData/QueryProcessorOrderByParser.OrderByBaseNode::getResourceType()
      * 
-     * @return ResourceType
+     * @return \POData\Providers\Metadata\ResourceType
      */
     public function getResourceType()
     {

src/POData/UriProcessor/QueryProcessor/QueryProcessor.php

Unused Use Statements -1 removed lines

@@ -10,7 +10,6 @@
 use POData\UriProcessor\QueryProcessor\SkipTokenParser\SkipTokenParser;
 use POData\UriProcessor\QueryProcessor\OrderByParser\OrderByParser;
 use POData\UriProcessor\QueryProcessor\ExpressionParser\ExpressionParser2;
-use POData\UriProcessor\QueryProcessor\ExpressionParser\FilterInfo;
 use POData\UriProcessor\QueryProcessor\ExpandProjectionParser\ExpandProjectionParser;
 use POData\Common\Messages;
 use POData\Common\ODataException;

Indentation +40 added lines, -40 removed lines

@@ -71,21 +71,21 @@ 
 
         $isSingleResult = $request->isSingleResult();
 
-	    //$top, $skip, $order, $inlinecount & $count are only applicable if:
-	    //The query targets a resource collection
+        //$top, $skip, $order, $inlinecount & $count are only applicable if:
+        //The query targets a resource collection
         $this->_setQueryApplicable = ($request->getTargetKind() == TargetKind::RESOURCE() && !$isSingleResult);
-	    //Or it's a $count resource (although $inlinecount isn't applicable in this case..but there's a check somewhere else for this
-	    $this->_setQueryApplicable |= $request->queryType == QueryType::COUNT();
+        //Or it's a $count resource (although $inlinecount isn't applicable in this case..but there's a check somewhere else for this
+        $this->_setQueryApplicable |= $request->queryType == QueryType::COUNT();
 
-	    //Paging is allowed if
-	    //The request targets a resource collection
-	    //and the request isn't for a $count segment
-	    $this->_pagingApplicable = $this->request->getTargetKind() == TargetKind::RESOURCE() && !$isSingleResult && ($request->queryType != QueryType::COUNT());
+        //Paging is allowed if
+        //The request targets a resource collection
+        //and the request isn't for a $count segment
+        $this->_pagingApplicable = $this->request->getTargetKind() == TargetKind::RESOURCE() && !$isSingleResult && ($request->queryType != QueryType::COUNT());
 
-	    $targetResourceType = $this->request->getTargetResourceType();
+        $targetResourceType = $this->request->getTargetResourceType();
         $targetResourceSetWrapper = $this->request->getTargetResourceSetWrapper();
 
-	    $this->_expandSelectApplicable = !is_null($targetResourceType)
+        $this->_expandSelectApplicable = !is_null($targetResourceType)
             && !is_null($targetResourceSetWrapper)
             && $targetResourceType->getResourceTypeKind() == ResourceTypeKind::ENTITY
             && !$this->request->isLinkUri();
@@ -270,7 +270,7 @@ 
             || $kind == TargetKind::COMPLEX_OBJECT()
             || $this->request->queryType == QueryType::COUNT() )
         ) {
-			throw ODataException::createBadRequestError(
+            throw ODataException::createBadRequestError(
                 Messages::queryProcessorQueryFilterOptionNotApplicable()
             );
         }
@@ -296,27 +296,27 @@ 
     {
         $inlineCount = $this->service->getHost()->getQueryStringItem( ODataConstants::HTTPQUERY_STRING_INLINECOUNT );
 
-	    //If it's not specified, we're done
-	    if(is_null($inlineCount)) return;
+        //If it's not specified, we're done
+        if(is_null($inlineCount)) return;
 
-	    //If the service doesn't allow count requests..then throw an exception
+        //If the service doesn't allow count requests..then throw an exception
         if (!$this->service->getConfiguration()->getAcceptCountRequests()) {
-			throw ODataException::createBadRequestError(
+            throw ODataException::createBadRequestError(
                 Messages::configurationCountNotAccepted()
             );
         }
 
         $inlineCount = trim($inlineCount);
 
-	    //if it's set to none, we don't do inline counts
+        //if it's set to none, we don't do inline counts
         if ($inlineCount === ODataConstants::URI_ROWCOUNT_OFFOPTION) {
             return;
         }
 
-	    //You can't specify $count & $inlinecount together
-	    //TODO: ensure there's a test for this case see #55
+        //You can't specify $count & $inlinecount together
+        //TODO: ensure there's a test for this case see #55
         if ($this->request->queryType == QueryType::COUNT() ) {
-			throw ODataException::createBadRequestError(
+            throw ODataException::createBadRequestError(
                 Messages::queryProcessorInlineCountWithValueCount()
             );
         }
@@ -325,13 +325,13 @@ 
 
 
         if ($inlineCount === ODataConstants::URI_ROWCOUNT_ALLOPTION) {
-	        $this->request->queryType = QueryType::ENTITIES_WITH_COUNT();
+            $this->request->queryType = QueryType::ENTITIES_WITH_COUNT();
 
             $this->request->raiseMinVersionRequirement( 2, 0 );
             $this->request->raiseResponseVersion( 2, 0 );
 
         } else {
-			throw ODataException::createBadRequestError(
+            throw ODataException::createBadRequestError(
                 Messages::queryProcessorInvalidInlineCountOptionError()
             );
         }
@@ -361,13 +361,13 @@ 
         }
 
         if (!$this->_pagingApplicable) {
-			throw ODataException::createBadRequestError(
+            throw ODataException::createBadRequestError(
                 Messages::queryProcessorSkipTokenNotAllowed()
             );
         }
 
         if (!$this->_isSSPagingRequired()) {
-			throw ODataException::createBadRequestError(
+            throw ODataException::createBadRequestError(
                 Messages::queryProcessorSkipTokenCannotBeAppliedForNonPagedResourceSet($this->request->getTargetResourceSetWrapper())
             );
         }
@@ -412,7 +412,7 @@ 
 
         if (!is_null($select)) {
             if (!$this->service->getConfiguration()->getAcceptProjectionRequests()) {
-				throw ODataException::createBadRequestError( Messages::configurationProjectionsNotAccepted() );
+                throw ODataException::createBadRequestError( Messages::configurationProjectionsNotAccepted() );
             }
 
             $this->_checkExpandOrSelectApplicable( ODataConstants::HTTPQUERY_STRING_SELECT );
@@ -423,19 +423,19 @@ 
         // 'RootProjectionNode' is required while generating next page Link
         if ($this->_expandSelectApplicable || $this->request->isLinkUri() ) {
 
-			$rootProjectionNode = ExpandProjectionParser::parseExpandAndSelectClause(
-				 $this->request->getTargetResourceSetWrapper(),
-				 $this->request->getTargetResourceType(),
-				 $this->request->getInternalOrderByInfo(),
-				 $this->request->getSkipCount(),
-				 $this->request->getTopCount(),
-				 $expand,
-				 $select,
-				 $this->service->getProvidersWrapper()
-			);
-			if ($rootProjectionNode->isSelectionSpecified()) {
-			    $this->request->raiseMinVersionRequirement(2, 0 );
-			}
+            $rootProjectionNode = ExpandProjectionParser::parseExpandAndSelectClause(
+                    $this->request->getTargetResourceSetWrapper(),
+                    $this->request->getTargetResourceType(),
+                    $this->request->getInternalOrderByInfo(),
+                    $this->request->getSkipCount(),
+                    $this->request->getTopCount(),
+                    $expand,
+                    $select,
+                    $this->service->getProvidersWrapper()
+            );
+            if ($rootProjectionNode->isSelectionSpecified()) {
+                $this->request->raiseMinVersionRequirement(2, 0 );
+            }
 
             if ($rootProjectionNode->hasPagedExpandedResult()) {
                 $this->request->raiseResponseVersion( 2, 0 );
@@ -533,7 +533,7 @@ 
             || !is_null($serviceHost->getQueryStringItem(ODataConstants::HTTPQUERY_STRING_SKIPTOKEN))
             || !is_null($serviceHost->getQueryStringItem(ODataConstants::HTTPQUERY_STRING_TOP))
         ) {
-			throw ODataException::createBadRequestError(
+            throw ODataException::createBadRequestError(
                 Messages::queryProcessorNoQueryOptionsApplicable()
             );
         }
@@ -551,7 +551,7 @@ 
     private function _checkSetQueryApplicable()
     {
         if (!$this->_setQueryApplicable) {
-			throw ODataException::createBadRequestError(
+            throw ODataException::createBadRequestError(
                 Messages::queryProcessorQuerySetOptionsNotApplicable()
             );
         }
@@ -572,7 +572,7 @@ 
     private function _checkExpandOrSelectApplicable($queryItem)
     {
         if (!$this->_expandSelectApplicable) {
-			throw ODataException::createBadRequestError(
+            throw ODataException::createBadRequestError(
                 Messages::queryProcessorSelectOrExpandOptionNotApplicable($queryItem)
             );
         }

Spacing +28 added lines, -28 removed lines

@@ -65,7 +65,7 @@ 
      * @param RequestDescription $request Description of the request submitted by client.
      * @param IService        $service        Reference to the service implementation.
      */
-    private function __construct(RequestDescription $request, IService $service ) {
+    private function __construct(RequestDescription $request, IService $service) {
         $this->request = $request;
         $this->service = $service;
 
@@ -102,7 +102,7 @@ 
      * 
      * @throws ODataException
      */
-    public static function process(RequestDescription $request, IService $service ) {
+    public static function process(RequestDescription $request, IService $service) {
         $queryProcessor = new QueryProcessor($request, $service);
         if ($request->getTargetSource() == TargetSource::NONE) {
             //A service directory, metadata or batch request
@@ -148,7 +148,7 @@ 
     private function _processSkipAndTop()
     {
         $value = null;
-        if ($this->_readSkipOrTopOption( ODataConstants::HTTPQUERY_STRING_SKIP, $value ) ) {
+        if ($this->_readSkipOrTopOption(ODataConstants::HTTPQUERY_STRING_SKIP, $value)) {
             $this->request->setSkipCount($value);
         }
 
@@ -160,7 +160,7 @@ 
                 ->getResourceSetPageSize(); 
         }
 
-        if ($this->_readSkipOrTopOption(ODataConstants::HTTPQUERY_STRING_TOP, $value) ) {
+        if ($this->_readSkipOrTopOption(ODataConstants::HTTPQUERY_STRING_TOP, $value)) {
             $this->request->setTopOptionCount($value);
             if ($isPagingRequired && $pageSize < $value) {
                 //If $top is greater than or equal to page size, 
@@ -196,7 +196,7 @@ 
      */
     private function _processOrderBy()
     {
-        $orderBy = $this->service->getHost()->getQueryStringItem( ODataConstants::HTTPQUERY_STRING_ORDERBY );
+        $orderBy = $this->service->getHost()->getQueryStringItem(ODataConstants::HTTPQUERY_STRING_ORDERBY);
 
         if (!is_null($orderBy)) {
             $this->_checkSetQueryApplicable();
@@ -217,12 +217,12 @@ 
          *     RequestDescription::getTopCount will give non-null value.
          *      
          */
-        if (!is_null($this->request->getSkipCount())|| !is_null($this->request->getTopCount())) {
-            $orderBy = !is_null($orderBy) ? $orderBy . ', ' : null;
+        if (!is_null($this->request->getSkipCount()) || !is_null($this->request->getTopCount())) {
+            $orderBy = !is_null($orderBy) ? $orderBy.', ' : null;
             $keys = array_keys($targetResourceType->getKeyProperties());
             //assert(!empty($keys))
             foreach ($keys as $key) {
-                $orderBy = $orderBy . $key . ', ';
+                $orderBy = $orderBy.$key.', ';
             }
 
             $orderBy = rtrim($orderBy, ', ');
@@ -260,7 +260,7 @@ 
      */ 
     private function _processFilter()
     {
-        $filter = $this->service->getHost()->getQueryStringItem( ODataConstants::HTTPQUERY_STRING_FILTER );
+        $filter = $this->service->getHost()->getQueryStringItem(ODataConstants::HTTPQUERY_STRING_FILTER);
         if (is_null($filter)) {
             return;
         }
@@ -268,7 +268,7 @@ 
         $kind = $this->request->getTargetKind();
         if (!($kind == TargetKind::RESOURCE()
             || $kind == TargetKind::COMPLEX_OBJECT()
-            || $this->request->queryType == QueryType::COUNT() )
+            || $this->request->queryType == QueryType::COUNT())
         ) {
 			throw ODataException::createBadRequestError(
                 Messages::queryProcessorQueryFilterOptionNotApplicable()
@@ -277,7 +277,7 @@ 
         $resourceType = $this->request->getTargetResourceType();
         $expressionProvider = $this->service->getProvidersWrapper()->getExpressionProvider();
         $filterInfo = ExpressionParser2::parseExpression2($filter, $resourceType, $expressionProvider);
-        $this->request->setFilterInfo( $filterInfo );
+        $this->request->setFilterInfo($filterInfo);
 
     }
 
@@ -294,10 +294,10 @@ 
      */
     private function _processCount()
     {
-        $inlineCount = $this->service->getHost()->getQueryStringItem( ODataConstants::HTTPQUERY_STRING_INLINECOUNT );
+        $inlineCount = $this->service->getHost()->getQueryStringItem(ODataConstants::HTTPQUERY_STRING_INLINECOUNT);
 
 	    //If it's not specified, we're done
-	    if(is_null($inlineCount)) return;
+	    if (is_null($inlineCount)) return;
 
 	    //If the service doesn't allow count requests..then throw an exception
         if (!$this->service->getConfiguration()->getAcceptCountRequests()) {
@@ -315,7 +315,7 @@ 
 
 	    //You can't specify $count & $inlinecount together
 	    //TODO: ensure there's a test for this case see #55
-        if ($this->request->queryType == QueryType::COUNT() ) {
+        if ($this->request->queryType == QueryType::COUNT()) {
 			throw ODataException::createBadRequestError(
                 Messages::queryProcessorInlineCountWithValueCount()
             );
@@ -327,8 +327,8 @@ 
         if ($inlineCount === ODataConstants::URI_ROWCOUNT_ALLOPTION) {
 	        $this->request->queryType = QueryType::ENTITIES_WITH_COUNT();
 
-            $this->request->raiseMinVersionRequirement( 2, 0 );
-            $this->request->raiseResponseVersion( 2, 0 );
+            $this->request->raiseMinVersionRequirement(2, 0);
+            $this->request->raiseResponseVersion(2, 0);
 
         } else {
 			throw ODataException::createBadRequestError(
@@ -355,7 +355,7 @@ 
      */
     private function _processSkipToken()
     {
-        $skipToken = $this->service->getHost()->getQueryStringItem( ODataConstants::HTTPQUERY_STRING_SKIPTOKEN );
+        $skipToken = $this->service->getHost()->getQueryStringItem(ODataConstants::HTTPQUERY_STRING_SKIPTOKEN);
         if (is_null($skipToken)) {
             return;
         }
@@ -383,8 +383,8 @@ 
             $skipToken
         );
         $this->request->setInternalSkipTokenInfo($internalSkipTokenInfo);
-        $this->request->raiseMinVersionRequirement( 2, 0 );
-        $this->request->raiseResponseVersion( 2, 0 );
+        $this->request->raiseMinVersionRequirement(2, 0);
+        $this->request->raiseResponseVersion(2, 0);
 
 
     }
@@ -402,26 +402,26 @@ 
      */
     private function _processExpandAndSelect()
     {
-        $expand = $this->service->getHost()->getQueryStringItem( ODataConstants::HTTPQUERY_STRING_EXPAND );
+        $expand = $this->service->getHost()->getQueryStringItem(ODataConstants::HTTPQUERY_STRING_EXPAND);
 
         if (!is_null($expand)) {
-            $this->_checkExpandOrSelectApplicable(ODataConstants::HTTPQUERY_STRING_EXPAND );
+            $this->_checkExpandOrSelectApplicable(ODataConstants::HTTPQUERY_STRING_EXPAND);
         }
 
-        $select = $this->service->getHost()->getQueryStringItem( ODataConstants::HTTPQUERY_STRING_SELECT );
+        $select = $this->service->getHost()->getQueryStringItem(ODataConstants::HTTPQUERY_STRING_SELECT);
 
         if (!is_null($select)) {
             if (!$this->service->getConfiguration()->getAcceptProjectionRequests()) {
-				throw ODataException::createBadRequestError( Messages::configurationProjectionsNotAccepted() );
+				throw ODataException::createBadRequestError(Messages::configurationProjectionsNotAccepted());
             }
 
-            $this->_checkExpandOrSelectApplicable( ODataConstants::HTTPQUERY_STRING_SELECT );
+            $this->_checkExpandOrSelectApplicable(ODataConstants::HTTPQUERY_STRING_SELECT);
         }
 
         // We will generate RootProjectionNode in case of $link request also, but
         // expand and select in this case must be null (we are ensuring this above)
         // 'RootProjectionNode' is required while generating next page Link
-        if ($this->_expandSelectApplicable || $this->request->isLinkUri() ) {
+        if ($this->_expandSelectApplicable || $this->request->isLinkUri()) {
 
 			$rootProjectionNode = ExpandProjectionParser::parseExpandAndSelectClause(
 				 $this->request->getTargetResourceSetWrapper(),
@@ -434,13 +434,13 @@ 
 				 $this->service->getProvidersWrapper()
 			);
 			if ($rootProjectionNode->isSelectionSpecified()) {
-			    $this->request->raiseMinVersionRequirement(2, 0 );
+			    $this->request->raiseMinVersionRequirement(2, 0);
 			}
 
             if ($rootProjectionNode->hasPagedExpandedResult()) {
-                $this->request->raiseResponseVersion( 2, 0 );
+                $this->request->raiseResponseVersion(2, 0);
             }
-            $this->request->setRootProjectionNode($rootProjectionNode );
+            $this->request->setRootProjectionNode($rootProjectionNode);
 
         }
     } 

Braces +3 added lines, -1 removed lines

@@ -297,7 +297,9 @@
         $inlineCount = $this->service->getHost()->getQueryStringItem( ODataConstants::HTTPQUERY_STRING_INLINECOUNT );
 
 	    //If it's not specified, we're done
-	    if(is_null($inlineCount)) return;
+	    if(is_null($inlineCount)) {
+	        return;
+	    }
 
 	    //If the service doesn't allow count requests..then throw an exception
         if (!$this->service->getConfiguration()->getAcceptCountRequests()) {

src/POData/UriProcessor/QueryProcessor/SkipTokenParser/SkipTokenInfo.php

Unused Use Statements -2 removed lines

@@ -2,8 +2,6 @@
 
 namespace POData\UriProcessor\QueryProcessor\SkipTokenParser;
 
-use POData\Common\Messages;
-use POData\Providers\Metadata\ResourceType;
 use POData\UriProcessor\QueryProcessor\OrderByParser\OrderByInfo;
 
 /**

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
      * @param array(int,(array(string,IType))) $orderByValuesInSkipToken Collection of values in the skiptoken corrosponds
      *                                                                   to the orderby path segments.
      */
-    public function __construct(OrderByInfo &$orderByInfo, $orderByValuesInSkipToken)
+    public function __construct(OrderByInfo & $orderByInfo, $orderByValuesInSkipToken)
     {
         $this->_orderByInfo = $orderByInfo;
         $this->_orderByValuesInSkipToken = $orderByValuesInSkipToken;

src/POData/UriProcessor/QueryProcessor/SkipTokenParser/SkipTokenParser.php

Unused Use Statements -1 removed lines

@@ -7,7 +7,6 @@
 use POData\Providers\Metadata\Type\Null1;
 use POData\Providers\Metadata\ResourceType;
 use POData\UriProcessor\ResourcePathProcessor\SegmentParser\KeyDescriptor;
-use POData\UriProcessor\QueryProcessor\OrderByParser\OrderByInfo;
 use POData\UriProcessor\QueryProcessor\OrderByParser\InternalOrderByInfo;
 
 /**

Indentation +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
         $orderByPathSegments = $internalOrderByInfo->getOrderByPathSegments();
         $orderByPathCount = count($orderByPathSegments);
         if ($count != ($orderByPathCount)) {
-			    throw ODataException::createBadRequestError(
+                throw ODataException::createBadRequestError(
                     Messages::skipTokenParserSkipTokenNotMatchingOrdering(
                         $count, $skipToken, $orderByPathCount
                     )

Spacing +2 added lines, -2 removed lines

@@ -44,8 +44,8 @@
      * @throws ODataException
      */
     public static function parseSkipTokenClause(
-        ResourceType &$resourceType, 
-        InternalOrderByInfo &$internalOrderByInfo, 
+        ResourceType & $resourceType, 
+        InternalOrderByInfo & $internalOrderByInfo, 
         $skipToken
     ) {
         $tokenValueDescriptor = null;

src/POData/UriProcessor/RequestDescription.php

Unused Use Statements -2 removed lines

@@ -7,11 +7,9 @@
 use POData\Common\Messages;
 use POData\Common\Version;
 use POData\Common\ODataException;
-use POData\IService;
 use POData\Providers\Metadata\ResourceProperty;
 use POData\Providers\Metadata\ResourceSetWrapper;
 use POData\Providers\Metadata\ResourceStreamInfo;
-use POData\UriProcessor\QueryProcessor\QueryProcessor;
 use POData\UriProcessor\UriProcessor;
 use POData\UriProcessor\ResourcePathProcessor\SegmentParser\TargetSource;
 use POData\UriProcessor\ResourcePathProcessor\SegmentParser\TargetKind;

Indentation +50 added lines, -50 removed lines

@@ -75,8 +75,8 @@ 
      */
     private $requiredMinRequestVersion;
 
-	/** @var Version */
-	private $maxServiceVersion;
+    /** @var Version */
+    private $maxServiceVersion;
 
     /**
      * Collection of known data service versions.
@@ -114,12 +114,12 @@ 
     private $_containerName;
 
 
-	/**
-	 * The count option specified in the request.
-	 *
-	 * @var QueryType
-	 */
-	public $queryType;
+    /**
+     * The count option specified in the request.
+     *
+     * @var QueryType
+     */
+    public $queryType;
 
     /**
      * Number of segments.
@@ -213,36 +213,36 @@ 
 
 
 
-	/**
-	 * @param SegmentDescriptor[] $segmentDescriptors Description of segments in the resource path.
-	 * @param Url $requestUri
-	 * @param Version $serviceMaxVersion
-	 * @param $requestVersion
-	 * @param $maxRequestVersion
-	 */
-	public function __construct($segmentDescriptors, Url $requestUri, Version $serviceMaxVersion, $requestVersion, $maxRequestVersion)
+    /**
+     * @param SegmentDescriptor[] $segmentDescriptors Description of segments in the resource path.
+     * @param Url $requestUri
+     * @param Version $serviceMaxVersion
+     * @param $requestVersion
+     * @param $maxRequestVersion
+     */
+    public function __construct($segmentDescriptors, Url $requestUri, Version $serviceMaxVersion, $requestVersion, $maxRequestVersion)
     {
         $this->segments = $segmentDescriptors;
         $this->_segmentCount = count($this->segments);
         $this->requestUrl = $requestUri;
         $this->lastSegment = $segmentDescriptors[$this->_segmentCount - 1];
-	    $this->queryType = QueryType::ENTITIES();
+        $this->queryType = QueryType::ENTITIES();
 
         //we use this for validation checks down in validateVersions...but maybe we should check that outside of this object...
         $this->maxServiceVersion = $serviceMaxVersion;
 
-	    //Per OData 1 & 2 spec we must return the smallest size
-	    //We start at 1.0 and move it up as features are requested
+        //Per OData 1 & 2 spec we must return the smallest size
+        //We start at 1.0 and move it up as features are requested
         $this->requiredMinResponseVersion = clone Version::v1();
         $this->requiredMinRequestVersion = clone Version::v1();
 
 
-	    //see http://www.odata.org/documentation/odata-v2-documentation/overview/#ProtocolVersioning
-	    //if requestVersion isn't there, use Service Max Version
-	    $this->requestVersion = is_null($requestVersion) ? $serviceMaxVersion : self::parseVersionHeader($requestVersion, ODataConstants::ODATAVERSIONHEADER);
+        //see http://www.odata.org/documentation/odata-v2-documentation/overview/#ProtocolVersioning
+        //if requestVersion isn't there, use Service Max Version
+        $this->requestVersion = is_null($requestVersion) ? $serviceMaxVersion : self::parseVersionHeader($requestVersion, ODataConstants::ODATAVERSIONHEADER);
 
-	    //if max version isn't there, use the request version
-	    $this->requestMaxVersion = is_null($maxRequestVersion) ? $this->requestVersion : self::parseVersionHeader($maxRequestVersion, ODataConstants::ODATAMAXVERSIONHEADER);
+        //if max version isn't there, use the request version
+        $this->requestMaxVersion = is_null($maxRequestVersion) ? $this->requestVersion : self::parseVersionHeader($maxRequestVersion, ODataConstants::ODATAMAXVERSIONHEADER);
 
         //if it's OData v3..things change a bit
         if($this->maxServiceVersion == Version::v3()){
@@ -284,7 +284,7 @@ 
     public function raiseMinVersionRequirement($major, $minor) {
         if($this->requiredMinRequestVersion->raiseVersion($major, $minor))
         {
-	        $this->validateVersions();
+            $this->validateVersions();
         }
     }
 
@@ -299,7 +299,7 @@ 
      */  
     public function raiseResponseVersion($major, $minor) {
         if($this->requiredMinResponseVersion->raiseVersion($major, $minor)){
-	        $this->validateVersions();
+            $this->validateVersions();
         }
 
     }
@@ -810,7 +810,7 @@ 
     public function getResponseVersion()
     {
 
-	    return $this->requiredMinResponseVersion;
+        return $this->requiredMinResponseVersion;
     }
 
     /**
@@ -838,7 +838,7 @@ 
     {
         if (is_null(self::$_knownDataServiceVersions)) {
             self::$_knownDataServiceVersions = array(
-	            new Version(1, 0),
+                new Version(1, 0),
                 new Version(2, 0),
                 new Version(3, 0)
             );
@@ -867,32 +867,32 @@ 
      */
     public function validateVersions() {
 
-	    //If the request version is below the minimum version required by supplied request arguments..throw an exception
+        //If the request version is below the minimum version required by supplied request arguments..throw an exception
         if ($this->requestVersion->compare($this->requiredMinRequestVersion) < 0) {
-			throw ODataException::createBadRequestError(
+            throw ODataException::createBadRequestError(
                 Messages::requestVersionTooLow(
-	                $this->requestVersion->toString(),
-	                $this->requiredMinRequestVersion->toString()
+                    $this->requestVersion->toString(),
+                    $this->requiredMinRequestVersion->toString()
                 )
             );
         }
 
-	    //If the requested max version is below the version required to fulfill the response...throw an exception
+        //If the requested max version is below the version required to fulfill the response...throw an exception
         if ($this->requestMaxVersion->compare($this->requiredMinResponseVersion) < 0) {
-			throw ODataException::createBadRequestError(
+            throw ODataException::createBadRequestError(
                 Messages::requestVersionTooLow(
-	                $this->requestMaxVersion->toString(),
-	                $this->requiredMinResponseVersion->toString()
+                    $this->requestMaxVersion->toString(),
+                    $this->requiredMinResponseVersion->toString()
                 )
             );
         }
 
         //If the max version supported by the service is below the version required to fulfill the response..throw an exception
         if ($this->maxServiceVersion->compare($this->requiredMinResponseVersion) < 0) {
-			throw ODataException::createBadRequestError(
+            throw ODataException::createBadRequestError(
                 Messages::requestVersionIsBiggerThanProtocolVersion(
-	                $this->requiredMinResponseVersion->toString(),
-	                $this->maxServiceVersion->toString()
+                    $this->requiredMinResponseVersion->toString(),
+                    $this->maxServiceVersion->toString()
                 )
             );
         }
@@ -923,9 +923,9 @@ 
         for ($i = 0; $i < $libNameIndex; $i++) {
             if ($versionHeader[$i] == '.') {
 
-	            //Throw an exception if we find more than 1 dot
-	            if ($dotIndex != -1) {
-					throw ODataException::createBadRequestError(
+                //Throw an exception if we find more than 1 dot
+                if ($dotIndex != -1) {
+                    throw ODataException::createBadRequestError(
                         Messages::requestDescriptionInvalidVersionHeader(
                             $versionHeader,
                             $headerName
@@ -935,7 +935,7 @@ 
 
                 $dotIndex = $i;
             } else if ($versionHeader[$i] < '0' || $versionHeader[$i] > '9') {
-				throw ODataException::createBadRequestError(
+                throw ODataException::createBadRequestError(
                     Messages::requestDescriptionInvalidVersionHeader(
                         $versionHeader,
                         $headerName
@@ -945,14 +945,14 @@ 
         }
 
 
-	    $major = intval(substr($versionHeader, 0, $dotIndex));
-	    $minor = 0;
+        $major = intval(substr($versionHeader, 0, $dotIndex));
+        $minor = 0;
 
-	   //Apparently the . is optional
+        //Apparently the . is optional
         if ($dotIndex != -1) {
             if ($dotIndex == 0) {
-	            //If it starts with a ., throw an exception
-				throw ODataException::createBadRequestError(
+                //If it starts with a ., throw an exception
+                throw ODataException::createBadRequestError(
                     Messages::requestDescriptionInvalidVersionHeader(
                         $versionHeader,
                         $headerName
@@ -965,8 +965,8 @@ 
 
         $version = new Version($major, $minor);
 
-	    //TODO: move this somewhere...
-	    /*
+        //TODO: move this somewhere...
+        /*
         $isSupportedVersion = false;
         foreach (self::getKnownDataServiceVersions() as $version1) {
             if ($version->compare($version1) == 0) {

Spacing +8 added lines, -8 removed lines

@@ -245,8 +245,8 @@ 
 	    $this->requestMaxVersion = is_null($maxRequestVersion) ? $this->requestVersion : self::parseVersionHeader($maxRequestVersion, ODataConstants::ODATAMAXVERSIONHEADER);
 
         //if it's OData v3..things change a bit
-        if($this->maxServiceVersion == Version::v3()){
-            if(is_null($maxRequestVersion))
+        if ($this->maxServiceVersion == Version::v3()) {
+            if (is_null($maxRequestVersion))
             {
                 //if max request version isn't specified we use the service max version instead of the request version
                 //thus we favour newer versions
@@ -282,7 +282,7 @@ 
      * @throws ODataException If capability negotiation fails.
      */
     public function raiseMinVersionRequirement($major, $minor) {
-        if($this->requiredMinRequestVersion->raiseVersion($major, $minor))
+        if ($this->requiredMinRequestVersion->raiseVersion($major, $minor))
         {
 	        $this->validateVersions();
         }
@@ -298,7 +298,7 @@ 
      * @throws ODataException If capability negotiation fails.
      */  
     public function raiseResponseVersion($major, $minor) {
-        if($this->requiredMinResponseVersion->raiseVersion($major, $minor)){
+        if ($this->requiredMinResponseVersion->raiseVersion($major, $minor)) {
 	        $this->validateVersions();
         }
 
@@ -623,7 +623,7 @@ 
      * 
      * @return void
      */
-    public function setInternalOrderByInfo(InternalOrderByInfo &$internalOrderByInfo)
+    public function setInternalOrderByInfo(InternalOrderByInfo & $internalOrderByInfo)
     {
         $this->internalOrderByInfo = $internalOrderByInfo;
     }
@@ -647,7 +647,7 @@ 
      * @return void
      */
     public function setInternalSkipTokenInfo(
-        InternalSkipTokenInfo &$internalSkipTokenInfo
+        InternalSkipTokenInfo & $internalSkipTokenInfo
     ) {
         $this->_internalSkipTokenInfo = $internalSkipTokenInfo;
     }
@@ -679,9 +679,9 @@ 
      * 
      * @return void
      */
-    public function setRootProjectionNode(RootProjectionNode &$rootProjectionNode)
+    public function setRootProjectionNode(RootProjectionNode & $rootProjectionNode)
     {
-        $this->_rootProjectionNode =  $rootProjectionNode;
+        $this->_rootProjectionNode = $rootProjectionNode;
     }
 
     /**

Doc Comments +2 added lines, -2 removed lines

@@ -217,8 +217,8 @@
 	 * @param SegmentDescriptor[] $segmentDescriptors Description of segments in the resource path.
 	 * @param Url $requestUri
 	 * @param Version $serviceMaxVersion
-	 * @param $requestVersion
-	 * @param $maxRequestVersion
+	 * @param string|null $requestVersion
+	 * @param string|null $maxRequestVersion
 	 */
 	public function __construct($segmentDescriptors, Url $requestUri, Version $serviceMaxVersion, $requestVersion, $maxRequestVersion)
     {

src/POData/UriProcessor/ResourcePathProcessor/SegmentParser/KeyDescriptor.php

Doc Comments +2 added lines, -2 removed lines

@@ -202,7 +202,7 @@ 
      *  KeyDescription. 
      *    
      * @param string        $keyPredicate   The predicate to parse
-     * @param KeyDescriptor &$keyDescriptor On return, Description of key after 
+     * @param KeyDescriptor KeyDescriptor On return, Description of key after 
      *                                      parsing
      * 
      * @return boolean True if the given values were parsed; false if there was 
@@ -454,7 +454,7 @@ 
      * the type if valid this function provide the PHP value equivalent to 
      * the astoira URI key value
      * 
-     * @param unknown           $value     The Astoria URI key value
+     * @param string           $value     The Astoria URI key value
      * @param ExpressionTokenId $tokenId   The tokenId for $value literal
      * @param unknown           &$outValue After the invocation, this parameter 
      *                                     holds the PHP value equivalent to $value, 

Unused Use Statements -1 removed lines

@@ -16,7 +16,6 @@
 use POData\Providers\Metadata\Type\Int32;
 use POData\Providers\Metadata\Type\Null1;
 use POData\UriProcessor\QueryProcessor\ExpressionParser\ExpressionTokenId;
-use POData\UriProcessor\QueryProcessor\ExpressionParser\ExpressionToken;
 use POData\UriProcessor\QueryProcessor\ExpressionParser\ExpressionLexer;
 use POData\Common\Messages;
 

Indentation +1 added lines, -1 removed lines

@@ -175,7 +175,7 @@
      */
     public function isEmpty()
     {
-         return empty($this->_namedValues) 
+            return empty($this->_namedValues) 
              && empty($this->_positionalValues);
     }
 

Spacing +1 added lines, -1 removed lines

@@ -271,7 +271,7 @@
                 if (!array_key_exists($keyName, $this->_namedValues)) {
                     $keysAsString = null;
                     foreach (array_keys($keyProperties) as $key) {
-                        $keysAsString .= $key . ', ';
+                        $keysAsString .= $key.', ';
                     }
                     
                     $keysAsString = rtrim($keysAsString, ' ,');

Switch Indentation +33 added lines, -33 removed lines

@@ -470,39 +470,39 @@
     private static function _getTypeAndValidateKeyValue($value, $tokenId, &$outValue, &$outType)
     {     
         switch ($tokenId) {
-        case ExpressionTokenId::BOOLEAN_LITERAL:
-            $outType = new Boolean();
-            break;
-        case ExpressionTokenId::DATETIME_LITERAL:
-            $outType = new DateTime();
-            break;
-        case ExpressionTokenId::GUID_LITERAL:
-            $outType = new Guid();
-            break;
-        case ExpressionTokenId::STRING_LITERAL:
-            $outType = new StringType();
-            break;
-        case ExpressionTokenId::INTEGER_LITERAL:
-            $outType = new Int32();
-            break;
-        case ExpressionTokenId::DECIMAL_LITERAL:
-            $outType = new Decimal();
-            break;
-        case ExpressionTokenId::DOUBLE_LITERAL:
-            $outType = new Double();
-            break;
-        case ExpressionTokenId::INT64_LITERAL:
-            $outType = new Int64();
-            break;
-        case ExpressionTokenId::SINGLE_LITERAL:
-            $outType = new Single();
-            break;
-        case ExpressionTokenId::NULL_LITERAL:
-            $outType = new Null1();
-            break;
-        default:
-            $outType = null;
-            return false;
+            case ExpressionTokenId::BOOLEAN_LITERAL:
+                $outType = new Boolean();
+                break;
+            case ExpressionTokenId::DATETIME_LITERAL:
+                $outType = new DateTime();
+                break;
+            case ExpressionTokenId::GUID_LITERAL:
+                $outType = new Guid();
+                break;
+            case ExpressionTokenId::STRING_LITERAL:
+                $outType = new StringType();
+                break;
+            case ExpressionTokenId::INTEGER_LITERAL:
+                $outType = new Int32();
+                break;
+            case ExpressionTokenId::DECIMAL_LITERAL:
+                $outType = new Decimal();
+                break;
+            case ExpressionTokenId::DOUBLE_LITERAL:
+                $outType = new Double();
+                break;
+            case ExpressionTokenId::INT64_LITERAL:
+                $outType = new Int64();
+                break;
+            case ExpressionTokenId::SINGLE_LITERAL:
+                $outType = new Single();
+                break;
+            case ExpressionTokenId::NULL_LITERAL:
+                $outType = new Null1();
+                break;
+            default:
+                $outType = null;
+                return false;
         }
 
         if (!$outType->validate($value, $outValue)) {