c-harris / ODataMetadata

src/Edm/Validation/ValidationRules/INavigationProperty/NavigationPropertyWithRecursiveContainmentSourceMustBeFromZeroOrOne.php

Braces +1 added lines, -2 removed lines

@@ -29,8 +29,7 @@
             $property->containsTarget() &&
             $property->getDeclaringType()->IsOrInheritsFrom($property->ToEntityType()) &&
             !$property->Multiplicity()->isZeroOrOne()
-        )
-        {
+        ) {
             $context->AddError(
                 $property->Location(),
                 EdmErrorCode::NavigationPropertyWithRecursiveContainmentSourceMustBeFromZeroOrOne(),

src/Edm/Validation/ValidationRules/INavigationProperty/NavigationPropertyWithNonRecursiveContainmentSourceMustBeFromOne.php

Braces +1 added lines, -2 removed lines

@@ -24,8 +24,7 @@
         assert($property instanceof INavigationProperty);
         if ($property->containsTarget() &&
             !$property->getDeclaringType()->IsOrInheritsFrom($property->ToEntityType()) &&
-            !$property->Multiplicity()->isOne())
-        {
+            !$property->Multiplicity()->isOne()) {
             $context->AddError(
                 $property->Location(),
                 EdmErrorCode::NavigationPropertyWithNonRecursiveContainmentSourceMustBeFromOne(),

src/Edm/Validation/ValidationRules/INavigationProperty/NavigationPropertyEntityMustNotIndirectlyContainItself.php

Braces +2 added lines, -4 removed lines

@@ -24,10 +24,8 @@
     {
         assert($property instanceof INavigationProperty);
         if ($property->containsTarget() &&
-            !$property->getDeclaringType()->IsOrInheritsFrom($property->ToEntityType()))
-        {
-            if (ValidationHelper::TypeIndirectlyContainsTarget($property->ToEntityType(), $property->DeclaringEntityType(), new SplObjectStorage()/*new HashSetInternal()*/, $context->getModel()))
-            {
+            !$property->getDeclaringType()->IsOrInheritsFrom($property->ToEntityType())) {
+            if (ValidationHelper::TypeIndirectlyContainsTarget($property->ToEntityType(), $property->DeclaringEntityType(), new SplObjectStorage()/*new HashSetInternal()*/, $context->getModel())) {
                 $context->AddError(
                     $property->Location(),
                     EdmErrorCode::NavigationPropertyEntityMustNotIndirectlyContainItself(),

src/Edm/Validation/ValidationRules/INavigationProperty/NavigationPropertyWithRecursiveContainmentTargetMustBeOptional.php

Braces +1 added lines, -2 removed lines

@@ -26,8 +26,7 @@
         assert($property instanceof INavigationProperty);
         if ($property->containsTarget() &&
             $property->getDeclaringType()->IsOrInheritsFrom($property->ToEntityType()) &&
-            !($property->getType()->IsCollection() || $property->getType()->getNullable()))
-        {
+            !($property->getType()->IsCollection() || $property->getType()->getNullable())) {
             $context->AddError(
                 $property->Location(),
                 EdmErrorCode::NavigationPropertyWithRecursiveContainmentTargetMustBeOptional(),

src/Edm/Validation/ValidationRules/INavigationProperty/NavigationPropertyDependentEndMultiplicity.php

Braces +4 added lines, -9 removed lines

@@ -26,23 +26,18 @@
     {
         assert($navigationProperty instanceof INavigationProperty);
         $dependentProperties = $navigationProperty->getDependentProperties();
-        if ($dependentProperties != null)
-        {
-            if (ValidationHelper::PropertySetsAreEquivalent($navigationProperty->DeclaringEntityType()->Key(), $dependentProperties))
-            {
+        if ($dependentProperties != null) {
+            if (ValidationHelper::PropertySetsAreEquivalent($navigationProperty->DeclaringEntityType()->Key(), $dependentProperties)) {
                 if (
                     !$navigationProperty->Multiplicity()->isZeroOrOne() &&
                     !$navigationProperty->Multiplicity()->isOne()
-                )
-                {
+                ) {
                     $context->AddError(
                         $navigationProperty->Location(),
                         EdmErrorCode::InvalidMultiplicityOfDependentEnd(),
                         StringConst::EdmModel_Validator_Semantic_InvalidMultiplicityOfDependentEndMustBeZeroOneOrOne($navigationProperty->getName()));
                 }
-            }
-            else if ($navigationProperty->Multiplicity()->isMany())
-            {
+            } else if ($navigationProperty->Multiplicity()->isMany()) {
                 $context->AddError(
                     $navigationProperty->Location(),
                     EdmErrorCode::InvalidMultiplicityOfDependentEnd(),

src/Edm/Validation/ValidationRules/INavigationProperty/NavigationPropertyEndWithManyMultiplicityCannotHaveOperationsSpecified.php

Braces +1 added lines, -2 removed lines

@@ -23,8 +23,7 @@
         if (
             $end->Multiplicity()->isMany() &&
             !$end->getOnDelete()->isNone()
-        )
-        {
+        ) {
             $context->AddError(
                 $end->Location(),
                 EdmErrorCode::EndWithManyMultiplicityCannotHaveOperationsSpecified(),

src/Edm/Validation/ValidationRules/INavigationProperty/NavigationPropertyContainsTargetNotSupportedBeforeV3.php

Braces +1 added lines, -2 removed lines

@@ -21,8 +21,7 @@
     public function __invoke(ValidationContext $context, ?IEdmElement $property)
     {
         assert($property instanceof INavigationProperty);
-        if ($property->containsTarget() != CsdlConstants::Default_ContainsTarget)
-        {
+        if ($property->containsTarget() != CsdlConstants::Default_ContainsTarget) {
             $context->AddError(
                 $property->Location(),
                 EdmErrorCode::NavigationPropertyContainsTargetNotSupportedBeforeV3(),

src/Edm/Validation/ValidationRules/INavigationProperty/NavigationPropertyCorrectType.php

Braces +7 added lines, -15 removed lines

@@ -24,31 +24,24 @@ 
         assert($property instanceof INavigationProperty);
         $isBad = false;
 
-        if ($property->ToEntityType() !== $property->getPartner()->DeclaringEntityType())
-        {
+        if ($property->ToEntityType() !== $property->getPartner()->DeclaringEntityType()) {
             $isBad = true;
-        }
-        else
-        {
-            switch ($property->getPartner()->Multiplicity())
-            {
+        } else {
+            switch ($property->getPartner()->Multiplicity()) {
                 case Multiplicity::Many():
-                    if (!$property->getType()->IsCollection())
-                    {
+                    if (!$property->getType()->IsCollection()) {
                         $isBad = true;
                     }
 
                     break;
                 case Multiplicity::ZeroOrOne():
-                    if ($property->getType()->IsCollection() || !$property->getType()->getNullable())
-                    {
+                    if ($property->getType()->IsCollection() || !$property->getType()->getNullable()) {
                         $isBad = true;
                     }
 
                     break;
                 case Multiplicity::One():
-                    if ($property->getType()->IsCollection() || $property->getType()->getNullable())
-                    {
+                    if ($property->getType()->IsCollection() || $property->getType()->getNullable()) {
                         $isBad = true;
                     }
 
@@ -56,8 +49,7 @@ 
             }
         }
 
-        if ($isBad)
-        {
+        if ($isBad) {
             $context->AddError(
                 $property->Location(),
                 EdmErrorCode::InvalidNavigationPropertyType(),

src/Edm/Validation/ValidationRules/INavigationProperty/NavigationPropertyPrincipalEndMultiplicity.php

Braces +6 added lines, -14 removed lines

@@ -40,31 +40,23 @@
         if ($dependentProperties === null) {
             return;
         }
-        if (ValidationHelper::AllPropertiesAreNullable($dependentProperties))
-        {
-            if (!$navigationProperty->getPartner()->Multiplicity()->isZeroOrOne())
-            {
+        if (ValidationHelper::AllPropertiesAreNullable($dependentProperties)) {
+            if (!$navigationProperty->getPartner()->Multiplicity()->isZeroOrOne()) {
                 $context->AddError(
                     $navigationProperty->getPartner()->Location(),
                     EdmErrorCode::InvalidMultiplicityOfPrincipalEnd(),
                     StringConst::EdmModel_Validator_Semantic_InvalidMultiplicityOfPrincipalEndDependentPropertiesAllNullable($navigationProperty->getPartner()->getName(), $navigationProperty->getName()));
             }
-        }
-        else if (!ValidationHelper::HasNullableProperty($dependentProperties))
-        {
-            if (!$navigationProperty->getPartner()->Multiplicity()->isOne())
-            {
+        } else if (!ValidationHelper::HasNullableProperty($dependentProperties)) {
+            if (!$navigationProperty->getPartner()->Multiplicity()->isOne()) {
                 $context->AddError(
                     $navigationProperty->getPartner()->Location(),
                     EdmErrorCode::InvalidMultiplicityOfPrincipalEnd(),
                     StringConst::EdmModel_Validator_Semantic_InvalidMultiplicityOfPrincipalEndDependentPropertiesAllNonnullable($navigationProperty->getPartner()->getName(), $navigationProperty->getName()));
             }
-        }
-        else
-        {
+        } else {
             if (!$navigationProperty->getPartner()->Multiplicity()->isOne() &&
-                !$navigationProperty->getPartner()->Multiplicity()->isZeroOrOne())
-            {
+                !$navigationProperty->getPartner()->Multiplicity()->isZeroOrOne()) {
                 $context->AddError(
                     $navigationProperty->getPartner()->Location(),
                     EdmErrorCode::InvalidMultiplicityOfPrincipalEnd(),