c-harris / ODataMetadata

src/Edm/Validation/ValidationRules/IFunctionImport/FunctionImportBindableFunctionImportMustHaveParameters.php

Braces +1 added lines, -2 removed lines

@@ -21,8 +21,7 @@
     public function __invoke(ValidationContext $context, ?IEdmElement $functionImport)
     {
         assert($functionImport instanceof IFunctionImport);
-        if ($functionImport->isBindable() && count($functionImport->getParameters()) === 0)
-        {
+        if ($functionImport->isBindable() && count($functionImport->getParameters()) === 0) {
             $context->AddError(
                 $functionImport->Location(),
                 EdmErrorCode::BindableFunctionImportMustHaveParameters(),

src/Edm/Validation/ValidationRules/IFunctionImport/FunctionImportIsComposableNotSupportedBeforeV3.php

Braces +1 added lines, -2 removed lines

@@ -22,8 +22,7 @@
     public function __invoke(ValidationContext $context, ?IEdmElement $functionImport)
     {
         assert($functionImport instanceof IFunctionImport);
-        if ($functionImport->isComposable() != CsdlConstants::Default_IsComposable)
-        {
+        if ($functionImport->isComposable() != CsdlConstants::Default_IsComposable) {
             $context->AddError(
                 $functionImport->Location(),
                 EdmErrorCode::FunctionImportComposableNotSupportedBeforeV3(),

src/Edm/Validation/ValidationRules/IFunctionImport/FunctionImportUnsupportedReturnTypeAfterV1.php

Spacing +1 added lines, -2 removed lines

@@ -24,8 +24,7 @@
         if ($functionImport->getReturnType() != null)
         {
             $elementType = $functionImport->getReturnType()->IsCollection() ?
-                $functionImport->getReturnType()->AsCollection()->ElementType() :
-                $functionImport->getReturnType();
+                $functionImport->getReturnType()->AsCollection()->ElementType() : $functionImport->getReturnType();
             if (
                 !$elementType->IsPrimitive() &&
                 !$elementType->IsEntity() &&

Braces +2 added lines, -4 removed lines

@@ -21,8 +21,7 @@ 
     public function __invoke(ValidationContext $context, ?IEdmElement $functionImport)
     {
         assert($functionImport instanceof IFunctionImport);
-        if ($functionImport->getReturnType() != null)
-        {
+        if ($functionImport->getReturnType() != null) {
             $elementType = $functionImport->getReturnType()->IsCollection() ?
                 $functionImport->getReturnType()->AsCollection()->ElementType() :
                 $functionImport->getReturnType();
@@ -32,8 +31,7 @@ 
                 !$elementType->IsComplex() &&
                 !$elementType->IsEnum() &&
                 !$context->checkIsBad($elementType->getDefinition())
-            )
-            {
+            ) {
                 $context->AddError(
                     $functionImport->Location(),
                     EdmErrorCode::FunctionImportUnsupportedReturnType(),

src/Edm/Validation/ValidationRules/IFunctionImport/ComposableFunctionImportMustHaveReturnType.php

Braces +1 added lines, -2 removed lines

@@ -20,8 +20,7 @@
     public function __invoke(ValidationContext $context, ?IEdmElement $functionImport)
     {
         assert($functionImport instanceof IFunctionImport);
-        if ($functionImport->IsComposable() && $functionImport->getReturnType() == null)
-        {
+        if ($functionImport->IsComposable() && $functionImport->getReturnType() == null) {
             $context->AddError(
                 $functionImport->Location(),
                 EdmErrorCode::ComposableFunctionImportMustHaveReturnType(),

src/Edm/Validation/ValidationRules/IFunctionImport/FunctionImportEntitySetExpressionIsInvalid.php

Braces +4 added lines, -9 removed lines

@@ -24,13 +24,11 @@ 
     public function __invoke(ValidationContext $context, ?IEdmElement $functionImport)
     {
         assert($functionImport instanceof IFunctionImport);
-        if ($functionImport->getEntitySet() != null)
-        {
+        if ($functionImport->getEntitySet() != null) {
             if (
                 !$functionImport->getEntitySet()->getExpressionKind()->isEntitySetReference() &&
                 !$functionImport->getEntitySet()->getExpressionKind()->isPath()
-            )
-            {
+            ) {
                 $context->AddError(
                     $functionImport->Location(),
                     EdmErrorCode::FunctionImportEntitySetExpressionIsInvalid(),
@@ -38,9 +36,7 @@ 
                         $functionImport->getName(),
                         $functionImport->getEntitySet()->getExpressionKind()->getKey())
                 );
-            }
-            else
-            {
+            } else {
                 /**
                  * @var IEntitySet $entitySet;
                  */
@@ -56,8 +52,7 @@ 
                 if (
                     !$functionImport->TryGetStaticEntitySet($entitySet) &&
                     !$functionImport->TryGetRelativeEntitySetPath($context->getModel(), $parameter, $path)
-                )
-                {
+                ) {
                     $context->AddError(
                         $functionImport->Location(),
                         EdmErrorCode::FunctionImportEntitySetExpressionIsInvalid(),

src/Edm/Validation/ValidationRules/IFunctionImport/FunctionImportIsSideEffectingNotSupportedBeforeV3.php

Braces +1 added lines, -2 removed lines

@@ -22,8 +22,7 @@
     public function __invoke(ValidationContext $context, ?IEdmElement $functionImport)
     {
         assert($functionImport instanceof IFunctionImport);
-        if ($functionImport->isSideEffecting() != CsdlConstants::Default_IsSideEffecting)
-        {
+        if ($functionImport->isSideEffecting() != CsdlConstants::Default_IsSideEffecting) {
             $context->AddError(
                 $functionImport->Location(),
                 EdmErrorCode::FunctionImportSideEffectingNotSupportedBeforeV3(),

src/Edm/Validation/ValidationRules/IFunction/FunctionOnlyInputParametersAllowedInFunctions.php

Braces +2 added lines, -4 removed lines

@@ -22,11 +22,9 @@
     public function __invoke(ValidationContext $context, ?IEdmElement $function)
     {
         assert($function instanceof IFunction);
-        foreach ($function->getParameters() as $parameter)
-        {
+        foreach ($function->getParameters() as $parameter) {
             assert($parameter instanceof IFunctionParameter);
-            if (!$parameter->getMode()->isIn())
-            {
+            if (!$parameter->getMode()->isIn()) {
                 $context->AddError(
                     $parameter->Location(),
                     EdmErrorCode::OnlyInputParametersAllowedInFunctions(),

src/Edm/Validation/ValidationRules/IEntityContainer/EntityContainerDuplicateEntityContainerMemberName.php

Braces +10 added lines, -22 removed lines

@@ -27,13 +27,10 @@ 
         assert($entityContainer instanceof IEntityContainer);
         $nonFunctionNameList = new HashSetInternal();
         $functionDictionary = [];
-        foreach ($entityContainer->getElements() as $item)
-        {
-            if ($item instanceof IFunctionImport)
-            {
+        foreach ($entityContainer->getElements() as $item) {
+            if ($item instanceof IFunctionImport) {
                 $function = $item;
-                if ($nonFunctionNameList->contains($item->getName()))
-                {
+                if ($nonFunctionNameList->contains($item->getName())) {
                     $context->AddError(
                         $item->Location(),
                         EdmErrorCode::DuplicateEntityContainerMemberName(),
@@ -41,16 +38,13 @@ 
                 }
 
                 $functionList = null;
-                if (isset($functionDictionary[$function->getName()]))
-                {
+                if (isset($functionDictionary[$function->getName()])) {
                     $functionList = $functionDictionary[$function->getName()];
                     /**
                      * @var IFunctionImport $existingFunction
                      */
-                    foreach ($functionList as  $existingFunction)
-                    {
-                        if (EdmElementComparer::isFunctionSignatureEquivalentTo($function, $existingFunction))
-                        {
+                    foreach ($functionList as  $existingFunction) {
+                        if (EdmElementComparer::isFunctionSignatureEquivalentTo($function, $existingFunction)) {
                             $context->AddError(
                                 $item->Location(),
                                 EdmErrorCode::DuplicateEntityContainerMemberName(),
@@ -58,27 +52,21 @@ 
                             break;
                         }
                     }
-                }
-                else
-                {
+                } else {
                     $functionList = [];
                 }
 
                 $functionList[] = $function;
                 $functionDictionary[$function->getName()] = $functionList;
-            }
-            else
-            {
+            } else {
                 if (ValidationHelper::AddMemberNameToHashSet(
                     $item,
                     $nonFunctionNameList,
                     $context,
                     EdmErrorCode::DuplicateEntityContainerMemberName(),
                     StringConst::EdmModel_Validator_Semantic_DuplicateEntityContainerMemberName($item->getName()),
-                    false))
-                {
-                    if (isset($functionDictionary[$item->getName()]))
-                    {
+                    false)) {
+                    if (isset($functionDictionary[$item->getName()])) {
                         $context->AddError(
                             $item->Location(),
                             EdmErrorCode::DuplicateEntityContainerMemberName(),

src/Edm/Validation/ValidationRules/IEnumMember/EnumMemberValueMustHaveSameTypeAsUnderlyingType.php

Indentation +9 added lines, -9 removed lines

@@ -24,15 +24,15 @@
     {
         assert($enumMember instanceof IEnumMember);
         $discoveredErrors = [];
-                   if (
-                       !$context->checkIsBad($enumMember->getDeclaringType()) &&
+                    if (
+                        !$context->checkIsBad($enumMember->getDeclaringType()) &&
                        !$context->checkIsBad($enumMember->getDeclaringType()->getUnderlyingType()) &&
                        !ExpressionTypeChecker::TryAssertPrimitiveAsType($enumMember->getValue(),
-                           EdmTypeSemantics::GetPrimitiveTypeReference($enumMember->getDeclaringType()->getUnderlyingType(), false), $discoveredErrors))
-                   {
-                       $context->AddError(
-                           $enumMember->Location(),
-                           EdmErrorCode::EnumMemberTypeMustMatchEnumUnderlyingType(),
-                           StringConst::EdmModel_Validator_Semantic_EnumMemberTypeMustMatchEnumUnderlyingType($enumMember->getName()));
-                   }    }
+                            EdmTypeSemantics::GetPrimitiveTypeReference($enumMember->getDeclaringType()->getUnderlyingType(), false), $discoveredErrors))
+                    {
+                        $context->AddError(
+                            $enumMember->Location(),
+                            EdmErrorCode::EnumMemberTypeMustMatchEnumUnderlyingType(),
+                            StringConst::EdmModel_Validator_Semantic_EnumMemberTypeMustMatchEnumUnderlyingType($enumMember->getName()));
+                    }    }
 }
\ No newline at end of file

Braces +1 added lines, -2 removed lines

@@ -28,8 +28,7 @@
                        !$context->checkIsBad($enumMember->getDeclaringType()) &&
                        !$context->checkIsBad($enumMember->getDeclaringType()->getUnderlyingType()) &&
                        !ExpressionTypeChecker::TryAssertPrimitiveAsType($enumMember->getValue(),
-                           EdmTypeSemantics::GetPrimitiveTypeReference($enumMember->getDeclaringType()->getUnderlyingType(), false), $discoveredErrors))
-                   {
+                           EdmTypeSemantics::GetPrimitiveTypeReference($enumMember->getDeclaringType()->getUnderlyingType(), false), $discoveredErrors)) {
                        $context->AddError(
                            $enumMember->Location(),
                            EdmErrorCode::EnumMemberTypeMustMatchEnumUnderlyingType(),