Qeti / POData

src/POData/Writers/Json/JsonLightMetadataLevel.php

Indentation +4 added lines, -4 removed lines

@@ -15,11 +15,11 @@
  * @method static \POData\Writers\Json\JsonLightMetadataLevel FULL()
  */
 class JsonLightMetadataLevel extends Enum {
-	//using these const because it makes them easy to use in writer canHandle..but maybe not such a good idea
-	const NONE = "odata=nometadata";
+    //using these const because it makes them easy to use in writer canHandle..but maybe not such a good idea
+    const NONE = "odata=nometadata";
 
-	const MINIMAL = "odata=minimalmetadata";
+    const MINIMAL = "odata=minimalmetadata";
 
-	const FULL = "odata=fullmetadata";
+    const FULL = "odata=fullmetadata";
 
 }
\ No newline at end of file

src/POData/Writers/Json/JsonLightODataWriter.php

Indentation +295 added lines, -295 removed lines

@@ -29,255 +29,255 @@ 
 class JsonLightODataWriter extends JsonODataV2Writer
 {
 
-	/**
-	 * @var JsonLightMetadataLevel
-	 */
-	protected $metadataLevel;
-
-
-	/**
-	 *
-	 * The service base uri
-	 * @var string
-	 */
-	protected $baseUri;
-
-
-	public function __construct(JsonLightMetadataLevel $metadataLevel, $absoluteServiceUri)
-	{
-		if(strlen($absoluteServiceUri) == 0)
-		{
-			throw new \Exception("absoluteServiceUri must not be empty or null");
-		}
-		$this->baseUri = $absoluteServiceUri;
-
-		$this->_writer = new JsonWriter('');
-		$this->urlKey = ODataConstants::JSON_URL_STRING;
-		$this->dataArrayName = ODataConstants::JSON_LIGHT_VALUE_NAME;
-		$this->rowCountName = ODataConstants::JSON_LIGHT_ROWCOUNT_STRING;
-		$this->metadataLevel = $metadataLevel;
-	}
-
-
-	/**
-	 * 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)
-	{
-		if($responseVersion != Version::v3()){
-			return false;
-		}
-
-		$parts = explode(";", $contentType);
-
-		//It must be app/json and have the right odata= piece
-		return in_array(MimeTypes::MIME_APPLICATION_JSON, $parts) && in_array($this->metadataLevel->getValue(), $parts);
-	}
-
-
-
-	/**
-	 * Write the given OData model in a specific response format
-	 *
-	 * @param  ODataURL|ODataURLCollection|ODataPropertyContent|ODataFeed|ODataEntry $model Object of requested content.
-	 *
-	 * @return JsonLightODataWriter
-	 */
-	public function write($model){
-		$this->_writer->startObjectScope();
-
-		if ($model instanceof ODataURL) {
-			$this->writeTopLevelMeta("url");
-			$this->writeURL($model);
-		} elseif ($model instanceof ODataURLCollection) {
-			$this->writeTopLevelMeta("urlCollection");
-			$this->writeURLCollection($model);
-		} elseif ($model instanceof ODataPropertyContent) {
-			$this->writeTopLevelMeta( $model->properties[0]->typeName );
-			$this->writeTopLevelProperty($model->properties[0]);
-		} elseif ($model instanceof ODataFeed) {
-			$this->writeTopLevelMeta($model->title);
-			$this->writeRowCount($model->rowCount);
-			$this->writeNextPageLink($model->nextPageLink);
-			$this->_writer
-				->writeName($this->dataArrayName)
-				->startArrayScope();
-			$this->writeFeed($model);
-			$this->_writer->endScope();
-		}elseif ($model instanceof ODataEntry) {
-			$this->writeTopLevelMeta($model->resourceSetName . "/@Element");
-			$this->writeEntry($model);
-		}
-
-		$this->_writer->endScope();
-
-		return $this;
-	}
-
-
-	/**
-	 *
-	 * @param ODataProperty $property
-	 *
-	 * @return JsonLightODataWriter
-	 */
-	protected function writeTopLevelProperty(ODataProperty $property)
-	{
-		$this->writePropertyMeta($property);
-		if ($property->value == null) {
-			$this->_writer->writeName(ODataConstants::JSON_LIGHT_VALUE_NAME);
-			$this->_writer->writeValue("null");
-		} elseif ($property->value instanceof ODataPropertyContent) {
-			//In the case of complex properties at the top level we don't write the name of the property,
-			//just the sub properties.
-			$this->writeComplexPropertyMeta($property)
-				->writeProperties($property->value);
-		} elseif ($property->value instanceof ODataBagContent) {
-			$this->_writer->writeName(ODataConstants::JSON_LIGHT_VALUE_NAME);
-			$this->writeBagContent($property->value);
-		} else {
-			$this->_writer->writeName(ODataConstants::JSON_LIGHT_VALUE_NAME);
-			$this->_writer->writeValue($property->value, $property->typeName);
-		}
-
-		return $this;
-	}
-
-
-
-	protected function writeTopLevelMeta($fragment)
-	{
-		if($this->metadataLevel == JsonLightMetadataLevel::NONE())
-		{
-			return;
-		}
-
-		$this->_writer
-			->writeName(ODataConstants::JSON_LIGHT_METADATA_STRING)
-			->writeValue($this->baseUri . '/' . ODataConstants::URI_METADATA_SEGMENT . '#' . $fragment);
-
-	}
-
-
-	protected function writePropertyMeta(ODataProperty $property)
-	{
-		if($this->metadataLevel != JsonLightMetadataLevel::FULL())
-		{
-			//Only full meta level outputs this info
-			return $this;
-		}
-
-		if(is_null($property->value))
-		{
-			//it appears full metadata doesn't output types for nulls...
-			return $this;
-		}
-
-
-		switch($property->typeName)
-		{
-			//The type metadata is only included on certain types of properties
-			//Note this also excludes Complex types
-
-			case "Edm.Decimal":
-			case "Edm.DateTime":
-				$this->_writer
-					->writeName($property->name . ODataConstants::JSON_LIGHT_METADATA_PROPERTY_TYPE_SUFFIX_STRING)
-					->writeValue($property->typeName);
-		}
-
-
-		return $this;
-	}
-
-	/**
-	 *
-	 * @param ODataEntry $entry Entry to write metadata for.
-	 *
-	 * @return JsonLightODataWriter
-	 */
-	protected function writeEntryMetadata(ODataEntry $entry){
-
-		if($this->metadataLevel != JsonLightMetadataLevel::FULL())
-		{
-			//Only full meta level outputs this info
-			return $this;
-		}
-
-		$this->_writer
-			->writeName(ODataConstants::JSON_LIGHT_METADATA_TYPE_STRING)
-			->writeValue($entry->type)
-			->writeName(ODataConstants::JSON_LIGHT_METADATA_ID_STRING)
-			->writeValue($entry->id)
-			->writeName(ODataConstants::JSON_LIGHT_METADATA_ETAG_STRING)
-			->writeValue($entry->eTag)
-			->writeName(ODataConstants::JSON_LIGHT_METADATA_EDIT_LINK_STRING)
-			->writeValue($entry->editLink)
-		;
-
-		return $this;
-	}
-
-
-	/**
-	 * @param ODataLink $link Link to write.
-	 *
-	 * @return JsonLightODataWriter
-	 */
-	protected function writeLink(ODataLink $link){
-
-		if($this->metadataLevel == JsonLightMetadataLevel::FULL())
-		{
-			//Interestingly the fullmetadata outputs this metadata..even if the thing is expanded
-			$this->_writer
-				->writeName($link->title . ODataConstants::JSON_LIGHT_METADATA_LINK_NAVIGATION_SUFFIX_STRING)
-				->writeValue($link->url);;
-		}
-
-
-		if($link->isExpanded)
-		{
-			$this->_writer->writeName($link->title);
-
-			if(is_null($link->expandedResult)) {
-				$this->_writer->writeValue("null");
-			} else {
-				$this->writeExpandedLink($link);
-			}
-		}
-
-		return $this;
-	}
-
-	protected function writeExpandedLink(ODataLink $link)
-	{
-
-
-		if ($link->isCollection) {
-			$this->_writer->startArrayScope();
-			$this->writeFeed($link->expandedResult);
-		} else {
-			$this->_writer->startObjectScope();
-			$this->writeEntry($link->expandedResult);
-		}
-
-
-		$this->_writer->endScope();
-	}
-
-	/**
-	 * Writes the next page link.
-	 *
-	 * @param ODataLink $nextPageLinkUri Uri for next page link.
-	 *
-	 * @return JsonLightODataWriter
-	 */
-	protected function writeNextPageLink(ODataLink $nextPageLinkUri = null)
-	{
-		/*
+    /**
+     * @var JsonLightMetadataLevel
+     */
+    protected $metadataLevel;
+
+
+    /**
+     *
+     * The service base uri
+     * @var string
+     */
+    protected $baseUri;
+
+
+    public function __construct(JsonLightMetadataLevel $metadataLevel, $absoluteServiceUri)
+    {
+        if(strlen($absoluteServiceUri) == 0)
+        {
+            throw new \Exception("absoluteServiceUri must not be empty or null");
+        }
+        $this->baseUri = $absoluteServiceUri;
+
+        $this->_writer = new JsonWriter('');
+        $this->urlKey = ODataConstants::JSON_URL_STRING;
+        $this->dataArrayName = ODataConstants::JSON_LIGHT_VALUE_NAME;
+        $this->rowCountName = ODataConstants::JSON_LIGHT_ROWCOUNT_STRING;
+        $this->metadataLevel = $metadataLevel;
+    }
+
+
+    /**
+     * 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)
+    {
+        if($responseVersion != Version::v3()){
+            return false;
+        }
+
+        $parts = explode(";", $contentType);
+
+        //It must be app/json and have the right odata= piece
+        return in_array(MimeTypes::MIME_APPLICATION_JSON, $parts) && in_array($this->metadataLevel->getValue(), $parts);
+    }
+
+
+
+    /**
+     * Write the given OData model in a specific response format
+     *
+     * @param  ODataURL|ODataURLCollection|ODataPropertyContent|ODataFeed|ODataEntry $model Object of requested content.
+     *
+     * @return JsonLightODataWriter
+     */
+    public function write($model){
+        $this->_writer->startObjectScope();
+
+        if ($model instanceof ODataURL) {
+            $this->writeTopLevelMeta("url");
+            $this->writeURL($model);
+        } elseif ($model instanceof ODataURLCollection) {
+            $this->writeTopLevelMeta("urlCollection");
+            $this->writeURLCollection($model);
+        } elseif ($model instanceof ODataPropertyContent) {
+            $this->writeTopLevelMeta( $model->properties[0]->typeName );
+            $this->writeTopLevelProperty($model->properties[0]);
+        } elseif ($model instanceof ODataFeed) {
+            $this->writeTopLevelMeta($model->title);
+            $this->writeRowCount($model->rowCount);
+            $this->writeNextPageLink($model->nextPageLink);
+            $this->_writer
+                ->writeName($this->dataArrayName)
+                ->startArrayScope();
+            $this->writeFeed($model);
+            $this->_writer->endScope();
+        }elseif ($model instanceof ODataEntry) {
+            $this->writeTopLevelMeta($model->resourceSetName . "/@Element");
+            $this->writeEntry($model);
+        }
+
+        $this->_writer->endScope();
+
+        return $this;
+    }
+
+
+    /**
+     *
+     * @param ODataProperty $property
+     *
+     * @return JsonLightODataWriter
+     */
+    protected function writeTopLevelProperty(ODataProperty $property)
+    {
+        $this->writePropertyMeta($property);
+        if ($property->value == null) {
+            $this->_writer->writeName(ODataConstants::JSON_LIGHT_VALUE_NAME);
+            $this->_writer->writeValue("null");
+        } elseif ($property->value instanceof ODataPropertyContent) {
+            //In the case of complex properties at the top level we don't write the name of the property,
+            //just the sub properties.
+            $this->writeComplexPropertyMeta($property)
+                ->writeProperties($property->value);
+        } elseif ($property->value instanceof ODataBagContent) {
+            $this->_writer->writeName(ODataConstants::JSON_LIGHT_VALUE_NAME);
+            $this->writeBagContent($property->value);
+        } else {
+            $this->_writer->writeName(ODataConstants::JSON_LIGHT_VALUE_NAME);
+            $this->_writer->writeValue($property->value, $property->typeName);
+        }
+
+        return $this;
+    }
+
+
+
+    protected function writeTopLevelMeta($fragment)
+    {
+        if($this->metadataLevel == JsonLightMetadataLevel::NONE())
+        {
+            return;
+        }
+
+        $this->_writer
+            ->writeName(ODataConstants::JSON_LIGHT_METADATA_STRING)
+            ->writeValue($this->baseUri . '/' . ODataConstants::URI_METADATA_SEGMENT . '#' . $fragment);
+
+    }
+
+
+    protected function writePropertyMeta(ODataProperty $property)
+    {
+        if($this->metadataLevel != JsonLightMetadataLevel::FULL())
+        {
+            //Only full meta level outputs this info
+            return $this;
+        }
+
+        if(is_null($property->value))
+        {
+            //it appears full metadata doesn't output types for nulls...
+            return $this;
+        }
+
+
+        switch($property->typeName)
+        {
+            //The type metadata is only included on certain types of properties
+            //Note this also excludes Complex types
+
+            case "Edm.Decimal":
+            case "Edm.DateTime":
+                $this->_writer
+                    ->writeName($property->name . ODataConstants::JSON_LIGHT_METADATA_PROPERTY_TYPE_SUFFIX_STRING)
+                    ->writeValue($property->typeName);
+        }
+
+
+        return $this;
+    }
+
+    /**
+     *
+     * @param ODataEntry $entry Entry to write metadata for.
+     *
+     * @return JsonLightODataWriter
+     */
+    protected function writeEntryMetadata(ODataEntry $entry){
+
+        if($this->metadataLevel != JsonLightMetadataLevel::FULL())
+        {
+            //Only full meta level outputs this info
+            return $this;
+        }
+
+        $this->_writer
+            ->writeName(ODataConstants::JSON_LIGHT_METADATA_TYPE_STRING)
+            ->writeValue($entry->type)
+            ->writeName(ODataConstants::JSON_LIGHT_METADATA_ID_STRING)
+            ->writeValue($entry->id)
+            ->writeName(ODataConstants::JSON_LIGHT_METADATA_ETAG_STRING)
+            ->writeValue($entry->eTag)
+            ->writeName(ODataConstants::JSON_LIGHT_METADATA_EDIT_LINK_STRING)
+            ->writeValue($entry->editLink)
+        ;
+
+        return $this;
+    }
+
+
+    /**
+     * @param ODataLink $link Link to write.
+     *
+     * @return JsonLightODataWriter
+     */
+    protected function writeLink(ODataLink $link){
+
+        if($this->metadataLevel == JsonLightMetadataLevel::FULL())
+        {
+            //Interestingly the fullmetadata outputs this metadata..even if the thing is expanded
+            $this->_writer
+                ->writeName($link->title . ODataConstants::JSON_LIGHT_METADATA_LINK_NAVIGATION_SUFFIX_STRING)
+                ->writeValue($link->url);;
+        }
+
+
+        if($link->isExpanded)
+        {
+            $this->_writer->writeName($link->title);
+
+            if(is_null($link->expandedResult)) {
+                $this->_writer->writeValue("null");
+            } else {
+                $this->writeExpandedLink($link);
+            }
+        }
+
+        return $this;
+    }
+
+    protected function writeExpandedLink(ODataLink $link)
+    {
+
+
+        if ($link->isCollection) {
+            $this->_writer->startArrayScope();
+            $this->writeFeed($link->expandedResult);
+        } else {
+            $this->_writer->startObjectScope();
+            $this->writeEntry($link->expandedResult);
+        }
+
+
+        $this->_writer->endScope();
+    }
+
+    /**
+     * Writes the next page link.
+     *
+     * @param ODataLink $nextPageLinkUri Uri for next page link.
+     *
+     * @return JsonLightODataWriter
+     */
+    protected function writeNextPageLink(ODataLink $nextPageLinkUri = null)
+    {
+        /*
 		// "__next" : uri
 		if ($nextPageLinkUri != null) {
 			$this->_writer
@@ -287,48 +287,48 @@ 
 
 		return $this;
 		*/
-	}
+    }
 
 
-	/**
-	 * Begin write complex property.
-	 *
-	 * @param ODataProperty $property property to write.
-	 *
-	 * @return JsonLightODataWriter
-	 */
-	protected function writeComplexProperty(ODataProperty $property)
-	{
+    /**
+     * Begin write complex property.
+     *
+     * @param ODataProperty $property property to write.
+     *
+     * @return JsonLightODataWriter
+     */
+    protected function writeComplexProperty(ODataProperty $property)
+    {
 
-		// {
-		$this->_writer->startObjectScope();
+        // {
+        $this->_writer->startObjectScope();
 
-		$this->writeComplexPropertyMeta($property)
-			->writeProperties($property->value);
+        $this->writeComplexPropertyMeta($property)
+            ->writeProperties($property->value);
 
-		$this->_writer->endScope();
+        $this->_writer->endScope();
 
-		return $this;
-	}
+        return $this;
+    }
 
-	protected function writeComplexPropertyMeta(ODataProperty $property)
-	{
-		if($this->metadataLevel == JsonLightMetadataLevel::FULL()){
-			$this->_writer
-				->writeName(ODataConstants::JSON_LIGHT_METADATA_TYPE_STRING)
-				->writeValue($property->typeName);
-		}
+    protected function writeComplexPropertyMeta(ODataProperty $property)
+    {
+        if($this->metadataLevel == JsonLightMetadataLevel::FULL()){
+            $this->_writer
+                ->writeName(ODataConstants::JSON_LIGHT_METADATA_TYPE_STRING)
+                ->writeValue($property->typeName);
+        }
 
-		return $this;
-	}
+        return $this;
+    }
 
-	protected function writeBagContent(ODataBagContent $bag)
-	{
+    protected function writeBagContent(ODataBagContent $bag)
+    {
 
-		$this->_writer
+        $this->_writer
 
 
-			/*
+            /*
 			->writeName(ODataConstants::JSON_METADATA_STRING) //__metadata : { Type : "typename" }
 			->startObjectScope()
 
@@ -338,24 +338,24 @@ 
 			*/
 
 
-			->startArrayScope(); // [
+            ->startArrayScope(); // [
 
-		foreach ($bag->propertyContents as $content) {
-			if ($content instanceof ODataPropertyContent) {
-				$this->_writer->startObjectScope();
-				$this->writeProperties($content);
-				$this->_writer->endScope();
-			} else {
-				// retrieving the collection datatype in order
-				//to write in json specific format, with in chords or not
-				preg_match('#\((.*?)\)#', $bag->type, $type);
-				$this->_writer->writeValue($content, $type[1]);
-			}
-		}
+        foreach ($bag->propertyContents as $content) {
+            if ($content instanceof ODataPropertyContent) {
+                $this->_writer->startObjectScope();
+                $this->writeProperties($content);
+                $this->_writer->endScope();
+            } else {
+                // retrieving the collection datatype in order
+                //to write in json specific format, with in chords or not
+                preg_match('#\((.*?)\)#', $bag->type, $type);
+                $this->_writer->writeValue($content, $type[1]);
+            }
+        }
 
 
-		$this->_writer->endScope();  // ]
-		return $this;
-	}
+        $this->_writer->endScope();  // ]
+        return $this;
+    }
 
 }
