balint777 / POData

src/POData/Providers/ProvidersWrapper.php

Spacing +5 added lines, -5 removed lines

@@ -609,30 +609,30 @@
      * @param QueryResult $queryResult
      * @param string $methodName
      */
-    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)
             );

src/POData/Providers/Query/QueryResult.php

Braces +15 added lines, -5 removed lines

@@ -25,16 +25,26 @@
      */
     public static function adjustCountForPaging($count, $top, $skip) {
 
-        if (!is_numeric($count)) throw new \InvalidArgumentException('$count');
+        if (!is_numeric($count)) {
+            throw new \InvalidArgumentException('$count');
+        }
 
         //treat nulls like 0
-        if (is_null($skip)) $skip = 0;
+        if (is_null($skip)) {
+            $skip = 0;
+        }
 
 
         $count = $count - $skip; //eliminate the skipped records
-        if ($count < 0) return 0; //if there aren't enough to skip, the count is 0
-
-        if (is_null($top)) return $count; //if there's no top, then it's the count as is
+        if ($count < 0) {
+            return 0;
+        }
+        //if there aren't enough to skip, the count is 0
+
+        if (is_null($top)) {
+            return $count;
+        }
+        //if there's no top, then it's the count as is
 
         return min($count, $top); //count is top, unless there aren't enough records
 

src/POData/Writers/ResponseWriter.php

Braces +4 added lines, -3 removed lines

@@ -67,12 +67,13 @@
         } else {
             $writer = $service->getODataWriterRegistry()->getWriter($request->getResponseVersion(), $responseContentType);
             //TODO: move ot Messages
-            if (is_null($writer)) throw new \Exception("no writer can handle the request");
+            if (is_null($writer)) {
+                throw new \Exception("no writer can handle the request");
+            }
 
             if (is_null($entityModel)) {  //TODO: this seems like a weird way to know that the request is for a service document..i'd think we know this some other way
                 $responseBody = $writer->writeServiceDocument($service->getProvidersWrapper())->getOutput();
-            }
-            else {
+            } else {
                 $responseBody = $writer->write($entityModel)->getOutput();
             }
         }

src/POData/Writers/Json/IndentedTextWriter.php

Braces +3 added lines, -1 removed lines

@@ -98,7 +98,9 @@
      */
     public function decreaseIndent()
     {
-        if ($this->indentLevel > 0) $this->indentLevel--;
+        if ($this->indentLevel > 0) {
+            $this->indentLevel--;
+        }
         return $this;
     }
 

src/POData/Writers/Json/JsonODataV1Writer.php

Braces +1 added lines, -2 removed lines

