balint777 / POData

src/POData/Providers/Metadata/ResourceType.php

Doc Comments +2 added lines, -2 removed lines

@@ -277,7 +277,7 @@ 
     /**
      * To set custom state object for this type
      *
-     * @param Object $object The custom object.
+     * @param ResourceSet $object The custom object.
      *
      * @return void
      */
@@ -699,7 +699,7 @@ 
      *
      * @param array &$arrayToDetectLoopInComplexType array for detecting loop.
      *
-     * @return boolean true if resource type instance has bag property else false
+     * @return boolean|null true if resource type instance has bag property else false
      */
     public function hasBagProperty(&$arrayToDetectLoopInComplexType)
     {

Switch Indentation +96 added lines, -96 removed lines

@@ -829,102 +829,102 @@
     public static function getPrimitiveResourceType($typeCode)
     {
         switch($typeCode) {
-        case EdmPrimitiveType::BINARY:
-            return new ResourceType(
-                new Binary(), ResourceTypeKind::PRIMITIVE,
-                'Binary', 'Edm'
-            );
-            break;
-        case EdmPrimitiveType::BOOLEAN:
-            return new ResourceType(
-                new Boolean(),
-                ResourceTypeKind::PRIMITIVE,
-                'Boolean', 'Edm'
-            );
-            break;
-        case EdmPrimitiveType::BYTE:
-            return new ResourceType(
-                new Byte(),
-                ResourceTypeKind::PRIMITIVE,
-                'Byte', 'Edm'
-            );
-            break;
-        case EdmPrimitiveType::DATETIME:
-            return new ResourceType(
-                new DateTime(),
-                ResourceTypeKind::PRIMITIVE,
-                'DateTime', 'Edm'
-            );
-            break;
-        case EdmPrimitiveType::DECIMAL:
-            return new ResourceType(
-                new Decimal(),
-                ResourceTypeKind::PRIMITIVE,
-                'Decimal', 'Edm'
-            );
-            break;
-        case EdmPrimitiveType::DOUBLE:
-            return new ResourceType(
-                new Double(),
-                ResourceTypeKind::PRIMITIVE,
-                'Double', 'Edm'
-            );
-            break;
-        case EdmPrimitiveType::GUID:
-            return new ResourceType(
-                new Guid(),
-                ResourceTypeKind::PRIMITIVE,
-                'Guid', 'Edm'
-            );
-            break;
-        case EdmPrimitiveType::INT16:
-            return new ResourceType(
-                new Int16(),
-                ResourceTypeKind::PRIMITIVE,
-                'Int16', 'Edm'
-            );
-            break;
-        case EdmPrimitiveType::INT32:
-            return new ResourceType(
-                new Int32(),
-                ResourceTypeKind::PRIMITIVE,
-                'Int32', 'Edm'
-            );
-            break;
-        case EdmPrimitiveType::INT64:
-            return new ResourceType(
-                new Int64(),
-                ResourceTypeKind::PRIMITIVE,
-                'Int64', 'Edm'
-            );
-            break;
-        case EdmPrimitiveType::SBYTE:
-            return new ResourceType(
-                new SByte(),
-                ResourceTypeKind::PRIMITIVE,
-                'SByte', 'Edm'
-            );
-            break;
-        case EdmPrimitiveType::SINGLE:
-            return new ResourceType(
-                new Single(),
-                ResourceTypeKind::PRIMITIVE,
-                'Single', 'Edm'
-            );
-            break;
-        case EdmPrimitiveType::STRING:
-            return new ResourceType(
-                new StringType(),
-                ResourceTypeKind::PRIMITIVE,
-                'String', 'Edm'
-            );
-            break;
-        default:
-            throw new InvalidArgumentException(
-                Messages::commonNotValidPrimitiveEDMType(
-                    '$typeCode', 'getPrimitiveResourceType'
-                )
-            );
+            case EdmPrimitiveType::BINARY:
+                return new ResourceType(
+                    new Binary(), ResourceTypeKind::PRIMITIVE,
+                    'Binary', 'Edm'
+                );
+                break;
+            case EdmPrimitiveType::BOOLEAN:
+                return new ResourceType(
+                    new Boolean(),
+                    ResourceTypeKind::PRIMITIVE,
+                    'Boolean', 'Edm'
+                );
+                break;
+            case EdmPrimitiveType::BYTE:
+                return new ResourceType(
+                    new Byte(),
+                    ResourceTypeKind::PRIMITIVE,
+                    'Byte', 'Edm'
+                );
+                break;
+            case EdmPrimitiveType::DATETIME:
+                return new ResourceType(
+                    new DateTime(),
+                    ResourceTypeKind::PRIMITIVE,
+                    'DateTime', 'Edm'
+                );
+                break;
+            case EdmPrimitiveType::DECIMAL:
+                return new ResourceType(
+                    new Decimal(),
+                    ResourceTypeKind::PRIMITIVE,
+                    'Decimal', 'Edm'
+                );
+                break;
+            case EdmPrimitiveType::DOUBLE:
+                return new ResourceType(
+                    new Double(),
+                    ResourceTypeKind::PRIMITIVE,
+                    'Double', 'Edm'
+                );
+                break;
+            case EdmPrimitiveType::GUID:
+                return new ResourceType(
+                    new Guid(),
+                    ResourceTypeKind::PRIMITIVE,
+                    'Guid', 'Edm'
+                );
+                break;
+            case EdmPrimitiveType::INT16:
+                return new ResourceType(
+                    new Int16(),
+                    ResourceTypeKind::PRIMITIVE,
+                    'Int16', 'Edm'
+                );
+                break;
+            case EdmPrimitiveType::INT32:
+                return new ResourceType(
+                    new Int32(),
+                    ResourceTypeKind::PRIMITIVE,
+                    'Int32', 'Edm'
+                );
+                break;
+            case EdmPrimitiveType::INT64:
+                return new ResourceType(
+                    new Int64(),
+                    ResourceTypeKind::PRIMITIVE,
+                    'Int64', 'Edm'
+                );
+                break;
+            case EdmPrimitiveType::SBYTE:
+                return new ResourceType(
+                    new SByte(),
+                    ResourceTypeKind::PRIMITIVE,
+                    'SByte', 'Edm'
+                );
+                break;
+            case EdmPrimitiveType::SINGLE:
+                return new ResourceType(
+                    new Single(),
+                    ResourceTypeKind::PRIMITIVE,
+                    'Single', 'Edm'
+                );
+                break;
+            case EdmPrimitiveType::STRING:
+                return new ResourceType(
+                    new StringType(),
+                    ResourceTypeKind::PRIMITIVE,
+                    'String', 'Edm'
+                );
+                break;
+            default:
+                throw new InvalidArgumentException(
+                    Messages::commonNotValidPrimitiveEDMType(
+                        '$typeCode', 'getPrimitiveResourceType'
+                    )
+                );
         }
     }
 

Spacing +2 added lines, -2 removed lines

@@ -828,7 +828,7 @@ 
      */
     public static function getPrimitiveResourceType($typeCode)
     {
-        switch($typeCode) {
+        switch ($typeCode) {
         case EdmPrimitiveType::BINARY:
             return new ResourceType(
                 new Binary(), ResourceTypeKind::PRIMITIVE,
@@ -929,7 +929,7 @@ 
     }
 
 
-    function __wakeup () {
+    function __wakeup() {
         if ($this->_type instanceof ReflectionClass) $this->_type = new ReflectionClass($this->_type->name);
     }
 }

Braces +3 added lines, -1 removed lines

@@ -930,6 +930,8 @@
 
 
     function __wakeup () {
-        if ($this->_type instanceof ReflectionClass) $this->_type = new ReflectionClass($this->_type->name);
+        if ($this->_type instanceof ReflectionClass) {
+            $this->_type = new ReflectionClass($this->_type->name);
+        }
     }
 }

src/POData/Providers/Metadata/ResourceAssociationSetEnd.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
         }
 
         if (!is_null($resourceProperty)
-            && (is_null($resourceType->resolveProperty($resourceProperty->getName())) || (($resourceProperty->getKind() != ResourcePropertyKind::RESOURCE_REFERENCE) && ($resourceProperty->getKind() != ResourcePropertyKind::RESOURCESET_REFERENCE)&& ($resourceProperty->getKind() != ResourcePropertyKind::KEY_RESOURCE_REFERENCE)))
+            && (is_null($resourceType->resolveProperty($resourceProperty->getName())) || (($resourceProperty->getKind() != ResourcePropertyKind::RESOURCE_REFERENCE) && ($resourceProperty->getKind() != ResourcePropertyKind::RESOURCESET_REFERENCE) && ($resourceProperty->getKind() != ResourcePropertyKind::KEY_RESOURCE_REFERENCE)))
         ) {
             throw new \InvalidArgumentException(
                 Messages::resourceAssociationSetEndPropertyMustBeNavigationProperty(

src/POData/Providers/Metadata/ResourceProperty.php

Indentation +1 added lines, -1 removed lines

@@ -172,7 +172,7 @@
     private function _isValidResourcePropertyKind($kind)
     {
         return
-          !($kind != ResourcePropertyKind::RESOURCE_REFERENCE &&
+            !($kind != ResourcePropertyKind::RESOURCE_REFERENCE &&
             $kind != ResourcePropertyKind::KEY_RESOURCE_REFERENCE &&
             $kind != ResourcePropertyKind::RESOURCESET_REFERENCE &&
             $kind != ResourcePropertyKind::COMPLEX_TYPE &&

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

Indentation +7 added lines, -7 removed lines

@@ -106,7 +106,7 @@ 
      * @throws ODataException If any error occur while parsing orderby clause
      */
     public static function parseOrderByClause(
-	    ResourceSetWrapper $resourceSetWrapper,
+        ResourceSetWrapper $resourceSetWrapper,
         ResourceType $resourceType,
         $orderBy,
         ProvidersWrapper $providerWrapper
@@ -190,14 +190,14 @@ 
                 }
 
                 if ($resourceProperty->isKindOf(ResourcePropertyKind::BAG)) {
-					throw ODataException::createBadRequestError(
+                    throw ODataException::createBadRequestError(
                         Messages::orderByParserBagPropertyNotAllowed(
                             $resourceProperty->getName()
                         )
                     );
                 } else if ($resourceProperty->isKindOf(ResourcePropertyKind::PRIMITIVE)) {
                     if (!$isLastSegment) {
-						throw ODataException::createBadRequestError(
+                        throw ODataException::createBadRequestError(
                             Messages::orderByParserPrimitiveAsIntermediateSegment(
                                 $resourceProperty->getName()
                             )
@@ -206,7 +206,7 @@ 
 
                     $type = $resourceProperty->getInstanceType();
                     if ($type instanceof Binary) {
-						throw ODataException::createBadRequestError(Messages::orderByParserSortByBinaryPropertyNotAllowed($resourceProperty->getName()));
+                        throw ODataException::createBadRequestError(Messages::orderByParserSortByBinaryPropertyNotAllowed($resourceProperty->getName()));
                     }
                 } else if ($resourceProperty->getKind() == ResourcePropertyKind::RESOURCESET_REFERENCE
                     || $resourceProperty->getKind() == ResourcePropertyKind::RESOURCE_REFERENCE
@@ -220,7 +220,7 @@ 
                             $resourceSetWrapper, $resourceType, $resourceProperty
                         );
                     if (is_null($resourceSetWrapper)) {
-						throw ODataException::createBadRequestError(
+                        throw ODataException::createBadRequestError(
                             Messages::badRequestInvalidPropertyNameSpecified(
                                 $resourceType->getFullName(), $orderBySubPathSegment
                             )
@@ -228,7 +228,7 @@ 
                     }
 
                     if ($resourceProperty->getKind() == ResourcePropertyKind::RESOURCESET_REFERENCE) {
-						throw ODataException::createBadRequestError(
+                        throw ODataException::createBadRequestError(
                             Messages::orderByParserResourceSetReferenceNotAllowed(
                                 $resourceProperty->getName(), $resourceType->getFullName()
                             )
@@ -249,7 +249,7 @@ 
                     $ancestors[] = $orderBySubPathSegment;
                 } else if ($resourceProperty->isKindOf(ResourcePropertyKind::COMPLEX_TYPE)) {
                     if ($isLastSegment) {
-						throw ODataException::createBadRequestError(
+                        throw ODataException::createBadRequestError(
                             Messages::orderByParserSortByComplexPropertyIsNotAllowed(
                                 $resourceProperty->getName()
                             )