\ No newline at end of file

src/POData/Writers/Json/JsonODataV1Writer.php

Indentation +198 added lines, -198 removed lines

@@ -34,7 +34,7 @@ 
     protected $_writer;
 
 
-	protected $urlKey = ODataConstants::JSON_URI_STRING;
+    protected $urlKey = ODataConstants::JSON_URI_STRING;
 
     /**
      * Constructs and initializes the Json output writer.
@@ -45,60 +45,60 @@ 
         $this->_writer = new JsonWriter('');
     }
 
-	/**
-	 * 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)
-	{
-		if($responseVersion != Version::v1()){
-			return false;
-		}
-
-		$parts = explode(";", $contentType);
-
-		return in_array(MimeTypes::MIME_APPLICATION_JSON, $parts);
-	}
-
-	/**
-	 * Write the given OData model in a specific response format
-	 *
-	 * @param  ODataURL|ODataURLCollection|ODataPropertyContent|ODataFeed|ODataEntry $model Object of requested content.
-	 *
-	 * @return JsonODataV1Writer
-	 */
-	public function write($model){
-		// { "d" :
-		$this->_writer
-			->startObjectScope()
-			->writeName("d");
-
-
-		if ($model instanceof ODataURL) {
-			$this->_writer->startObjectScope();
-			$this->writeURL($model);
-		} elseif ($model instanceof ODataURLCollection) {
-			$this->_writer->startArrayScope();
-			$this->writeURLCollection($model);
-		} elseif ($model instanceof ODataPropertyContent) {
-			$this->_writer->startObjectScope();
-			$this->writeProperties($model);
-		} elseif ($model instanceof ODataFeed) {
-			$this->_writer->startArrayScope();
-			$this->writeFeed($model);
-		}elseif ($model instanceof ODataEntry) {
-			$this->_writer->startObjectScope();
-			$this->writeEntry($model);
-		}
-
-
-		$this->_writer->endScope();
-		$this->_writer->endScope();
-
-		return $this;
-	}
+    /**
+     * 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)
+    {
+        if($responseVersion != Version::v1()){
+            return false;
+        }
+
+        $parts = explode(";", $contentType);
+
+        return in_array(MimeTypes::MIME_APPLICATION_JSON, $parts);
+    }
+
+    /**
+     * Write the given OData model in a specific response format
+     *
+     * @param  ODataURL|ODataURLCollection|ODataPropertyContent|ODataFeed|ODataEntry $model Object of requested content.
+     *
+     * @return JsonODataV1Writer
+     */
+    public function write($model){
+        // { "d" :
+        $this->_writer
+            ->startObjectScope()
+            ->writeName("d");
+
+
+        if ($model instanceof ODataURL) {
+            $this->_writer->startObjectScope();
+            $this->writeURL($model);
+        } elseif ($model instanceof ODataURLCollection) {
+            $this->_writer->startArrayScope();
+            $this->writeURLCollection($model);
+        } elseif ($model instanceof ODataPropertyContent) {
+            $this->_writer->startObjectScope();
+            $this->writeProperties($model);
+        } elseif ($model instanceof ODataFeed) {
+            $this->_writer->startArrayScope();
+            $this->writeFeed($model);
+        }elseif ($model instanceof ODataEntry) {
+            $this->_writer->startObjectScope();
+            $this->writeEntry($model);
+        }
+
+
+        $this->_writer->endScope();
+        $this->_writer->endScope();
+
+        return $this;
+    }
 
 
     /**
@@ -110,9 +110,9 @@ 
     {
         $this->_writer
             ->writeName($this->urlKey)
-	        ->writeValue($url->url);
+            ->writeValue($url->url);
 
-	    return $this;
+        return $this;
     }
 
     /**
@@ -125,11 +125,11 @@ 
     public function writeUrlCollection(ODataURLCollection $urls)
     {
         foreach ($urls->urls as $url) {
-	        $this->_writer->startObjectScope();
+            $this->_writer->startObjectScope();
             $this->writeUrl($url);
-	        $this->_writer->endScope();
+            $this->_writer->endScope();
         }
-	    return $this;
+        return $this;
     }
 
     /**
@@ -142,14 +142,14 @@ 
     protected function writeFeed(ODataFeed $feed)
     {
 
-	    foreach ($feed->entries as $entry) {
-		    $this->_writer->startObjectScope();
-		    $this->writeEntry($entry);
-		    $this->_writer->endScope();
-	    }
+        foreach ($feed->entries as $entry) {
+            $this->_writer->startObjectScope();
+            $this->writeEntry($entry);
+            $this->_writer->endScope();
+        }
 
 
-	    return $this;
+        return $this;
     }
 
 
@@ -163,15 +163,15 @@ 
     protected function writeEntry(ODataEntry $entry)
     {
 
-	    $this->writeEntryMetadata($entry);
-	    foreach ($entry->links as $link) {
-		    $this->writeLink($link);
-	    }
+        $this->writeEntryMetadata($entry);
+        foreach ($entry->links as $link) {
+            $this->writeLink($link);
+        }
 
-	    $this->writeProperties($entry->propertyContent);
+        $this->writeProperties($entry->propertyContent);
 
 
-	    return $this;
+        return $this;
     }
 
     /**
@@ -187,28 +187,28 @@ 
         if ($entry->id != null || $entry->type != null || $entry->eTag != null) {
             // "__metadata"
             $this->_writer
-	            ->writeName(ODataConstants::JSON_METADATA_STRING)
+                ->writeName(ODataConstants::JSON_METADATA_STRING)
                 ->startObjectScope();
 
             // Write uri value only for entity types
             if ($entry->id != null) {
                 $this->_writer
-	                ->writeName($this->urlKey)
+                    ->writeName($this->urlKey)
                     ->writeValue($entry->id);
             }
 
             // Write the etag property, if the entry has etag properties.
             if ($entry->eTag != null) {
                 $this->_writer
-	                ->writeName(ODataConstants::JSON_ETAG_STRING)
+                    ->writeName(ODataConstants::JSON_ETAG_STRING)
                     ->writeValue($entry->eTag);
             }
 
             // Write the type property, if the entry has type properties.
             if ($entry->type != null) {
                 $this->_writer
-	                ->writeName(ODataConstants::JSON_TYPE_STRING)
-	                ->writeValue($entry->type);
+                    ->writeName(ODataConstants::JSON_TYPE_STRING)
+                    ->writeValue($entry->type);
             }
         }
 
@@ -216,19 +216,19 @@ 
         if ($entry->isMediaLinkEntry) {
             if ($entry->mediaLink != null) {
                 $this->_writer
-	                ->writeName(ODataConstants::JSON_EDITMEDIA_STRING)
-	                ->writeValue($entry->mediaLink->editLink)
+                    ->writeName(ODataConstants::JSON_EDITMEDIA_STRING)
+                    ->writeValue($entry->mediaLink->editLink)
 
-	                ->writeName(ODataConstants::JSON_MEDIASRC_STRING)
-	                ->writeValue($entry->mediaLink->srcLink)
+                    ->writeName(ODataConstants::JSON_MEDIASRC_STRING)
+                    ->writeValue($entry->mediaLink->srcLink)
 
-	                ->writeName(ODataConstants::JSON_CONTENTTYPE_STRING)
-	                ->writeValue($entry->mediaLink->contentType);
+                    ->writeName(ODataConstants::JSON_CONTENTTYPE_STRING)
+                    ->writeValue($entry->mediaLink->contentType);
 
                 if ($entry->mediaLink->eTag != null) {
                     $this->_writer
-	                    ->writeName(ODataConstants::JSON_MEDIAETAG_STRING)
-	                    ->writeValue($entry->mediaLink->eTag);
+                        ->writeName(ODataConstants::JSON_MEDIAETAG_STRING)
+                        ->writeValue($entry->mediaLink->eTag);
                 }
 
                 $this->_writer->endScope();
@@ -237,19 +237,19 @@ 
             // writing named resource streams
             foreach ($entry->mediaLinks as $mediaLink) {
                 $this->_writer
-	                ->writeName($mediaLink->name)
-	                ->startObjectScope()
+                    ->writeName($mediaLink->name)
+                    ->startObjectScope()
 
-	                ->writeName(ODataConstants::JSON_MEDIASRC_STRING)
-	                ->writeValue($mediaLink->srcLink)
+                    ->writeName(ODataConstants::JSON_MEDIASRC_STRING)
+                    ->writeValue($mediaLink->srcLink)
 
-	                ->writeName(ODataConstants::JSON_CONTENTTYPE_STRING)
-	                ->writeValue($mediaLink->contentType);
+                    ->writeName(ODataConstants::JSON_CONTENTTYPE_STRING)
+                    ->writeValue($mediaLink->contentType);
 
                 if ($mediaLink->eTag != null) {
                     $this->_writer
-	                    ->writeName(ODataConstants::JSON_MEDIAETAG_STRING)
-	                    ->writeValue($mediaLink->eTag);
+                        ->writeName(ODataConstants::JSON_MEDIAETAG_STRING)
+                        ->writeValue($mediaLink->eTag);
                 }
 
                 $this->_writer->endScope();
@@ -258,92 +258,92 @@ 
             $this->_writer->endScope();
         }
 
-	    return $this;
+        return $this;
     }
 
 
-	/**
-	 * @param ODataLink $link Link to write.
-	 *
-	 * @return JsonODataV1Writer
-	 */
-	protected function writeLink(ODataLink $link)
+    /**
+     * @param ODataLink $link Link to write.
+     *
+     * @return JsonODataV1Writer
+     */
+    protected function writeLink(ODataLink $link)
     {
 
         // "<linkname>" :
         $this->_writer->writeName($link->title);
 
-	    if ($link->isExpanded) {
-		    if(is_null($link->expandedResult)){
-				$this->_writer->writeValue("null");
-		    }
-		    else{
-			    $this->writeExpandedLink($link);
-		    }
-	    } else {
-		    $this->_writer
-			    ->startObjectScope()
-			    ->writeName(ODataConstants::JSON_DEFERRED_STRING)
-			    ->startObjectScope()
-			    ->writeName($this->urlKey)
-			    ->writeValue($link->url)
-			    ->endScope()
-			    ->endScope()
-		    ;
-	    }
-
-	    return $this;
+        if ($link->isExpanded) {
+            if(is_null($link->expandedResult)){
+                $this->_writer->writeValue("null");
+            }
+            else{
+                $this->writeExpandedLink($link);
+            }
+        } else {
+            $this->_writer
+                ->startObjectScope()
+                ->writeName(ODataConstants::JSON_DEFERRED_STRING)
+                ->startObjectScope()
+                ->writeName($this->urlKey)
+                ->writeValue($link->url)
+                ->endScope()
+                ->endScope()
+            ;
+        }
+
+        return $this;
+    }
+
+    protected function writeExpandedLink(ODataLink $link)
+    {
+        if ($link->isCollection) {
+            $this->_writer->startArrayScope();
+            $this->writeFeed($link->expandedResult);
+        } else {
+            $this->_writer->startObjectScope();
+            $this->writeEntry($link->expandedResult);
+        }
+
+        $this->_writer->endScope();
     }
 
