c-harris / ODataMetadata

src/Edm/Validation/Internal/InterfaceValidator/VisitorOfIFunctionBase.php

Braces +1 added lines, -2 removed lines

@@ -20,8 +20,7 @@
         // Return type is optional for function imports and is required for MDFs. Both cases are derived interfaces (IEdmFunctionImport and IEdmFunction).
         // So, from the point of view of this interface, we consider return type as optional and it is expected that IEdmFunction visitor will have
         // an additional null check for the return type.
-        if ($function->getReturnType() != null)
-        {
+        if ($function->getReturnType() != null) {
             // Function owns its return type reference, so it goes as a followup.
             $followup[] = $function->getReturnType();
         }

src/Edm/Validation/Internal/InterfaceValidator/VisitorOfIEntitySet.php

Braces +7 added lines, -17 removed lines

@@ -16,12 +16,9 @@ 
         assert($item instanceof IEntitySet);
         $errors = null;
 
-        if ($item->getElementType() != null)
-        {
+        if ($item->getElementType() != null) {
             $references[] = $item->getElementType();
-        }
-        else
-        {
+        } else {
             InterfaceValidator::CollectErrors(
                 InterfaceValidator::CreatePropertyMustNotBeNullError(
                     $item,
@@ -41,14 +38,10 @@ 
         /**
          * @var INavigationTargetMapping $navTargetMapping
          */
-        foreach ($navTargetMappings as $navTargetMapping)
-        {
-            if ($navTargetMapping->getNavigationProperty() != null)
-            {
+        foreach ($navTargetMappings as $navTargetMapping) {
+            if ($navTargetMapping->getNavigationProperty() != null) {
                 $references[] = $navTargetMapping->getNavigationProperty();
-            }
-            else
-            {
+            } else {
                 InterfaceValidator::CollectErrors(
                     InterfaceValidator::CreatePropertyMustNotBeNullError(
                         $navTargetMapping,
@@ -57,12 +50,9 @@ 
                     $errors);
             }
 
-            if ($navTargetMapping->getTargetEntitySet() != null)
-            {
+            if ($navTargetMapping->getTargetEntitySet() != null) {
                 $references[] = $navTargetMapping->getTargetEntitySet();
-            }
-            else
-            {
+            } else {
                 InterfaceValidator::CollectErrors(
                     InterfaceValidator::CreatePropertyMustNotBeNullError(
                         $navTargetMapping,

src/Edm/Validation/Internal/InterfaceValidator/VisitorOfIValueTermReferenceExpression.php

Braces +4 added lines, -10 removed lines

@@ -15,12 +15,9 @@ 
         assert($expression instanceof IValueTermReferenceExpression);
         $errors = null;
 
-                if ($expression->getBase() != null)
-                {
+                if ($expression->getBase() != null) {
                     $followup[] = $expression->getBase();
-                }
-                else
-                {
+                } else {
                     InterfaceValidator::CollectErrors(
                         InterfaceValidator::CreatePropertyMustNotBeNullError(
                             $expression,
@@ -30,12 +27,9 @@ 
                     );
                 }
 
-                if ($expression->getTerm() != null)
-                {
+                if ($expression->getTerm() != null) {
                     $references[] = $expression->getTerm();
-                }
-                else
-                {
+                } else {
                     InterfaceValidator::CollectErrors(
                         InterfaceValidator::CreatePropertyMustNotBeNullError(
                             $expression,

src/Edm/Validation/Internal/InterfaceValidator/VisitorOfIFunctionParameter.php

Braces +5 added lines, -12 removed lines

@@ -17,13 +17,10 @@ 
 
         $errors = null;
 
-                if ($parameter->getType() != null)
-                {
+                if ($parameter->getType() != null) {
                     // Parameter owns its type reference, so it goes as a followup.
                     $followup[] = $parameter->getType();
-                }
-                else
-                {
+                } else {
                     InterfaceValidator::CollectErrors(
                         InterfaceValidator::CreatePropertyMustNotBeNullError(
                             $parameter, "Type"
@@ -32,12 +29,9 @@ 
                     );
                 }
 
-                if ($parameter->getDeclaringFunction() != null)
-                {
+                if ($parameter->getDeclaringFunction() != null) {
                     $references[] = $parameter->getDeclaringFunction();
-                }
-                else
-                {
+                } else {
                     InterfaceValidator::CollectErrors(
                         InterfaceValidator::CreatePropertyMustNotBeNullError(
                             $parameter,
@@ -48,8 +42,7 @@ 
                 }
 
                 if ($parameter->getMode()->getValue() < FunctionParameterMode::None()->getValue() ||
-                    $parameter->getMode()->getValue() > FunctionParameterMode::InOut()->getValue())
-                {
+                    $parameter->getMode()->getValue() > FunctionParameterMode::InOut()->getValue()) {
                     InterfaceValidator::CollectErrors(
                         InterfaceValidator::CreateEnumPropertyOutOfRangeError(
                             $parameter,

src/Edm/Validation/Internal/InterfaceValidator/VisitorOfIEntityType.php

Braces +1 added lines, -2 removed lines

@@ -14,8 +14,7 @@
     {
         assert($type instanceof IEntityType);
         $errors = null;
-                if ($type->getDeclaredKey() != null)
-                {
+                if ($type->getDeclaredKey() != null) {
                     InterfaceValidator::ProcessEnumerable($type, $type->getDeclaredKey(), "DeclaredKey", $references, $errors);
                 }
 

src/Edm/Validation/Internal/InterfaceValidator/VisitorOfIEntityReferenceType.php

Braces +2 added lines, -5 removed lines

@@ -13,13 +13,10 @@
     protected function VisitT($type, array &$followup, array &$references): iterable
     {
         assert($type instanceof IEntityReferenceType);
-        if ($type->getEntityType() != null)
-        {
+        if ($type->getEntityType() != null) {
             $references[] = $type->getEntityType();
             return null;
-        }
-        else
-        {
+        } else {
             return [ InterfaceValidator::CreatePropertyMustNotBeNullError($type, "EntityType") ];
         }
     }

src/Edm/Validation/Internal/InterfaceValidator/VisitorOfIPrimitiveType.php

Braces +2 added lines, -5 removed lines

@@ -21,12 +21,9 @@
                 $type->getPrimitiveKind()->getValue() < PrimitiveTypeKind::None()->getValue() ||
                 $type->getPrimitiveKind()->getValue() > PrimitiveTypeKind::GeometryMultiPoint()->getValue()
             )
-        )
-        {
+        ) {
             return [InterfaceValidator::CreateInterfaceKindValueUnexpectedError($type, $type->getPrimitiveKind()->getKey(), "PrimitiveKind") ];
-        }
-        else
-        {
+        } else {
             return null;
         }
     }

src/Edm/Validation/Internal/InterfaceValidator/VisitorOfIEnumMember.php

Braces +4 added lines, -10 removed lines

@@ -15,12 +15,9 @@ 
         assert($member instanceof IEnumMember);
         $errors = null;
 
-                if ($member->getDeclaringType() != null)
-                {
+                if ($member->getDeclaringType() != null) {
                     $references[] = $member->getDeclaringType();
-                }
-                else
-                {
+                } else {
                     InterfaceValidator::CollectErrors(
                         InterfaceValidator::CreatePropertyMustNotBeNullError(
                             $member,
@@ -29,12 +26,9 @@ 
                     );
                 }
 
-                if ($member->getValue() != null)
-                {
+                if ($member->getValue() != null) {
                     $followup[] = $member->getValue();
-                }
-                else
-                {
+                } else {
                     InterfaceValidator::CollectErrors(
                         InterfaceValidator::CreatePropertyMustNotBeNullError(
                             $member,

src/Edm/Validation/Internal/InterfaceValidator/VisitorOfIProperty.php

Braces +5 added lines, -12 removed lines

@@ -18,8 +18,7 @@ 
         assert($property instanceof IProperty);
         $errors = null;
 
-        switch ($property->getPropertyKind())
-        {
+        switch ($property->getPropertyKind()) {
             case PropertyKind::Structural():
                 InterfaceValidator::CollectErrors(
                     InterfaceValidator::CheckForInterfaceKindValueMismatchError(
@@ -59,13 +58,10 @@ 
                 break;
         }
 
-        if ($property->getType() != null)
-        {
+        if ($property->getType() != null) {
             // Property owns its type reference, so it goes as a followup.
             $followup[] = $property->getType();
-        }
-        else
-        {
+        } else {
             InterfaceValidator::CollectErrors(
                 InterfaceValidator::CreatePropertyMustNotBeNullError(
                     $property,
@@ -75,12 +71,9 @@ 
             );
         }
 
-        if ($property->getDeclaringType() != null)
-        {
+        if ($property->getDeclaringType() != null) {
             $references[] = $property->getDeclaringType();
-        }
-        else
-        {
+        } else {
             InterfaceValidator::CollectErrors(
                 InterfaceValidator::CreatePropertyMustNotBeNullError(
                     $property,