c-harris / ODataMetadata

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

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
         }
         else
         {
-            return[ InterfaceValidator::CreatePropertyMustNotBeNullError($type, "ElementType")];
+            return[InterfaceValidator::CreatePropertyMustNotBeNullError($type, "ElementType")];
         }
 
     }

Braces +2 added lines, -5 removed lines

@@ -13,14 +13,11 @@
     protected function VisitT($type, array &$followup, array &$references): iterable
     {
         assert($type instanceof ICollectionType);
-        if ($type->getElementType() != null)
-        {
+        if ($type->getElementType() != null) {
             // Collection owns its element type reference, so it goes as a followup.
             $followup[] = $type->getElementType();
             return null;
-        }
-        else
-        {
+        } else {
             return[ InterfaceValidator::CreatePropertyMustNotBeNullError($type, "ElementType")];
         }
 

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

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
         assert($typeRef instanceof ITemporalTypeReference);
         $primitive = $typeRef->getDefinition();
         assert($primitive instanceof IPrimitiveType);
-        return $typeRef->getDefinition() != null && !$primitive->getPrimitiveKind()->IsTemporal() ? [ InterfaceValidator::CreateTypeRefInterfaceTypeKindValueMismatchError($typeRef) ] : null;
+        return $typeRef->getDefinition() != null && !$primitive->getPrimitiveKind()->IsTemporal() ? [InterfaceValidator::CreateTypeRefInterfaceTypeKindValueMismatchError($typeRef)] : null;
     }
 
     public function forType(): string

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

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
         }
         else
         {
-            return [ InterfaceValidator::CreatePropertyMustNotBeNullError($expression, "ReferencedParameter") ];
+            return [InterfaceValidator::CreatePropertyMustNotBeNullError($expression, "ReferencedParameter")];
         }
     }
 

Braces +2 added lines, -5 removed lines

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

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

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
     protected function VisitT($typeRef, array &$followup, array &$references): iterable
     {
         assert($typeRef instanceof IEnumTypeReference);
-        return $typeRef->getDefinition() != null && !$typeRef->getDefinition()->getTypeKind()->isEnum() ? [ InterfaceValidator::CreateTypeRefInterfaceTypeKindValueMismatchError($typeRef) ] : null;
+        return $typeRef->getDefinition() != null && !$typeRef->getDefinition()->getTypeKind()->isEnum() ? [InterfaceValidator::CreateTypeRefInterfaceTypeKindValueMismatchError($typeRef)] : null;
 
     }
 

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

Braces +4 added lines, -10 removed lines

@@ -15,12 +15,9 @@ 
         assert($expression instanceof IIsTypeExpression);
         $errors = null;
 