-	protected function writeExpandedLink(ODataLink $link)
-	{
-		if ($link->isCollection) {
-			$this->_writer->startArrayScope();
-			$this->writeFeed($link->expandedResult);
-		} else {
-			$this->_writer->startObjectScope();
-			$this->writeEntry($link->expandedResult);
-		}
-
-		$this->_writer->endScope();
-	}
-
-
-	/**
-	 * Write the given collection of properties.
-	 * (properties of an entity or complex type)
-	 *
-	 * @param ODataPropertyContent $properties Collection of properties.
-	 *
-	 * @return JsonODataV1Writer
-	 */
-	protected function writeProperties(ODataPropertyContent $properties)
-	{
-		foreach ($properties->properties as $property) {
-
-			$this->writePropertyMeta($property);
-			$this->_writer->writeName($property->name);
-
-			if ($property->value == null) {
-				$this->_writer->writeValue("null");
-			} elseif ($property->value instanceof ODataPropertyContent) {
-				$this->writeComplexProperty($property);
-			} elseif ($property->value instanceof ODataBagContent) {
-				$this->writeBagContent($property->value);
-			} else {
-				$this->_writer->writeValue($property->value, $property->typeName);
-			}
-
-		}
-
-		return $this;
-	}
-
-
-	protected function writePropertyMeta(ODataProperty $property)
-	{
-		return $this; //does nothing in v1 or v2, json light outputs stuff
-	}
+
+    /**
+     * Write the given collection of properties.
+     * (properties of an entity or complex type)
+     *
+     * @param ODataPropertyContent $properties Collection of properties.
+     *
+     * @return JsonODataV1Writer
+     */
+    protected function writeProperties(ODataPropertyContent $properties)
+    {
+        foreach ($properties->properties as $property) {
+
+            $this->writePropertyMeta($property);
+            $this->_writer->writeName($property->name);
+
+            if ($property->value == null) {
+                $this->_writer->writeValue("null");
+            } elseif ($property->value instanceof ODataPropertyContent) {
+                $this->writeComplexProperty($property);
+            } elseif ($property->value instanceof ODataBagContent) {
+                $this->writeBagContent($property->value);
+            } else {
+                $this->_writer->writeValue($property->value, $property->typeName);
+            }
+
+        }
+
+        return $this;
+    }
+
+
+    protected function writePropertyMeta(ODataProperty $property)
+    {
+        return $this; //does nothing in v1 or v2, json light outputs stuff
+    }
 
     /**
      * Begin write complex property.
@@ -356,21 +356,21 @@ 
     {
 
         $this->_writer
-	        // {
-	        ->startObjectScope()
+            // {
+            ->startObjectScope()
 
-	        // __metadata : { Type : "typename" }
-	        ->writeName(ODataConstants::JSON_METADATA_STRING)
-	        ->startObjectScope()
-	        ->writeName(ODataConstants::JSON_TYPE_STRING)
-	        ->writeValue($property->typeName)
-	        ->endScope();
+            // __metadata : { Type : "typename" }
+            ->writeName(ODataConstants::JSON_METADATA_STRING)
+            ->startObjectScope()
+            ->writeName(ODataConstants::JSON_TYPE_STRING)
+            ->writeValue($property->typeName)
+            ->endScope();
 
-	    $this->writeProperties($property->value);
+        $this->writeProperties($property->value);
 
-		$this->_writer->endScope();
+        $this->_writer->endScope();
 
-	    return $this;
+        return $this;
     }
 
 
@@ -385,15 +385,15 @@ 
     {
 
         $this->_writer
-	        ->startObjectScope() // {
-	        ->writeName(ODataConstants::JSON_METADATA_STRING) //__metadata : { Type : "typename" }
+            ->startObjectScope() // {
+            ->writeName(ODataConstants::JSON_METADATA_STRING) //__metadata : { Type : "typename" }
             ->startObjectScope()
 
             ->writeName(ODataConstants::JSON_TYPE_STRING)
             ->writeValue($bag->type)
             ->endScope()  // }
-	        ->writeName(ODataConstants::JSON_RESULT_NAME) // "__results":
-	    	->startArrayScope(); // [
+            ->writeName(ODataConstants::JSON_RESULT_NAME) // "__results":
+            ->startArrayScope(); // [
 
         foreach ($bag->propertyContents as $content) {
             if ($content instanceof ODataPropertyContent) {
@@ -410,9 +410,9 @@ 
 
 
         $this->_writer
-	        ->endScope()  // ]
-	        ->endScope(); // }
-	    return $this;
+            ->endScope()  // ]
+            ->endScope(); // }
+        return $this;
     }
 
 
@@ -433,29 +433,29 @@ 
         $writer = new JsonWriter('');
         // Wrapper for error.
         $writer
-	        ->startObjectScope()
+            ->startObjectScope()
             ->writeName(ODataConstants::JSON_ERROR) // "error"
             ->startObjectScope();
 
         // "code"
         if ($exception->getCode() != null) {
             $writer
-	            ->writeName(ODataConstants::JSON_ERROR_CODE)
-	            ->writeValue($exception->getCode());
+                ->writeName(ODataConstants::JSON_ERROR_CODE)
+                ->writeValue($exception->getCode());
         }
 
         // "message"
         $writer
-	        ->writeName(ODataConstants::JSON_ERROR_MESSAGE)
-	        ->startObjectScope()
-	        ->writeName(ODataConstants::XML_LANG_ATTRIBUTE_NAME) // "lang"
-	        ->writeValue('en-US')
+            ->writeName(ODataConstants::JSON_ERROR_MESSAGE)
+            ->startObjectScope()
+            ->writeName(ODataConstants::XML_LANG_ATTRIBUTE_NAME) // "lang"
+            ->writeValue('en-US')
             ->writeName(ODataConstants::JSON_ERROR_VALUE)
-	        ->writeValue($exception->getMessage())
+            ->writeValue($exception->getMessage())
 
-	        ->endScope()
-	        ->endScope()
-	        ->endScope();
+            ->endScope()
+            ->endScope()
+            ->endScope();
 
         return $writer->getJsonOutput();
     }

src/POData/Writers/Json/JsonODataV2Writer.php

Indentation +132 added lines, -132 removed lines

@@ -25,87 +25,87 @@ 
  */
 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
