balint777 / POData

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

Doc Comments -2 removed lines

@@ -38,11 +38,9 @@
      *                                                     (if any) and orderby path
      *                                                     if IDSQP implementation wants to perform sorting.
      *
-     * @param AnonymousFunction[] $subSorterFunctions Collection of sub sorter functions corresponding to each orderby path segment
      *
      *
      *
-     * @param AnonymousFunction        $sorterFunction     The top level anonymous sorter function.
      *
      * @param mixed                    $dummyObject        A dummy object of type
      *                                                     of the resource set

src/POData/Writers/Json/JsonODataV2Writer.php

Doc Comments +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 	 * Determines if the given writer is capable of writing the response or not
 	 * @param Version $responseVersion the OData version of the response
 	 * @param string $contentType the Content Type of the response
-	 * @return boolean true if the writer can handle the response, false otherwise
+	 * @return boolean|null true if the writer can handle the response, false otherwise
 	 */
 	public function canHandle(Version $responseVersion, $contentType)
 	{

Indentation +33 added lines, -33 removed lines

@@ -18,39 +18,39 @@
  */
 class JsonODataV2Writer extends JsonODataV1Writer
 {
-	//The key difference between 1 and 2 is that in 2 collection results
-	//are wrapped in a "result" array.  this is to allow a place for collection metadata to be placed
-	//
-	//IE {d : [ item1, item2, item3] }
-	//is now { d : { results :[item1, item2, item3], meta1 : x, meta2 : y }
-	//So we override the collection methods to shove this stuff in there
-
-	protected $dataArrayName = ODataConstants::JSON_RESULT_NAME;
-
-	protected $rowCountName = ODataConstants::JSON_ROWCOUNT_STRING;
-
-	protected $nextLinkName = ODataConstants::JSON_NEXT_STRING;
-
-
-	/**
-	 * Determines if the given writer is capable of writing the response or not
-	 * @param Version $responseVersion the OData version of the response
-	 * @param string $contentType the Content Type of the response
-	 * @return boolean true if the writer can handle the response, false otherwise
-	 */
-	public function canHandle(Version $responseVersion, $contentType)
-	{
-		$parts = explode(";", $contentType);
-
-		//special case, in v3 verbose is the v2 writer
-		if($responseVersion == Version::v3()){
-			return in_array(MimeTypes::MIME_APPLICATION_JSON, $parts) && (in_array('odata=verbose', $parts) || in_array('odata=minimal', $parts));
-		}
-
-		if($responseVersion != Version::v2()){
-			return false;
-		}
-	}
+    //The key difference between 1 and 2 is that in 2 collection results
+    //are wrapped in a "result" array.  this is to allow a place for collection metadata to be placed
+    //
+    //IE {d : [ item1, item2, item3] }
+    //is now { d : { results :[item1, item2, item3], meta1 : x, meta2 : y }
+    //So we override the collection methods to shove this stuff in there
+
+    protected $dataArrayName = ODataConstants::JSON_RESULT_NAME;
+
+    protected $rowCountName = ODataConstants::JSON_ROWCOUNT_STRING;
+
+    protected $nextLinkName = ODataConstants::JSON_NEXT_STRING;
+
+
+    /**
+     * Determines if the given writer is capable of writing the response or not
+     * @param Version $responseVersion the OData version of the response
+     * @param string $contentType the Content Type of the response
+     * @return boolean true if the writer can handle the response, false otherwise
+     */
+    public function canHandle(Version $responseVersion, $contentType)
+    {
+        $parts = explode(";", $contentType);
+
+        //special case, in v3 verbose is the v2 writer
+        if($responseVersion == Version::v3()){
+            return in_array(MimeTypes::MIME_APPLICATION_JSON, $parts) && (in_array('odata=verbose', $parts) || in_array('odata=minimal', $parts));
+        }
+
+        if($responseVersion != Version::v2()){
+            return false;
+        }
+    }
 
 
     /**

Spacing +2 added lines, -2 removed lines

@@ -43,11 +43,11 @@
 		$parts = explode(";", $contentType);
 
 		//special case, in v3 verbose is the v2 writer
-		if($responseVersion == Version::v3()){
+		if ($responseVersion == Version::v3()) {
 			return in_array(MimeTypes::MIME_APPLICATION_JSON, $parts) && (in_array('odata=verbose', $parts) || in_array('odata=minimal', $parts));
 		}
 
-		if($responseVersion != Version::v2()){
+		if ($responseVersion != Version::v2()) {
 			return false;
 		}
 	}

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

Indentation +31 added lines, -31 removed lines

@@ -690,37 +690,37 @@
 
         $null = new NullType();
         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()));