c-harris / ODataMetadata

src/Edm/Validation/ValidationRules/IDirectValueAnnotation/DirectValueAnnotationHasXmlSerializableName.php

Spacing +2 added lines, -2 removed lines

@@ -36,8 +36,8 @@
         {
 
             // Note: this check can be done without the try/catch block, but we need XmlConvert.IsStartNCNameChar and XmlConvert.IsNCNameChar, which are not available in 3.5.
-            if(!XmlConvert::VerifyNCName($annotation->getName())){
-                $value = $annotation->getValue() ;
+            if (!XmlConvert::VerifyNCName($annotation->getName())) {
+                $value = $annotation->getValue();
                 $errorLocation = ($value === null || !($value instanceof IValue)) ? null : $value->Location();
                 $context->AddRawError(new EdmError($errorLocation, EdmErrorCode::InvalidName(), StringConst::EdmModel_Validator_Syntactic_EdmModel_NameIsNotAllowed($annotation->getName())));
             }

Braces +2 added lines, -3 removed lines

@@ -32,11 +32,10 @@
             !EdmUtil::IsNullOrWhiteSpaceInternal($name) &&
             strlen($name) <= CsdlConstants::Max_NameLength &&
             strlen($name) > 0
-        )
-        {
+        ) {
 
             // Note: this check can be done without the try/catch block, but we need XmlConvert.IsStartNCNameChar and XmlConvert.IsNCNameChar, which are not available in 3.5.
-            if(!XmlConvert::VerifyNCName($annotation->getName())){
+            if(!XmlConvert::VerifyNCName($annotation->getName())) {
                 $value = $annotation->getValue() ;
                 $errorLocation = ($value === null || !($value instanceof IValue)) ? null : $value->Location();
                 $context->AddRawError(new EdmError($errorLocation, EdmErrorCode::InvalidName(), StringConst::EdmModel_Validator_Syntactic_EdmModel_NameIsNotAllowed($annotation->getName())));

src/Edm/Validation/ValidationRules/IDirectValueAnnotation/ImmediateValueAnnotationElementAnnotationHasNameAndNamespace.php

Spacing +2 added lines, -3 removed lines

@@ -25,7 +25,7 @@ 
         $stringValue = $annotation->getValue();
         if ($stringValue != null && $stringValue instanceof IStringValue)
         {
-            if (                            boolval(
+            if (boolval(
                 $context
                     ->getModel()
                     ->getDirectValueAnnotationsManager()
@@ -37,8 +37,7 @@ 
             ))
             {
                 $error = null;
-                if (!
-                ValidationHelper::ValidateValueCanBeWrittenAsXmlElementAnnotation(
+                if (!ValidationHelper::ValidateValueCanBeWrittenAsXmlElementAnnotation(
                     $stringValue,
                     $annotation->getNamespaceUri(),
                     $annotation->getName(),

Braces +3 added lines, -6 removed lines

@@ -23,8 +23,7 @@ 
     {
         assert($annotation instanceof IDirectValueAnnotation);
         $stringValue = $annotation->getValue();
-        if ($stringValue != null && $stringValue instanceof IStringValue)
-        {
+        if ($stringValue != null && $stringValue instanceof IStringValue) {
             if (                            boolval(
                 $context
                     ->getModel()
@@ -34,8 +33,7 @@ 
                         EdmConstants::InternalUri,
                         CsdlConstants::IsSerializedAsElementAnnotation
                     ) ?? false
-            ))
-            {
+            )) {
                 $error = null;
                 if (!
                 ValidationHelper::ValidateValueCanBeWrittenAsXmlElementAnnotation(
@@ -43,8 +41,7 @@ 
                     $annotation->getNamespaceUri(),
                     $annotation->getName(),
                     $error)
-                )
-                {
+                ) {
                     $context->AddRawError($error);
                 }
             }

src/Edm/Validation/ValidationRules/IDirectValueAnnotation/ImmediateValueAnnotationElementAnnotationIsValid.php

Braces +3 added lines, -6 removed lines

@@ -25,8 +25,7 @@ 
     {
         assert($annotation instanceof IDirectValueAnnotation);
         $stringValue = $annotation->getValue();
-                    if ($stringValue != null && $stringValue instanceof IStringValue)
-                    {
+                    if ($stringValue != null && $stringValue instanceof IStringValue) {
                         if (
                             boolval(
                                 $context
@@ -38,13 +37,11 @@ 
                                         CsdlConstants::IsSerializedAsElementAnnotation
                                     ) ?? false
                             )
-                        )
-                        {
+                        ) {
                             if (
                                 EdmUtil::IsNullOrWhiteSpaceInternal($annotation->getNamespaceUri()) ||
                                 EdmUtil::IsNullOrWhiteSpaceInternal($annotation->getName())
-                            )
-                            {
+                            ) {
                                 $context->AddError(
                                     $annotation->Location(),
                                     EdmErrorCode::InvalidElementAnnotation(),

src/Edm/Validation/ValidationRules/IIfExpression/IfExpressionAssertCorrectTestType.php

Braces +2 added lines, -4 removed lines

@@ -23,10 +23,8 @@
         $errors = null;
         if (!ExpressionTypeChecker::tryAssertType(
             $expression->getTestExpression(),
-            EdmCoreModel::getInstance()->GetBoolean(false), $errors))
-        {
-            foreach ($errors as $error)
-            {
+            EdmCoreModel::getInstance()->GetBoolean(false), $errors)) {
+            foreach ($errors as $error) {
                 $context->AddRawError($error);
             }
         }

src/Edm/Validation/ValidationRules/IApplyExpression/FunctionApplicationExpressionParametersMatchAppliedFunction.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
             foreach ($parameters as $parameter)
             {
                 $recursiveErrors = null;
-                if (!ExpressionTypeChecker::tryAssertType(current($arguments),$parameter->getType(), $recursiveErrors))
+                if (!ExpressionTypeChecker::tryAssertType(current($arguments), $parameter->getType(), $recursiveErrors))
                 {
                     foreach ($recursiveErrors as $error)
                     {

Braces +5 added lines, -10 removed lines

@@ -26,11 +26,9 @@ 
         assert($functionReference instanceof IFunctionReferenceExpression);
         if (
             $functionReference->getReferencedFunction() != null &&
-            !$context->checkIsBad($functionReference->getReferencedFunction()))
-        {
+            !$context->checkIsBad($functionReference->getReferencedFunction())) {
             if (
-                count($functionReference->getReferencedFunction()->getParameters()) != count($expression->getArguments()))
-            {
+                count($functionReference->getReferencedFunction()->getParameters()) != count($expression->getArguments())) {
                 $context->AddError(
                     $expression->Location(),
                     EdmErrorCode::IncorrectNumberOfArguments(),
@@ -44,13 +42,10 @@ 
             $parameters = $functionReference->getReferencedFunction()->getParameters();
             $arguments = $expression->getArguments();
             reset($arguments);
-            foreach ($parameters as $parameter)
-            {
+            foreach ($parameters as $parameter) {
                 $recursiveErrors = null;
-                if (!ExpressionTypeChecker::tryAssertType(current($arguments),$parameter->getType(), $recursiveErrors))
-                {
-                    foreach ($recursiveErrors as $error)
-                    {
+                if (!ExpressionTypeChecker::tryAssertType(current($arguments),$parameter->getType(), $recursiveErrors)) {
+                    foreach ($recursiveErrors as $error) {
                         $context->AddRawError($error);
                     }
                 }

src/Edm/Validation/ValidationRules/IEntityContainerElement/EntityContainerElementMustNotHaveKindOfNone.php

Braces +1 added lines, -2 removed lines

@@ -21,8 +21,7 @@
     public function __invoke(ValidationContext $context, ?IEdmElement $element)
     {
         assert($element instanceof IEntityContainerElement);
-        if ($element->getContainerElementKind()->isNone() && !$context->checkIsBad($element))
-        {
+        if ($element->getContainerElementKind()->isNone() && !$context->checkIsBad($element)) {
             $context->AddError(
                 $element->Location(),
                 EdmErrorCode::EntityContainerElementMustNotHaveKindOfNone(),

src/Edm/Validation/ValidationRules/IDecimalTypeReference/DecimalTypeReferenceScaleOutOfRange.php

Braces +1 added lines, -2 removed lines

@@ -21,8 +21,7 @@
     public function __invoke(ValidationContext $context, ?IEdmElement $type)
     {
         assert($type instanceof IDecimalTypeReference);
-        if ($type->getScale() > $type->getPrecision() || $type->getScale() < 0)
-        {
+        if ($type->getScale() > $type->getPrecision() || $type->getScale() < 0) {
             $context->AddError(
                 $type->Location(),
                 EdmErrorCode::ScaleOutOfRange(),

src/Edm/Validation/ValidationRules/IDecimalTypeReference/DecimalTypeReferencePrecisionOutOfRange.php

Braces +1 added lines, -2 removed lines

@@ -22,8 +22,7 @@
     public function __invoke(ValidationContext $context, ?IEdmElement $type)
     {
         assert($type instanceof IDecimalTypeReference);
-        if ($type->getPrecision() > EdmConstants::Max_Precision || $type->getPrecision() < EdmConstants::Min_Precision)
-        {
+        if ($type->getPrecision() > EdmConstants::Max_Precision || $type->getPrecision() < EdmConstants::Min_Precision) {
             $context->AddError(
                 $type->Location(),
                 EdmErrorCode::PrecisionOutOfRange(),

src/Edm/Validation/ValidationRules/INamedElement/NamedElementNameIsNotAllowed.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
             return;
         }
 
-        if (! EdmUtil::IsNullOrWhiteSpaceInternal($item->getName()) && strlen($item->getName()) <= CsdlConstants::Max_NameLength && strlen($item->getName()) > 0)
+        if (!EdmUtil::IsNullOrWhiteSpaceInternal($item->getName()) && strlen($item->getName()) <= CsdlConstants::Max_NameLength && strlen($item->getName()) > 0)
         {
             if (!EdmUtil::IsValidUndottedName($item->getName()))
             {

Braces +3 added lines, -6 removed lines

@@ -27,15 +27,12 @@
         // Don't run this rule for IDirectValueAnnotation,
         // We validate the name of IEdmDirectionValueAnnotation in a separate validation rule,
         // DirectValueAnnotationHasXmlSerializableName.
-        if ($item instanceof IDirectValueAnnotation)
-        {
+        if ($item instanceof IDirectValueAnnotation) {
             return;
         }
 
-        if (! EdmUtil::IsNullOrWhiteSpaceInternal($item->getName()) && strlen($item->getName()) <= CsdlConstants::Max_NameLength && strlen($item->getName()) > 0)
-        {
-            if (!EdmUtil::IsValidUndottedName($item->getName()))
-            {
+        if (! EdmUtil::IsNullOrWhiteSpaceInternal($item->getName()) && strlen($item->getName()) <= CsdlConstants::Max_NameLength && strlen($item->getName()) > 0) {
+            if (!EdmUtil::IsValidUndottedName($item->getName())) {
                 $context->AddError(
                     $item->Location(),
                     EdmErrorCode::InvalidName(),