@@ -273,8 +273,7 @@
         if ($link->isExpanded) {
             if (is_null($link->expandedResult)) {
                 $this->_writer->writeValue("null");
-            }
-            else {
+            } else {
                 $this->writeExpandedLink($link);
             }
         } else {

src/POData/Writers/ODataWriterRegistry.php

Braces +3 added lines, -1 removed lines

@@ -36,7 +36,9 @@
 
         foreach ($this->writers as $writer)
         {
-            if ($writer->canHandle($responseVersion, $contentType)) return $writer;
+            if ($writer->canHandle($responseVersion, $contentType)) {
+                return $writer;
+            }
         }
 
         return null;

src/POData/UriProcessor/UriProcessor.php

Spacing +1 added lines, -1 removed lines

@@ -625,7 +625,7 @@
         if (!empty($result)) {
             $top  = $this->request->getTopCount();
             $skip = $this->request->getSkipCount();
-            if(is_null($skip)) {
+            if (is_null($skip)) {
                 $skip = 0;
             }
 

src/POData/UriProcessor/QueryProcessor/QueryProcessor.php

Braces +3 added lines, -1 removed lines

@@ -296,7 +296,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()) {

services/WordPress/WordPressQueryProvider.php

Spacing +12 added lines, -12 removed lines

@@ -188,7 +188,7 @@ 
                 $query = "SELECT * FROM `wp_posts` WHERE"
                         ." wp_posts.post_type = 'post'"
                         ." AND wp_posts.post_status = 'publish'"
-                        ." AND wp_posts.ID = ".$namedKeyValues['PostID'][0];
+                        ." AND wp_posts.ID = " . $namedKeyValues['PostID'][0];
                 $stmt = mysql_query($query);
               
                 //If resource not found return null to the library
@@ -204,7 +204,7 @@ 
                         ." FROM `wp_terms` AS t INNER JOIN `wp_term_taxonomy` as tt"
                         ." ON tt.term_id = t.term_id"
                         ." WHERE tt.taxonomy = 'post_tag'"
-                        ." AND t.term_id = ".$namedKeyValues['TagID'][0];
+                        ." AND t.term_id = " . $namedKeyValues['TagID'][0];
                 $stmt = mysql_query($query);
               
                 //If resource not found return null to the library
@@ -220,7 +220,7 @@ 
                         ." FROM `wp_terms` AS t INNER JOIN `wp_term_taxonomy` as tt"
                         ." ON tt.term_id = t.term_id"
                         ." WHERE tt.taxonomy = 'category'"
-                        ." AND t.term_id = ".$namedKeyValues['CategoryID'][0];
+                        ." AND t.term_id = " . $namedKeyValues['CategoryID'][0];
                 $stmt = mysql_query($query);
               
                 //If resource not found return null to the library
@@ -234,7 +234,7 @@ 
             case 'Comments':
                 $query = "SELECT * FROM `wp_comments`"
                         ." WHERE comment_approved = 1" 
-                        ." AND comment_ID = ".$namedKeyValues['CommentID'][0];
+                        ." AND comment_ID = " . $namedKeyValues['CommentID'][0];
                 $stmt = mysql_query($query);
               
                 //If resource not found return null to the library
@@ -323,7 +323,7 @@ 
                         $query .= " AND $filter";
                     }
                     $stmt = mysql_query($query);
-                    if ( $stmt === false) {            
+                    if ($stmt === false) {            
                             die(mysql_error());
                     }
                         
@@ -481,7 +481,7 @@ 
                             ." ON tr.term_taxonomy_id = tt.term_taxonomy_id"
                             ." WHERE tt.taxonomy IN ('post_tag')"
                             ." AND tr.object_id IN ($sourceEntityInstance->PostID)"
-                            ." AND tt.term_id = ".$namedKeyValues['TagID'][0];
+                            ." AND tt.term_id = " . $namedKeyValues['TagID'][0];
                     $stmt = mysql_query($query);
                     $result = $this->_serializeTags($stmt);
                 } elseif ($navigationPropName == 'Categories') {
@@ -493,14 +493,14 @@ 
                             ." ON tr.term_taxonomy_id = tt.term_taxonomy_id"
                             ." WHERE tt.taxonomy IN ('category')"
                             ." AND tr.object_id IN ($sourceEntityInstance->PostID)"
-                            ." AND tt.term_id = ".$namedKeyValues['CategoryID'][0];
+                            ." AND tt.term_id = " . $namedKeyValues['CategoryID'][0];
                     $stmt = mysql_query($query);
                     $result = $this->_serializeCategories($stmt);
                 } else if ($navigationPropName == 'Comments') {
                     $query = "SELECT * FROM `wp_comments`"
                             ." WHERE comment_approved = 1" 
                             ." AND comment_post_ID = $sourceEntityInstance->PostID"
-                            ." AND comment_ID = ".$namedKeyValues['CommentID'][0];
+                            ." AND comment_ID = " . $namedKeyValues['CommentID'][0];
                     $stmt = mysql_query($query);
                     $result = $this->_serializeComments($stmt);
                 } else {
@@ -519,7 +519,7 @@ 
                                 ." WHERE tt.term_id = $sourceEntityInstance->TagID"
                                 ." AND p.post_type = 'post'"
                                 ." AND p.post_status = 'publish'"
-                                ." AND p.ID = ".$namedKeyValues['PostID'][0];
+                                ." AND p.ID = " . $namedKeyValues['PostID'][0];
                     $stmt = mysql_query($query);
                     $result = $this->_serializePosts($stmt);
                 } else {
@@ -538,7 +538,7 @@ 
                                 ." WHERE tt.term_id = $sourceEntityInstance->CategoryID"
                                 ." AND p.post_type = 'post'"
                                 ." AND p.post_status = 'publish'"
-                                ." AND p.ID = ".$namedKeyValues['PostID'][0];
+                                ." AND p.ID = " . $namedKeyValues['PostID'][0];
                     $stmt = mysql_query($query);
                     $result = $this->_serializePosts($stmt);
                 } else {
@@ -556,14 +556,14 @@ 
                             ." wp_posts.post_type = 'post'"
                             ." AND wp_posts.post_status = 'publish'"
                             ." AND wp_posts.post_author = $sourceEntityInstance->UserID"
-                            ." AND wp_posts.ID = ".$namedKeyValues['PostID'][0];
+                            ." AND wp_posts.ID = " . $namedKeyValues['PostID'][0];
                         $stmt = mysql_query($query);
                         $result = $this->_serializePosts($stmt);
                 } elseif ($navigationPropName == 'Comments') {
                         $query = "SELECT * FROM `wp_comments`"
                             ." WHERE comment_approved = 1" 
                             ." AND wp_comments.user_id = $sourceEntityInstance->UserID"
-                            ." AND wp_comments.comment_ID = ".$namedKeyValues['CommentID'][0];
+                            ." AND wp_comments.comment_ID = " . $namedKeyValues['CommentID'][0];
                         $stmt = mysql_query($query);
                         $result = $this->_serializeComments($stmt);
                 } else {