c-harris / ODataMetadata

src/Csdl/Internal/Serialization/EdmModelCsdlSerializationVisitor.php

Indentation +2 added lines, -2 removed lines

@@ -1294,7 +1294,7 @@ 
 
         // Association Set
         if (!($this->model->GetAssociationSetName($thisEntitySet, $thisNavprop) ==
-              $this->model->GetAssociationSetName($thatEntitySet, $thatNavprop) &&
+                $this->model->GetAssociationSetName($thatEntitySet, $thatNavprop) &&
             $this->model->GetAssociationFullName($thisNavprop) == $this->model->GetAssociationFullName($thatNavprop))) {
             return false;
         }
@@ -1316,7 +1316,7 @@ 
 
         if (null !== $thisOtherEntitySet) {
             if (!($this->model->GetAssociationEndName($thisNavprop->getPartner()) ==
-                  $this->model->GetAssociationEndName($thatNavprop->getPartner()) &&
+                    $this->model->GetAssociationEndName($thatNavprop->getPartner()) &&
                   $thisOtherEntitySet->getName() == $thatOtherEntitySet->getName())) {
                 return false;
             }

Spacing +9 added lines, -10 removed lines

@@ -132,8 +132,7 @@ 
         $alias = null;
         if ($this->namespaceAliasMappings != null) {
             $alias = array_key_exists($element->getNamespace(), $this->namespaceAliasMappings) ?
-                $this->namespaceAliasMappings[$element->getNamespace()] :
-                null;
+                $this->namespaceAliasMappings[$element->getNamespace()] : null;
         }
 
         $this->schemaWriter->WriteSchemaElementHeader($element, $alias, $mappings);
@@ -609,7 +608,7 @@ 
     protected function ProcessPropertyReferenceExpression(IPropertyReferenceExpression $expression): void
     {
         $this->BeginElement($expression, [$this->schemaWriter, 'WritePropertyReferenceExpressionElementHeader']);
-        if ($expression->getBase()!= null) {
+        if ($expression->getBase() != null) {
             $this->VisitExpression($expression->getBase());
         }
 
@@ -1208,10 +1207,10 @@ 
             return false;
         }
 
-        $thisAssociationAnnotations =[];
+        $thisAssociationAnnotations = [];
         $thisEnd1Annotations        = [];
-        $thisEnd2Annotations        =[];
-        $thisConstraintAnnotations  =[];
+        $thisEnd2Annotations        = [];
+        $thisConstraintAnnotations  = [];
         $this->model->GetAssociationAnnotations(
             $thisPrimary,
             $thisAssociationAnnotations,
@@ -1223,7 +1222,7 @@ 
         $thatAssociationAnnotations = [];
         $thatEnd1Annotations        = [];
         $thatEnd2Annotations        = [];
-        $thatConstraintAnnotations  =[];
+        $thatConstraintAnnotations  = [];
         $this->model->GetAssociationAnnotations(
             $thatPrimary,
             $thatAssociationAnnotations,
@@ -1268,7 +1267,7 @@ 
         if (null === $theseProperties || null === $thoseProperties) {
             return false;
         }
-        $numProp   = count($theseProperties);
+        $numProp = count($theseProperties);
         if ($numProp != count($thoseProperties)) {
             return false;
         }
@@ -1339,8 +1338,8 @@ 
         );
 
         $thatAssociationSetAnnotations = [];
-        $thatEnd1Annotations           =[];
-        $thatEnd2Annotations           =[];
+        $thatEnd1Annotations           = [];
+        $thatEnd2Annotations           = [];
         $this->model->GetAssociationSetAnnotations(
             $thatEntitySet,
             $thatNavprop,

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/Helpers/ToTraceString.php

Spacing +2 added lines, -2 removed lines

@@ -53,7 +53,7 @@ 
             case $element instanceof IProperty:
                 assert($element instanceof IProperty);
                 $type = $element->getType();
-                return $element->getName() ?? '' . ':' . ($type !== null ? self::ToTraceString($type) :'');
+                return $element->getName() ?? '' . ':' . ($type !== null ? self::ToTraceString($type) : '');
             case $element instanceof IEntityReferenceType:
                 assert($element instanceof IEntityReferenceType);
                 return strval(TypeKind::EntityReference()->getKey()) . '(' . (null !== $element->getEntityType() ?
@@ -188,7 +188,7 @@ 
             $sb,
             EdmConstants::FacetName_Srid,
             null !== $type->getSpatialReferenceIdentifier()
-                ? $type->getSpatialReferenceIdentifier(): EdmConstants::Value_SridVariable
+                ? $type->getSpatialReferenceIdentifier() : EdmConstants::Value_SridVariable
         );
         return $sb;
     }

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/Internal/InterfaceValidator/VisitorOfIValue.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
         $this->lookup[ValueKind::Floating()->getValue()]       = IFloatingValue::class;
         $this->lookup[ValueKind::Guid()->getValue()]           = IGuidValue::class;
         $this->lookup[ValueKind::Integer()->getValue()]        = IIntegerValue::class;
-        $this->lookup[ValueKind::Null()->getValue()]           = INullValue::class;
+        $this->lookup[ValueKind::null()->getValue()]           = INullValue::class;
         $this->lookup[ValueKind::String()->getValue()]         = IStringValue::class;
         $this->lookup[ValueKind::Structured()->getValue()]     = IStructuredValue::class;
         $this->lookup[ValueKind::Time()->getValue()]           = ITimeValue::class;

src/Helpers/VocabularyAnnotationHelpers.php

Indentation +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
         /** @var IVocabularyAnnotation $annotation */
         $annotation = $this;
         return $annotation->GetSerializationLocation($model) ==
-               EdmVocabularyAnnotationSerializationLocation::Inline() || null === $annotation->TargetString();
+                EdmVocabularyAnnotationSerializationLocation::Inline() || null === $annotation->TargetString();
     }
 
     public function TargetString(): string

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/Csdl/Internal/Serialization/EdmModelCsdlSchemaWriter.php

Spacing +5 added lines, -9 removed lines

@@ -1352,8 +1352,7 @@ 
      */
     public function WriteOptionalAttribute(string $attribute, $value, $defaultValue, callable $toXml): void
     {
-        $stem = is_array($toXml) ? new ReflectionMethod(...$toXml) :
-            new ReflectionFunction($toXml);
+        $stem = is_array($toXml) ? new ReflectionMethod(...$toXml) : new ReflectionFunction($toXml);
         /* @noinspection PhpUnhandledExceptionInspection suppressing exceptions for asserts.*/
         assert(
             1 === count(($stem)->getParameters()),
@@ -1361,8 +1360,7 @@ 
         );
         $stemType = $stem->getReturnType();
         $name = $stemType instanceof ReflectionNamedType ?
-            $stemType->getName() :
-            strval($stemType);
+            $stemType->getName() : strval($stemType);
         /* @noinspection PhpUnhandledExceptionInspection suppressing exceptions for asserts.*/
         assert(
             'string' === $name,
@@ -1381,8 +1379,7 @@ 
      */
     public function WriteRequiredAttribute(string $attribute, $value, callable $toXml): void
     {
-        $stem = is_array($toXml) ? new ReflectionMethod(...$toXml) :
-            new ReflectionFunction($toXml);
+        $stem = is_array($toXml) ? new ReflectionMethod(...$toXml) : new ReflectionFunction($toXml);
         /* @noinspection PhpUnhandledExceptionInspection suppressing exceptions for asserts.*/
         assert(
             1 === count($stem->getParameters()),
@@ -1390,8 +1387,7 @@ 
         );
         $stemType = $stem->getReturnType();
         $name = $stemType instanceof ReflectionNamedType ?
-            $stemType->getName() :
-            strval($stemType);
+            $stemType->getName() : strval($stemType);
         /* @noinspection PhpUnhandledExceptionInspection suppressing exceptions for asserts.*/
         assert(
             'string' === $name,
@@ -1488,7 +1484,7 @@ 
 
     private static function SridAsXml(?int $i): string
     {
-        return $i !== null ? strval($i) :  CsdlConstants::Value_SridVariable;
+        return $i !== null ? strval($i) : CsdlConstants::Value_SridVariable;
     }
 
     /**

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);