+    //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 $dataArrayName = ODataConstants::JSON_RESULT_NAME;
 
-	protected $rowCountName = ODataConstants::JSON_ROWCOUNT_STRING;
+    protected $rowCountName = ODataConstants::JSON_ROWCOUNT_STRING;
 
-	protected $nextLinkName = ODataConstants::JSON_NEXT_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);
-		}
-
-		if($responseVersion != Version::v2()){
-			return false;
-		}
-
-		return in_array(MimeTypes::MIME_APPLICATION_JSON, $parts);
-
-	}
-
-
-	/**
-	 * Write the given OData model in a specific response format
-	 *
-	 * @param  ODataURL|ODataURLCollection|ODataPropertyContent|ODataFeed|ODataEntry $model Object of requested content.
-	 *
-	 * @return JsonODataV1Writer
-	 */
-	public function write($model){
-		// { "d" :
-		$this->_writer
-			->startObjectScope()
-			->writeName("d")
-			->startObjectScope();
-
+    /**
+     * 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);
 
-		if ($model instanceof ODataURL) {
+        //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);
+        }
 
-			$this->writeURL($model);
-		} elseif ($model instanceof ODataURLCollection) {
-			$this->writeURLCollection($model);
-		} elseif ($model instanceof ODataPropertyContent) {
-			$this->writeProperties($model);
-		} elseif ($model instanceof ODataFeed) {
-			// Json Format V2:
-			// "results":
-			$this->writeRowCount($model->rowCount);
-			$this->writeNextPageLink($model->nextPageLink);
-			$this->_writer
-				->writeName($this->dataArrayName)
-				->startArrayScope();
-			$this->writeFeed($model);
-			$this->_writer->endScope();
+        if($responseVersion != Version::v2()){
+            return false;
+        }
 
-		}elseif ($model instanceof ODataEntry) {
-			$this->writeEntry($model);
-		}
+        return in_array(MimeTypes::MIME_APPLICATION_JSON, $parts);
 
+    }
 
-		$this->_writer->endScope();
-		$this->_writer->endScope();
 
-		return $this;
-	}
+    /**
+     * Write the given OData model in a specific response format
+     *
+     * @param  ODataURL|ODataURLCollection|ODataPropertyContent|ODataFeed|ODataEntry $model Object of requested content.
+     *
+     * @return JsonODataV1Writer
+     */
+    public function write($model){
+        // { "d" :
+        $this->_writer
+            ->startObjectScope()
+            ->writeName("d")
+            ->startObjectScope();
+
+
+        if ($model instanceof ODataURL) {
+
+            $this->writeURL($model);
+        } elseif ($model instanceof ODataURLCollection) {
+            $this->writeURLCollection($model);
+        } elseif ($model instanceof ODataPropertyContent) {
+            $this->writeProperties($model);
+        } elseif ($model instanceof ODataFeed) {
+            // Json Format V2:
+            // "results":
+            $this->writeRowCount($model->rowCount);
+            $this->writeNextPageLink($model->nextPageLink);
+            $this->_writer
+                ->writeName($this->dataArrayName)
+                ->startArrayScope();
+            $this->writeFeed($model);
+            $this->_writer->endScope();
+
+        }elseif ($model instanceof ODataEntry) {
+            $this->writeEntry($model);
+        }
+
+
+        $this->_writer->endScope();
+        $this->_writer->endScope();
+
+        return $this;
+    }
 
 
     /** 
@@ -119,76 +119,76 @@ 
     {
 
         $this->writeRowCount($urls->count);
-	    $this->writeNextPageLink($urls->nextPageLink);
+        $this->writeNextPageLink($urls->nextPageLink);
 
         // Json Format V2:
         // "results":
-	    $this->_writer
-	        ->writeName($this->dataArrayName)
-		    ->startArrayScope();
+        $this->_writer
+            ->writeName($this->dataArrayName)
+            ->startArrayScope();
 
-	   	parent::writeUrlCollection($urls);
+            parent::writeUrlCollection($urls);
 
-	    $this->_writer->endScope();
+        $this->_writer->endScope();
 
-	    return $this;
+        return $this;
     }
   
 
-	/**
-	 * Writes the row count.
-	 *
-	 * @param int $count Row count value.
-	 *
-	 * @return JsonODataV2Writer
-	 */
-	protected function writeRowCount($count)
-	{
-		if ($count != null) {
-			$this->_writer->writeName($this->rowCountName);
-			$this->_writer->writeValue($count);
-		}
-
-		return $this;
-	}
-
-
-	/**
-	 * Writes the next page link.
-	 *
-	 * @param ODataLink $nextPageLinkUri Uri for next page link.
-	 *
-	 * @return JsonODataV2Writer
-	 */
-	protected function writeNextPageLink(ODataLink $nextPageLinkUri = null)
-	{
-		// "__next" : uri
-		if ($nextPageLinkUri != null) {
-			$this->_writer
-				->writeName($this->nextLinkName)
-				->writeValue($nextPageLinkUri->url);
-		}
-
-		return $this;
-	}
-
-	protected function writeExpandedLink(ODataLink $link)
-	{
-		//Difference from v1 is that expanded collection have a result: wrapper to allow for metadata to exist
-		$this->_writer->startObjectScope();
-
-		if ($link->isCollection) {
-			$this->_writer
-				->writeName($this->dataArrayName)
-				->startArrayScope();
-			$this->writeFeed($link->expandedResult);
-			$this->_writer->endScope();
-		} else {
-			$this->writeEntry($link->expandedResult);
-		}
-
-
-		$this->_writer->endScope();
-	}
+    /**
+     * Writes the row count.
+     *
+     * @param int $count Row count value.
+     *
+     * @return JsonODataV2Writer
+     */
+    protected function writeRowCount($count)
+    {
+        if ($count != null) {
+            $this->_writer->writeName($this->rowCountName);
+            $this->_writer->writeValue($count);
+        }
+
+        return $this;
+    }
+
+
+    /**
+     * Writes the next page link.
+     *
+     * @param ODataLink $nextPageLinkUri Uri for next page link.
+     *
+     * @return JsonODataV2Writer
+     */
+    protected function writeNextPageLink(ODataLink $nextPageLinkUri = null)
+    {
+        // "__next" : uri
+        if ($nextPageLinkUri != null) {
+            $this->_writer
+                ->writeName($this->nextLinkName)
+                ->writeValue($nextPageLinkUri->url);
+        }
+
+        return $this;
+    }
+
+    protected function writeExpandedLink(ODataLink $link)
+    {
+        //Difference from v1 is that expanded collection have a result: wrapper to allow for metadata to exist
+        $this->_writer->startObjectScope();
+
+        if ($link->isCollection) {
+            $this->_writer
+                ->writeName($this->dataArrayName)
+                ->startArrayScope();
+            $this->writeFeed($link->expandedResult);
+            $this->_writer->endScope();
+        } else {
+            $this->writeEntry($link->expandedResult);
+        }
+
+
+        $this->_writer->endScope();
+    }
 
 }