-        if ($expression->getOperand() != null)
-        {
+        if ($expression->getOperand() != null) {
             $followup[] = $expression->getOperand();
-        }
-        else
-        {
+        } else {
             InterfaceValidator::CollectErrors(
                 InterfaceValidator::CreatePropertyMustNotBeNullError(
                     $expression,
@@ -29,13 +26,10 @@ 
             );
         }
 
-        if ($expression->getType() != null)
-        {
+        if ($expression->getType() != null) {
             // Assert owns its type reference, so it goes as a followup.
             $followup[] = $expression->getType();
-        }
-        else
-        {
+        } else {
             InterfaceValidator::CollectErrors(
                 InterfaceValidator::CreatePropertyMustNotBeNullError(
                     $expression,

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

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
         }
         else
         {
-            return [InterfaceValidator::CreatePropertyMustNotBeNullError($expression, "Expression") ];
+            return [InterfaceValidator::CreatePropertyMustNotBeNullError($expression, "Expression")];
         }
     }
 

Braces +2 added lines, -5 removed lines

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

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

Spacing +4 added lines, -4 removed lines

@@ -28,7 +28,7 @@ 
                         break;
 
                     case TypeKind::Entity():
-                        $typeKindError = InterfaceValidator::CheckForInterfaceKindValueMismatchError($type, $type->getTypeKind(), "TypeKind",IEntityType::class);
+                        $typeKindError = InterfaceValidator::CheckForInterfaceKindValueMismatchError($type, $type->getTypeKind(), "TypeKind", IEntityType::class);
                         break;
 
                     case TypeKind::Complex():
@@ -40,11 +40,11 @@ 
                         break;
 
                     case TypeKind::Collection():
-                        $typeKindError = InterfaceValidator::CheckForInterfaceKindValueMismatchError($type, $type->getTypeKind(), "TypeKind",ICollectionType::class);
+                        $typeKindError = InterfaceValidator::CheckForInterfaceKindValueMismatchError($type, $type->getTypeKind(), "TypeKind", ICollectionType::class);
                         break;
 
                     case TypeKind::EntityReference():
-                        $typeKindError = InterfaceValidator::CheckForInterfaceKindValueMismatchError($type, $type->getTypeKind(), "TypeKind",IEntityReferenceType::class);
+                        $typeKindError = InterfaceValidator::CheckForInterfaceKindValueMismatchError($type, $type->getTypeKind(), "TypeKind", IEntityReferenceType::class);
                         break;
 
                     case TypeKind::Enum():
@@ -59,7 +59,7 @@ 
                         break;
                 }
 
-                return $typeKindError != null ? [$typeKindError ] : null;
+                return $typeKindError != null ? [$typeKindError] : null;
     }
 
     public function forType(): string

Braces +1 added lines, -2 removed lines

@@ -21,8 +21,7 @@
     {
         assert($type instanceof IType);
         $typeKindError = null;
-                switch ($type->getTypeKind())
-                {
+                switch ($type->getTypeKind()) {
                     case TypeKind::Primitive():
                         $typeKindError = InterfaceValidator::CheckForInterfaceKindValueMismatchError($type, $type->getTypeKind(), "TypeKind", IPrimitiveType::class);
                         break;

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

Braces +6 added lines, -15 removed lines

@@ -15,12 +15,9 @@ 
         assert($expression instanceof IIfExpression);
         $errors = null;
 
-        if ($expression->getTestExpression() != null)
-        {
+        if ($expression->getTestExpression() != null) {
             $followup[] = $expression->getTestExpression();
-        }
-        else
-        {
+        } else {
             InterfaceValidator::CollectErrors(
                 InterfaceValidator::CreatePropertyMustNotBeNullError(
                     $expression,
@@ -30,12 +27,9 @@ 
             );
         }
 
-        if ($expression->getTrueExpression() != null)
-        {
+        if ($expression->getTrueExpression() != null) {
             $followup[] = $expression->getTrueExpression();
-        }
-        else
-        {
+        } else {
             InterfaceValidator::CollectErrors(
                 InterfaceValidator::CreatePropertyMustNotBeNullError(
                     $expression,
@@ -45,12 +39,9 @@ 
             );
         }
 
-        if ($expression->getFalseExpression() != null)
-        {
+        if ($expression->getFalseExpression() != null) {
             $followup[] = $expression->getFalseExpression();
-        }
-        else
-        {
+        } else {
             InterfaceValidator::CollectErrors(
                 InterfaceValidator::CreatePropertyMustNotBeNullError(
                     $expression, "FalseExpression"

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

Spacing +3 added lines, -3 removed lines

@@ -126,12 +126,12 @@ 
                     $expressionKindError = InterfaceValidator::CheckForInterfaceKindValueMismatchError($expression, $expression->getExpressionKind(), "ExpressionKind", IEnumMemberReferenceExpression::class);
                     break;
 
-                case ExpressionKind::If():
+                case ExpressionKind::If ():
                     $expressionKindError = InterfaceValidator::CheckForInterfaceKindValueMismatchError($expression, $expression->getExpressionKind(), "ExpressionKind", IIfExpression::class);
                     break;
 
                 case ExpressionKind::AssertType():
-                    $expressionKindError = InterfaceValidator::CheckForInterfaceKindValueMismatchError($expression, $expression->getExpressionKind(), "ExpressionKind",IAssertTypeExpression::class);
+                    $expressionKindError = InterfaceValidator::CheckForInterfaceKindValueMismatchError($expression, $expression->getExpressionKind(), "ExpressionKind", IAssertTypeExpression::class);
                     break;
 
                 case ExpressionKind::IsType():
@@ -156,7 +156,7 @@ 
             }
         }
 
-        return $expressionKindError != null ? [ $expressionKindError ] : null;
+        return $expressionKindError != null ? [$expressionKindError] : null;
     }
 
     public function forType(): string

Braces +2 added lines, -4 removed lines

@@ -42,10 +42,8 @@
         assert($expression instanceof IExpression);
 // Trying to reduce amount of noise in errors - if this expression is bad, then most likely it will have an unacceptable kind, no need to report it.
         $expressionKindError = null;
-        if (!InterfaceValidator::IsCheckableBad($expression))
-        {
-            switch ($expression->getExpressionKind())
-            {
+        if (!InterfaceValidator::IsCheckableBad($expression)) {
+            switch ($expression->getExpressionKind()) {
                 case ExpressionKind::IntegerConstant():
                     $expressionKindError = InterfaceValidator::CheckForInterfaceKindValueMismatchError($expression, $expression->getExpressionKind(), "ExpressionKind", IIntegerConstantExpression::class);
                     break;

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -86,7 +86,7 @@ 
                     $expressionKindError = InterfaceValidator::CheckForInterfaceKindValueMismatchError($expression, $expression->getExpressionKind(), "ExpressionKind", IGuidConstantExpression::class);
                     break;
 
-                case ExpressionKind::Null():
+                case ExpressionKind::null():
                     $expressionKindError = InterfaceValidator::CheckForInterfaceKindValueMismatchError($expression, $expression->getExpressionKind(), "ExpressionKind", INullExpression::class);
                     break;
 
@@ -126,7 +126,7 @@ 
                     $expressionKindError = InterfaceValidator::CheckForInterfaceKindValueMismatchError($expression, $expression->getExpressionKind(), "ExpressionKind", IEnumMemberReferenceExpression::class);
                     break;
 
-                case ExpressionKind::If():
+                case ExpressionKind::if():
                     $expressionKindError = InterfaceValidator::CheckForInterfaceKindValueMismatchError($expression, $expression->getExpressionKind(), "ExpressionKind", IIfExpression::class);
                     break;