Qeti / POData

src/POData/Providers/Metadata/Type/DateTime.php

Doc Comments +6 added lines, -6 removed lines

@@ -125,7 +125,7 @@ 
      * 
      * @param string $dateTime datetime to get the year from
      * 
-     * @return int
+     * @return string
      */
     public static function year($dateTime)
     {
@@ -138,7 +138,7 @@ 
      * 
      * @param string $dateTime datetime to get the month from
      * 
-     * @return int
+     * @return string
      */
     public static function month($dateTime)
     {
@@ -151,7 +151,7 @@ 
      * 
      * @param string $dateTime datetime to get the day from
      * 
-     * @return int
+     * @return string
      */
     public static function day($dateTime)
     {
@@ -164,7 +164,7 @@ 
      * 
      * @param string $dateTime datetime to get the hour from
      * 
-     * @return int
+     * @return string
      */
     public static function hour($dateTime)
     {
@@ -177,7 +177,7 @@ 
      * 
      * @param string $dateTime datetime to get the minute from
      * 
-     * @return int
+     * @return string
      */
     public static function minute($dateTime)
     {
@@ -190,7 +190,7 @@ 
      * 
      * @param string $dateTime datetime to get the second from
      * 
-     * @return int
+     * @return string
      */
     public static function second($dateTime)
     {

Spacing +2 added lines, -2 removed lines

@@ -60,7 +60,7 @@ 
             return false;
         }
     
-        $outValue = "'" . $value . "'";
+        $outValue = "'".$value."'";
         return true;
     }
 
@@ -99,7 +99,7 @@ 
      */
     public function convertToOData($value)
     {
-        return 'datetime\'' . urlencode($value) . '\'';
+        return 'datetime\''.urlencode($value).'\'';
     }
 
     /**

src/POData/Providers/ProvidersWrapper.php

Doc Comments +5 added lines, -1 removed lines

@@ -550,7 +550,7 @@ 
      * @param ResourceType     $resourceType     The resource type to start looking
      * @param ResourceProperty $resourceProperty The resource property in question
      * 
-     * @return ResourceType|null Returns reference to the ResourceType on which 
+     * @return ResourceType Returns reference to the ResourceType on which 
      *                                   the $resourceProperty is declared, NULL if 
      *                                   $resourceProperty is not declared anywhere 
      *                                   in the inheritance hierarchy
@@ -605,6 +605,10 @@ 
 	}
 
 
+    /**
+     * @param QueryResult $queryResult
+     * @param string $methodName
+     */
     private function ValidateQueryResult($queryResult, QueryType $queryType, $methodName){
         if (!$queryResult instanceof QueryResult) {
             throw ODataException::createInternalServerError(

Indentation +72 added lines, -72 removed lines

@@ -177,7 +177,7 @@ 
         $resourceSetWrappers = array();
         $resourceSetNames = array();
         foreach ($resourceSets as $resourceSet) {
-	        $name = $resourceSet->getName();
+            $name = $resourceSet->getName();
             if (in_array($name, $resourceSetNames)) {
                 throw new ODataException(Messages::providersWrapperEntitySetNameShouldBeUnique($name), 500 );
             }
@@ -231,7 +231,7 @@ 
     public function resolveResourceSet($name)
     {
         if (array_key_exists($name, $this->setWrapperCache)) {
-			return $this->setWrapperCache[$name];
+            return $this->setWrapperCache[$name];
         }
         
         $resourceSet = $this->metaProvider->resolveResourceSet($name);
@@ -280,9 +280,9 @@ 
     public function getDerivedTypes(ResourceType $resourceType)
     {
         $derivedTypes = $this->metaProvider->getDerivedTypes($resourceType);
-	    if (!is_array($derivedTypes)) {
-		    throw new InvalidOperationException(Messages::metadataAssociationTypeSetInvalidGetDerivedTypesReturnType($resourceType->getName()));
-	    }
+        if (!is_array($derivedTypes)) {
+            throw new InvalidOperationException(Messages::metadataAssociationTypeSetInvalidGetDerivedTypesReturnType($resourceType->getName()));
+        }
 
         foreach ($derivedTypes as $derivedType) {
             $this->_validateResourceType($derivedType);
@@ -326,7 +326,7 @@ 
      *                                             other end of the association is invisible
      */
     public function getResourceAssociationSet(
-	    ResourceSet $set,
+        ResourceSet $set,
         ResourceType $type,
         ResourceProperty $property
     ) {        
@@ -345,7 +345,7 @@ 
 
         if (!is_null($associationSet)) {
             $thisAssociationSetEnd = $associationSet->getResourceAssociationSetEnd(
-				$set,
+                $set,
                 $type,
                 $property
             );
@@ -438,26 +438,26 @@ 
      */
     public function getResourceProperties(ResourceSetWrapper $setWrapper, ResourceType $resourceType) {
         if ($resourceType->getResourceTypeKind() != ResourceTypeKind::ENTITY) {
-	        //Complex resource type
-	        return $resourceType->getAllProperties();
+            //Complex resource type
+            return $resourceType->getAllProperties();
         }
-	    //TODO: move this to doctrine annotations
-	    $cacheKey = $setWrapper->getName() . '_' . $resourceType->getFullName();
+        //TODO: move this to doctrine annotations
+        $cacheKey = $setWrapper->getName() . '_' . $resourceType->getFullName();
         if (!array_key_exists($cacheKey,  $this->propertyCache)) {
-	        //Fill the cache
-	        $this->propertyCache[$cacheKey] = array();
-	        foreach ($resourceType->getAllProperties() as $resourceProperty) {
-	            //Check whether this is a visible navigation property
-		        //TODO: is this broken?? see #87
-	            if ($resourceProperty->getTypeKind() == ResourceTypeKind::ENTITY
-	                && !is_null($this->getResourceSetWrapperForNavigationProperty($setWrapper, $resourceType, $resourceProperty))
-	            ) {
-	                $this->propertyCache[$cacheKey][$resourceProperty->getName()] = $resourceProperty;
-	            } else {
-	                //primitive, bag or complex property
-	                $this->propertyCache[$cacheKey][$resourceProperty->getName()] = $resourceProperty;
-	            }
-	        }
+            //Fill the cache
+            $this->propertyCache[$cacheKey] = array();
+            foreach ($resourceType->getAllProperties() as $resourceProperty) {
+                //Check whether this is a visible navigation property
+                //TODO: is this broken?? see #87
+                if ($resourceProperty->getTypeKind() == ResourceTypeKind::ENTITY
+                    && !is_null($this->getResourceSetWrapperForNavigationProperty($setWrapper, $resourceType, $resourceProperty))
+                ) {
+                    $this->propertyCache[$cacheKey][$resourceProperty->getName()] = $resourceProperty;
+                } else {
+                    //primitive, bag or complex property
+                    $this->propertyCache[$cacheKey][$resourceProperty->getName()] = $resourceProperty;
+                }
+            }
         }
         return $this->propertyCache[$cacheKey];
 
@@ -579,30 +579,30 @@ 
      */
     public function getExpressionProvider()
     {
-	    $expressionProvider = $this->queryProvider->getExpressionProvider();
+        $expressionProvider = $this->queryProvider->getExpressionProvider();
         if (is_null($expressionProvider)) {
             throw ODataException::createInternalServerError(Messages::providersWrapperExpressionProviderMustNotBeNullOrEmpty());
         }
 
         if (!$expressionProvider instanceof IExpressionProvider)
         {
-			throw ODataException::createInternalServerError( Messages::providersWrapperInvalidExpressionProviderInstance() );
+            throw ODataException::createInternalServerError( Messages::providersWrapperInvalidExpressionProviderInstance() );
         }
 
         return $expressionProvider;
     }
 
-	/**
-	 * Indicates if the QueryProvider can handle ordered paging, this means respecting order, skip, and top parameters
-	 * If the query provider can not handle ordered paging, it must return the entire result set and POData will
-	 * perform the ordering and paging
-	 *
-	 * @return Boolean True if the query provider can handle ordered paging, false if POData should perform the paging
-	 */
-	public function handlesOrderedPaging()
-	{
-		return $this->queryProvider->handlesOrderedPaging();
-	}
+    /**
+     * Indicates if the QueryProvider can handle ordered paging, this means respecting order, skip, and top parameters
+     * If the query provider can not handle ordered paging, it must return the entire result set and POData will
+     * perform the ordering and paging
+     *
+     * @return Boolean True if the query provider can handle ordered paging, false if POData should perform the paging
+     */
+    public function handlesOrderedPaging()
+    {
+        return $this->queryProvider->handlesOrderedPaging();
+    }
 
 
     private function ValidateQueryResult($queryResult, QueryType $queryType, $methodName){
@@ -650,14 +650,14 @@ 
     public function getResourceSet(QueryType $queryType, ResourceSet $resourceSet, $filterInfo, $orderBy, $top, $skip)
     {
 
-		$queryResult = $this->queryProvider->getResourceSet(
-			$queryType,
-			$resourceSet,
-			$filterInfo,
-			$orderBy,
-			$top,
-			$skip
-		);
+        $queryResult = $this->queryProvider->getResourceSet(
+            $queryType,
+            $resourceSet,
+            $filterInfo,
+            $orderBy,
+            $top,
+            $skip
+        );
 
         $this->validateQueryResult($queryResult, $queryType, 'IQueryProvider::getResourceSet');
 
@@ -703,10 +703,10 @@ 
      *
      * @throws ODataException
      */
-	public function getRelatedResourceSet(
-		QueryType $queryType,
-	    ResourceSet $sourceResourceSet,
-	    $sourceEntity,
+    public function getRelatedResourceSet(
+        QueryType $queryType,
+        ResourceSet $sourceResourceSet,
+        $sourceEntity,
         ResourceSet $targetResourceSet,
         ResourceProperty $targetProperty, 
         $filterInfo,
@@ -715,17 +715,17 @@ 
         $skip
     ) {
 
-		$queryResult = $this->queryProvider->getRelatedResourceSet(
-			$queryType,
-		    $sourceResourceSet,
-		    $sourceEntity,
-		    $targetResourceSet,
-		    $targetProperty,
-			$filterInfo,
-		    $orderBy,
-		    $top,
-		    $skip
-		);
+        $queryResult = $this->queryProvider->getRelatedResourceSet(
+            $queryType,
+            $sourceResourceSet,
+            $sourceEntity,
+            $targetResourceSet,
+            $targetProperty,
+            $filterInfo,
+            $orderBy,
+            $top,
+            $skip
+        );
 
 
         $this->validateQueryResult($queryResult, $queryType, 'IQueryProvider::getRelatedResourceSet');
@@ -751,14 +751,14 @@ 
         KeyDescriptor $keyDescriptor
     ) {
         $entityInstance = $this->queryProvider->getResourceFromRelatedResourceSet(
-			$sourceResourceSet,
-			$sourceEntity,
-			$targetResourceSet,
-			$targetProperty,
-			$keyDescriptor
-		);
-
-	    $this->_validateEntityInstance(
+            $sourceResourceSet,
+            $sourceEntity,
+            $targetResourceSet,
+            $targetProperty,
+            $keyDescriptor
+        );
+
+        $this->_validateEntityInstance(
             $entityInstance, $targetResourceSet, 
             $keyDescriptor, 
             'IQueryProvider::getResourceFromRelatedResourceSet'
@@ -913,8 +913,8 @@ 
      */
     protected function assert($condition, $conditionAsString)
     {
-    	if (!$condition) {
-    		throw new InvalidOperationException("Unexpected state, expecting $conditionAsString");
-    	}
+        if (!$condition) {
+            throw new InvalidOperationException("Unexpected state, expecting $conditionAsString");
+        }
     }
 }
\ No newline at end of file

Spacing +14 added lines, -14 removed lines

@@ -179,7 +179,7 @@ 
         foreach ($resourceSets as $resourceSet) {
 	        $name = $resourceSet->getName();
             if (in_array($name, $resourceSetNames)) {
-                throw new ODataException(Messages::providersWrapperEntitySetNameShouldBeUnique($name), 500 );
+                throw new ODataException(Messages::providersWrapperEntitySetNameShouldBeUnique($name), 500);
             }
 
             $resourceSetNames[] = $name;
@@ -331,9 +331,9 @@ 
         ResourceProperty $property
     ) {        
         $type = $this->_getResourceTypeWherePropertyIsDeclared($type, $property);
-        $cacheKey = $set->getName() . '_' . $type->getName() . '_' . $property->getName();
+        $cacheKey = $set->getName().'_'.$type->getName().'_'.$property->getName();
 
-        if (array_key_exists($cacheKey,  $this->associationSetCache)) {
+        if (array_key_exists($cacheKey, $this->associationSetCache)) {
             return $this->associationSetCache[$cacheKey];
         }
 
@@ -442,8 +442,8 @@ 
 	        return $resourceType->getAllProperties();
         }
 	    //TODO: move this to doctrine annotations
-	    $cacheKey = $setWrapper->getName() . '_' . $resourceType->getFullName();
-        if (!array_key_exists($cacheKey,  $this->propertyCache)) {
+	    $cacheKey = $setWrapper->getName().'_'.$resourceType->getFullName();
+        if (!array_key_exists($cacheKey, $this->propertyCache)) {
 	        //Fill the cache
 	        $this->propertyCache[$cacheKey] = array();
 	        foreach ($resourceType->getAllProperties() as $resourceProperty) {
@@ -586,7 +586,7 @@ 
 
         if (!$expressionProvider instanceof IExpressionProvider)
         {
-			throw ODataException::createInternalServerError( Messages::providersWrapperInvalidExpressionProviderInstance() );
+			throw ODataException::createInternalServerError(Messages::providersWrapperInvalidExpressionProviderInstance());
         }
 
         return $expressionProvider;
@@ -605,30 +605,30 @@ 
 	}
 
 
-    private function ValidateQueryResult($queryResult, QueryType $queryType, $methodName){
+    private function ValidateQueryResult($queryResult, QueryType $queryType, $methodName) {
         if (!$queryResult instanceof QueryResult) {
             throw ODataException::createInternalServerError(
                 Messages::queryProviderReturnsNonQueryResult($methodName)
             );
         }
 
-        if($queryType == QueryType::COUNT() || $queryType == QueryType::ENTITIES_WITH_COUNT()){
+        if ($queryType == QueryType::COUNT() || $queryType == QueryType::ENTITIES_WITH_COUNT()) {
             //and the provider is supposed to handle the ordered paging they must return a count!
-            if($this->queryProvider->handlesOrderedPaging() && !is_numeric($queryResult->count)){
+            if ($this->queryProvider->handlesOrderedPaging() && !is_numeric($queryResult->count)) {
                 throw ODataException::createInternalServerError(
                     Messages::queryProviderResultCountMissing($methodName, $queryType)
                 );
             }
 
             //If POData is supposed to handle the ordered aging they must return results! (possibly empty)
-            if(!$this->queryProvider->handlesOrderedPaging() && !is_array($queryResult->results)){
+            if (!$this->queryProvider->handlesOrderedPaging() && !is_array($queryResult->results)) {
                 throw ODataException::createInternalServerError(
                     Messages::queryProviderResultsMissing($methodName, $queryType)
                 );
             }
         }
 
-        if(($queryType == QueryType::ENTITIES() || $queryType == QueryType::ENTITIES_WITH_COUNT()) && !is_array($queryResult->results)){
+        if (($queryType == QueryType::ENTITIES() || $queryType == QueryType::ENTITIES_WITH_COUNT()) && !is_array($queryResult->results)) {
             throw ODataException::createInternalServerError(
                 Messages::queryProviderResultsMissing($methodName, $queryType)
             );
@@ -676,7 +676,7 @@ 
      */
     public function getResourceFromResourceSet(ResourceSet $resourceSet, KeyDescriptor $keyDescriptor)
     {
-        $entityInstance = $this->queryProvider->getResourceFromResourceSet( $resourceSet, $keyDescriptor );
+        $entityInstance = $this->queryProvider->getResourceFromResourceSet($resourceSet, $keyDescriptor);
         $this->_validateEntityInstance(
             $entityInstance, 
             $resourceSet, 
@@ -852,8 +852,8 @@ 
      * @throws ODataException
      */
     private function _validateEntityInstance($entityInstance, 
-        ResourceSet &$resourceSet, 
-        KeyDescriptor &$keyDescriptor, 
+        ResourceSet & $resourceSet, 
+        KeyDescriptor & $keyDescriptor, 
         $methodName
     ) {
         if (is_null($entityInstance)) {

src/POData/UriProcessor/QueryProcessor/ExpandProjectionParser/ExpandedProjectionNode.php

Doc Comments +1 added lines, -1 removed lines

@@ -281,7 +281,7 @@
      * Gets the sort information associated with the expanded navigation 
      * property or root of 'Projection Tree'.
      * 
-     * @return InternalOrderByInfo|null
+     * @return InternalOrderByInfo
      */
     public function getInternalOrderByInfo()
     {

Indentation +1 added lines, -1 removed lines

@@ -413,7 +413,7 @@
         $this->_selectAllImmediateProperties = false;
         foreach ($this->_childNodes as $node) {
             if ($node instanceof ExpandedProjectionNode) {
-                 $node->markSubtreeAsSelected();   
+                    $node->markSubtreeAsSelected();   
             }
         }
     }

src/POData/UriProcessor/QueryProcessor/ExpandProjectionParser/ExpandProjectionParser.php

Unused Use Statements -1 removed lines

@@ -5,7 +5,6 @@
 use POData\Common\ODataException;
 use POData\Common\Messages;
 use POData\Providers\Metadata\ResourceTypeKind;
-use POData\Configuration\ServiceConfiguration;
 use POData\Providers\Metadata\ResourceType;
 use POData\Providers\Metadata\ResourceSetWrapper;
 use POData\Providers\ProvidersWrapper;

Indentation +8 added lines, -8 removed lines

@@ -195,7 +195,7 @@ 
                         $expandSubPathSegment
                     );
                 if (is_null($resourceProperty)) {
-					throw ODataException::createSyntaxError(
+                    throw ODataException::createSyntaxError(
                         Messages::expandProjectionParserPropertyNotFound(
                             $resourceType->getFullName(), 
                             $expandSubPathSegment, 
@@ -203,7 +203,7 @@ 
                         )
                     );
                 } else if ($resourceProperty->getTypeKind() != ResourceTypeKind::ENTITY) {
-					throw ODataException::createBadRequestError(
+                    throw ODataException::createBadRequestError(
                         Messages::expandProjectionParserExpandCanOnlyAppliedToEntity(
                             $resourceType->getFullName(), 
                             $expandSubPathSegment
@@ -218,7 +218,7 @@ 
                         $resourceProperty
                     );
                 if (is_null($resourceSetWrapper)) {
-					throw ODataException::createBadRequestError(
+                    throw ODataException::createBadRequestError(
                         Messages::badRequestInvalidPropertyNameSpecified(
                             $resourceType->getFullName(), 
                             $expandSubPathSegment
@@ -295,7 +295,7 @@ 
                 if (!($currentNode instanceof RootProjectionNode) 
                     && !($currentNode instanceof ExpandedProjectionNode)
                 ) {
-					throw ODataException::createBadRequestError(
+                    throw ODataException::createBadRequestError(
                         Messages::expandProjectionParserPropertyWithoutMatchingExpand(
                             $currentNode->getPropertyName()
                         )
@@ -326,21 +326,21 @@ 
 
                 if (!$isLastSegment) {
                     if ($resourceProperty->isKindOf(ResourcePropertyKind::BAG)) {
-						throw ODataException::createBadRequestError(
+                        throw ODataException::createBadRequestError(
                             Messages::expandProjectionParserBagPropertyAsInnerSelectSegment(
                                 $currentResourceType->getFullName(), 
                                 $selectSubPathSegment
                             )
                         );
                     } else if ($resourceProperty->isKindOf(ResourcePropertyKind::PRIMITIVE)) {
-						throw ODataException::createBadRequestError(
+                        throw ODataException::createBadRequestError(
                             Messages::expandProjectionParserPrimitivePropertyUsedAsNavigationProperty(
                                 $currentResourceType->getFullName(), 
                                 $selectSubPathSegment
                             )
                         );
                     } else if ($resourceProperty->isKindOf(ResourcePropertyKind::COMPLEX_TYPE)) {
-						throw ODataException::createBadRequestError(
+                        throw ODataException::createBadRequestError(
                             Messages::expandProjectionParserComplexPropertyAsInnerSelectSegment(
                                 $currentResourceType->getFullName(), 
                                 $selectSubPathSegment
@@ -356,7 +356,7 @@ 
                 $node = $currentNode->findNode($selectSubPathSegment);
                 if (is_null($node)) {
                     if (!$isLastSegment) {
-						throw ODataException::createBadRequestError(
+                        throw ODataException::createBadRequestError(
                             Messages::expandProjectionParserPropertyWithoutMatchingExpand(
                                 $selectSubPathSegment
                             )

Spacing +1 added lines, -1 removed lines

@@ -241,7 +241,7 @@
                     //assert(!empty($keys))
                     $orderBy = null;
                     foreach ($keys as $key) {
-                        $orderBy = $orderBy . $key . ', ';
+                        $orderBy = $orderBy.$key.', ';
                     }
 
                     $orderBy = rtrim($orderBy, ', ');

src/POData/UriProcessor/QueryProcessor/ExpressionParser/ExpressionLexer.php

Doc Comments +1 added lines, -1 removed lines

@@ -117,7 +117,7 @@
     /**
      * To get the text being parsed
      * 
-     * @return string
+     * @return char[]
      */
     public function getExpressionText()
     {

Indentation +105 added lines, -105 removed lines

@@ -166,111 +166,111 @@
         $t = null;
         $tokenPos = $this->_textPos;
         switch ($this->_ch) {
-	        case '(':
-	            $this->_nextChar();
-	            $t = ExpressionTokenId::OPENPARAM;
-	            break;
-	        case ')':
-	            $this->_nextChar();
-	            $t = ExpressionTokenId::CLOSEPARAM;
-	            break;
-	        case ',':
-	            $this->_nextChar();
-	            $t = ExpressionTokenId::COMMA;
-	            break;
-	        case '-':
-	            $hasNext = $this->_textPos + 1 < $this->_textLen;
-	            if ($hasNext && Char::isDigit($this->_text[$this->_textPos + 1])) {
-	                $this->_nextChar();
-	                $t = $this->_parseFromDigit();
-	                if (self::isNumeric($t)) {
-	                    break;
-	                }
-
-	                $this->_setTextPos($tokenPos);
-	            } else if ($hasNext && $this->_text[$tokenPos + 1] == 'I') {
-	                $this->_nextChar();
-	                $this->_parseIdentifier();
-	                $currentIdentifier = substr($this->_text, $tokenPos + 1, $this->_textPos - $tokenPos - 1);
-
-	                if (self::_isInfinityLiteralDouble($currentIdentifier)) {
-	                    $t = ExpressionTokenId::DOUBLE_LITERAL;
-	                    break;
-	                } else if (self::_isInfinityLiteralSingle($currentIdentifier)) {
-	                    $t = ExpressionTokenId::SINGLE_LITERAL;
-	                    break;
-	                }
-
-	                // If it looked like '-INF' but wasn't we'll rewind and fall
-	                // through to a simple '-' token.
-	                $this->_setTextPos($tokenPos);
-	            }
-
-	            $this->_nextChar();
-	            $t = ExpressionTokenId::MINUS;
-	            break;
-	        case '=':
-	            $this->_nextChar();
-	            $t = ExpressionTokenId::EQUAL;
-	            break;
-	        case '/':
-	            $this->_nextChar();
-	            $t = ExpressionTokenId::SLASH;
-	            break;
-	        case '?':
-	            $this->_nextChar();
-	            $t = ExpressionTokenId::QUESTION;
-	            break;
-	        case '.':
-	            $this->_nextChar();
-	            $t = ExpressionTokenId::DOT;
-	            break;
-	        case '\'':
-	            $quote = $this->_ch;
-	            do {
-	                $this->_nextChar();
-	                while ($this->_textPos < $this->_textLen && $this->_ch != $quote) {
-	                    $this->_nextChar();
-	                }
-
-	                if ($this->_textPos == $this->_textLen) {
-	                    $this->_parseError(
-	                        Messages::expressionLexerUnterminatedStringLiteral(
-	                            $this->_textPos, $this->_text
-	                        )
-	                    );
-	                }
-
-	                $this->_nextChar();
-	            } while ($this->_ch == $quote);
-	            $t = ExpressionTokenId::STRING_LITERAL;
-	            break;
-	        case '*':
-	            $this->_nextChar();
-	            $t = ExpressionTokenId::STAR;
-	            break;
-	        default:
-	            if (Char::isLetter($this->_ch) || $this->_ch == '_') {
-	                $this->_parseIdentifier();
-	                $t = ExpressionTokenId::IDENTIFIER;
-	                break;
-	            }
-
-	            if (Char::isDigit($this->_ch)) {
-	                $t = $this->_parseFromDigit();
-	                break;
-	            }
-
-	            if ($this->_textPos == $this->_textLen) {
-	                $t = ExpressionTokenId::END;
-	                break;
-	            }
-
-	            $this->_parseError(
-	                Messages::expressionLexerInvalidCharacter(
-	                    $this->_ch, $this->_textPos
-	                )
-	            );
+            case '(':
+                $this->_nextChar();
+                $t = ExpressionTokenId::OPENPARAM;
+                break;
+            case ')':
+                $this->_nextChar();
+                $t = ExpressionTokenId::CLOSEPARAM;
+                break;
+            case ',':
+                $this->_nextChar();
+                $t = ExpressionTokenId::COMMA;
+                break;
+            case '-':
+                $hasNext = $this->_textPos + 1 < $this->_textLen;
+                if ($hasNext && Char::isDigit($this->_text[$this->_textPos + 1])) {
+                    $this->_nextChar();
+                    $t = $this->_parseFromDigit();
+                    if (self::isNumeric($t)) {
+                        break;
+                    }
+
+                    $this->_setTextPos($tokenPos);
+                } else if ($hasNext && $this->_text[$tokenPos + 1] == 'I') {
+                    $this->_nextChar();
+                    $this->_parseIdentifier();
+                    $currentIdentifier = substr($this->_text, $tokenPos + 1, $this->_textPos - $tokenPos - 1);
+
+                    if (self::_isInfinityLiteralDouble($currentIdentifier)) {
+                        $t = ExpressionTokenId::DOUBLE_LITERAL;
+                        break;
+                    } else if (self::_isInfinityLiteralSingle($currentIdentifier)) {
+                        $t = ExpressionTokenId::SINGLE_LITERAL;
+                        break;
+                    }
+
+                    // If it looked like '-INF' but wasn't we'll rewind and fall
+                    // through to a simple '-' token.
+                    $this->_setTextPos($tokenPos);
+                }
+
+                $this->_nextChar();
+                $t = ExpressionTokenId::MINUS;
+                break;
+            case '=':
+                $this->_nextChar();
+                $t = ExpressionTokenId::EQUAL;
+                break;
+            case '/':
+                $this->_nextChar();
+                $t = ExpressionTokenId::SLASH;
+                break;
+            case '?':
+                $this->_nextChar();
+                $t = ExpressionTokenId::QUESTION;
+                break;
+            case '.':
+                $this->_nextChar();
+                $t = ExpressionTokenId::DOT;
+                break;
+            case '\'':
+                $quote = $this->_ch;
+                do {
+                    $this->_nextChar();
+                    while ($this->_textPos < $this->_textLen && $this->_ch != $quote) {
+                        $this->_nextChar();
+                    }
+
+                    if ($this->_textPos == $this->_textLen) {
+                        $this->_parseError(
+                            Messages::expressionLexerUnterminatedStringLiteral(
+                                $this->_textPos, $this->_text
+                            )
+                        );
+                    }
+
+                    $this->_nextChar();
+                } while ($this->_ch == $quote);
+                $t = ExpressionTokenId::STRING_LITERAL;
+                break;
+            case '*':
+                $this->_nextChar();
+                $t = ExpressionTokenId::STAR;
+                break;
+            default:
+                if (Char::isLetter($this->_ch) || $this->_ch == '_') {
+                    $this->_parseIdentifier();
+                    $t = ExpressionTokenId::IDENTIFIER;
+                    break;
+                }
+
+                if (Char::isDigit($this->_ch)) {
+                    $t = $this->_parseFromDigit();
+                    break;
+                }
+
+                if ($this->_textPos == $this->_textLen) {
+                    $t = ExpressionTokenId::END;
+                    break;
+                }
+
+                $this->_parseError(
+                    Messages::expressionLexerInvalidCharacter(
+                        $this->_ch, $this->_textPos
+                    )
+                );
         }
 
         $this->_token->Id = $t;

Spacing +2 added lines, -2 removed lines

@@ -351,7 +351,7 @@ 
         while ($this->_token->Id == ExpressionTokenId::DOT) {
             $this->nextToken();
             $this->validateToken(ExpressionTokenId::IDENTIFIER);
-            $identifier = $identifier . '.' . $this->_token->Text;
+            $identifier = $identifier.'.'.$this->_token->Text;
             $this->nextToken();
         }
 
@@ -458,7 +458,7 @@ 
             || strcasecmp('X', $tokenText) == 0 
             || strcasecmp('x', $tokenText) == 0
         ) {
-            $id =  ExpressionTokenId::BINARY_LITERAL;
+            $id = ExpressionTokenId::BINARY_LITERAL;
         } else {
             return;
         }

src/POData/UriProcessor/QueryProcessor/ExpressionParser/ExpressionParser.php

Unused Use Statements -3 removed lines

@@ -16,11 +16,8 @@
 use POData\Providers\Metadata\Type\Guid;
 use POData\Providers\Metadata\Type\Binary;
 use POData\Providers\Metadata\Type\Null1;
-use POData\Providers\Metadata\Type\INavigationType;
-use POData\Providers\Metadata\Type\TypeCode;
 use POData\Providers\Metadata\Type\IType;
 use POData\Providers\Metadata\ResourceType;
-use POData\Providers\Metadata\ResourceSet;
 use POData\Providers\Metadata\ResourcePropertyKind;
 use POData\UriProcessor\QueryProcessor\ExpressionParser\Expressions\AbstractExpression;
 use POData\UriProcessor\QueryProcessor\ExpressionParser\Expressions\PropertyAccessExpression;

Indentation +66 added lines, -66 removed lines

@@ -690,81 +690,81 @@
 
         $null = new Null1();
         if ($left->typeIs($null) || $right->typeIs($null)) {
-          // If the end user is responsible for implementing IExpressionProvider
-          // then the sub-tree for a nullability check would be:
-          //
-          //          RelationalExpression(EQ/NE)
-          //                    |
-          //               ------------
-          //               |           |
-          //               |           |
-          //            CustomerID    NULL
-          //
-          // Otherwise (In case of default PHPExpressionProvider):
-          //          
-          //  CustomerID eq null
-          //  ==================
-          //
-          //              FunctionCallExpression(is_null)
-          //                       |
-          //                       |- Signature => bool (typeof(CustomerID))
-          //                       |- args => {CustomerID}
-          //
-          //
-          //  CustomerID ne null
-          //  ==================
-          //
-          //              UnaryExpression (not)
-          //                       |
-          //              FunctionCallExpression(is_null)
-          //                       |
-          //                       |- Signature => bool (typeof(CustomerID))
-          //                       |- args => {CustomerID}
-          //
+            // If the end user is responsible for implementing IExpressionProvider
+            // then the sub-tree for a nullability check would be:
+            //
+            //          RelationalExpression(EQ/NE)
+            //                    |
+            //               ------------
+            //               |           |
+            //               |           |
+            //            CustomerID    NULL
+            //
+            // Otherwise (In case of default PHPExpressionProvider):
+            //          
+            //  CustomerID eq null
+            //  ==================
+            //
+            //              FunctionCallExpression(is_null)
+            //                       |
+            //                       |- Signature => bool (typeof(CustomerID))
+            //                       |- args => {CustomerID}
+            //
+            //
+            //  CustomerID ne null
+            //  ==================
+            //
+            //              UnaryExpression (not)
+            //                       |
+            //              FunctionCallExpression(is_null)
+            //                       |
+            //                       |- Signature => bool (typeof(CustomerID))
+            //                       |- args => {CustomerID}
+            //
             if ($isPHPExpressionProvider) {
                 $arg = $left->typeIs($null) ? $right : $left;
                 $isNullFunctionDescription = new FunctionDescription('is_null', new Boolean(), array($arg->getType()));
                 switch ($expressionToken->Text) {
-	                case ODataConstants::KEYWORD_EQUAL:
-	                    return new FunctionCallExpression($isNullFunctionDescription, array($arg));
-	                    break;
-
-	                case ODataConstants::KEYWORD_NOT_EQUAL:
-	                    return new UnaryExpression(
-	                        new FunctionCallExpression($isNullFunctionDescription, array($arg)),
-	                        ExpressionType::NOT_LOGICAL,
-	                        new Boolean()
-	                    );
-	                    break;
+                    case ODataConstants::KEYWORD_EQUAL:
+                        return new FunctionCallExpression($isNullFunctionDescription, array($arg));
+                        break;
+
+                    case ODataConstants::KEYWORD_NOT_EQUAL:
+                        return new UnaryExpression(
+                            new FunctionCallExpression($isNullFunctionDescription, array($arg)),
+                            ExpressionType::NOT_LOGICAL,
+                            new Boolean()
+                        );
+                        break;
                 }
             }
         }
 
         switch ($expressionToken->Text) {
-	        case ODataConstants::KEYWORD_EQUAL:
-	            return new RelationalExpression(
-	                $left, $right, ExpressionType::EQUAL
-	            );
-	        case ODataConstants::KEYWORD_NOT_EQUAL:
-	            return new RelationalExpression(
-	                $left, $right, ExpressionType::NOTEQUAL
-	            );
-	        case ODataConstants::KEYWORD_GREATERTHAN:
-	            return new RelationalExpression(
-	                $left, $right, ExpressionType::GREATERTHAN
-	            );
-	        case ODataConstants::KEYWORD_GREATERTHAN_OR_EQUAL:
-	            return new RelationalExpression(
-	                $left, $right, ExpressionType::GREATERTHAN_OR_EQUAL
-	            );
-	        case ODataConstants::KEYWORD_LESSTHAN:
-	            return new RelationalExpression(
-	                $left, $right, ExpressionType::LESSTHAN
-	            );
-	        default:
-	            return new RelationalExpression(
-	                $left, $right, ExpressionType::LESSTHAN_OR_EQUAL
-	            );
+            case ODataConstants::KEYWORD_EQUAL:
+                return new RelationalExpression(
+                    $left, $right, ExpressionType::EQUAL
+                );
+            case ODataConstants::KEYWORD_NOT_EQUAL:
+                return new RelationalExpression(
+                    $left, $right, ExpressionType::NOTEQUAL
+                );
+            case ODataConstants::KEYWORD_GREATERTHAN:
+                return new RelationalExpression(
+                    $left, $right, ExpressionType::GREATERTHAN
+                );
+            case ODataConstants::KEYWORD_GREATERTHAN_OR_EQUAL:
+                return new RelationalExpression(
+                    $left, $right, ExpressionType::GREATERTHAN_OR_EQUAL
+                );
+            case ODataConstants::KEYWORD_LESSTHAN:
+                return new RelationalExpression(
+                    $left, $right, ExpressionType::LESSTHAN
+                );
+            default:
+                return new RelationalExpression(
+                    $left, $right, ExpressionType::LESSTHAN_OR_EQUAL
+                );
         }
     }
 

Switch Indentation +31 added lines, -31 removed lines

@@ -363,37 +363,37 @@
     private function _parsePrimaryStart()
     {
         switch ($this->_lexer->getCurrentToken()->Id) {
-        case ExpressionTokenId::BOOLEAN_LITERAL:
-            return $this->_parseTypedLiteral(new Boolean());
-        case ExpressionTokenId::DATETIME_LITERAL:
-            return $this->_parseTypedLiteral(new DateTime());
-        case ExpressionTokenId::DECIMAL_LITERAL:
-            return $this->_parseTypedLiteral(new Decimal());
-        case ExpressionTokenId::NULL_LITERAL:
-            return $this->_parseNullLiteral();
-        case ExpressionTokenId::IDENTIFIER:
-            return $this->_parseIdentifier();
-        case ExpressionTokenId::STRING_LITERAL:
-            return $this->_parseTypedLiteral(new String());
-        case ExpressionTokenId::INT64_LITERAL:
-            return $this->_parseTypedLiteral(new Int64());
-        case ExpressionTokenId::INTEGER_LITERAL:
-            return $this->_parseTypedLiteral(new Int32());
-        case ExpressionTokenId::DOUBLE_LITERAL:
-            return $this->_parseTypedLiteral(new Double());
-        case ExpressionTokenId::SINGLE_LITERAL:
-            return $this->_parseTypedLiteral(new Single());
-        case ExpressionTokenId::GUID_LITERAL:
-            return $this->_parseTypedLiteral(new Guid());
-        case ExpressionTokenId::BINARY_LITERAL:
-            throw new NotImplementedException(
-                'Support for binary is not implemented'
-            );
-            //return $this->_parseTypedLiteral(new Binary());
-        case ExpressionTokenId::OPENPARAM:
-            return $this->_parseParenExpression();
-        default:
-            throw ODataException::createSyntaxError("Expression expected.");
+            case ExpressionTokenId::BOOLEAN_LITERAL:
+                return $this->_parseTypedLiteral(new Boolean());
+            case ExpressionTokenId::DATETIME_LITERAL:
+                return $this->_parseTypedLiteral(new DateTime());
+            case ExpressionTokenId::DECIMAL_LITERAL:
+                return $this->_parseTypedLiteral(new Decimal());
+            case ExpressionTokenId::NULL_LITERAL:
+                return $this->_parseNullLiteral();
+            case ExpressionTokenId::IDENTIFIER:
+                return $this->_parseIdentifier();
+            case ExpressionTokenId::STRING_LITERAL:
+                return $this->_parseTypedLiteral(new String());
+            case ExpressionTokenId::INT64_LITERAL:
+                return $this->_parseTypedLiteral(new Int64());
+            case ExpressionTokenId::INTEGER_LITERAL:
+                return $this->_parseTypedLiteral(new Int32());
+            case ExpressionTokenId::DOUBLE_LITERAL:
+                return $this->_parseTypedLiteral(new Double());
+            case ExpressionTokenId::SINGLE_LITERAL:
+                return $this->_parseTypedLiteral(new Single());
+            case ExpressionTokenId::GUID_LITERAL:
+                return $this->_parseTypedLiteral(new Guid());
+            case ExpressionTokenId::BINARY_LITERAL:
+                throw new NotImplementedException(
+                    'Support for binary is not implemented'
+                );
+                //return $this->_parseTypedLiteral(new Binary());
+            case ExpressionTokenId::OPENPARAM:
+                return $this->_parseParenExpression();
+            default:
+                throw ODataException::createSyntaxError("Expression expected.");
         }
     }
 

Spacing +4 added lines, -4 removed lines

@@ -202,7 +202,7 @@ 
             $this->_lexer->nextToken();
             $right = $this->_parseComparison();
             FunctionDescription::verifyLogicalOpArguments($logicalOpToken, $left, $right);
-            $left = new LogicalExpression($left, $right, ExpressionType::AND_LOGICAL );
+            $left = new LogicalExpression($left, $right, ExpressionType::AND_LOGICAL);
         }
 
         $this->_recurseLeave();
@@ -250,7 +250,7 @@ 
             if ($additiveToken->identifierIs(ODataConstants::KEYWORD_ADD)) {
                 $left = new ArithmeticExpression($left, $right, ExpressionType::ADD, $opReturnType);
             } else {
-                $left = new ArithmeticExpression($left, $right, ExpressionType::SUBTRACT, $opReturnType );
+                $left = new ArithmeticExpression($left, $right, ExpressionType::SUBTRACT, $opReturnType);
             }
         }
 
@@ -308,7 +308,7 @@ 
                 && (ExpressionLexer::isNumeric($this->_getCurrentToken()->Id))
             ) {
                 $numberLiteral = $this->_getCurrentToken();
-                $numberLiteral->Text = '-' . $numberLiteral->Text;
+                $numberLiteral->Text = '-'.$numberLiteral->Text;
                 $numberLiteral->Position = $op->Position;
                 $v = $this->_getCurrentToken();
                 $this->_setCurrentToken($numberLiteral);
@@ -670,7 +670,7 @@ 
         $dateTime = new DateTime();
         if ($left->typeIs($dateTime) && $right->typeIs($dateTime)) {
             $dateTimeCmpFunctions = FunctionDescription::dateTimeComparisonFunctions();
-            $left = new FunctionCallExpression( $dateTimeCmpFunctions[0], array($left, $right));
+            $left = new FunctionCallExpression($dateTimeCmpFunctions[0], array($left, $right));
             $right = new ConstantExpression(0, new Int32());
         }
 

src/POData/UriProcessor/QueryProcessor/ExpressionParser/ExpressionParser2.php

Doc Comments +6 added lines, -6 removed lines

@@ -176,7 +176,7 @@ 
      * @param ArithmeticExpression $expression The arithmetic expression node
      *                                         to process.
      *                                          
-     * @return LogicalExpression|null
+     * @return AbstractExpression|null
      */
     private function _processArithmeticNode(ArithmeticExpression $expression)
     {
@@ -210,7 +210,7 @@ 
      * @param AbstractExpression     $parentExpression The parent expression of 
      *                                                 expression node to process.
      * 
-     * @return LogicalExpression|null
+     * @return null|AbstractExpression
      */
     private function _processFunctionCallNode(FunctionCallExpression $expression,
         $parentExpression
@@ -261,7 +261,7 @@ 
      * @param AbstractExpression $parentExpression The parent expression of 
      *                                             expression node to process.
      * 
-     * @return LogicalExpression|null
+     * @return null|AbstractExpression
      */
     private function _processLogicalNode(
         LogicalExpression $expression, $parentExpression
@@ -364,7 +364,7 @@ 
      * @param AbstractExpression   $parentExpression The parent expression of 
      *                                               expression node to process.
      * 
-     * @return LogicalExpression|null
+     * @return null|AbstractExpression
      */
     private function _processRelationalNode(RelationalExpression $expression, 
         $parentExpression
@@ -411,7 +411,7 @@ 
      * @param AbstractExpression $parentExpression The parent expression of 
      *                                             expression node to process.
      * 
-     * @return LogicalExpression|null
+     * @return AbstractExpression|null
      */
     private function _processUnaryNode(UnaryExpression $expression, 
         $parentExpression
@@ -454,7 +454,7 @@ 
      * @param AbstractExpression $nullCheckExpTree1 First expression.
      * @param AbstractExpression $nullCheckExpTree2 Second expression.
      * 
-     * @return UnaryExpression|LogicalExpression
+     * @return AbstractExpression
      */
     private function _mergeNullableExpressionTrees($nullCheckExpTree1, 
         $nullCheckExpTree2

Unused Use Statements -1 removed lines

@@ -8,7 +8,6 @@
 use POData\Providers\Expression\PHPExpressionProvider;
 use POData\Providers\Metadata\Type\Boolean;
 use POData\Providers\Metadata\ResourceType;
-use POData\Providers\Metadata\ResourceTypeKind;
 use POData\UriProcessor\QueryProcessor\ExpressionParser\Expressions\AbstractExpression;
 use POData\UriProcessor\QueryProcessor\ExpressionParser\Expressions\ArithmeticExpression;
 use POData\UriProcessor\QueryProcessor\ExpressionParser\Expressions\LogicalExpression;

Indentation +2 added lines, -2 removed lines

@@ -308,7 +308,7 @@ 
         }
 
         if ($resultExpression == null) {
-               return null;
+                return null;
         }
            
         if ($parentExpression == null) {
@@ -389,7 +389,7 @@ 
         }
         
         if ($resultExpression == null) {
-               return null;
+                return null;
         }
            
         if ($parentExpression == null) {

Spacing +3 added lines, -3 removed lines

@@ -93,9 +93,9 @@ 
         $expressionProcessor = new ExpressionProcessor($expressionProvider);
 
         try {
-            $expressionAsString = $expressionProcessor->processExpression( $expressionTree );
+            $expressionAsString = $expressionProcessor->processExpression($expressionTree);
         } catch (\InvalidArgumentException $invalidArgumentException) {
-            throw ODataException::createInternalServerError( $invalidArgumentException->getMessage() );
+            throw ODataException::createInternalServerError($invalidArgumentException->getMessage());
         }
 
         
@@ -518,7 +518,7 @@ 
             $parent = $nullCheckExpTree;
             $key = null;        
             do {
-                $key = $parent->getResourceProperty()->getName() . '_' . $key;
+                $key = $parent->getResourceProperty()->getName().'_'.$key;
                 $parent = $parent->getParent();
             } while ($parent != null);
                         

src/POData/UriProcessor/QueryProcessor/ExpressionParser/ExpressionProcessor.php

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 namespace POData\UriProcessor\QueryProcessor\ExpressionParser;
 
 use POData\Providers\Expression\IExpressionProvider;
-use POData\UriProcessor\QueryProcessor\ExpressionParser\Expressions\PropertyNullabilityCheckExpression;
 use POData\UriProcessor\QueryProcessor\ExpressionParser\Expressions\AbstractExpression;
 use POData\UriProcessor\QueryProcessor\ExpressionParser\Expressions\ArithmeticExpression;
 use POData\UriProcessor\QueryProcessor\ExpressionParser\Expressions\LogicalExpression;

src/POData/UriProcessor/QueryProcessor/ExpressionParser/Expressions/ArithmeticExpression.php

Doc Comments +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
      * @param AbstractExpression $left     left expression
      * @param AbstractExpression $right    right Expression
      * @param ExpressionType     $nodeType Expression node type
-     * @param IType              $type     Expression type 
+     * @param \POData\Providers\Metadata\Type\IType              $type     Expression type 
      */
     public function __construct($left, $right, $nodeType, $type)
     {