balint777 / POData

src/POData/BaseService.php

Spacing +13 added lines, -13 removed lines

@@ -318,11 +318,11 @@ 
 		$registry->register(new JsonODataV1Writer());
 		$registry->register(new AtomODataWriter($serviceURI));
 
-		if($serviceVersion->compare(Version::v2()) > -1){
+		if ($serviceVersion->compare(Version::v2()) > -1) {
 			$registry->register(new JsonODataV2Writer());
 		}
 
-		if($serviceVersion->compare(Version::v3()) > -1){
+		if ($serviceVersion->compare(Version::v3()) > -1) {
 			$registry->register(new JsonLightODataWriter(JsonLightMetadataLevel::NONE(), $serviceURI));
 			$registry->register(new JsonLightODataWriter(JsonLightMetadataLevel::MINIMAL(), $serviceURI));
 			$registry->register(new JsonLightODataWriter(JsonLightMetadataLevel::FULL(), $serviceURI));
@@ -353,7 +353,7 @@ 
 
 	    if (is_null($responseContentType) && $request->getTargetKind() != TargetKind::MEDIA_RESOURCE()) {
 		    //the responseContentType can ONLY be null if it's a stream (media resource) and that stream is storing null as the content type
-		    throw new ODataException( Messages::unsupportedMediaType(), 415 );
+		    throw new ODataException(Messages::unsupportedMediaType(), 415);
 	    }
 
 	    $odataModelInstance = null;
@@ -530,10 +530,10 @@ 
 
 	    //if the $format header is present it overrides the accepts header
 	    $format = $host->getQueryStringItem(ODataConstants::HTTPQUERY_STRING_FORMAT);
-	    if(!is_null($format)){
+	    if (!is_null($format)) {
 
             //There's a strange edge case..if application/json is supplied and it's V3
-            if($format == MimeTypes::MIME_APPLICATION_JSON && $requestVersion == Version::v3()){
+            if ($format == MimeTypes::MIME_APPLICATION_JSON && $requestVersion == Version::v3()) {
                 //then it's actual minimalmetadata
                 //TODO: should this be done with the header text too?
                 $format = MimeTypes::MIME_APPLICATION_JSON_MINIMAL_META;
@@ -549,7 +549,7 @@ 
 	    //getTargetKind doesn't deal with link resources directly and this can change things
 	    $targetKind = $request->isLinkUri() ? TargetKind::LINK() : $request->getTargetKind();
 
-	    switch($targetKind){
+	    switch ($targetKind) {
 		    case TargetKind::METADATA():
 			    return HttpProcessUtility::selectMimeType(
 				    $requestAcceptText,
@@ -627,7 +627,7 @@ 
 			    );
 
 		    case TargetKind::MEDIA_RESOURCE():
-			    if (!$request->isNamedStream() && !$request->getTargetResourceType()->isMediaLinkEntry()){
+			    if (!$request->isNamedStream() && !$request->getTargetResourceType()->isMediaLinkEntry()) {
 					throw ODataException::createBadRequestError(
 					    Messages::badRequestInvalidUriForMediaResource(
 						    $host->getAbsoluteRequestUri()->getUrlAsString()
@@ -661,7 +661,7 @@ 
 
 
 	    //If we got here, we just don't know what it is...
-        throw new ODataException( Messages::unsupportedMediaType(), 415 );
+        throw new ODataException(Messages::unsupportedMediaType(), 415);
 
     }
 
@@ -682,7 +682,7 @@ 
      * @return string|null The ETag for the entry object if it has eTag properties
      *                     NULL otherwise.
      */
-    protected function compareETag(&$entryObject, ResourceType &$resourceType,
+    protected function compareETag(&$entryObject, ResourceType & $resourceType,
         &$needToSerializeResponse
     ) {
         $needToSerializeResponse = true;
@@ -775,7 +775,7 @@ 
      *                     for use in a URI) there are etag properties, NULL if
      *                     there is no etag property.
      */
-    protected function getETagForEntry(&$entryObject, ResourceType &$resourceType)
+    protected function getETagForEntry(&$entryObject, ResourceType & $resourceType)
     {
         $eTag = null;
         $comma = null;
@@ -790,16 +790,16 @@ 
             try {
 
 	            //TODO #88...also this seems like dupe work
-                $reflectionProperty  = new \ReflectionProperty($entryObject, $eTagProperty->getName() );
+                $reflectionProperty = new \ReflectionProperty($entryObject, $eTagProperty->getName());
                 $value = $reflectionProperty->getValue($entryObject);
             } catch (\ReflectionException $reflectionException) {
                 throw ODataException::createInternalServerError(
-                    Messages::failedToAccessProperty($eTagProperty->getName(), $resourceType->getName() )
+                    Messages::failedToAccessProperty($eTagProperty->getName(), $resourceType->getName())
                 );
             }
 
             if (is_null($value)) {
-                $eTag = $eTag . $comma. 'null';
+                $eTag = $eTag . $comma . 'null';
             } else {
                 $eTag = $eTag . $comma . $type->convertToOData($value);
             }

src/POData/UriProcessor/QueryProcessor/QueryProcessor.php

Spacing +26 added lines, -26 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,7 +217,7 @@ 
          *     RequestDescription::getTopCount will give non-null value.
          *
          */
-        if (!is_null($this->request->getSkipCount())|| !is_null($this->request->getTopCount())) {
+        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))
@@ -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/RequestDescription.php

Spacing +8 added lines, -8 removed lines

@@ -269,8 +269,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
@@ -402,7 +402,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();
         }
@@ -418,7 +418,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();
         }
 
@@ -752,7 +752,7 @@ 
      *
      * @return void
      */
-    public function setInternalOrderByInfo(InternalOrderByInfo &$internalOrderByInfo)
+    public function setInternalOrderByInfo(InternalOrderByInfo & $internalOrderByInfo)
     {
         $this->internalOrderByInfo = $internalOrderByInfo;
     }
@@ -776,7 +776,7 @@ 
      * @return void
      */
     public function setInternalSkipTokenInfo(
-        InternalSkipTokenInfo &$internalSkipTokenInfo
+        InternalSkipTokenInfo & $internalSkipTokenInfo
     ) {
         $this->_internalSkipTokenInfo = $internalSkipTokenInfo;
     }
@@ -808,9 +808,9 @@ 
      *
      * @return void
      */
-    public function setRootProjectionNode(RootProjectionNode &$rootProjectionNode)
+    public function setRootProjectionNode(RootProjectionNode & $rootProjectionNode)
     {
-        $this->_rootProjectionNode =  $rootProjectionNode;
+        $this->_rootProjectionNode = $rootProjectionNode;
     }
 
     /**

src/POData/UriProcessor/UriProcessor.php

Spacing +12 added lines, -12 removed lines

@@ -114,7 +114,7 @@ 
 	    $uriProcessor->request->setUriProcessor($uriProcessor);
 
         //Parse the query string options of the request Uri.
-        QueryProcessor::process( $uriProcessor->request, $service );
+        QueryProcessor::process($uriProcessor->request, $service);
 
         return $uriProcessor;
     }
@@ -175,7 +175,7 @@ 
      */
     protected function executePut()
     {
-        return $this->executeBase(function ($uriProcessor, $segment) {
+        return $this->executeBase(function($uriProcessor, $segment) {
             $requestMethod = $uriProcessor->service->getOperationContext()->incomingRequest()->getMethod();
             $resourceSet = $segment->getTargetResourceSetWrapper();
             $keyDescriptor = $segment->getKeyDescriptor();
@@ -199,7 +199,7 @@ 
      */
     protected function executePost()
     {
-        return $this->executeBase(function ($uriProcessor, $segment) {
+        return $this->executeBase(function($uriProcessor, $segment) {
             $requestMethod = $uriProcessor->service->getOperationContext()->incomingRequest()->getMethod();
             $resourceSet = $segment->getTargetResourceSetWrapper();
             $data = $uriProcessor->request->getData();
@@ -227,7 +227,7 @@ 
      */
     protected function executeDelete()
     {
-        return $this->executeBase(function ($uriProcessor, $segment) {
+        return $this->executeBase(function($uriProcessor, $segment) {
             $requestMethod = $uriProcessor->service->getOperationContext()->incomingRequest()->getMethod();
             $resourceSet = $segment->getTargetResourceSetWrapper();
             $keyDescriptor = $segment->getKeyDescriptor();
@@ -247,7 +247,7 @@ 
     protected function executeBatch()
     {
         $callback = null;
-        $post_callback = function ($uriProcessor, $segment) {
+        $post_callback = function($uriProcessor, $segment) {
             $requestMethod = $uriProcessor->service->getOperationContext()->incomingRequest()->getMethod();
             $resourceSet = $segment->getTargetResourceSetWrapper();
             $data = $uriProcessor->request->getData();
@@ -348,7 +348,7 @@ 
         }
 
         return;
-        return $this->executeBase(function ($uriProcessor, $segment) {
+        return $this->executeBase(function($uriProcessor, $segment) {
             $requestMethod = $uriProcessor->service->getOperationContext()->incomingRequest()->getMethod();
             $resourceSet = $segment->getTargetResourceSetWrapper();
             $data = $uriProcessor->request->getData();
@@ -461,7 +461,7 @@ 
      * @return void
      *
      */
-    private function handleSegmentTargetsToResourceSet( SegmentDescriptor $segment ) {
+    private function handleSegmentTargetsToResourceSet(SegmentDescriptor $segment) {
         if ($segment->isSingleResult()) {
             $entityInstance = $this->providers->getResourceFromResourceSet(
                 $segment->getTargetResourceSetWrapper(),
@@ -562,7 +562,7 @@ 
 	    //and just work with the QueryResult in the object model serializer
 	    $result = $segment->getResult();
 
-	    if(!$result instanceof QueryResult){
+	    if (!$result instanceof QueryResult) {
 		    //If the segment isn't a query result, then there's no paging or counting to be done
 		    return;
         }
@@ -579,7 +579,7 @@ 
         }
 
 	    //Have POData perform paging if necessary
-	    if(!$this->providers->handlesOrderedPaging() && !empty($result->results)){
+	    if (!$this->providers->handlesOrderedPaging() && !empty($result->results)) {
 			$result->results = $this->performPaging($result->results);
 	    }
 
@@ -622,7 +622,7 @@ 
 		if (!empty($result)) {
 			$top  = $this->request->getTopCount();
 			$skip = $this->request->getSkipCount();
-			if(is_null($skip)) $skip = 0;
+			if (is_null($skip)) $skip = 0;
 
 			$result = array_slice($result, $skip, $top);
 		}
@@ -829,7 +829,7 @@ 
      * @throws InvalidOperationException If this function invoked with non-navigation
      *                                   property instance.
      */
-    private function _pushSegmentForNavigationProperty(ResourceProperty &$resourceProperty)
+    private function _pushSegmentForNavigationProperty(ResourceProperty & $resourceProperty)
     {
         if ($resourceProperty->getTypeKind() == ResourceTypeKind::ENTITY) {
             $this->assert(
@@ -924,7 +924,7 @@ 
      *
      * @return bool true if the segment was push, false otherwise
      */
-    private function _pushSegment($segmentName, ResourceSetWrapper &$resourceSetWrapper)
+    private function _pushSegment($segmentName, ResourceSetWrapper & $resourceSetWrapper)
     {
         $rootProjectionNode = $this->request->getRootProjectionNode();
         if (!is_null($rootProjectionNode)