balint777 / POData

src/POData/Writers/Json/JsonLightODataWriter.php

Doc Comments +7 added lines, -1 removed lines

@@ -44,6 +44,9 @@ 
 	protected $baseUri;
 
 
+	/**
+	 * @param string $absoluteServiceUri
+	 */
 	public function __construct(JsonLightMetadataLevel $metadataLevel, $absoluteServiceUri)
 	{
 		if(strlen($absoluteServiceUri) == 0)
@@ -150,6 +153,9 @@ 
 
 
 
+	/**
+	 * @param string $fragment
+	 */
 	protected function writeTopLevelMeta($fragment)
 	{
 		if($this->metadataLevel == JsonLightMetadataLevel::NONE())
@@ -362,7 +368,7 @@ 
 
 	/**
 	 * @param ProvidersWrapper $providers
-	 * @return IODataWriter
+	 * @return JsonLightODataWriter
 	 */
 	public function writeServiceDocument(ProvidersWrapper $providers){
 		$writer = $this->_writer;

Unused Use Statements -5 removed lines

@@ -10,16 +10,11 @@
 use POData\ObjectModel\ODataPropertyContent;
 use POData\ObjectModel\ODataBagContent;
 use POData\ObjectModel\ODataProperty;
-use POData\ObjectModel\ODataMediaLink;
 use POData\Writers\Json\JsonWriter;
 use POData\Common\Version;
 use POData\Common\ODataConstants;
 use POData\Common\MimeTypes;
-use POData\Common\Messages;
-use POData\Common\ODataException;
-use POData\Common\InvalidOperationException;
 use POData\Providers\ProvidersWrapper;
-
 use POData\Writers\Json\JsonLightMetadataLevel;
 
 

Indentation +335 added lines, -335 removed lines

@@ -30,256 +30,256 @@ 
 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
-		$metadata = array_filter($parts, function ($item) { return strpos($item, 'odata') !== false; });
-		return in_array(MimeTypes::MIME_APPLICATION_JSON, $parts) && (empty($metadata) || in_array($this->metadataLevel->getValue(), $metadata));
-	}
-
-
-
-	/**
-	 * 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
+        $metadata = array_filter($parts, function ($item) { return strpos($item, 'odata') !== false; });
+        return in_array(MimeTypes::MIME_APPLICATION_JSON, $parts) && (empty($metadata) || in_array($this->metadataLevel->getValue(), $metadata));
+    }
+
+
+
+    /**
+     * 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
@@ -289,48 +289,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()
 
@@ -340,60 +340,60 @@ 
 			*/
 
 
-			->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]);
-			}
-		}
-
-
-		$this->_writer->endScope();  // ]
-		return $this;
-	}
-
-	/**
-	 * @param ProvidersWrapper $providers
-	 * @return IODataWriter
-	 */
-	public function writeServiceDocument(ProvidersWrapper $providers){
-		$writer = $this->_writer;
-		$writer
-			->startObjectScope() // {
-				->writeName("odata.metadata")
-				->writeValue("{$this->baseUri}/\$metadata")
-				->writeName("value") // "value" :
-				// ->writeName(ODataConstants::ENTITY_SET) // "EntitySets"
-				->startArrayScope() // [
-				;
-
-		foreach ($providers->getResourceSets() as $resourceSetWrapper) {
-			$name = $resourceSetWrapper->getName();
-			$writer
-					->startObjectScope() // {
-						->writeName("name") // "name" :
-						->writeValue($name)
-						->writeName("url") // "name" :
-						->writeValue($name)
-					->endScope() // }
-					;
-		}
-
-		$writer
-				->endScope() // ]
-			->endScope() // }
-		;
-
-		return $this;
-
-	}
+            ->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]);
+            }
+        }
+
+
+        $this->_writer->endScope();  // ]
+        return $this;
+    }
+
+    /**
+     * @param ProvidersWrapper $providers
+     * @return IODataWriter
+     */
+    public function writeServiceDocument(ProvidersWrapper $providers){
+        $writer = $this->_writer;
+        $writer
+            ->startObjectScope() // {
+                ->writeName("odata.metadata")
+                ->writeValue("{$this->baseUri}/\$metadata")
+                ->writeName("value") // "value" :
+                // ->writeName(ODataConstants::ENTITY_SET) // "EntitySets"
+                ->startArrayScope() // [
+                ;
+
+        foreach ($providers->getResourceSets() as $resourceSetWrapper) {
+            $name = $resourceSetWrapper->getName();
+            $writer
+                    ->startObjectScope() // {
+                        ->writeName("name") // "name" :
+                        ->writeValue($name)
+                        ->writeName("url") // "name" :
+                        ->writeValue($name)
+                    ->endScope() // }
+                    ;
+        }
+
+        $writer
+                ->endScope() // ]
+            ->endScope() // }
+        ;
+
+        return $this;
+
+    }
 
 }

Spacing +19 added lines, -19 removed lines