\ No newline at end of file

src/POData/Writers/Json/JsonWriter.php

Indentation +64 added lines, -64 removed lines

@@ -20,7 +20,7 @@ 
     private $_jsonDateTimeFormat = "\/Date(%s)\/";
 
 
-	/**
+    /**
      * Writer to write text into
      *
      */
@@ -57,8 +57,8 @@ 
     public function endScope()
     {
         $this->_writer
-	        ->writeLine()
-	        ->decreaseIndent();
+            ->writeLine()
+            ->decreaseIndent();
  
         if (array_pop($this->_scopes)->type == $this->_scopeType['Array']) {
             $this->_writer->writeValue("]");
@@ -66,7 +66,7 @@ 
             $this->_writer->writeValue("}");
         }
 
-	    return $this;
+        return $this;
 
     }
 
@@ -78,7 +78,7 @@ 
     public function startArrayScope()
     {
         $this->_startScope($this->_scopeType['Array']);
-	    return $this;
+        return $this;
     }
 
 
@@ -90,7 +90,7 @@ 
     public function writeDataArrayName()
     {
         $this->writeName($this->dataArrayName);
-	    return $this;
+        return $this;
     }
 
     /**
@@ -101,7 +101,7 @@ 
     public function startObjectScope()
     {
         $this->_startScope($this->_scopeType['Object']);
-	    return $this;
+        return $this;
     }
 
     /**
@@ -125,7 +125,7 @@ 
         $this->_writeCore($name, true /*quotes*/);
         $this->_writer->writeTrimmed(": ");
 
