Qeti / POData

src/POData/UriProcessor/QueryProcessor/QueryProcessor.php

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);
 
         }
     } 

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

Spacing +3 added lines, -3 removed lines

@@ -72,8 +72,8 @@ 
      *                                                                orderby path segments.
      * @param ResourceType                  &$resourceType            Reference to the type of the resource pointed by the request uri.
      */
-    public function __construct(InternalOrderByInfo &$internalOrderByInfo, 
-        $orderByValuesInSkipToken, ResourceType &$resourceType
+    public function __construct(InternalOrderByInfo & $internalOrderByInfo, 
+        $orderByValuesInSkipToken, ResourceType & $resourceType
     ) {
         $this->_internalOrderByInfo = $internalOrderByInfo;        
         $this->_orderByValuesInSkipToken = $orderByValuesInSkipToken;
@@ -282,7 +282,7 @@ 
                     } else if ($isLastSegment) {
                         $type = $subPathSegment->getInstanceType();
                         $value = $type->convertToOData($currentObject);
-                        $nextPageLink .= $value . ', ';
+                        $nextPageLink .= $value.', ';
                     }                    
                 } catch (\ReflectionException $reflectionException) {
                     throw ODataException::createInternalServerError(

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

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

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

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;
     }
 
     /**

src/POData/UriProcessor/ResourcePathProcessor/ResourcePathProcessor.php

Spacing +6 added lines, -6 removed lines

@@ -55,7 +55,7 @@ 
         );
         $kind = $request->getTargetKind();
 
-	    if ($kind == TargetKind::METADATA() || $kind == TargetKind::BATCH() || $kind == TargetKind::SERVICE_DIRECTORY()){
+	    if ($kind == TargetKind::METADATA() || $kind == TargetKind::BATCH() || $kind == TargetKind::SERVICE_DIRECTORY()) {
 		    return $request;
 	    }
 
@@ -80,11 +80,11 @@ 
             // use of $count requires request DataServiceVersion
             // and MaxDataServiceVersion greater than or equal to 2.0
 
-            $request->raiseResponseVersion( 2, 0);
-            $request->raiseMinVersionRequirement(2, 0 );
+            $request->raiseResponseVersion(2, 0);
+            $request->raiseMinVersionRequirement(2, 0);
 
         } else if ($request->isNamedStream()) {
-            $request->raiseMinVersionRequirement(3, 0 );
+            $request->raiseMinVersionRequirement(3, 0);
         } else if ($request->getTargetKind() == TargetKind::RESOURCE()) {
             if (!$request->isLinkUri()) {
                 $resourceSetWrapper = $request->getTargetResourceSetWrapper();
@@ -94,12 +94,12 @@ 
                 $hasBagProperty = $resourceSetWrapper->hasBagProperty($service->getProvidersWrapper());
 
                 if ($hasNamedStream || $hasBagProperty) {
-                    $request->raiseResponseVersion( 3, 0 );
+                    $request->raiseResponseVersion(3, 0);
                 }
             }
         } else if ($request->getTargetKind() == TargetKind::BAG()
         ) {
-            $request->raiseResponseVersion( 3, 0 );
+            $request->raiseResponseVersion(3, 0);
         }
 
 

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

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, ' ,');

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

Spacing +6 added lines, -6 removed lines

@@ -51,7 +51,7 @@ 
      * @param ProvidersWrapper $providerWrapper Reference to metadata and query provider wrapper
      *
      */
-    private function __construct(ProvidersWrapper $providerWrapper ) {
+    private function __construct(ProvidersWrapper $providerWrapper) {
         $this->providerWrapper = $providerWrapper;
     }
 
@@ -142,7 +142,7 @@ 
         }
     }
 
-    private function createNextSegment(SegmentDescriptor $previous, $segment, $checkRights){
+    private function createNextSegment(SegmentDescriptor $previous, $segment, $checkRights) {
         $previousKind = $previous->getTargetKind();
         if ($previousKind == TargetKind::METADATA()
             || $previousKind == TargetKind::BATCH()
@@ -263,7 +263,7 @@ 
                     );
                 }
 
-                switch($projectedProperty->getKind()) {
+                switch ($projectedProperty->getKind()) {
                     case ResourcePropertyKind::COMPLEX_TYPE:
                         $current->setTargetKind(TargetKind::COMPLEX_OBJECT());
                         break;
@@ -297,7 +297,7 @@ 
                 if ($hasPredicate) {
                     $this->_assertion(!$current->isSingleResult());
                     $keyDescriptor = $this->_createKeyDescriptor(
-                        $identifier . '(' . $keyPredicate . ')',
+                        $identifier.'('.$keyPredicate.')',
                         $projectedProperty->getResourceType(),
                         $keyPredicate
                     );
@@ -307,7 +307,7 @@ 
                     }
                 }
 
-                if ($checkRights&& !is_null($current->getTargetResourceSetWrapper())) {
+                if ($checkRights && !is_null($current->getTargetResourceSetWrapper())) {
                     $current->getTargetResourceSetWrapper()
                         ->checkResourceSetRightsForRead(
                             $current->isSingleResult()
@@ -373,7 +373,7 @@ 
         $descriptor->setTargetKind(TargetKind::RESOURCE());
         if ($keyPredicate !== null) {
             $keyDescriptor = $this->_createKeyDescriptor(
-                $segmentIdentifier . '(' . $keyPredicate . ')', 
+                $segmentIdentifier.'('.$keyPredicate.')', 
                 $resourceSetWrapper->getResourceType(), 
                 $keyPredicate
             );

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

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
      * e.g. http://localhost/myservice.svc/Customers('ALFKI')/CustomerName/$value
      *      http://localhost/myservice.svc/Customers/$count
      */
-    const PRIMITIVE_VALUE= 6;
+    const PRIMITIVE_VALUE = 6;
 
     /**
      * System metadata.