c-harris / ODataMetadata

src/Edm/Validation/ValidationRules/IModel/ModelDuplicateEntityContainerName.php

Braces +2 added lines, -3 removed lines

@@ -25,9 +25,8 @@
     {
         assert($model instanceof IModel);
         $entityContainerNameList = new HashSetInternal();
-        foreach ($model->getSchemaElements() as $item)
-        {
-            if(!$item instanceof IEntityContainer){
+        foreach ($model->getSchemaElements() as $item) {
+            if(!$item instanceof IEntityContainer) {
                 continue;
             }
             ValidationHelper::AddMemberNameToHashSet(

src/Edm/Validation/ValidationRules/IModel/ModelDuplicateSchemaElementName.php

Braces +14 added lines, -33 removed lines

@@ -27,61 +27,42 @@
         assert($model instanceof IModel);
         $nonFunctionNameList = new HashSetInternal();
         $functionDictionary = [];
-        foreach ($model->getSchemaElements() as $item)
-        {
+        foreach ($model->getSchemaElements() as $item) {
             $duplicate = false;
             $fullName = $item->FullName();
             $function = $item;
-            if ($function instanceof IFunction)
-            {
+            if ($function instanceof IFunction) {
                 // If a non-function already exists with the same name, stop processing as a function, as it is irrelevant it will always be an error.
-                if ($nonFunctionNameList->contains($fullName))
-                {
+                if ($nonFunctionNameList->contains($fullName)) {
                     $duplicate = true;
-                }
-                else
-                {
+                } else {
                     $functionList = null;
-                    if (isset($function[$fullName]))
-                    {
-                        if (count(array_filter($function[$fullName], [EdmElementComparer::class, 'isFunctionSignatureEquivalentTo'])) !== 0)
-                        {
+                    if (isset($function[$fullName])) {
+                        if (count(array_filter($function[$fullName], [EdmElementComparer::class, 'isFunctionSignatureEquivalentTo'])) !== 0) {
                             $duplicate = true;
                         }
-                    }
-                    else
-                    {
+                    } else {
                         $functionDictionary[$fullName] = [];
                     }
                     $functionDictionary[$fullName][] = $function;
                 }
 
-                if (!$duplicate)
-                {
+                if (!$duplicate) {
                     $duplicate = ValidationHelper::FunctionOrNameExistsInReferencedModel($model, $function, $fullName, true);
                 }
-            }
-            else
-            {
-                if (!$nonFunctionNameList->add($fullName))
-                {
+            } else {
+                if (!$nonFunctionNameList->add($fullName)) {
                     $duplicate = true;
-                }
-                else
-                {
-                    if (isset($functionDictionary[$fullName]))
-                    {
+                } else {
+                    if (isset($functionDictionary[$fullName])) {
                         $duplicate = true;
-                    }
-                    else
-                    {
+                    } else {
                         $duplicate = ValidationHelper::ItemExistsInReferencedModel($model,$fullName, true);
                     }
                 }
             }
 
-            if ($duplicate)
-            {
+            if ($duplicate) {
                 $context->AddError(
                     $item->Location(),
                     EdmErrorCode::AlreadyDefined(),

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

Braces +2 added lines, -4 removed lines

@@ -20,10 +20,8 @@
     public function __invoke(ValidationContext $context, ?IEdmElement $function)
     {
         assert($function instanceof IFunctionImport);
-        foreach ($function->getParameters() as $parameter)
-        {
-            if ($parameter->getMode()->isNone() && !$context->checkIsBad($function))
-            {
+        foreach ($function->getParameters() as $parameter) {
+            if ($parameter->getMode()->isNone() && !$context->checkIsBad($function)) {
                 $context->AddError(
                     $parameter->Location(),
                     EdmErrorCode::InvalidFunctionImportParameterMode(),

src/Edm/Validation/ValidationRules/IFunctionImport/FunctionImportComposableFunctionImportCannotBeSideEffecting.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->isSideEffecting())
-        {
+        if ($functionImport->isComposable() && $functionImport->isSideEffecting()) {
             $context->AddError(
                 $functionImport->Location(),
                 EdmErrorCode::ComposableFunctionImportCannotBeSideEffecting(),

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

Braces +2 added lines, -4 removed lines

@@ -21,14 +21,12 @@
     public function __invoke(ValidationContext $context, ?IEdmElement $functionImport)
     {
         assert($functionImport instanceof IFunctionImport);
-        if ($functionImport->getReturnType() != null && $functionImport->getEntitySet() == null)
-        {
+        if ($functionImport->getReturnType() != null && $functionImport->getEntitySet() == null) {
             $elementType = $functionImport->getReturnType()->IsCollection() ?
                 $functionImport->getReturnType()->AsCollection()->ElementType()
                 :
                 $functionImport->getReturnType();
-            if ($elementType->IsEntity() && !$context->checkIsBad($elementType->getDefinition()))
-            {
+            if ($elementType->IsEntity() && !$context->checkIsBad($elementType->getDefinition())) {
                 $context->AddError(
                     $functionImport->Location(),
                     EdmErrorCode::FunctionImportReturnsEntitiesButDoesNotSpecifyEntitySet(),

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

Braces +2 added lines, -4 removed lines

@@ -20,13 +20,11 @@
     public function __invoke(ValidationContext $context, ?IEdmElement $functionImport)
     {
         assert($functionImport instanceof IFunctionImport);
-        foreach ($functionImport->getParameters() as $functionParameter)
-        {
+        foreach ($functionImport->getParameters() as $functionParameter) {
             $type = $functionParameter->getType();
             if (
                 !$type->IsPrimitive() && !$type->IsComplex() && !$context->checkIsBad($type->getDefinition())
-            )
-            {
+            ) {
                 $context->AddError(
                     $functionParameter->Location(),
                     EdmErrorCode::FunctionImportParameterIncorrectType(),

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

Braces +7 added lines, -16 removed lines

@@ -24,13 +24,11 @@ 
     public function __invoke(ValidationContext $context, ?IEdmElement $functionImport)
     {
         assert($functionImport instanceof IFunctionImport);
-        if ($functionImport->getEntitySet() != null && $functionImport->getReturnType() != null)
-        {
+        if ($functionImport->getEntitySet() != null && $functionImport->getReturnType() != null) {
             $elementType = $functionImport->getReturnType()->IsCollection() ?
                 $functionImport->getReturnType()->AsCollection()->ElementType() :
                 $functionImport->getReturnType();
-            if ($elementType->IsEntity())
-            {
+            if ($elementType->IsEntity()) {
                 $returnedEntityType = $elementType->AsEntity()->EntityDefinition();
 
                 /**
@@ -45,8 +43,7 @@ 
                  * @var INavigationProperty[] $path
                  */
                 $path = null;
-                if ($functionImport->TryGetStaticEntitySet($entitySet))
-                {
+                if ($functionImport->TryGetStaticEntitySet($entitySet)) {
                     $errorMessage = StringConst::EdmModel_Validator_Semantic_FunctionImportEntityTypeDoesNotMatchEntitySet(
                         $functionImport->getName(),
                         $returnedEntityType->FullName(),
@@ -59,22 +56,18 @@ 
                         !$context->checkIsBad($returnedEntityType) &&
                         !$context->checkIsBad($entitySet) &&
                         !$context->checkIsBad($entitySetElementType)
-                    )
-                    {
+                    ) {
                         $context->AddError(
                             $functionImport->Location(),
                             EdmErrorCode::FunctionImportEntityTypeDoesNotMatchEntitySet(),
                             $errorMessage);
                     }
-                }
-                else if ($functionImport->TryGetRelativeEntitySetPath($context->getModel(), $parameter, $path))
-                {
+                } else if ($functionImport->TryGetRelativeEntitySetPath($context->getModel(), $parameter, $path)) {
                     $relativePathType = count($path) == 0 ? $parameter->getType() : end($path)->getType();
                     $relativePathElementType = $relativePathType->IsCollection() ? $relativePathType->AsCollection()->ElementType() : $relativePathType;
                     if (
                         !$returnedEntityType->IsOrInheritsFrom($relativePathElementType->getDefinition()) &&
-                        !$context->checkIsBad($returnedEntityType) && !$context->checkIsBad($relativePathElementType->getDefinition()))
-                    {
+                        !$context->checkIsBad($returnedEntityType) && !$context->checkIsBad($relativePathElementType->getDefinition())) {
                         $context->AddError(
                             $functionImport->Location(),
                             EdmErrorCode::FunctionImportEntityTypeDoesNotMatchEntitySet(),
@@ -83,9 +76,7 @@ 
                 }
 
                 // The case when all try gets fail is caught by the FunctionImportEntitySetExpressionIsInvalid rule.
-            }
-            else if (!$context->checkIsBad($elementType->getDefinition()))
-            {
+            } else if (!$context->checkIsBad($elementType->getDefinition())) {
                 $context->AddError(
                     $functionImport->Location(),
                     EdmErrorCode::FunctionImportSpecifiesEntitySetButDoesNotReturnEntityType(),

src/Edm/Validation/ValidationRules/IFunctionImport/FunctionImportIsBindableNotSupportedBeforeV3.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->isBindable() != CsdlConstants::Default_IsBindable)
-        {
+        if ($functionImport->isBindable() != CsdlConstants::Default_IsBindable) {
             $context->AddError(
                 $functionImport->Location(),
                 EdmErrorCode::FunctionImportBindableNotSupportedBeforeV3(),

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

Braces +4 added lines, -9 removed lines

@@ -21,20 +21,15 @@
     public function __invoke(ValidationContext $context, ?IEdmElement $functionImport)
     {
         assert($functionImport instanceof IFunctionImport);
-        if ($functionImport->getReturnType() != null)
-        {
-            if ($functionImport->getReturnType()->IsCollection())
-            {
+        if ($functionImport->getReturnType() != null) {
+            if ($functionImport->getReturnType()->IsCollection()) {
                 $elementType = $functionImport->getReturnType()->AsCollection()->ElementType();
                 $reportError = !$elementType->IsPrimitive() && !$elementType->IsEntity() && !$context->checkIsBad($elementType->getDefinition());
-            }
-            else
-            {
+            } else {
                 $reportError = true;
             }
 
-            if ($reportError && !$context->checkIsBad($functionImport->getReturnType()->getDefinition()))
-            {
+            if ($reportError && !$context->checkIsBad($functionImport->getReturnType()->getDefinition())) {
                 $context->AddError(
                     $functionImport->Location(),
                     EdmErrorCode::FunctionImportUnsupportedReturnType(),