-	    return $this;
+        return $this;
     }
 
     /**
@@ -139,62 +139,62 @@ 
     public function writeValue($value, $type = null)
     {
         switch ($type) {
-	        case 'Edm.Boolean':
-	        case 'Edm.Int16':
-	        case 'Edm.Int32':
-	        case 'Edm.Byte':
-	        case 'Edm.SByte':
-	            $this->_writeCore($value, /* quotes */ false);
-	            break;
-
-
-	        case 'Edm.Int64':
-	        case 'Edm.Guid':
-	        case 'Edm.Decimal':
-	        case 'Edm.Binary':
-	            $this->_writeCore($value, /* quotes */ true);
-	            break;
-
-	        case 'Edm.Single':
-	        case 'Edm.Double':
-	            if (is_infinite($value) || is_nan($value)) {
-	                $this->_writeCore("null", /* quotes */ true);
-	            } else {
-	                $this->_writeCore($value, /* quotes */ false);
-	            }
-
-	            break;
-
-
-	        case 'Edm.DateTime':
-	            $dateTime = new \DateTime($value, new \DateTimeZone('UTC'));
-		        $formattedDateTime = $dateTime->format('Y-m-d\TH:i:s');
-	            $this->_writeCore($formattedDateTime, /* quotes */ true);
-	            break;
-
-
-	        case 'Edm.String':
-	            if ($value == null) {
-	                $this->_writeCore("null", /* quotes */ false);
-	            } else {
-	                $jsonEncoded = json_encode($value);
-	                //json_encode always escapes a solidus (forward slash, %x2F),
-	                //this will be a problem when encoding urls
-	                //JSON_UNESCAPED_SLASHES not available in earlier versions of php 5.3
-	                //So removing escaping forward slashes manually
-	                $jsonEncoded = str_replace('\\/', '/', $jsonEncoded);
-	                //since json_encode is already appending chords
-	                //there is no need to set it again
-	                $this->_writeCore($jsonEncoded, /* quotes */ false);
-	            }
-	            break;
-
-
-	        default:
-	            $this->_writeCore($this->_quoteJScriptString($value), /* quotes */ true);
+            case 'Edm.Boolean':
+            case 'Edm.Int16':
+            case 'Edm.Int32':
+            case 'Edm.Byte':
+            case 'Edm.SByte':
+                $this->_writeCore($value, /* quotes */ false);
+                break;
+
+
+            case 'Edm.Int64':
+            case 'Edm.Guid':
+            case 'Edm.Decimal':
+            case 'Edm.Binary':
+                $this->_writeCore($value, /* quotes */ true);
+                break;
+
+            case 'Edm.Single':
+            case 'Edm.Double':
+                if (is_infinite($value) || is_nan($value)) {
+                    $this->_writeCore("null", /* quotes */ true);
+                } else {
+                    $this->_writeCore($value, /* quotes */ false);
+                }
+
+                break;
+
+
+            case 'Edm.DateTime':
+                $dateTime = new \DateTime($value, new \DateTimeZone('UTC'));
+                $formattedDateTime = $dateTime->format('Y-m-d\TH:i:s');
+                $this->_writeCore($formattedDateTime, /* quotes */ true);
+                break;
+
+
+            case 'Edm.String':
+                if ($value == null) {
+                    $this->_writeCore("null", /* quotes */ false);
+                } else {
+                    $jsonEncoded = json_encode($value);
+                    //json_encode always escapes a solidus (forward slash, %x2F),
+                    //this will be a problem when encoding urls
+                    //JSON_UNESCAPED_SLASHES not available in earlier versions of php 5.3
+                    //So removing escaping forward slashes manually
+                    $jsonEncoded = str_replace('\\/', '/', $jsonEncoded);
+                    //since json_encode is already appending chords
+                    //there is no need to set it again
+                    $this->_writeCore($jsonEncoded, /* quotes */ false);
+                }
+                break;
+
+
+            default:
+                $this->_writeCore($this->_quoteJScriptString($value), /* quotes */ true);
         }
 
