c-harris / ODataMetadata

src/Asserts.php

Spacing +7 added lines, -13 removed lines

@@ -36,7 +36,7 @@ 
             );
         };
         assert(
-            $expectedReflection->getNumberOfRequiredParameters() ===  $actualReflection->getNumberOfRequiredParameters(),
+            $expectedReflection->getNumberOfRequiredParameters() === $actualReflection->getNumberOfRequiredParameters(),
             $messageBuilder('Incorrect Parameter Count')
         );
         if ($expectedReflection->hasReturnType()) {
@@ -48,11 +48,9 @@ 
             $expectedReturnType = $expectedReflection->getReturnType();
             $actualReturnType   = $actualReflection->getReturnType();
             $name               = $expectedReturnType instanceof ReflectionNamedType ?
-                $expectedReturnType->getName() :
-                strval($expectedReturnType);
+                $expectedReturnType->getName() : strval($expectedReturnType);
             $actName = $actualReturnType instanceof ReflectionNamedType ?
-                $actualReturnType->getName() :
-                strval($actualReturnType);
+                $actualReturnType->getName() : strval($actualReturnType);
 
             assert(
                 $name === $actName,
@@ -77,11 +75,9 @@ 
                 $expectedParmType = $expectedParm->getType();
                 $actualParmType   = $actualParm->getType();
                 $name             = $expectedParmType instanceof ReflectionNamedType ?
-                    $expectedParmType->getName() :
-                    strval($expectedParmType);
+                    $expectedParmType->getName() : strval($expectedParmType);
                 $actName = $actualParmType instanceof ReflectionNamedType ?
-                    $actualParmType->getName() :
-                    strval($actualParmType);
+                    $actualParmType->getName() : strval($actualParmType);
 
                 //TODO: improve this to check that the actual type does not return a childType;
                 assert(
@@ -107,8 +103,7 @@ 
             if ($parameter->hasType()) {
                 $parmType        = $parameter->getType();
                 $parmName        = $parmType instanceof ReflectionNamedType ?
-                                    $parmType->getName() :
-                                    strval($parmType);
+                                    $parmType->getName() : strval($parmType);
                 $parameterString .= $parmType->allowsNull() ? '?' : '';
                 $parameterString .= $parmName . ' ';
             }
@@ -127,8 +122,7 @@ 
         if ($reflection->hasReturnType()) {
             $returnType = $reflection->getReturnType();
             $name       = $returnType instanceof ReflectionNamedType ?
-                $returnType->getName() :
-                strval($returnType);
+                $returnType->getName() : strval($returnType);
             $return .= ': ' . $name;
         }
         return sprintf('function(%s)%s', implode(',', $parameters), $return);

src/Edm/Validation/ValidationContext.php

Spacing +2 added lines, -4 removed lines

@@ -56,12 +56,10 @@
         $stem           = is_array($isBad) ? new ReflectionMethod(...$isBad) : new ReflectionFunction($isBad);
         $stemReturnType = $stem->getReturnType();
         $stemName       = $stemReturnType instanceof ReflectionNamedType ?
-            $stemReturnType->getName() :
-            strval($stemReturnType);
+            $stemReturnType->getName() : strval($stemReturnType);
         $stemParmType = $stem->getParameters()[0]->getType();
         $stemParmName = $stemParmType instanceof ReflectionNamedType ?
-            $stemParmType->getName() :
-            strval($stemParmType);
+            $stemParmType->getName() : strval($stemParmType);
 
         /* @noinspection PhpUnhandledExceptionInspection suppressing exceptions for asserts. */
         assert(

src/Edm/Validation/ValidationRules/IStructuralProperty/StructuralPropertyInvalidPropertyType.php

Spacing +1 added lines, -2 removed lines

@@ -24,8 +24,7 @@
         assert($property instanceof IStructuralProperty);
         if ($property->getDeclaringType()->getTypeKind()->isRow()) {
             $validatedType = $property->getType()->isCollection() ?
-                $property->getType()->asCollection()->elementType()->getDefinition() :
-                $property->getType()->getDefinition();
+                $property->getType()->asCollection()->elementType()->getDefinition() : $property->getType()->getDefinition();
 
             EdmUtil::checkArgumentNull($validatedType, 'validatedType');
             if (!$validatedType->getTypeKind()->isPrimitive() &&

src/Edm/Validation/ValidationRules/IStructuralProperty/StructuralPropertyInvalidPropertyTypeConcurrencyMode.php

Spacing +1 added lines, -2 removed lines

@@ -43,8 +43,7 @@
                 StringConst::EdmModel_Validator_Semantic_InvalidPropertyTypeConcurrencyMode(
                     (
                         $propType->isCollection() ?
-                        EdmConstants::Type_Collection :
-                        $key
+                        EdmConstants::Type_Collection : $key
                     )
                 )
             );

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

Spacing +1 added lines, -2 removed lines

@@ -32,8 +32,7 @@
         if (null !== $functionImport->getEntitySet() && null !== $returnType) {
             /** @var ITypeReference $elementType */
             $elementType = $returnType->isCollection() ?
-                $returnType->asCollection()->elementType() :
-                $returnType;
+                $returnType->asCollection()->elementType() : $returnType;
             EdmUtil::checkArgumentNull($elementType->getDefinition(), 'elementType->getDefinition');
             if ($elementType->isEntity()) {
                 $returnedEntityType = $elementType->asEntity()->entityDefinition();

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

Spacing +1 added lines, -2 removed lines

@@ -24,8 +24,7 @@
         assert($functionImport instanceof IFunctionImport);
         if (null !== $functionImport->getReturnType()) {
             $elementType = $functionImport->getReturnType()->isCollection() ?
-                $functionImport->getReturnType()->asCollection()->elementType() :
-                $functionImport->getReturnType();
+                $functionImport->getReturnType()->asCollection()->elementType() : $functionImport->getReturnType();
             if (!$elementType->isPrimitive() &&
                 !$elementType->isEntity() &&
                 !$elementType->isComplex() &&

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

Spacing +1 added lines, -2 removed lines

@@ -36,8 +36,7 @@
                     ) ?? false
             )) {
                 $error = null;
-                if (!
-                ValidationHelper::validateValueCanBeWrittenAsXmlElementAnnotation(
+                if (!ValidationHelper::validateValueCanBeWrittenAsXmlElementAnnotation(
                     $stringValue,
                     $annotation->getNamespaceUri(),
                     $annotation->getName(),

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

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
             // 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() ;
+                $value         = $annotation->getValue();
                 $errorLocation = ($value === null || !($value instanceof IValue)) ? null : $value->location();
                 $error         = new EdmError(
                     $errorLocation,

src/Edm/Validation/EdmValidator.php

Spacing +1 added lines, -2 removed lines

@@ -28,8 +28,7 @@
     public static function validate(IModel $root, $versionOrRuleset, array &$errors): bool
     {
         $ruleSet = $versionOrRuleset instanceof Version ?
-            ValidationRuleSet::getEdmModelRuleSet($versionOrRuleset) :
-            $versionOrRuleset;
+            ValidationRuleSet::getEdmModelRuleSet($versionOrRuleset) : $versionOrRuleset;
         assert($ruleSet instanceof ValidationRuleSet);
         $errors = InterfaceValidator::validateModelStructureAndSemantics($root, $ruleSet);
         return count($errors) === 0;