Qeti / POData

src/POData/Writers/IODataWriter.php

Indentation +17 added lines, -17 removed lines

@@ -20,23 +20,23 @@
 interface IODataWriter
 {
 
-	/**
-	 * 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);
-
-	/**
-	 * Create OData object model from the request description and transform it to required content type form
-	 *
-	 *
-	 * @param  ODataURL|ODataURLCollection|ODataPropertyContent|ODataFeed|ODataEntry $model Object of requested content.
-	 *
-	 * @return IODataWriter
-	 */
-	public function write($model);
+    /**
+     * 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);
+
+    /**
+     * Create OData object model from the request description and transform it to required content type form
+     *
+     *
+     * @param  ODataURL|ODataURLCollection|ODataPropertyContent|ODataFeed|ODataEntry $model Object of requested content.
+     *
+     * @return IODataWriter
+     */
+    public function write($model);
 
 
     /**

src/POData/Writers/Json/IndentedTextWriter.php

Indentation +49 added lines, -49 removed lines

@@ -54,62 +54,62 @@
     {
         $this->outputTabs();
         $this->_write($value);
-	    return $this;
+        return $this;
     }
 
-	/**
-	 * Writes a new line character to the text stream
-	 *
-	 * @return IndentedTextWriter
-	 */
-	public function writeLine()
-	{
-		$this->_write("\n");
-		$this->tabsPending = true;
-		return $this;
-	}
+    /**
+     * Writes a new line character to the text stream
+     *
+     * @return IndentedTextWriter
+     */
+    public function writeLine()
+    {
+        $this->_write("\n");
+        $this->tabsPending = true;
+        return $this;
+    }
 
-	/**
-	 * Writes the given text trimmed with no indentation
-	 *
-	 * @param string $value text to be written
-	 *
-	 * @return IndentedTextWriter
-	 */
-	public function writeTrimmed($value)
-	{
-		$this->_write(trim($value));
-		return $this;
-	}
+    /**
+     * Writes the given text trimmed with no indentation
+     *
+     * @param string $value text to be written
+     *
+     * @return IndentedTextWriter
+     */
+    public function writeTrimmed($value)
+    {
+        $this->_write(trim($value));
+        return $this;
+    }
 
-	/**
-	 * Increases the current indent setting by 1
-	 * @return IndentedTextWriter
-	 */
-	public function increaseIndent()
-	{
-		$this->indentLevel++;
-		return $this;
-	}
+    /**
+     * Increases the current indent setting by 1
+     * @return IndentedTextWriter
+     */
+    public function increaseIndent()
+    {
+        $this->indentLevel++;
+        return $this;
+    }
 
-	/**
-	 * Decreases the current indent setting by 1, never going below 0
-	 * @return IndentedTextWriter
-	 */
-	public function decreaseIndent()
-	{
-		if($this->indentLevel > 0) $this->indentLevel--;
-		return $this;
-	}
+    /**
+     * Decreases the current indent setting by 1, never going below 0
+     * @return IndentedTextWriter
+     */
+    public function decreaseIndent()
+    {
+        if($this->indentLevel > 0) $this->indentLevel--;
+        return $this;
+    }
 
 
-	/**
-	 * @return string the current written text
-	 */
-	public function getResult()
-	{
-		return $this->result;
-	}
+    /**
+     * @return string the current written text
+     */
+    public function getResult()
+    {
+        return $this->result;
+    }
    
     /**
      * Writes the tabs depending on the indent level

Spacing +1 added lines, -1 removed lines

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

Braces +3 added lines, -1 removed lines

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

src/POData/Writers/Json/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/Metadata/MetadataAssociationTypeSet.php

Spacing +10 added lines, -11 removed lines

@@ -252,7 +252,7 @@ 
      */
     private function _getResourceAssociationSet(ResourceSetWrapper $resourceSet, ResourceType $resourceType, ResourceProperty $navigationProperty)
     {
-        $associationSetLookupKey = $resourceSet->getName() . '_' . $resourceType->getFullName() . '_' . $navigationProperty->getName();
+        $associationSetLookupKey = $resourceSet->getName().'_'.$resourceType->getFullName().'_'.$navigationProperty->getName();
         if (array_key_exists($associationSetLookupKey, $this->_resourceAssociationSets)) {
             return $this->_resourceAssociationSets[$associationSetLookupKey];
         }
@@ -290,9 +290,9 @@ 
 
         $reverseAssociationSetLookupKey = null;
         if (!is_null($relatedEnd->getResourceProperty())) {
-            $reverseAssociationSetLookupKey = $relatedEnd->getResourceSet()->getName() . '_' . $relatedEnd->getResourceProperty()->getResourceType()->getFullName() . '_' . $relatedEnd->getResourceProperty()->getName();
+            $reverseAssociationSetLookupKey = $relatedEnd->getResourceSet()->getName().'_'.$relatedEnd->getResourceProperty()->getResourceType()->getFullName().'_'.$relatedEnd->getResourceProperty()->getName();
         } else {
-            $reverseAssociationSetLookupKey = $relatedEnd->getResourceSet()->getName() . '_Null_' . $resourceType->getFullName() . '_' . $navigationProperty->getName();
+            $reverseAssociationSetLookupKey = $relatedEnd->getResourceSet()->getName().'_Null_'.$resourceType->getFullName().'_'.$navigationProperty->getName();
         }
 
         if (array_key_exists($reverseAssociationSetLookupKey, $this->_resourceAssociationSets)) {
@@ -332,7 +332,7 @@ 
     {
         $resourceTypeNamespace = $this->getResourceTypeNamespace($resourceType);
         $resourceAssociationTypesInNamespace = &$this->getResourceAssociationTypesForNamespace($resourceTypeNamespace);
-        $associationTypeLookupKey = $resourceType->getName() . '_' . $navigationProperty->getName();
+        $associationTypeLookupKey = $resourceType->getName().'_'.$navigationProperty->getName();
         if (array_key_exists($associationTypeLookupKey, $resourceAssociationTypesInNamespace)) {
             return $resourceAssociationTypesInNamespace[$associationTypeLookupKey];
         }
@@ -342,8 +342,8 @@ 
         $associationTypeEnd1Name = $associationTypeEnd2Name = null; 
         $isBiDirectional = $resourceAssociationSet->isBidirectional();
         if ($isBiDirectional) {
-            $associationTypeEnd1Name = $resourceAssociationSet->getEnd1()->getResourceType()->getName() . '_' . $resourceAssociationSet->getEnd1()->getResourceProperty()->getName();
-            $associationTypeEnd2Name = $resourceAssociationSet->getEnd2()->getResourceType()->getName() . '_' . $resourceAssociationSet->getEnd2()->getResourceProperty()->getName();
+            $associationTypeEnd1Name = $resourceAssociationSet->getEnd1()->getResourceType()->getName().'_'.$resourceAssociationSet->getEnd1()->getResourceProperty()->getName();
+            $associationTypeEnd2Name = $resourceAssociationSet->getEnd2()->getResourceType()->getName().'_'.$resourceAssociationSet->getEnd2()->getResourceProperty()->getName();
         } else {
             if (!is_null($resourceAssociationSet->getEnd1()->getResourceProperty())) {
                 $associationTypeEnd1Name = $resourceAssociationSet->getEnd1()->getResourceType()->getName();
@@ -378,7 +378,7 @@ 
         $resourceAssociationTypesInNamespace[$associationTypeLookupKey] = $resourceAssociationType;
         if ($isBiDirectional) {
             $relatedAssociationSetEnd = $resourceAssociationSet->getRelatedResourceAssociationSetEnd($resourceSet->getResourceSet(), $resourceType, $navigationProperty);
-            $relatedEndLookupKey = $relatedAssociationSetEnd->getResourceType()->getName() . '_' . $relatedAssociationSetEnd->getResourceProperty()->getName();
+            $relatedEndLookupKey = $relatedAssociationSetEnd->getResourceType()->getName().'_'.$relatedAssociationSetEnd->getResourceProperty()->getName();
             $resourceAssociationTypesInNamespace[$relatedEndLookupKey] = $resourceAssociationType;
         }
 
@@ -399,14 +399,13 @@ 
     private function _getAssociationTypeName(ResourceAssociationSet $resourceAssociationSet)
     {
         $end1 = !is_null($resourceAssociationSet->getEnd1()->getResourceProperty()) ?
-                    $resourceAssociationSet->getEnd1() :
-                    $resourceAssociationSet->getEnd2();
+                    $resourceAssociationSet->getEnd1() : $resourceAssociationSet->getEnd2();
         $end2 = $resourceAssociationSet->getRelatedResourceAssociationSetEnd($end1->getResourceSet(), $end1->getResourceType(), $end1->getResourceProperty());
         //e.g. Customer_Orders (w.r.t Northwind DB)
-        $associationTypeName = $end1->getResourceType()->getName() . '_' . $end1->getResourceProperty()->getName();
+        $associationTypeName = $end1->getResourceType()->getName().'_'.$end1->getResourceProperty()->getName();
         if (!is_null($end2->getResourceProperty())) {
             //Customer_Orders_Order_Customer
-            $associationTypeName .= '_' . $end2->getResourceType()->getName() . '_' . $end2->getResourceProperty()->getName();
+            $associationTypeName .= '_'.$end2->getResourceType()->getName().'_'.$end2->getResourceProperty()->getName();
         }
 
         return $associationTypeName;

src/POData/Writers/Metadata/MetadataResourceTypeSet.php

Spacing +2 added lines, -2 removed lines

@@ -179,7 +179,7 @@ 
                 $resourceType = $resourceProperty->getResourceType();
                 $resourceTypeNamespace = $this->getResourceTypeNamespace($resourceType);
                 $resourceTypesInNamespace = $this->getResourceTypesForNamespace($resourceTypeNamespace);
-                if (!array_key_exists($resourceTypeNamespace . '.' . $resourceType->getName(), $resourceTypesInNamespace)) {
+                if (!array_key_exists($resourceTypeNamespace.'.'.$resourceType->getName(), $resourceTypesInNamespace)) {
                     continue;
                 }
             }
@@ -242,7 +242,7 @@ 
     {
         $resourceTypeNamespace = $this->getResourceTypeNamespace($resourceType);
         $resourceTypesInNamespace = &$this->getResourceTypesForNamespace($resourceTypeNamespace);
-        $resourceNameWithNamespace = $resourceTypeNamespace . '.' . $resourceType->getName();
+        $resourceNameWithNamespace = $resourceTypeNamespace.'.'.$resourceType->getName();
         if (!array_key_exists($resourceNameWithNamespace, $resourceTypesInNamespace)) {
             if ($resourceType->isMediaLinkEntry()) {
                 $this->_hasVisibleMediaLinkEntry = true;

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

Spacing +3 added lines, -3 removed lines

@@ -32,11 +32,11 @@
 	 *
 	 * @return IODataWriter|null the writer that can handle the give criteria, or null
 	 */
-	public function getWriter(Version $responseVersion, $contentType){
+	public function getWriter(Version $responseVersion, $contentType) {
 
-		foreach($this->writers as $writer)
+		foreach ($this->writers as $writer)
 		{
-			if($writer->canHandle($responseVersion, $contentType)) return $writer;
+			if ($writer->canHandle($responseVersion, $contentType)) return $writer;
 		}
 
 		return null;

Braces +3 added lines, -1 removed lines

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

src/POData/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();

Spacing +5 added lines, -5 removed lines

@@ -52,11 +52,11 @@ 
             // Binary property or media resource
             if ($request->getTargetKind() == TargetKind::MEDIA_RESOURCE()) {
 	            $result = $request->getTargetResult();
-	            $streamInfo =  $request->getResourceStreamInfo();
+	            $streamInfo = $request->getResourceStreamInfo();
 	            $provider = $service->getStreamProviderWrapper();
-                $eTag = $provider->getStreamETag( $result, $streamInfo );
+                $eTag = $provider->getStreamETag($result, $streamInfo);
                 $service->getHost()->setResponseETag($eTag);
-                $responseBody = $provider->getReadStream( $result, $streamInfo );
+                $responseBody = $provider->getReadStream($result, $streamInfo);
             } else {
                 $responseBody = $request->getTargetResult();
             }
@@ -67,7 +67,7 @@ 
         } else {
             $writer = $service->getODataWriterRegistry()->getWriter($request->getResponseVersion(), $responseContentType);
 	        //TODO: move ot Messages
-	        if(is_null($writer)) throw new \Exception("no writer can handle the request");
+	        if (is_null($writer)) throw new \Exception("no writer can handle the request");
 
             if (is_null($entityModel)) {  //TODO: this seems like a weird way to know that the request is for a service document..i'd think we know this some other way
                 $responseBody = $writer->writeServiceDocument($service->getProvidersWrapper())->getOutput();
@@ -79,7 +79,7 @@ 
 
         $service->getHost()->setResponseStatusCode(HttpStatus::CODE_OK);
         $service->getHost()->setResponseContentType($responseContentType);
-        $service->getHost()->setResponseVersion($dataServiceVersion->toString() .';');
+        $service->getHost()->setResponseVersion($dataServiceVersion->toString().';');
         $service->getHost()->setResponseCacheControl(ODataConstants::HTTPRESPONSE_HEADER_CACHECONTROL_NOCACHE);
         $service->getHost()->getOperationContext()->outgoingResponse()->setStream($responseBody);
     }    

Braces +4 added lines, -3 removed lines

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