-	    return $this;
+        return $this;
     }
 
     /**
@@ -278,7 +278,7 @@ 
         }
 
         $this->_writer
-	        ->increaseIndent()
+            ->increaseIndent()
             ->writeLine();
     }
 
@@ -321,7 +321,7 @@ 
     public function __construct($type)
     {
         $this->type = $type;
-	    $this->objectCount = 0;
+        $this->objectCount = 0;
     }
 
 }
\ No newline at end of file

src/POData/Writers/Metadata/MetadataWriter.php

Indentation +16 added lines, -17 removed lines

@@ -87,7 +87,7 @@ 
      */
     public function writeMetadata()
     {   
-       $this->_metadataManager = MetadataManager::create($this->providersWrapper);
+        $this->_metadataManager = MetadataManager::create($this->providersWrapper);
 
         $this->_dataServiceVersion = new Version(1, 0);
         $edmSchemaVersion = $this->providersWrapper->getEdmSchemaVersion();
@@ -184,7 +184,6 @@ 
      * Write all resource types (entity and complex types)
      * 
      * @param ResourceType[] $resourceTypes resource types array
-
      * @param array $associationTypesInResourceTypesNamespace collection of 
      * association types for the given resource types
      * array(string, AssociationType)
@@ -286,10 +285,10 @@ 
             } else if ($resourceProperty->isKindOf(ResourcePropertyKind::RESOURCE_REFERENCE) 
                 || $resourceProperty->isKindOf(ResourcePropertyKind::RESOURCESET_REFERENCE)
             ) {
-                 $this->_writeNavigationProperty($resourceType, $associationTypesInResourceTypeNamespace, $resourceProperty);
+                    $this->_writeNavigationProperty($resourceType, $associationTypesInResourceTypeNamespace, $resourceProperty);
             } else {
-                 //Unexpected ResourceProperty, expected 
-                 //Bag/Primitive/Complex/Navigation Property   
+                    //Unexpected ResourceProperty, expected 
+                    //Bag/Primitive/Complex/Navigation Property   
             }            
         }
     }