@@ -46,7 +46,7 @@ 
 
 	public function __construct(JsonLightMetadataLevel $metadataLevel, $absoluteServiceUri)
 	{
-		if(strlen($absoluteServiceUri) == 0)
+		if (strlen($absoluteServiceUri) == 0)
 		{
 			throw new \Exception("absoluteServiceUri must not be empty or null");
 		}
@@ -68,14 +68,14 @@ 
 	 */
 	public function canHandle(Version $responseVersion, $contentType)
 	{
-		if($responseVersion != Version::v3()){
+		if ($responseVersion != Version::v3()) {
 			return false;
 		}
 
 		$parts = explode(";", $contentType);
 
 		//It must be app/json and have the right odata= piece
-		$metadata = array_filter($parts, function ($item) { return strpos($item, 'odata') !== false; });
+		$metadata = array_filter($parts, function($item) { return strpos($item, 'odata') !== false; });
 		return in_array(MimeTypes::MIME_APPLICATION_JSON, $parts) && (empty($metadata) || in_array($this->metadataLevel->getValue(), $metadata));
 	}
 
@@ -88,7 +88,7 @@ 
 	 *
 	 * @return JsonLightODataWriter
 	 */
-	public function write($model){
+	public function write($model) {
 		$this->_writer->startObjectScope();
 
 		if ($model instanceof ODataURL) {
@@ -98,7 +98,7 @@ 
 			$this->writeTopLevelMeta("urlCollection");
 			$this->writeURLCollection($model);
 		} elseif ($model instanceof ODataPropertyContent) {
-			$this->writeTopLevelMeta( $model->properties[0]->typeName );
+			$this->writeTopLevelMeta($model->properties[0]->typeName);
 			$this->writeTopLevelProperty($model->properties[0]);
 		} elseif ($model instanceof ODataFeed) {
 			$this->writeTopLevelMeta($model->title);
@@ -152,7 +152,7 @@ 
 
 	protected function writeTopLevelMeta($fragment)
 	{
-		if($this->metadataLevel == JsonLightMetadataLevel::NONE())
+		if ($this->metadataLevel == JsonLightMetadataLevel::NONE())
 		{
 			return;
 		}
@@ -166,20 +166,20 @@ 
 
 	protected function writePropertyMeta(ODataProperty $property)
 	{
-		if($this->metadataLevel != JsonLightMetadataLevel::FULL())
+		if ($this->metadataLevel != JsonLightMetadataLevel::FULL())
 		{
 			//Only full meta level outputs this info
 			return $this;
 		}
 
-		if(is_null($property->value))
+		if (is_null($property->value))
 		{
 			//it appears full metadata doesn't output types for nulls...
 			return $this;
 		}
 
 
-		switch($property->typeName)
+		switch ($property->typeName)
 		{
 			//The type metadata is only included on certain types of properties
 			//Note this also excludes Complex types
@@ -201,9 +201,9 @@ 
 	 *
 	 * @return JsonLightODataWriter
 	 */
-	protected function writeEntryMetadata(ODataEntry $entry){
+	protected function writeEntryMetadata(ODataEntry $entry) {
 
-		if($this->metadataLevel != JsonLightMetadataLevel::FULL())
+		if ($this->metadataLevel != JsonLightMetadataLevel::FULL())
 		{
 			//Only full meta level outputs this info
 			return $this;
@@ -229,22 +229,22 @@ 
 	 *
 	 * @return JsonLightODataWriter
 	 */
-	protected function writeLink(ODataLink $link){
+	protected function writeLink(ODataLink $link) {
 
-		if($this->metadataLevel == JsonLightMetadataLevel::FULL())
+		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);;
+				->writeValue($link->url); ;
 		}
 
 
-		if($link->isExpanded)
+		if ($link->isExpanded)
 		{
 			$this->_writer->writeName($link->title);
 
-			if(is_null($link->expandedResult)) {
+			if (is_null($link->expandedResult)) {
 				$this->_writer->writeValue("null");
 			} else {
 				$this->writeExpandedLink($link);
@@ -315,7 +315,7 @@ 
 
 	protected function writeComplexPropertyMeta(ODataProperty $property)
 	{
-		if($this->metadataLevel == JsonLightMetadataLevel::FULL()){
+		if ($this->metadataLevel == JsonLightMetadataLevel::FULL()) {
 			$this->_writer
 				->writeName(ODataConstants::JSON_LIGHT_METADATA_TYPE_STRING)
 				->writeValue($property->typeName);
@@ -356,7 +356,7 @@ 
 		}
 
 
-		$this->_writer->endScope();  // ]
+		$this->_writer->endScope(); // ]
 		return $this;
 	}
 
@@ -364,7 +364,7 @@ 
 	 * @param ProvidersWrapper $providers
 	 * @return IODataWriter
 	 */
-	public function writeServiceDocument(ProvidersWrapper $providers){
+	public function writeServiceDocument(ProvidersWrapper $providers) {
 		$writer = $this->_writer;
 		$writer
 			->startObjectScope() // {

src/POData/Writers/Metadata/MetadataWriter.php

Doc Comments +1 added lines, -1 removed lines

@@ -189,7 +189,7 @@
      *
      * @param ResourceType[] $resourceTypes resource types array
 
-     * @param array $associationTypesInResourceTypesNamespace collection of
+     * @param ResourceAssociationType[] $associationTypesInResourceTypesNamespace collection of
      * association types for the given resource types
      * array(string, AssociationType)
      *

Indentation +15 added lines, -16 removed lines

@@ -188,7 +188,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)
@@ -290,10 +289,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
             }
         }
     }
@@ -530,23 +529,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;
         }
     }
 }