Qeti / POData

src/POData/UriProcessor/RequestDescription.php

Doc Comments +5 added lines, -5 removed lines

@@ -217,8 +217,8 @@ 
 	 * @param SegmentDescriptor[] $segmentDescriptors Description of segments in the resource path.
 	 * @param Url $requestUri
 	 * @param Version $serviceMaxVersion
-	 * @param $requestVersion
-	 * @param $maxRequestVersion
+	 * @param string|null $requestVersion
+	 * @param string|null $maxRequestVersion
 	 */
 	public function __construct($segmentDescriptors, Url $requestUri, Version $serviceMaxVersion, $requestVersion, $maxRequestVersion)
     {
@@ -382,7 +382,7 @@ 
      *      (i) $bath
      *          http://server/NW.svc/$batch
      *       
-     * @return ResourceSetWrapper|null
+     * @return ResourceSetWrapper
      */
     public function getTargetResourceSetWrapper()
     {
@@ -426,7 +426,7 @@ 
      *      (c) $bath
      *          http://server/NW.svc/$batch
      *      
-     * @return ResourceType|null
+     * @return ResourceType
      */
     public function getTargetResourceType()
     {
@@ -473,7 +473,7 @@ 
      *      (e) $bath
      *          http://server/NW.svc/$batch
      *      
-     * @return ResourceProperty|null
+     * @return ResourceProperty
      */
     public function getProjectedProperty()
     {

Unused Use Statements -2 removed lines

@@ -7,11 +7,9 @@
 use POData\Common\Messages;
 use POData\Common\Version;
 use POData\Common\ODataException;
-use POData\IService;
 use POData\Providers\Metadata\ResourceProperty;
 use POData\Providers\Metadata\ResourceSetWrapper;
 use POData\Providers\Metadata\ResourceStreamInfo;
-use POData\UriProcessor\QueryProcessor\QueryProcessor;
 use POData\UriProcessor\UriProcessor;
 use POData\UriProcessor\ResourcePathProcessor\SegmentParser\TargetSource;
 use POData\UriProcessor\ResourcePathProcessor\SegmentParser\TargetKind;

Indentation +50 added lines, -50 removed lines

@@ -75,8 +75,8 @@ 
      */
     private $requiredMinRequestVersion;
 
-	/** @var Version */
-	private $maxServiceVersion;
+    /** @var Version */
+    private $maxServiceVersion;
 
     /**
      * Collection of known data service versions.
@@ -114,12 +114,12 @@ 
     private $_containerName;
 
 
-	/**
-	 * The count option specified in the request.
-	 *
-	 * @var QueryType
-	 */
-	public $queryType;
+    /**
+     * The count option specified in the request.
+     *
+     * @var QueryType
+     */
+    public $queryType;
 
     /**
      * Number of segments.
@@ -213,36 +213,36 @@ 
 
 
 
-	/**
-	 * @param SegmentDescriptor[] $segmentDescriptors Description of segments in the resource path.
-	 * @param Url $requestUri
-	 * @param Version $serviceMaxVersion
-	 * @param $requestVersion
-	 * @param $maxRequestVersion
-	 */
-	public function __construct($segmentDescriptors, Url $requestUri, Version $serviceMaxVersion, $requestVersion, $maxRequestVersion)
+    /**
+     * @param SegmentDescriptor[] $segmentDescriptors Description of segments in the resource path.
+     * @param Url $requestUri
+     * @param Version $serviceMaxVersion
+     * @param $requestVersion
+     * @param $maxRequestVersion
+     */
+    public function __construct($segmentDescriptors, Url $requestUri, Version $serviceMaxVersion, $requestVersion, $maxRequestVersion)
     {
         $this->segments = $segmentDescriptors;
         $this->_segmentCount = count($this->segments);
         $this->requestUrl = $requestUri;
         $this->lastSegment = $segmentDescriptors[$this->_segmentCount - 1];
-	    $this->queryType = QueryType::ENTITIES();
+        $this->queryType = QueryType::ENTITIES();
 
         //we use this for validation checks down in validateVersions...but maybe we should check that outside of this object...
         $this->maxServiceVersion = $serviceMaxVersion;
 
-	    //Per OData 1 & 2 spec we must return the smallest size
-	    //We start at 1.0 and move it up as features are requested
+        //Per OData 1 & 2 spec we must return the smallest size
+        //We start at 1.0 and move it up as features are requested
         $this->requiredMinResponseVersion = clone Version::v1();
         $this->requiredMinRequestVersion = clone Version::v1();
 
 
-	    //see http://www.odata.org/documentation/odata-v2-documentation/overview/#ProtocolVersioning
-	    //if requestVersion isn't there, use Service Max Version
-	    $this->requestVersion = is_null($requestVersion) ? $serviceMaxVersion : self::parseVersionHeader($requestVersion, ODataConstants::ODATAVERSIONHEADER);
+        //see http://www.odata.org/documentation/odata-v2-documentation/overview/#ProtocolVersioning
+        //if requestVersion isn't there, use Service Max Version
+        $this->requestVersion = is_null($requestVersion) ? $serviceMaxVersion : self::parseVersionHeader($requestVersion, ODataConstants::ODATAVERSIONHEADER);
 
-	    //if max version isn't there, use the request version
-	    $this->requestMaxVersion = is_null($maxRequestVersion) ? $this->requestVersion : self::parseVersionHeader($maxRequestVersion, ODataConstants::ODATAMAXVERSIONHEADER);
+        //if max version isn't there, use the request version
+        $this->requestMaxVersion = is_null($maxRequestVersion) ? $this->requestVersion : self::parseVersionHeader($maxRequestVersion, ODataConstants::ODATAMAXVERSIONHEADER);
 
         //if it's OData v3..things change a bit
         if($this->maxServiceVersion == Version::v3()){
@@ -284,7 +284,7 @@ 
     public function raiseMinVersionRequirement($major, $minor) {
         if($this->requiredMinRequestVersion->raiseVersion($major, $minor))
         {
-	        $this->validateVersions();
+            $this->validateVersions();
         }
     }
 
@@ -299,7 +299,7 @@ 
      */  
     public function raiseResponseVersion($major, $minor) {
         if($this->requiredMinResponseVersion->raiseVersion($major, $minor)){
-	        $this->validateVersions();
+            $this->validateVersions();
         }
 
     }
@@ -810,7 +810,7 @@ 
     public function getResponseVersion()
     {
 
-	    return $this->requiredMinResponseVersion;
+        return $this->requiredMinResponseVersion;
     }
 
     /**
@@ -838,7 +838,7 @@ 
     {
         if (is_null(self::$_knownDataServiceVersions)) {
             self::$_knownDataServiceVersions = array(
-	            new Version(1, 0),
+                new Version(1, 0),
                 new Version(2, 0),
                 new Version(3, 0)
             );
@@ -867,32 +867,32 @@ 
      */
     public function validateVersions() {
 
-	    //If the request version is below the minimum version required by supplied request arguments..throw an exception
+        //If the request version is below the minimum version required by supplied request arguments..throw an exception
         if ($this->requestVersion->compare($this->requiredMinRequestVersion) < 0) {
-			throw ODataException::createBadRequestError(
+            throw ODataException::createBadRequestError(
                 Messages::requestVersionTooLow(
-	                $this->requestVersion->toString(),
-	                $this->requiredMinRequestVersion->toString()
+                    $this->requestVersion->toString(),
+                    $this->requiredMinRequestVersion->toString()
                 )
             );
         }
 
-	    //If the requested max version is below the version required to fulfill the response...throw an exception
+        //If the requested max version is below the version required to fulfill the response...throw an exception
         if ($this->requestMaxVersion->compare($this->requiredMinResponseVersion) < 0) {
-			throw ODataException::createBadRequestError(
+            throw ODataException::createBadRequestError(
                 Messages::requestVersionTooLow(
-	                $this->requestMaxVersion->toString(),
-	                $this->requiredMinResponseVersion->toString()
+                    $this->requestMaxVersion->toString(),
+                    $this->requiredMinResponseVersion->toString()
                 )
             );
         }
 
         //If the max version supported by the service is below the version required to fulfill the response..throw an exception
         if ($this->maxServiceVersion->compare($this->requiredMinResponseVersion) < 0) {
-			throw ODataException::createBadRequestError(
+            throw ODataException::createBadRequestError(
                 Messages::requestVersionIsBiggerThanProtocolVersion(
-	                $this->requiredMinResponseVersion->toString(),
-	                $this->maxServiceVersion->toString()
+                    $this->requiredMinResponseVersion->toString(),
+                    $this->maxServiceVersion->toString()
                 )
             );
         }
@@ -923,9 +923,9 @@ 
         for ($i = 0; $i < $libNameIndex; $i++) {
             if ($versionHeader[$i] == '.') {
 
-	            //Throw an exception if we find more than 1 dot
-	            if ($dotIndex != -1) {
-					throw ODataException::createBadRequestError(
+                //Throw an exception if we find more than 1 dot
+                if ($dotIndex != -1) {
+                    throw ODataException::createBadRequestError(
                         Messages::requestDescriptionInvalidVersionHeader(
                             $versionHeader,
                             $headerName
@@ -935,7 +935,7 @@ 
 
                 $dotIndex = $i;
             } else if ($versionHeader[$i] < '0' || $versionHeader[$i] > '9') {
-				throw ODataException::createBadRequestError(
+                throw ODataException::createBadRequestError(
                     Messages::requestDescriptionInvalidVersionHeader(
                         $versionHeader,
                         $headerName
@@ -945,14 +945,14 @@ 
         }
 
 
-	    $major = intval(substr($versionHeader, 0, $dotIndex));
-	    $minor = 0;
+        $major = intval(substr($versionHeader, 0, $dotIndex));
+        $minor = 0;
 
-	   //Apparently the . is optional
+        //Apparently the . is optional
         if ($dotIndex != -1) {
             if ($dotIndex == 0) {
-	            //If it starts with a ., throw an exception
-				throw ODataException::createBadRequestError(
+                //If it starts with a ., throw an exception
+                throw ODataException::createBadRequestError(
                     Messages::requestDescriptionInvalidVersionHeader(
                         $versionHeader,
                         $headerName
@@ -965,8 +965,8 @@ 
 
         $version = new Version($major, $minor);
 
-	    //TODO: move this somewhere...
-	    /*
+        //TODO: move this somewhere...
+        /*
         $isSupportedVersion = false;
         foreach (self::getKnownDataServiceVersions() as $version1) {
             if ($version->compare($version1) == 0) {

Spacing +8 added lines, -8 removed lines

@@ -245,8 +245,8 @@ 
 	    $this->requestMaxVersion = is_null($maxRequestVersion) ? $this->requestVersion : self::parseVersionHeader($maxRequestVersion, ODataConstants::ODATAMAXVERSIONHEADER);
 
         //if it's OData v3..things change a bit
-        if($this->maxServiceVersion == Version::v3()){
-            if(is_null($maxRequestVersion))
+        if ($this->maxServiceVersion == Version::v3()) {
+            if (is_null($maxRequestVersion))
             {
                 //if max request version isn't specified we use the service max version instead of the request version
                 //thus we favour newer versions
@@ -282,7 +282,7 @@ 
      * @throws ODataException If capability negotiation fails.
      */
     public function raiseMinVersionRequirement($major, $minor) {
-        if($this->requiredMinRequestVersion->raiseVersion($major, $minor))
+        if ($this->requiredMinRequestVersion->raiseVersion($major, $minor))
         {
 	        $this->validateVersions();
         }
@@ -298,7 +298,7 @@ 
      * @throws ODataException If capability negotiation fails.
      */  
     public function raiseResponseVersion($major, $minor) {
-        if($this->requiredMinResponseVersion->raiseVersion($major, $minor)){
+        if ($this->requiredMinResponseVersion->raiseVersion($major, $minor)) {
 	        $this->validateVersions();
         }
 
@@ -623,7 +623,7 @@ 
      * 
      * @return void
      */
-    public function setInternalOrderByInfo(InternalOrderByInfo &$internalOrderByInfo)
+    public function setInternalOrderByInfo(InternalOrderByInfo & $internalOrderByInfo)
     {
         $this->internalOrderByInfo = $internalOrderByInfo;
     }
@@ -647,7 +647,7 @@ 
      * @return void
      */
     public function setInternalSkipTokenInfo(
-        InternalSkipTokenInfo &$internalSkipTokenInfo
+        InternalSkipTokenInfo & $internalSkipTokenInfo
     ) {
         $this->_internalSkipTokenInfo = $internalSkipTokenInfo;
     }
@@ -679,9 +679,9 @@ 
      * 
      * @return void
      */
-    public function setRootProjectionNode(RootProjectionNode &$rootProjectionNode)
+    public function setRootProjectionNode(RootProjectionNode & $rootProjectionNode)
     {
-        $this->_rootProjectionNode =  $rootProjectionNode;
+        $this->_rootProjectionNode = $rootProjectionNode;
     }
 
     /**

src/POData/UriProcessor/ResourcePathProcessor/SegmentParser/KeyDescriptor.php

Doc Comments +2 added lines, -2 removed lines

@@ -202,7 +202,7 @@ 
      *  KeyDescription. 
      *    
      * @param string        $keyPredicate   The predicate to parse
-     * @param KeyDescriptor &$keyDescriptor On return, Description of key after 
+     * @param KeyDescriptor KeyDescriptor On return, Description of key after 
      *                                      parsing
      * 
      * @return boolean True if the given values were parsed; false if there was 
@@ -454,7 +454,7 @@ 
      * the type if valid this function provide the PHP value equivalent to 
      * the astoira URI key value
      * 
-     * @param unknown           $value     The Astoria URI key value
+     * @param string           $value     The Astoria URI key value
      * @param ExpressionTokenId $tokenId   The tokenId for $value literal
      * @param unknown           &$outValue After the invocation, this parameter 
      *                                     holds the PHP value equivalent to $value, 

Unused Use Statements -1 removed lines

@@ -16,7 +16,6 @@
 use POData\Providers\Metadata\Type\Int32;
 use POData\Providers\Metadata\Type\Null1;
 use POData\UriProcessor\QueryProcessor\ExpressionParser\ExpressionTokenId;
-use POData\UriProcessor\QueryProcessor\ExpressionParser\ExpressionToken;
 use POData\UriProcessor\QueryProcessor\ExpressionParser\ExpressionLexer;
 use POData\Common\Messages;
 

Indentation +1 added lines, -1 removed lines

@@ -175,7 +175,7 @@
      */
     public function isEmpty()
     {
-         return empty($this->_namedValues) 
+            return empty($this->_namedValues) 
              && empty($this->_positionalValues);
     }
 

Switch Indentation +33 added lines, -33 removed lines

@@ -470,39 +470,39 @@
     private static function _getTypeAndValidateKeyValue($value, $tokenId, &$outValue, &$outType)
     {     
         switch ($tokenId) {
-        case ExpressionTokenId::BOOLEAN_LITERAL:
-            $outType = new Boolean();
-            break;
-        case ExpressionTokenId::DATETIME_LITERAL:
-            $outType = new DateTime();
-            break;
-        case ExpressionTokenId::GUID_LITERAL:
-            $outType = new Guid();
-            break;
-        case ExpressionTokenId::STRING_LITERAL:
-            $outType = new String();
-            break;
-        case ExpressionTokenId::INTEGER_LITERAL:
-            $outType = new Int32();
-            break;
-        case ExpressionTokenId::DECIMAL_LITERAL:
-            $outType = new Decimal();
-            break;
-        case ExpressionTokenId::DOUBLE_LITERAL:
-            $outType = new Double();
-            break;
-        case ExpressionTokenId::INT64_LITERAL:
-            $outType = new Int64();
-            break;
-        case ExpressionTokenId::SINGLE_LITERAL:
-            $outType = new Single();
-            break;
-        case ExpressionTokenId::NULL_LITERAL:
-            $outType = new Null1();
-            break;
-        default:
-            $outType = null;
-            return false;
+            case ExpressionTokenId::BOOLEAN_LITERAL:
+                $outType = new Boolean();
+                break;
+            case ExpressionTokenId::DATETIME_LITERAL:
+                $outType = new DateTime();
+                break;
+            case ExpressionTokenId::GUID_LITERAL:
+                $outType = new Guid();
+                break;
+            case ExpressionTokenId::STRING_LITERAL:
+                $outType = new String();
+                break;
+            case ExpressionTokenId::INTEGER_LITERAL:
+                $outType = new Int32();
+                break;
+            case ExpressionTokenId::DECIMAL_LITERAL:
+                $outType = new Decimal();
+                break;
+            case ExpressionTokenId::DOUBLE_LITERAL:
+                $outType = new Double();
+                break;
+            case ExpressionTokenId::INT64_LITERAL:
+                $outType = new Int64();
+                break;
+            case ExpressionTokenId::SINGLE_LITERAL:
+                $outType = new Single();
+                break;
+            case ExpressionTokenId::NULL_LITERAL:
+                $outType = new Null1();
+                break;
+            default:
+                $outType = null;
+                return false;
         }
 
         if (!$outType->validate($value, $outValue)) {

Spacing +1 added lines, -1 removed lines

@@ -271,7 +271,7 @@
                 if (!array_key_exists($keyName, $this->_namedValues)) {
                     $keysAsString = null;
                     foreach (array_keys($keyProperties) as $key) {
-                        $keysAsString .= $key . ', ';
+                        $keysAsString .= $key.', ';
                     }
                     
                     $keysAsString = rtrim($keysAsString, ' ,');

src/POData/UriProcessor/ResourcePathProcessor/SegmentParser/SegmentParser.php

Doc Comments +4 added lines

@@ -142,6 +142,10 @@
         }
     }
 
+    /**
+     * @param string $segment
+     * @param boolean $checkRights
+     */
     private function createNextSegment(SegmentDescriptor $previous, $segment, $checkRights){
         $previousKind = $previous->getTargetKind();
         if ($previousKind == TargetKind::METADATA()

Indentation +19 added lines, -19 removed lines

@@ -92,7 +92,7 @@ 
 
         $segmentLength = strlen($segment);
         if (strrpos($segment, ')') !== $segmentLength - 1) {
-			throw ODataException::createSyntaxError(Messages::syntaxError());
+            throw ODataException::createSyntaxError(Messages::syntaxError());
         }
 
         $identifier = substr($segment, 0, $predicateStart);
@@ -112,8 +112,8 @@ 
     {        
         if (empty($segments)) {
             //If there's no segments, then it's the service root
-	        $descriptor = new SegmentDescriptor();
-	        $descriptor->setTargetKind(TargetKind::SERVICE_DIRECTORY());
+            $descriptor = new SegmentDescriptor();
+            $descriptor->setTargetKind(TargetKind::SERVICE_DIRECTORY());
             $this->_segmentDescriptors[] = $descriptor;
             return;
         }
@@ -121,13 +121,13 @@ 
         $segmentCount = count($segments);
         $identifier = $keyPredicate = null;
         $this->extractSegmentIdentifierAndKeyPredicate($segments[0], $identifier, $keyPredicate);
-	    $previous = $this->_createFirstSegmentDescriptor(
+        $previous = $this->_createFirstSegmentDescriptor(
             $identifier, $keyPredicate, $checkRights
         );
         $this->_segmentDescriptors[0] = $previous;
 
         for ($i = 1; $i < $segmentCount; $i++) {
-	        $current = $this->createNextSegment($previous, $segments[$i], $checkRights);
+            $current = $this->createNextSegment($previous, $segments[$i], $checkRights);
 
             
             $current->setPrevious($previous);
@@ -138,7 +138,7 @@ 
 
         //At this point $previous is the final segment..which cannot be a $link
         if ($previous->getTargetKind() == TargetKind::LINK()) {
-			throw ODataException::createBadRequestError(Messages::segmentParserMissingSegmentAfterLink());
+            throw ODataException::createBadRequestError(Messages::segmentParserMissingSegmentAfterLink());
         }
     }
 
@@ -151,7 +151,7 @@ 
             || $previousKind == TargetKind::MEDIA_RESOURCE()
         ) {
             //All these targets are terminal segments, there cannot be anything after them.
-			throw ODataException::resourceNotFoundError(
+            throw ODataException::resourceNotFoundError(
                 Messages::segmentParserMustBeLeafSegment($previous->getIdentifier())
             );
         }
@@ -162,7 +162,7 @@ 
         $current = null;
         if ($previousKind == TargetKind::PRIMITIVE()) {
             if ($identifier !== ODataConstants::URI_VALUE_SEGMENT) {
-				throw ODataException::resourceNotFoundError(
+                throw ODataException::resourceNotFoundError(
                     Messages::segmentParserOnlyValueSegmentAllowedAfterPrimitivePropertySegment(
                         $identifier, $previous->getIdentifier()
                     )
@@ -175,7 +175,7 @@ 
             $current->setTargetKind(TargetKind::PRIMITIVE_VALUE());
             $current->setSingleResult(true);
         } else if (!is_null($previous->getPrevious()) && $previous->getPrevious()->getIdentifier() === ODataConstants::URI_LINK_SEGMENT && $identifier !== ODataConstants::URI_COUNT_SEGMENT) {
-			throw ODataException::createBadRequestError(
+            throw ODataException::createBadRequestError(
                 Messages::segmentParserNoSegmentAllowedAfterPostLinkSegment($identifier)
             );
         } else if ($previousKind == TargetKind::RESOURCE()
@@ -198,7 +198,7 @@ 
             }
 
             if (!$previous->isSingleResult() && $identifier !== ODataConstants::URI_COUNT_SEGMENT) {
-				throw ODataException::createBadRequestError(
+                throw ODataException::createBadRequestError(
                     Messages::segmentParserCannotQueryCollection($previous->getIdentifier())
                 );
             }
@@ -211,13 +211,13 @@ 
 
             if ($identifier === ODataConstants::URI_COUNT_SEGMENT) {
                 if ($previousKind != TargetKind::RESOURCE()) {
-					throw ODataException::createBadRequestError(
+                    throw ODataException::createBadRequestError(
                         Messages::segmentParserCountCannotBeApplied($previous->getIdentifier())
                     );
                 }
 
                 if ($previous->isSingleResult()) {
-					throw ODataException::createBadRequestError(
+                    throw ODataException::createBadRequestError(
                         Messages::segmentParserCountCannotFollowSingleton($previous->getIdentifier())
                     );
                 }
@@ -248,7 +248,7 @@ 
                         $previous->getTargetResourceType()
                     );
                 } else {
-					throw ODataException::createResourceNotFoundError($identifier);
+                    throw ODataException::createResourceNotFoundError($identifier);
                 }
             } else {
                 $current->setTargetResourceType($projectedProperty->getResourceType());
@@ -256,7 +256,7 @@ 
                 if ($previousKind == TargetKind::LINK()
                     && $projectedProperty->getTypeKind() != ResourceTypeKind::ENTITY
                 ) {
-					throw ODataException::createBadRequestError(
+                    throw ODataException::createBadRequestError(
                         Messages::segmentParserLinkSegmentMustBeFollowedByEntitySegment(
                             $identifier
                         )
@@ -276,14 +276,14 @@ 
                         $current->setTargetKind(TargetKind::RESOURCE());
                         $resourceSetWrapper = $this->providerWrapper->getResourceSetWrapperForNavigationProperty($previous->getTargetResourceSetWrapper(), $previous->getTargetResourceType(), $projectedProperty);
                         if (is_null($resourceSetWrapper)) {
-							throw ODataException::createResourceNotFoundError($projectedProperty->getName());
+                            throw ODataException::createResourceNotFoundError($projectedProperty->getName());
                         }
 
                         $current->setTargetResourceSetWrapper($resourceSetWrapper);
                         break;
                     default:
                         if (!$projectedProperty->isKindOf(ResourcePropertyKind::PRIMITIVE)) {
-							throw ODataException::createInternalServerError(
+                            throw ODataException::createInternalServerError(
                                 Messages::segmentParserUnExpectedPropertyKind(
                                     'Primitive'
                                 )
@@ -347,7 +347,7 @@ 
         }
 
         if ($segmentIdentifier === ODataConstants::URI_COUNT_SEGMENT) {
-			throw ODataException::createBadRequestError(
+            throw ODataException::createBadRequestError(
                 Messages::segmentParserSegmentNotAllowedOnRoot(
                     ODataConstants::URI_COUNT_SEGMENT
                 )
@@ -355,7 +355,7 @@ 
         }
 
         if ($segmentIdentifier === ODataConstants::URI_LINK_SEGMENT) {
-			throw ODataException::createBadRequestError(
+            throw ODataException::createBadRequestError(
                 Messages::segmentParserSegmentNotAllowedOnRoot(
                     ODataConstants::URI_LINK_SEGMENT
                 )
@@ -364,7 +364,7 @@ 
 
         $resourceSetWrapper = $this->providerWrapper->resolveResourceSet($segmentIdentifier);
         if ($resourceSetWrapper === null) {
-			throw ODataException::createResourceNotFoundError($segmentIdentifier);
+            throw ODataException::createResourceNotFoundError($segmentIdentifier);
         }
 
         $descriptor->setTargetResourceSetWrapper($resourceSetWrapper);

Spacing +6 added lines, -6 removed lines

@@ -51,7 +51,7 @@ 
      * @param ProvidersWrapper $providerWrapper Reference to metadata and query provider wrapper
      *
      */
-    private function __construct(ProvidersWrapper $providerWrapper ) {
+    private function __construct(ProvidersWrapper $providerWrapper) {
         $this->providerWrapper = $providerWrapper;
     }
 
@@ -142,7 +142,7 @@ 
         }
     }
 
-    private function createNextSegment(SegmentDescriptor $previous, $segment, $checkRights){
+    private function createNextSegment(SegmentDescriptor $previous, $segment, $checkRights) {
         $previousKind = $previous->getTargetKind();
         if ($previousKind == TargetKind::METADATA()
             || $previousKind == TargetKind::BATCH()
@@ -263,7 +263,7 @@ 
                     );
                 }
 
-                switch($projectedProperty->getKind()) {
+                switch ($projectedProperty->getKind()) {
                     case ResourcePropertyKind::COMPLEX_TYPE:
                         $current->setTargetKind(TargetKind::COMPLEX_OBJECT());
                         break;
@@ -297,7 +297,7 @@ 
                 if ($hasPredicate) {
                     $this->_assertion(!$current->isSingleResult());
                     $keyDescriptor = $this->_createKeyDescriptor(
-                        $identifier . '(' . $keyPredicate . ')',
+                        $identifier.'('.$keyPredicate.')',
                         $projectedProperty->getResourceType(),
                         $keyPredicate
                     );
@@ -307,7 +307,7 @@ 
                     }
                 }
 
-                if ($checkRights&& !is_null($current->getTargetResourceSetWrapper())) {
+                if ($checkRights && !is_null($current->getTargetResourceSetWrapper())) {
                     $current->getTargetResourceSetWrapper()
                         ->checkResourceSetRightsForRead(
                             $current->isSingleResult()
@@ -373,7 +373,7 @@ 
         $descriptor->setTargetKind(TargetKind::RESOURCE());
         if ($keyPredicate !== null) {
             $keyDescriptor = $this->_createKeyDescriptor(
-                $segmentIdentifier . '(' . $keyPredicate . ')', 
+                $segmentIdentifier.'('.$keyPredicate.')', 
                 $resourceSetWrapper->getResourceType(), 
                 $keyPredicate
             );

src/POData/UriProcessor/UriProcessor.php

Unused Use Statements -1 removed lines

@@ -15,7 +15,6 @@
 use POData\UriProcessor\ResourcePathProcessor\SegmentParser\TargetKind;
 use POData\UriProcessor\ResourcePathProcessor\SegmentParser\TargetSource;
 use POData\IService;
-use POData\Common\Url;
 use POData\Common\Messages;
 use POData\Common\ODataException;
 use POData\Common\InvalidOperationException;

Indentation +73 added lines, -73 removed lines

@@ -98,7 +98,7 @@ 
         $absoluteServiceUri = $service->getHost()->getAbsoluteServiceUri();
         
         if (!$absoluteServiceUri->isBaseOf($absoluteRequestUri)) {
-			throw ODataException::createInternalServerError(
+            throw ODataException::createInternalServerError(
                 Messages::uriProcessorRequestUriDoesNotHaveTheRightBaseUri(
                     $absoluteRequestUri->getUrlAsString(), 
                     $absoluteServiceUri->getUrlAsString()
@@ -108,9 +108,9 @@ 
 
         $uriProcessor = new UriProcessor($service);
         //Parse the resource path part of the request Uri.
-		$uriProcessor->request = ResourcePathProcessor::process($service);
+        $uriProcessor->request = ResourcePathProcessor::process($service);
 
-	    $uriProcessor->request->setUriProcessor($uriProcessor);
+        $uriProcessor->request->setUriProcessor($uriProcessor);
 
 
         //Parse the query string options of the request Uri.
@@ -140,11 +140,11 @@ 
 
             $requestTargetKind = $segment->getTargetKind();
 
-	        if ($segment->getTargetSource() == TargetSource::ENTITY_SET) {
+            if ($segment->getTargetSource() == TargetSource::ENTITY_SET) {
                 $this->handleSegmentTargetsToResourceSet($segment);
             } else if ($requestTargetKind == TargetKind::RESOURCE()) {
                 if (is_null($segment->getPrevious()->getResult())) {
-					throw ODataException::createResourceNotFoundError(
+                    throw ODataException::createResourceNotFoundError(
                         $segment->getPrevious()->getIdentifier()
                     );
                 }
@@ -159,7 +159,7 @@ 
             } else {
                 if ($requestTargetKind == TargetKind::MEDIA_RESOURCE()) {
                     if (is_null($segment->getPrevious()->getResult())) {
-						throw ODataException::createResourceNotFoundError(
+                        throw ODataException::createResourceNotFoundError(
                             $segment->getPrevious()->getIdentifier()
                         );
                     }
@@ -172,14 +172,14 @@ 
                     break;
                 }
 
-	            $value = $segment->getPrevious()->getResult();
+                $value = $segment->getPrevious()->getResult();
                 while (!is_null($segment)) {
-	                //TODO: what exactly is this doing here?  Once a null's found it seems everything will be null
+                    //TODO: what exactly is this doing here?  Once a null's found it seems everything will be null
                     if (!is_null($value)) {
                         $value = null;
                     } else {
                         try {
-	                        //see #88
+                            //see #88
                             $property = new \ReflectionProperty($value, $segment->getIdentifier());
                             $value = $property->getValue($value);
                         } catch (\ReflectionException $reflectionException) {
@@ -204,9 +204,9 @@ 
             }
         }
 
-         // Apply $select and $expand options to result set, this function will be always applied
-         // irrespective of return value of IDSQP2::canApplyQueryOptions which means library will
-         // not delegate $expand/$select operation to IDSQP2 implementation
+            // Apply $select and $expand options to result set, this function will be always applied
+            // irrespective of return value of IDSQP2::canApplyQueryOptions which means library will
+            // not delegate $expand/$select operation to IDSQP2 implementation
         $this->handleExpansion();
     }
 
@@ -229,7 +229,7 @@ 
         } else {
 
             $queryResult = $this->providers->getResourceSet(
-	            $this->request->queryType,
+                $this->request->queryType,
                 $segment->getTargetResourceSetWrapper(),
                 $this->request->getFilterInfo(),
                 $this->request->getInternalOrderByInfo(),
@@ -266,13 +266,13 @@ 
                 $segment->setResult($entityInstance);
             } else {
                 $queryResult = $this->providers->getRelatedResourceSet(
-	                $this->request->queryType,
+                    $this->request->queryType,
                     $segment->getPrevious()->getTargetResourceSetWrapper(),
                     $segment->getPrevious()->getResult(),
                     $segment->getTargetResourceSetWrapper(),
                     $segment->getProjectedProperty(),
                     $this->request->getFilterInfo(),
-	                //TODO: why are these null?  see #98
+                    //TODO: why are these null?  see #98
                     null, // $orderby
                     null, // $top
                     null  // $skip
@@ -302,19 +302,19 @@ 
      */
     private function applyQueryOptions(SegmentDescriptor $segment)
     {
-	    //TODO: I'm not really happy with this..i think i'd rather keep the result the QueryResult
-	    //not even bother with the setCountValue stuff (shouldn't counts be on segments?)
-	    //and just work with the QueryResult in the object model serializer
-	    $result = $segment->getResult();
-
-	    if(!$result instanceof QueryResult){
-		    //If the segment isn't a query result, then there's no paging or counting to be done
-		    return;
+        //TODO: I'm not really happy with this..i think i'd rather keep the result the QueryResult
+        //not even bother with the setCountValue stuff (shouldn't counts be on segments?)
+        //and just work with the QueryResult in the object model serializer
+        $result = $segment->getResult();
+
+        if(!$result instanceof QueryResult){
+            //If the segment isn't a query result, then there's no paging or counting to be done
+            return;
         }
 
 
         // Note $inlinecount=allpages means include the total count regardless of paging..so we set the counts first
-	    // regardless if POData does the paging or not.
+        // regardless if POData does the paging or not.
         if ($this->request->queryType == QueryType::ENTITIES_WITH_COUNT()) {
             if ($this->providers->handlesOrderedPaging()) {
                 $this->request->setCountValue($result->count);
@@ -323,57 +323,57 @@ 
             }
         }
 
-	    //Have POData perform paging if necessary
-	    if(!$this->providers->handlesOrderedPaging() && !empty($result->results)){
-			$result->results = $this->performPaging($result->results);
-	    }
-
-	    //a bit surprising, but $skip and $top affects $count so update it here, not above
-	    //IE  data.svc/Collection/$count?$top=10 returns 10 even if Collection has 11+ entries
-	    if ($this->request->queryType == QueryType::COUNT()) {
-		    if ($this->providers->handlesOrderedPaging()) {
-			    $this->request->setCountValue($result->count);
-		    } else {
-			    $this->request->setCountValue(count($result->results));
-		    }
-	    }
+        //Have POData perform paging if necessary
+        if(!$this->providers->handlesOrderedPaging() && !empty($result->results)){
+            $result->results = $this->performPaging($result->results);
+        }
+
+        //a bit surprising, but $skip and $top affects $count so update it here, not above
+        //IE  data.svc/Collection/$count?$top=10 returns 10 even if Collection has 11+ entries
+        if ($this->request->queryType == QueryType::COUNT()) {
+            if ($this->providers->handlesOrderedPaging()) {
+                $this->request->setCountValue($result->count);
+            } else {
+                $this->request->setCountValue(count($result->results));
+            }
+        }
 
         $segment->setResult($result->results);
     }
 
-	/**
-	 * If the provider does not perform the paging (ordering, top, skip) then this method does it
-	 *
-	 * @param array $result
-	 * @return array
-	 */
-	private function performPaging(array $result)
-	{
-		//Apply (implicit and explicit) $orderby option
-		$internalOrderByInfo = $this->request->getInternalOrderByInfo();
-		if (!is_null($internalOrderByInfo)) {
-			$orderByFunction = $internalOrderByInfo->getSorterFunction()->getReference();
-			usort($result, $orderByFunction);
-		}
-
-		//Apply $skiptoken option
-		$internalSkipTokenInfo = $this->request->getInternalSkipTokenInfo();
-		if (!is_null($internalSkipTokenInfo)) {
-			$matchingIndex = $internalSkipTokenInfo->getIndexOfFirstEntryInTheNextPage($result);
-			$result = array_slice($result, $matchingIndex);
-		}
-
-		//Apply $top and $skip option
-		if (!empty($result)) {
-			$top  = $this->request->getTopCount();
-			$skip = $this->request->getSkipCount();
-			if(is_null($skip)) $skip = 0;
-
-			$result = array_slice($result, $skip, $top);
-		}
-
-		return $result;
-	}
+    /**
+     * If the provider does not perform the paging (ordering, top, skip) then this method does it
+     *
+     * @param array $result
+     * @return array
+     */
+    private function performPaging(array $result)
+    {
+        //Apply (implicit and explicit) $orderby option
+        $internalOrderByInfo = $this->request->getInternalOrderByInfo();
+        if (!is_null($internalOrderByInfo)) {
+            $orderByFunction = $internalOrderByInfo->getSorterFunction()->getReference();
+            usort($result, $orderByFunction);
+        }
+
+        //Apply $skiptoken option
+        $internalSkipTokenInfo = $this->request->getInternalSkipTokenInfo();
+        if (!is_null($internalSkipTokenInfo)) {
+            $matchingIndex = $internalSkipTokenInfo->getIndexOfFirstEntryInTheNextPage($result);
+            $result = array_slice($result, $matchingIndex);
+        }
+
+        //Apply $top and $skip option
+        if (!empty($result)) {
+            $top  = $this->request->getTopCount();
+            $skip = $this->request->getSkipCount();
+            if(is_null($skip)) $skip = 0;
+
+            $result = array_slice($result, $skip, $top);
+        }
+
+        return $result;
+    }
 
 
     /**
@@ -416,7 +416,7 @@ 
                         $resourceSetOfProjectedProperty = $expandedProjectionNode->getResourceSetWrapper()->getResourceSet();
                         $projectedProperty1 = $expandedProjectionNode->getResourceProperty();
                         $result1 = $this->providers->getRelatedResourceSet(
-	                        QueryType::ENTITIES(), //it's always entities for an expansion
+                            QueryType::ENTITIES(), //it's always entities for an expansion
                             $currentResourceSet,
                             $entry,
                             $resourceSetOfProjectedProperty,
@@ -475,7 +475,7 @@ 
                     $resourceSetOfProjectedProperty2 = $expandedProjectionNode->getResourceSetWrapper()->getResourceSet();
                     $projectedProperty4 = $expandedProjectionNode->getResourceProperty();
                     $result1 = $this->providers->getRelatedResourceSet(
-	                    QueryType::ENTITIES(), //it's always entities for an expansion
+                        QueryType::ENTITIES(), //it's always entities for an expansion
                         $currentResourceSet2,
                         $result,
                         $resourceSetOfProjectedProperty2,

Spacing +7 added lines, -7 removed lines

@@ -114,7 +114,7 @@ 
 
 
         //Parse the query string options of the request Uri.
-        QueryProcessor::process( $uriProcessor->request, $service );
+        QueryProcessor::process($uriProcessor->request, $service);
 
         return $uriProcessor;
     }
@@ -217,7 +217,7 @@ 
      * @return void
      *
      */
-    private function handleSegmentTargetsToResourceSet( SegmentDescriptor $segment ) {
+    private function handleSegmentTargetsToResourceSet(SegmentDescriptor $segment) {
         if ($segment->isSingleResult()) {
             $entityInstance = $this->providers->getResourceFromResourceSet(
                 $segment->getTargetResourceSetWrapper(),
@@ -307,7 +307,7 @@ 
 	    //and just work with the QueryResult in the object model serializer
 	    $result = $segment->getResult();
 
-	    if(!$result instanceof QueryResult){
+	    if (!$result instanceof QueryResult) {
 		    //If the segment isn't a query result, then there's no paging or counting to be done
 		    return;
         }
@@ -324,7 +324,7 @@ 
         }
 
 	    //Have POData perform paging if necessary
-	    if(!$this->providers->handlesOrderedPaging() && !empty($result->results)){
+	    if (!$this->providers->handlesOrderedPaging() && !empty($result->results)) {
 			$result->results = $this->performPaging($result->results);
 	    }
 
@@ -367,7 +367,7 @@ 
 		if (!empty($result)) {
 			$top  = $this->request->getTopCount();
 			$skip = $this->request->getSkipCount();
-			if(is_null($skip)) $skip = 0;
+			if (is_null($skip)) $skip = 0;
 
 			$result = array_slice($result, $skip, $top);
 		}
@@ -574,7 +574,7 @@ 
      * @throws InvalidOperationException If this function invoked with non-navigation
      *                                   property instance.
      */
-    private function _pushSegmentForNavigationProperty(ResourceProperty &$resourceProperty)
+    private function _pushSegmentForNavigationProperty(ResourceProperty & $resourceProperty)
     {
         if ($resourceProperty->getTypeKind() == ResourceTypeKind::ENTITY) {
             $this->assert(
@@ -669,7 +669,7 @@ 
      *
      * @return bool true if the segment was push, false otherwise
      */
-    private function _pushSegment($segmentName, ResourceSetWrapper &$resourceSetWrapper)
+    private function _pushSegment($segmentName, ResourceSetWrapper & $resourceSetWrapper)
     {
         $rootProjectionNode = $this->request->getRootProjectionNode();
         if (!is_null($rootProjectionNode) 

Braces +3 added lines, -1 removed lines

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

src/POData/Writers/Atom/AtomODataWriter.php

Doc Comments +4 added lines, -4 removed lines

@@ -102,7 +102,7 @@ 
 	}
 
     /** 
-     * @param ODataUrl $url the url to write.
+     * @param ODataURL $url the url to write.
      * 
      * @return AtomODataWriter
      */
@@ -119,7 +119,7 @@ 
     /**
      * Begin write odata links
      * 
-     * @param ODataUrlCollection $urls Object of ODataUrlCollection to start writing collection of url.
+     * @param ODataURLCollection $urls Object of ODataUrlCollection to start writing collection of url.
      *
      * 
      * @return AtomODataWriter
@@ -415,10 +415,10 @@ 
     /**
      * XML write a basic data type (string, number, boolean, null)
      * 
-     * @param mixed  $value value to be written
+     * @param string  $value value to be written
      * @param string $type  data type of the value
      * 
-     * @return mixed
+     * @return string
      */
     protected function beforeWriteValue($value, $type = null)
     {

Unused Use Statements -1 removed lines

@@ -11,7 +11,6 @@
 use POData\ObjectModel\ODataPropertyContent;
 use POData\ObjectModel\ODataBagContent;
 use POData\ObjectModel\ODataProperty;
-use POData\ObjectModel\ODataMediaLink;
 use POData\Writers\IODataWriter;
 use POData\Common\ODataConstants;
 use POData\Common\MimeTypes;

Indentation +252 added lines, -252 removed lines

@@ -31,12 +31,12 @@ 
      */
     public $xmlWriter;
 
-	/**
-	 *
-	 * The service base uri
-	 * @var string
-	 */
-	protected $baseUri;
+    /**
+     *
+     * The service base uri
+     * @var string
+     */
+    protected $baseUri;
 
     /**
      * Construct a new instance of AtomODataWriter.
@@ -45,7 +45,7 @@ 
      */
     public function __construct($absoluteServiceUri)
     {
-	    $this->baseUri = $absoluteServiceUri;
+        $this->baseUri = $absoluteServiceUri;
 
         $this->xmlWriter = new \XMLWriter();
         $this->xmlWriter->openMemory();
@@ -53,67 +53,67 @@ 
         $this->xmlWriter->setIndent(4);
     }
 
-	/**
-	 * 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);
-
-		//first 2 parts are for service documents, second part is for Resources
-		//TODO: i'm not sold about this first part not being constrained to v1 (or maybe v2)..but it's how WS DS works. See #94
-		return in_array(MimeTypes::MIME_APPLICATION_XML, $parts) || in_array(MimeTypes::MIME_APPLICATION_ATOMSERVICE, $parts) || in_array(MimeTypes::MIME_APPLICATION_ATOM, $parts);
-	}
-
-	/**
-	 * Write the given OData model in a specific response format
-	 *
-	 * @param  ODataURL|ODataURLCollection|ODataPropertyContent|ODataFeed|ODataEntry $model Object of requested content.
-	 *
-	 * @return AtomODataWriter
-	 */
-	public function write($model)
-	{
-		if ($model instanceof ODataURL) {
-			return $this->writeURL($model);
-		}
-
-		if ($model instanceof ODataURLCollection) {
-			return $this->writeURLCollection($model);
-		}
-
-		if ($model instanceof ODataPropertyContent) {
-			return $this->writeProperties($model, true);
-		}
-
-		if ($model instanceof ODataFeed) {
-			return $this->writeFeed($model, true);
-		}
-
-		if ($model instanceof ODataEntry) {
-			return $this->writeEntry($model, true);
-		}
-
-		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)
+    {
+
+        $parts = explode(";", $contentType);
+
+        //first 2 parts are for service documents, second part is for Resources
+        //TODO: i'm not sold about this first part not being constrained to v1 (or maybe v2)..but it's how WS DS works. See #94
+        return in_array(MimeTypes::MIME_APPLICATION_XML, $parts) || in_array(MimeTypes::MIME_APPLICATION_ATOMSERVICE, $parts) || in_array(MimeTypes::MIME_APPLICATION_ATOM, $parts);
+    }
+
+    /**
+     * Write the given OData model in a specific response format
+     *
+     * @param  ODataURL|ODataURLCollection|ODataPropertyContent|ODataFeed|ODataEntry $model Object of requested content.
+     *
+     * @return AtomODataWriter
+     */
+    public function write($model)
+    {
+        if ($model instanceof ODataURL) {
+            return $this->writeURL($model);
+        }
+
+        if ($model instanceof ODataURLCollection) {
+            return $this->writeURLCollection($model);
+        }
+
+        if ($model instanceof ODataPropertyContent) {
+            return $this->writeProperties($model, true);
+        }
+
+        if ($model instanceof ODataFeed) {
+            return $this->writeFeed($model, true);
+        }
+
+        if ($model instanceof ODataEntry) {
+            return $this->writeEntry($model, true);
+        }
+
+        return $this;
+    }
 
     /** 
      * @param ODataUrl $url the url to write.
      * 
      * @return AtomODataWriter
      */
-	protected function writeURL(ODataURL $url)
+    protected function writeURL(ODataURL $url)
     {
         $this->xmlWriter->startElement(ODataConstants::ATOM_URI_ELEMENT_NAME);
         $this->xmlWriter->writeAttribute(ODataConstants::XMLNS_NAMESPACE_PREFIX, ODataConstants::ODATA_NAMESPACE);
         $this->xmlWriter->text($url->url);
         $this->xmlWriter->endElement();
 
-	    return $this;
+        return $this;
     }
 
     /**
@@ -152,12 +152,12 @@ 
         }
 
 
-	    if ($urls->nextPageLink!=null) {
-		    $this->writeLinkNode($urls->nextPageLink, false);
-	    }
-	    $this->xmlWriter->endElement();
+        if ($urls->nextPageLink!=null) {
+            $this->writeLinkNode($urls->nextPageLink, false);
+        }
+        $this->xmlWriter->endElement();
 
-	    return $this;
+        return $this;
         
     }
 
@@ -176,65 +176,65 @@ 
             $this->writeBaseUriAndDefaultNamespaces();
         }
 
-	    $this
-		    ->writeNodeAttributeValue(
-			    ODataConstants::ATOM_TITLE_ELELMET_NAME,
-			    ODataConstants::ATOM_TYPE_ATTRIBUTE_NAME,
-			    MimeTypes::MIME_TEXTTYPE,
-			    $feed->title
-		    )
-		    ->writeNodeValue(ODataConstants::ATOM_ID_ELEMENT_NAME, $feed->id)
-		    ->writeNodeValue(ODataConstants::ATOM_UPDATED_ELEMENT_NAME, date(DATE_ATOM) )
-		    ->writeLinkNode($feed->selfLink, false);
-
-	    if ($feed->rowCount != null) {
-		    $this->xmlWriter->startElementNs(
-			    ODataConstants::ODATA_METADATA_NAMESPACE_PREFIX,
-			    ODataConstants::ROWCOUNT_ELEMENT, null
-		    );
-		    $this->xmlWriter->text($feed->rowCount);
-		    $this->xmlWriter->endElement();
-	    }
-
-	    foreach ($feed->entries as $entry) {
-		    $this->writeEntry($entry);
-	    }
-
-	    if ($feed->nextPageLink != null) {
-		    $this->writeLinkNode($feed->nextPageLink, false);
-	    }
-	    $this->xmlWriter->endElement();
-
-
-	    return $this;
+        $this
+            ->writeNodeAttributeValue(
+                ODataConstants::ATOM_TITLE_ELELMET_NAME,
+                ODataConstants::ATOM_TYPE_ATTRIBUTE_NAME,
+                MimeTypes::MIME_TEXTTYPE,
+                $feed->title
+            )
+            ->writeNodeValue(ODataConstants::ATOM_ID_ELEMENT_NAME, $feed->id)
+            ->writeNodeValue(ODataConstants::ATOM_UPDATED_ELEMENT_NAME, date(DATE_ATOM) )
+            ->writeLinkNode($feed->selfLink, false);
+
+        if ($feed->rowCount != null) {
+            $this->xmlWriter->startElementNs(
+                ODataConstants::ODATA_METADATA_NAMESPACE_PREFIX,
+                ODataConstants::ROWCOUNT_ELEMENT, null
+            );
+            $this->xmlWriter->text($feed->rowCount);
+            $this->xmlWriter->endElement();
+        }
+
+        foreach ($feed->entries as $entry) {
+            $this->writeEntry($entry);
+        }
+
+        if ($feed->nextPageLink != null) {
+            $this->writeLinkNode($feed->nextPageLink, false);
+        }
+        $this->xmlWriter->endElement();
+
+
+        return $this;
     }
 
 
-	/**
-	 * Write top level entry
-	 *
-	 * @param ODataEntry $entry Object of ODataEntry
-	 * @param boolean $isTopLevel
-	 *
-	 * @return AtomODataWriter
-	 */
-	protected function writeEntry(ODataEntry $entry, $isTopLevel = false)
-	{
-		$this->writeBeginEntry($entry, $isTopLevel);
-		foreach ($entry->links as $link) {
-			$this->writeLink($link);
-		}
+    /**
+     * Write top level entry
+     *
+     * @param ODataEntry $entry Object of ODataEntry
+     * @param boolean $isTopLevel
+     *
+     * @return AtomODataWriter
+     */
+    protected function writeEntry(ODataEntry $entry, $isTopLevel = false)
+    {
+        $this->writeBeginEntry($entry, $isTopLevel);
+        foreach ($entry->links as $link) {
+            $this->writeLink($link);
+        }
 
-		$this
-			->preWriteProperties($entry)
-			->writeProperties($entry->propertyContent)
-			->postWriteProperties($entry);
+        $this
+            ->preWriteProperties($entry)
+            ->writeProperties($entry->propertyContent)
+            ->postWriteProperties($entry);
 
-		$this->xmlWriter->endElement();
+        $this->xmlWriter->endElement();
 
 
-		return $this;
-	}
+        return $this;
+    }
 
 
     /**
@@ -262,155 +262,155 @@ 
             $this->xmlWriter->endAttribute();
         }
 
-	    $this
-		    ->writeNodeValue(ODataConstants::ATOM_ID_ELEMENT_NAME, $entry->id)
-		    ->writeNodeAttributeValue(
-			    ODataConstants::ATOM_TITLE_ELELMET_NAME,
-			    ODataConstants::ATOM_TYPE_ATTRIBUTE_NAME,
-			    MimeTypes::MIME_TEXTTYPE,
-			    $entry->title
-		    )
-		    ->writeNodeValue(ODataConstants::ATOM_UPDATED_ELEMENT_NAME, date(DATE_ATOM));
-
-	    $this->xmlWriter->startElement(ODataConstants::ATOM_AUTHOR_ELEMENT_NAME);
-	    $this->xmlWriter->startElement(ODataConstants::ATOM_NAME_ELEMENT_NAME);
-	    $this->xmlWriter->endElement();
-	    $this->xmlWriter->endElement();
-	    if ($entry->isMediaLinkEntry) {
-		    $this->xmlWriter->startElement(ODataConstants::ATOM_LINK_ELEMENT_NAME);
-		    if ($entry->mediaLink->eTag != null) {
-			    $this->xmlWriter->startAttributeNs(
-				    ODataConstants::ODATA_METADATA_NAMESPACE_PREFIX,
-				    ODataConstants::ATOM_ETAG_ATTRIBUTE_NAME,
-				    null
-			    );
-			    $this->xmlWriter->text($entry->mediaLink->eTag);
-			    $this->xmlWriter->endAttribute();
-		    }
-		    $this->xmlWriter->startAttribute(
-			    ODataConstants::ATOM_LINK_RELATION_ATTRIBUTE_NAME
-		    );
-		    $this->xmlWriter->text(ODataConstants::ATOM_EDIT_MEDIA_RELATION_ATTRIBUTE_VALUE);
-		    $this->xmlWriter->endAttribute();
-
-		    $this->xmlWriter->startAttribute(ODataConstants::ATOM_TYPE_ATTRIBUTE_NAME);
-		    $this->xmlWriter->text($entry->mediaLink->contentType);
-		    $this->xmlWriter->endAttribute();
-
-		    $this->xmlWriter->startAttribute(ODataConstants::ATOM_TITLE_ELELMET_NAME);
-		    $this->xmlWriter->text($entry->mediaLink->name);
-		    $this->xmlWriter->endAttribute();
-
-		    $this->xmlWriter->startAttribute(ODataConstants::ATOM_HREF_ATTRIBUTE_NAME);
-		    $this->xmlWriter->text($entry->mediaLink->editLink);
-		    $this->xmlWriter->endAttribute();
-		    $this->xmlWriter->endElement();
-
-		    foreach ($entry->mediaLinks as $mediaLink) {
-			    $this->xmlWriter->startElement(ODataConstants::ATOM_LINK_ELEMENT_NAME);
-			    if ($mediaLink->eTag != null) {
-				    $this->xmlWriter->startAttributeNs(
-					    ODataConstants::ODATA_METADATA_NAMESPACE_PREFIX,
-					    ODataConstants::ATOM_ETAG_ATTRIBUTE_NAME,
-					    null
-				    );
-				    $this->xmlWriter->text($mediaLink->eTag);
-				    $this->xmlWriter->endAttribute();
-			    }
-			    $this->xmlWriter->startAttribute(ODataConstants::ATOM_LINK_RELATION_ATTRIBUTE_NAME);
-			    $this->xmlWriter->text(
-				    "http://schemas.microsoft.com/ado/2007/08/dataservices/mediaresource/"
-				    .$mediaLink->name
-			    );
-			    $this->xmlWriter->endAttribute();
-
-			    $this->xmlWriter->startAttribute(ODataConstants::ATOM_TYPE_ATTRIBUTE_NAME);
-			    $this->xmlWriter->text($mediaLink->contentType);
-			    $this->xmlWriter->endAttribute();
-
-			    $this->xmlWriter->startAttribute(ODataConstants::ATOM_TITLE_ELELMET_NAME);
-			    $this->xmlWriter->text($mediaLink->name);
-			    $this->xmlWriter->endAttribute();
-
-			    $this->xmlWriter->startAttribute(ODataConstants::ATOM_HREF_ATTRIBUTE_NAME);
-			    $this->xmlWriter->text($mediaLink->editLink);
-			    $this->xmlWriter->endAttribute();
-			    $this->xmlWriter->endElement();
-		    }
-	    }
-
-	    return $this;
+        $this
+            ->writeNodeValue(ODataConstants::ATOM_ID_ELEMENT_NAME, $entry->id)
+            ->writeNodeAttributeValue(
+                ODataConstants::ATOM_TITLE_ELELMET_NAME,
+                ODataConstants::ATOM_TYPE_ATTRIBUTE_NAME,
+                MimeTypes::MIME_TEXTTYPE,
+                $entry->title
+            )
+            ->writeNodeValue(ODataConstants::ATOM_UPDATED_ELEMENT_NAME, date(DATE_ATOM));
+
+        $this->xmlWriter->startElement(ODataConstants::ATOM_AUTHOR_ELEMENT_NAME);
+        $this->xmlWriter->startElement(ODataConstants::ATOM_NAME_ELEMENT_NAME);
+        $this->xmlWriter->endElement();
+        $this->xmlWriter->endElement();
+        if ($entry->isMediaLinkEntry) {
+            $this->xmlWriter->startElement(ODataConstants::ATOM_LINK_ELEMENT_NAME);
+            if ($entry->mediaLink->eTag != null) {
+                $this->xmlWriter->startAttributeNs(
+                    ODataConstants::ODATA_METADATA_NAMESPACE_PREFIX,
+                    ODataConstants::ATOM_ETAG_ATTRIBUTE_NAME,
+                    null
+                );
+                $this->xmlWriter->text($entry->mediaLink->eTag);
+                $this->xmlWriter->endAttribute();
+            }
+            $this->xmlWriter->startAttribute(
+                ODataConstants::ATOM_LINK_RELATION_ATTRIBUTE_NAME
+            );
+            $this->xmlWriter->text(ODataConstants::ATOM_EDIT_MEDIA_RELATION_ATTRIBUTE_VALUE);
+            $this->xmlWriter->endAttribute();
+
+            $this->xmlWriter->startAttribute(ODataConstants::ATOM_TYPE_ATTRIBUTE_NAME);
+            $this->xmlWriter->text($entry->mediaLink->contentType);
+            $this->xmlWriter->endAttribute();
+
+            $this->xmlWriter->startAttribute(ODataConstants::ATOM_TITLE_ELELMET_NAME);
+            $this->xmlWriter->text($entry->mediaLink->name);
+            $this->xmlWriter->endAttribute();
+
+            $this->xmlWriter->startAttribute(ODataConstants::ATOM_HREF_ATTRIBUTE_NAME);
+            $this->xmlWriter->text($entry->mediaLink->editLink);
+            $this->xmlWriter->endAttribute();
+            $this->xmlWriter->endElement();
+
+            foreach ($entry->mediaLinks as $mediaLink) {
+                $this->xmlWriter->startElement(ODataConstants::ATOM_LINK_ELEMENT_NAME);
+                if ($mediaLink->eTag != null) {
+                    $this->xmlWriter->startAttributeNs(
+                        ODataConstants::ODATA_METADATA_NAMESPACE_PREFIX,
+                        ODataConstants::ATOM_ETAG_ATTRIBUTE_NAME,
+                        null
+                    );
+                    $this->xmlWriter->text($mediaLink->eTag);
+                    $this->xmlWriter->endAttribute();
+                }
+                $this->xmlWriter->startAttribute(ODataConstants::ATOM_LINK_RELATION_ATTRIBUTE_NAME);
+                $this->xmlWriter->text(
+                    "http://schemas.microsoft.com/ado/2007/08/dataservices/mediaresource/"
+                    .$mediaLink->name
+                );
+                $this->xmlWriter->endAttribute();
+
+                $this->xmlWriter->startAttribute(ODataConstants::ATOM_TYPE_ATTRIBUTE_NAME);
+                $this->xmlWriter->text($mediaLink->contentType);
+                $this->xmlWriter->endAttribute();
+
+                $this->xmlWriter->startAttribute(ODataConstants::ATOM_TITLE_ELELMET_NAME);
+                $this->xmlWriter->text($mediaLink->name);
+                $this->xmlWriter->endAttribute();
+
+                $this->xmlWriter->startAttribute(ODataConstants::ATOM_HREF_ATTRIBUTE_NAME);
+                $this->xmlWriter->text($mediaLink->editLink);
+                $this->xmlWriter->endAttribute();
+                $this->xmlWriter->endElement();
+            }
+        }
+
+        return $this;
     }
 
 
 
 
-	/**
-	 *
-	 * @param ODataLink $link Link to write.
-	 *
-	 * @return AtomODataWriter
-	 */
-	protected function writeLink(ODataLink $link)
+    /**
+     *
+     * @param ODataLink $link Link to write.
+     *
+     * @return AtomODataWriter
+     */
+    protected function writeLink(ODataLink $link)
     {
         $this->writeLinkNode($link, $link->isExpanded);
 
-	    if ($link->isExpanded) {
-		    $this->xmlWriter->startElementNS(
-			    ODataConstants::ODATA_METADATA_NAMESPACE_PREFIX,
-			    ODataConstants::ATOM_INLINE_ELEMENT_NAME,
-			    null
-		    );
+        if ($link->isExpanded) {
+            $this->xmlWriter->startElementNS(
+                ODataConstants::ODATA_METADATA_NAMESPACE_PREFIX,
+                ODataConstants::ATOM_INLINE_ELEMENT_NAME,
+                null
+            );
 
 
-	        if (!is_null($link->expandedResult)) {
-		        if ($link->isCollection) {
-			        $this->writeFeed($link->expandedResult);
-		        } else {
-			        $this->writeEntry($link->expandedResult);
-		        }
-	        }
+            if (!is_null($link->expandedResult)) {
+                if ($link->isCollection) {
+                    $this->writeFeed($link->expandedResult);
+                } else {
+                    $this->writeEntry($link->expandedResult);
+                }
+            }
 
 
-		    $this->xmlWriter->endElement();
-		    $this->xmlWriter->endElement();
-	    }
+            $this->xmlWriter->endElement();
+            $this->xmlWriter->endElement();
+        }
 
-	    return $this;
+        return $this;
     }
 
 
 
 
-	/**
-	 * Write the given collection of properties.
-	 * (properties of an entity or complex type)
-	 *
-	 * @param ODataPropertyContent $properties Collection of properties.
-	 * @param bool $topLevel indicates if this property content is the top level response to be written
-	 * @return AtomODataWriter
-	 */
-	protected function writeProperties(ODataPropertyContent $properties, $topLevel = false)
-	{
-		foreach ($properties->properties as $property) {
-			$this->beginWriteProperty($property, $topLevel);
-
-			if ($property->value == null) {
-				$this->writeNullValue($property);
-			} elseif ($property->value instanceof ODataPropertyContent) {
-				$this->writeProperties($property->value, false);
-			} elseif ($property->value instanceof ODataBagContent) {
-				$this->writeBagContent($property->value);
-			} else {
-				$value = $this->beforeWriteValue($property->value, $property->typeName);
-				$this->xmlWriter->text($value);
-			}
+    /**
+     * Write the given collection of properties.
+     * (properties of an entity or complex type)
+     *
+     * @param ODataPropertyContent $properties Collection of properties.
+     * @param bool $topLevel indicates if this property content is the top level response to be written
+     * @return AtomODataWriter
+     */
+    protected function writeProperties(ODataPropertyContent $properties, $topLevel = false)
+    {
+        foreach ($properties->properties as $property) {
+            $this->beginWriteProperty($property, $topLevel);
+
+            if ($property->value == null) {
+                $this->writeNullValue($property);
+            } elseif ($property->value instanceof ODataPropertyContent) {
+                $this->writeProperties($property->value, false);
+            } elseif ($property->value instanceof ODataBagContent) {
+                $this->writeBagContent($property->value);
+            } else {
+                $value = $this->beforeWriteValue($property->value, $property->typeName);
+                $this->xmlWriter->text($value);
+            }
 
-			$this->xmlWriter->endElement();
-		}
+            $this->xmlWriter->endElement();
+        }
 
-		return $this;
-	}
+        return $this;
+    }
 
     /**
      * XML write a basic data type (string, number, boolean, null)
@@ -472,7 +472,7 @@ 
         } else {
             $this->xmlWriter->writeAttribute(
                 ODataConstants::ATOM_TYPE_ATTRIBUTE_NAME,
-	            MimeTypes::MIME_APPLICATION_XML
+                MimeTypes::MIME_APPLICATION_XML
             );
             $this->xmlWriter->startElementNS(
                 ODataConstants::ODATA_METADATA_NAMESPACE_PREFIX,
@@ -481,7 +481,7 @@ 
             );
         }
 
-	    return $this;
+        return $this;
     }
 
     /**
@@ -519,7 +519,7 @@ 
             $this->xmlWriter->endAttribute();
         }
 
-	    return $this;
+        return $this;
     }
 
 
@@ -538,7 +538,7 @@ 
         }
         $this->xmlWriter->endElement();
 
-	    return $this;
+        return $this;
     }
 
     /**
@@ -571,7 +571,7 @@ 
             }
         }
 
-	    return $this;
+        return $this;
     }
 
 
@@ -594,7 +594,7 @@ 
                 ODataConstants::XML_TRUE_LITERAL
             );
         }
-	    return $this;
+        return $this;
     }
 
 
@@ -665,7 +665,7 @@ 
         $this->xmlWriter->text($value);
         $this->xmlWriter->endElement();
 
-	    return $this;
+        return $this;
     }
 
     /**
@@ -689,7 +689,7 @@ 
         $this->xmlWriter->text($nodeValue);
         $this->xmlWriter->endElement();
 
-	    return $this;
+        return $this;
     }
 
     /**
@@ -727,7 +727,7 @@ 
             $this->xmlWriter->endElement();
         }
 
-	    return $this;
+        return $this;
     }
 
     /**
@@ -758,7 +758,7 @@ 
             ODataConstants::ATOM_NAMESPACE
         );
 
-	    return $this;
+        return $this;
     }
 
 

Spacing +5 added lines, -5 removed lines

@@ -152,7 +152,7 @@ 
         }
 
 
-	    if ($urls->nextPageLink!=null) {
+	    if ($urls->nextPageLink != null) {
 		    $this->writeLinkNode($urls->nextPageLink, false);
 	    }
 	    $this->xmlWriter->endElement();
@@ -184,7 +184,7 @@ 
 			    $feed->title
 		    )
 		    ->writeNodeValue(ODataConstants::ATOM_ID_ELEMENT_NAME, $feed->id)
-		    ->writeNodeValue(ODataConstants::ATOM_UPDATED_ELEMENT_NAME, date(DATE_ATOM) )
+		    ->writeNodeValue(ODataConstants::ATOM_UPDATED_ELEMENT_NAME, date(DATE_ATOM))
 		    ->writeLinkNode($feed->selfLink, false);
 
 	    if ($feed->rowCount != null) {
@@ -499,7 +499,7 @@ 
             $property->name,
             null
         );
-        if ($property->typeName!=null) {
+        if ($property->typeName != null) {
             $this->xmlWriter->startAttributeNs(
                 ODataConstants::ODATA_METADATA_NAMESPACE_PREFIX,
                 ODataConstants::ATOM_TYPE_ATTRIBUTE_NAME,
@@ -515,7 +515,7 @@ 
             $this->xmlWriter->startAttributeNs(ODataConstants::XMLNS_NAMESPACE_PREFIX, ODataConstants::ODATA_METADATA_NAMESPACE_PREFIX, null);
             $this->xmlWriter->text(ODataConstants::ODATA_METADATA_NAMESPACE);
         }
-        if ($property->typeName!=null || $isTopLevel) {
+        if ($property->typeName != null || $isTopLevel) {
             $this->xmlWriter->endAttribute();
         }
 
@@ -780,7 +780,7 @@ 
      * @param ProvidersWrapper $providers
      * @return IODataWriter
      */
-    public function writeServiceDocument(ProvidersWrapper $providers){
+    public function writeServiceDocument(ProvidersWrapper $providers) {
         $writer = $this->xmlWriter;
         $writer->startElementNs(null, ODataConstants::ATOM_PUBLISHING_SERVICE_ELEMENT_NAME, ODataConstants::APP_NAMESPACE);
         $writer->writeAttributeNs(ODataConstants::XML_NAMESPACE_PREFIX, ODataConstants::XML_BASE_ATTRIBUTE_NAME, null, $this->baseUri);

src/POData/Writers/Json/JsonLightODataWriter.php

Doc Comments +6 added lines

@@ -43,6 +43,9 @@ 
 	protected $baseUri;
 
 
+	/**
+	 * @param string $absoluteServiceUri
+	 */
 	public function __construct(JsonLightMetadataLevel $metadataLevel, $absoluteServiceUri)
 	{
 		if(strlen($absoluteServiceUri) == 0)
@@ -148,6 +151,9 @@ 
 
 
 
+	/**
+	 * @param string $fragment
+	 */
 	protected function writeTopLevelMeta($fragment)
 	{
 		if($this->metadataLevel == JsonLightMetadataLevel::NONE())

Unused Use Statements -5 removed lines

@@ -10,15 +10,10 @@
 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\Writers\Json\JsonLightMetadataLevel;
 
 

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

Spacing +21 added lines, -21 removed lines

@@ -45,7 +45,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");
 		}
@@ -67,7 +67,7 @@ 
 	 */
 	public function canHandle(Version $responseVersion, $contentType)
 	{
-		if($responseVersion != Version::v3()){
+		if ($responseVersion != Version::v3()) {
 			return false;
 		}
 
@@ -86,7 +86,7 @@ 
 	 *
 	 * @return JsonLightODataWriter
 	 */
-	public function write($model){
+	public function write($model) {
 		$this->_writer->startObjectScope();
 
 		if ($model instanceof ODataURL) {
@@ -96,7 +96,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);
@@ -108,7 +108,7 @@ 
 			$this->writeFeed($model);
 			$this->_writer->endScope();
 		}elseif ($model instanceof ODataEntry) {
-			$this->writeTopLevelMeta($model->resourceSetName . "/@Element");
+			$this->writeTopLevelMeta($model->resourceSetName."/@Element");
 			$this->writeEntry($model);
 		}
 
@@ -150,34 +150,34 @@ 
 
 	protected function writeTopLevelMeta($fragment)
 	{
-		if($this->metadataLevel == JsonLightMetadataLevel::NONE())
+		if ($this->metadataLevel == JsonLightMetadataLevel::NONE())
 		{
 			return;
 		}
 
 		$this->_writer
 			->writeName(ODataConstants::JSON_LIGHT_METADATA_STRING)
-			->writeValue($this->baseUri . '/' . ODataConstants::URI_METADATA_SEGMENT . '#' . $fragment);
+			->writeValue($this->baseUri.'/'.ODataConstants::URI_METADATA_SEGMENT.'#'.$fragment);
 
 	}
 
 
 	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
@@ -185,7 +185,7 @@ 
 			case "Edm.Decimal":
 			case "Edm.DateTime":
 				$this->_writer
-					->writeName($property->name . ODataConstants::JSON_LIGHT_METADATA_PROPERTY_TYPE_SUFFIX_STRING)
+					->writeName($property->name.ODataConstants::JSON_LIGHT_METADATA_PROPERTY_TYPE_SUFFIX_STRING)
 					->writeValue($property->typeName);
 		}
 
@@ -199,9 +199,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;
@@ -227,22 +227,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);;
+				->writeName($link->title.ODataConstants::JSON_LIGHT_METADATA_LINK_NAVIGATION_SUFFIX_STRING)
+				->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);
@@ -313,7 +313,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);
@@ -354,7 +354,7 @@ 
 		}
 
 
-		$this->_writer->endScope();  // ]
+		$this->_writer->endScope(); // ]
 		return $this;
 	}
 

Braces +1 added lines, -1 removed lines

@@ -107,7 +107,7 @@
 				->startArrayScope();
 			$this->writeFeed($model);
 			$this->_writer->endScope();
-		}elseif ($model instanceof ODataEntry) {
+		} elseif ($model instanceof ODataEntry) {
 			$this->writeTopLevelMeta($model->resourceSetName . "/@Element");
 			$this->writeEntry($model);
 		}

src/POData/Writers/Json/JsonODataV1Writer.php

Unused Use Statements -3 removed lines

@@ -10,15 +10,12 @@
 use POData\ObjectModel\ODataPropertyContent;
 use POData\ObjectModel\ODataBagContent;
 use POData\ObjectModel\ODataProperty;
-use POData\ObjectModel\ODataMediaLink;
 use POData\Writers\Json\JsonWriter;
 use POData\Writers\IODataWriter;
 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;
 
 /**

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();
     }

Spacing +5 added lines, -5 removed lines

@@ -53,7 +53,7 @@ 
 	 */
 	public function canHandle(Version $responseVersion, $contentType)
 	{
-		if($responseVersion != Version::v1()){
+		if ($responseVersion != Version::v1()) {
 			return false;
 		}
 
@@ -69,7 +69,7 @@ 
 	 *
 	 * @return JsonODataV1Writer
 	 */
-	public function write($model){
+	public function write($model) {
 		// { "d" :
 		$this->_writer
 			->startObjectScope()
@@ -274,10 +274,10 @@ 
         $this->_writer->writeName($link->title);
 
 	    if ($link->isExpanded) {
-		    if(is_null($link->expandedResult)){
+		    if (is_null($link->expandedResult)) {
 				$this->_writer->writeValue("null");
 		    }
-		    else{
+		    else {
 			    $this->writeExpandedLink($link);
 		    }
 	    } else {
@@ -477,7 +477,7 @@ 
      * @param ProvidersWrapper $providers
      * @return IODataWriter
      */
-    public function writeServiceDocument(ProvidersWrapper $providers){
+    public function writeServiceDocument(ProvidersWrapper $providers) {
         $writer = $this->_writer;
         $writer
             ->startObjectScope() // {

Braces +2 added lines, -3 removed lines

@@ -88,7 +88,7 @@ 
 		} elseif ($model instanceof ODataFeed) {
 			$this->_writer->startArrayScope();
 			$this->writeFeed($model);
-		}elseif ($model instanceof ODataEntry) {
+		} elseif ($model instanceof ODataEntry) {
 			$this->_writer->startObjectScope();
 			$this->writeEntry($model);
 		}
@@ -276,8 +276,7 @@ 
 	    if ($link->isExpanded) {
 		    if(is_null($link->expandedResult)){
 				$this->_writer->writeValue("null");
-		    }
-		    else{
+		    } else{
 			    $this->writeExpandedLink($link);
 		    }
 	    } else {

src/POData/Writers/Json/JsonODataV2Writer.php

Unused Use Statements -7 removed lines

@@ -8,16 +8,9 @@
 use POData\ObjectModel\ODataURL;
 use POData\ObjectModel\ODataLink;
 use POData\ObjectModel\ODataPropertyContent;
-use POData\ObjectModel\ODataBagContent;
-use POData\ObjectModel\ODataProperty;
-use POData\ObjectModel\ODataMediaLink;
-
 use POData\Common\MimeTypes;
 use POData\Common\Version;
 use POData\Common\ODataConstants;
-use POData\Common\Messages;
-use POData\Common\ODataException;
-use POData\Common\InvalidOperationException;
 
 /**
  * Class JsonODataV2Writer is a writer for the json format in OData V2 AKA JSON Verbose

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

Spacing +3 added lines, -3 removed lines

@@ -50,11 +50,11 @@ 
 		$parts = explode(";", $contentType);
 
 		//special case, in v3 verbose is the v2 writer
-		if($responseVersion == Version::v3()){
+		if ($responseVersion == Version::v3()) {
 			return in_array(MimeTypes::MIME_APPLICATION_JSON, $parts) && in_array('odata=verbose', $parts);
 		}
 
-		if($responseVersion != Version::v2()){
+		if ($responseVersion != Version::v2()) {
 			return false;
 		}
 
@@ -70,7 +70,7 @@ 
 	 *
 	 * @return JsonODataV1Writer
 	 */
-	public function write($model){
+	public function write($model) {
 		// { "d" :
 		$this->_writer
 			->startObjectScope()

Braces +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
 			$this->writeFeed($model);
 			$this->_writer->endScope();
 
-		}elseif ($model instanceof ODataEntry) {
+		} elseif ($model instanceof ODataEntry) {
 			$this->writeEntry($model);
 		}
 

src/POData/Writers/Json/JsonWriter.php

Unused Use Statements -2 removed lines

@@ -3,9 +3,7 @@
 namespace POData\Writers\Json;
 
 
-use MyCLabs\Enum\Enum;
 use POData\Writers\Json\IndentedTextWriter;
-use POData\Common\ODataConstants;
 
 /**
  * Class JsonWriter

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

Spacing +1 added lines, -1 removed lines

@@ -211,7 +211,7 @@
         // Escape ( " \ / \n \r \t \b \f) characters with a backslash.
         $search  = array('\\', "\n", "\t", "\r", "\b", "\f", '"');
         $replace = array('\\\\', '\\n', '\\t', '\\r', '\\b', '\\f', '\"');
-        $processedString  = str_replace($search, $replace, $string);
+        $processedString = str_replace($search, $replace, $string);
         // Escape some ASCII characters(0x08, 0x0c)
         $processedString = str_replace(array(chr(0x08), chr(0x0C)), array('\b', '\f'), $processedString);
         return $processedString;