@@ -526,23 +525,23 @@ 
     private function _getSchemaNamespaceUri($edmSchemaVersion)
     {
         switch ($edmSchemaVersion) {
-	        case EdmSchemaVersion::VERSION_1_DOT_0:
-	            return ODataConstants::CSDL_VERSION_1_0;
+            case EdmSchemaVersion::VERSION_1_DOT_0:
+                return ODataConstants::CSDL_VERSION_1_0;
 
-	        case EdmSchemaVersion::VERSION_1_DOT_1:
-	            return ODataConstants::CSDL_VERSION_1_1;
+            case EdmSchemaVersion::VERSION_1_DOT_1:
+                return ODataConstants::CSDL_VERSION_1_1;
 
-	        case EdmSchemaVersion::VERSION_1_DOT_2:
-	            return ODataConstants::CSDL_VERSION_1_2;
+            case EdmSchemaVersion::VERSION_1_DOT_2:
+                return ODataConstants::CSDL_VERSION_1_2;
 
-	        case EdmSchemaVersion::VERSION_2_DOT_0:
-	            return ODataConstants::CSDL_VERSION_2_0;
+            case EdmSchemaVersion::VERSION_2_DOT_0:
+                return ODataConstants::CSDL_VERSION_2_0;
 
-	        case EdmSchemaVersion::VERSION_2_DOT_2:
-	            return ODataConstants::CSDL_VERSION_2_2;
+            case EdmSchemaVersion::VERSION_2_DOT_2:
+                return ODataConstants::CSDL_VERSION_2_2;
 
-	        default:
-	            return ODataConstants::CSDL_VERSION_2_2;
+            default:
+                return ODataConstants::CSDL_VERSION_2_2;
         }
     }
 }
\ No newline at end of file

src/POData/Writers/ODataWriterRegistry.php

Indentation +29 added lines, -29 removed lines

@@ -12,35 +12,35 @@
 class ODataWriterRegistry
 {
 
-	/** @var IODataWriter[]  */
-	private $writers = array();
-
-
-	public function register(IODataWriter $writer)
-	{
-		$this->writers[] = $writer;
-	}
-
-	public function reset()
-	{
-		$this->writers = array();
-	}
-
-	/**
-	 * @param Version $responseVersion
-	 * @param $contentType
-	 *
-	 * @return IODataWriter|null the writer that can handle the give criteria, or null
-	 */
-	public function getWriter(Version $responseVersion, $contentType){
-
-		foreach($this->writers as $writer)
-		{
-			if($writer->canHandle($responseVersion, $contentType)) return $writer;
-		}
-
-		return null;
-	}
+    /** @var IODataWriter[]  */
+    private $writers = array();
+
+
+    public function register(IODataWriter $writer)
+    {
+        $this->writers[] = $writer;
+    }
+
+    public function reset()
+    {
+        $this->writers = array();
+    }
+
+    /**
+     * @param Version $responseVersion
+     * @param $contentType
+     *
+     * @return IODataWriter|null the writer that can handle the give criteria, or null
+     */
+    public function getWriter(Version $responseVersion, $contentType){
+
+        foreach($this->writers as $writer)
+        {
+            if($writer->canHandle($responseVersion, $contentType)) return $writer;
+        }
+
+        return null;
+    }
 
 
 }
\ No newline at end of file

src/POData/Writers/ResponseWriter.php

Indentation +8 added lines, -8 removed lines

@@ -29,14 +29,14 @@ 
      * 
      */
     public static function write(
-	    IService $service,
+        IService $service,
         RequestDescription $request,
         $entityModel,
         $responseContentType
     ) {
         $responseBody = null;
         $dataServiceVersion = $request->getResponseVersion();
-	    $targetKind = $request->getTargetKind();
+        $targetKind = $request->getTargetKind();
 
         if ($targetKind == TargetKind::METADATA()) {
             // /$metadata
@@ -44,16 +44,16 @@ 
             $responseBody = $writer->writeMetadata();            
             $dataServiceVersion = $writer->getDataServiceVersion();
         } else if ($targetKind == TargetKind::PRIMITIVE_VALUE() && $responseContentType != MimeTypes::MIME_APPLICATION_OCTETSTREAM) {
-	        //This second part is to exclude binary properties
+            //This second part is to exclude binary properties
             // /Customer('ALFKI')/CompanyName/$value
             // /Customers/$count
             $responseBody = utf8_encode($request->getTargetResult());
         } else if ($responseContentType == MimeTypes::MIME_APPLICATION_OCTETSTREAM || $targetKind == TargetKind::MEDIA_RESOURCE()) {
             // Binary property or media resource
             if ($request->getTargetKind() == TargetKind::MEDIA_RESOURCE()) {
-	            $result = $request->getTargetResult();
-	            $streamInfo =  $request->getResourceStreamInfo();
-	            $provider = $service->getStreamProviderWrapper();
+                $result = $request->getTargetResult();
+                $streamInfo =  $request->getResourceStreamInfo();
+                $provider = $service->getStreamProviderWrapper();
                 $eTag = $provider->getStreamETag( $result, $streamInfo );
                 $service->getHost()->setResponseETag($eTag);
                 $responseBody = $provider->getReadStream( $result, $streamInfo );
@@ -66,8 +66,8 @@ 
             }
         } 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");
+            //TODO: move ot Messages
+            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();