c-harris / ODataMetadata

src/Edm/Validation/Internal/InterfaceValidator/VisitorOfISpatialTypeReference.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
         $primitive = $typeRef->getDefinition();
         assert($primitive instanceof IPrimitiveType);
         return null !== $typeRef->getDefinition() && !$primitive->getPrimitiveKind()->IsSpatial()
-            ? [ InterfaceValidator::CreateTypeRefInterfaceTypeKindValueMismatchError($typeRef) ] : null;
+            ? [InterfaceValidator::CreateTypeRefInterfaceTypeKindValueMismatchError($typeRef)] : null;
     }
 
     public function forType(): string

src/Edm/Validation/Internal/InterfaceValidator/VisitorOfIBinaryTypeReference.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
         $primitive = $typeRef->getDefinition();
         assert($primitive instanceof IPrimitiveType);
         return null !== $typeRef->getDefinition() && !$primitive->getPrimitiveKind()->isBinary()
-            ? [ InterfaceValidator::CreateTypeRefInterfaceTypeKindValueMismatchError($typeRef) ] : null;
+            ? [InterfaceValidator::CreateTypeRefInterfaceTypeKindValueMismatchError($typeRef)] : null;
     }
 
     public function forType(): string

src/Edm/Validation/Internal/InterfaceValidator/VisitorOfIBinaryValue.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
     {
         assert($value instanceof IBinaryValue);
         return null !== $value->getValue() ?
-            [InterfaceValidator::CreatePropertyMustNotBeNullError($value, 'Value') ]
+            [InterfaceValidator::CreatePropertyMustNotBeNullError($value, 'Value')]
             :
             null;
     }

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

Spacing +1 added lines, -2 removed lines

@@ -35,8 +35,7 @@
                 StringConst::EdmModel_Validator_Semantic_InvalidPropertyTypeConcurrencyMode(
                     (
                         $propType->IsCollection() ?
-                        EdmConstants::Type_Collection :
-                        $propType->TypeKind()->getKey()
+                        EdmConstants::Type_Collection : $propType->TypeKind()->getKey()
                     )
                 )
             );

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/IFunctionImport/FunctionImportEntityTypeDoesNotMatchEntitySet.php

Spacing +1 added lines, -2 removed lines

@@ -28,8 +28,7 @@
         EdmUtil::checkArgumentNull($functionImport->Location(), 'functionImport->Location');
         if ($functionImport->getEntitySet() != null && $functionImport->getReturnType() != null) {
             $elementType = $functionImport->getReturnType()->IsCollection() ?
-                $functionImport->getReturnType()->AsCollection()->ElementType() :
-                $functionImport->getReturnType();
+                $functionImport->getReturnType()->AsCollection()->ElementType() : $functionImport->getReturnType();
             if ($elementType->IsEntity()) {
                 $returnedEntityType = $elementType->AsEntity()->EntityDefinition();
 

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

Indentation +5 added lines, -5 removed lines

@@ -26,13 +26,13 @@
         assert($enumMember instanceof IEnumMember);
         $discoveredErrors = [];
         if (
-                       !$context->checkIsBad($enumMember->getDeclaringType()) &&
+                        !$context->checkIsBad($enumMember->getDeclaringType()) &&
                        !$context->checkIsBad($enumMember->getDeclaringType()->getUnderlyingType()) &&
                        !ExpressionTypeChecker::TryAssertPrimitiveAsType(
-                           $enumMember->getValue(),
-                           EdmTypeSemantics::GetPrimitiveTypeReference($enumMember->getDeclaringType()->getUnderlyingType(), false),
-                           $discoveredErrors
-                       )) {
+                            $enumMember->getValue(),
+                            EdmTypeSemantics::GetPrimitiveTypeReference($enumMember->getDeclaringType()->getUnderlyingType(), false),
+                            $discoveredErrors
+                        )) {
             EdmUtil::checkArgumentNull($enumMember->Location(), 'enumMember->Location');
             $context->AddError(
                 $enumMember->Location(),

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

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
             return;
         }
 
-        if (! EdmUtil::IsNullOrWhiteSpaceInternal($item->getName()) && mb_strlen($item->getName()) <= CsdlConstants::Max_NameLength && mb_strlen($item->getName()) > 0) {
+        if (!EdmUtil::IsNullOrWhiteSpaceInternal($item->getName()) && mb_strlen($item->getName()) <= CsdlConstants::Max_NameLength && mb_strlen($item->getName()) > 0) {
             if (!EdmUtil::IsValidUndottedName($item->getName())) {
                 EdmUtil::checkArgumentNull($item->Location(), 'item->Location');
                 $context->AddError(

src/Csdl/Internal/Serialization/EdmModelCsdlSchemaWriter.php

Spacing +65 added lines, -65 removed lines

@@ -144,8 +144,8 @@ 
     public function WriteAssociationSetElementHeader(IEntitySet $entitySet, INavigationProperty $navigationProperty): void
     {
         $this->xmlWriter->startElement(CsdlConstants::Element_AssociationSet);
-        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Name, $this->model->GetAssociationSetName($entitySet, $navigationProperty), [EdmValueWriter::class,'StringAsXml']);
-        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Association, $this->model->GetAssociationFullName($navigationProperty), [EdmValueWriter::class,'StringAsXml']);
+        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Name, $this->model->GetAssociationSetName($entitySet, $navigationProperty), [EdmValueWriter::class, 'StringAsXml']);
+        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Association, $this->model->GetAssociationFullName($navigationProperty), [EdmValueWriter::class, 'StringAsXml']);
     }
 
     /**
@@ -155,9 +155,9 @@ 
     public function WriteComplexTypeElementHeader(IComplexType $complexType): void
     {
         $this->xmlWriter->startElement(CsdlConstants::Element_ComplexType);
-        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Name, $complexType->getName(), [EdmValueWriter::class,'StringAsXml']);
+        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Name, $complexType->getName(), [EdmValueWriter::class, 'StringAsXml']);
         $this->WriteOptionalAttribute(CsdlConstants::Attribute_BaseType, $complexType->BaseComplexType(), null, [$this, 'TypeDefinitionAsXml']);
-        $this->WriteOptionalAttribute(CsdlConstants::Attribute_Abstract, $complexType->isAbstract(), CsdlConstants::Default_Abstract, [EdmValueWriter::class,'BooleanAsXml']);
+        $this->WriteOptionalAttribute(CsdlConstants::Attribute_Abstract, $complexType->isAbstract(), CsdlConstants::Default_Abstract, [EdmValueWriter::class, 'BooleanAsXml']);
     }
 
     /**
@@ -167,12 +167,12 @@ 
     public function WriteEnumTypeElementHeader(IEnumType $enumType): void
     {
         $this->xmlWriter->startElement(CsdlConstants::Element_EnumType);
-        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Name, $enumType->getName(), [EdmValueWriter::class,'StringAsXml']);
+        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Name, $enumType->getName(), [EdmValueWriter::class, 'StringAsXml']);
         if ($enumType->getUnderlyingType()->getPrimitiveKind() != PrimitiveTypeKind::Int32()) {
             $this->WriteRequiredAttribute(CsdlConstants::Attribute_UnderlyingType, $enumType->getUnderlyingType(), [$this, 'TypeDefinitionAsXml']);
         }
 
-        $this->WriteOptionalAttribute(CsdlConstants::Attribute_IsFlags, $enumType->isFlags(), CsdlConstants::Default_IsFlags, [EdmValueWriter::class,'BooleanAsXml']);
+        $this->WriteOptionalAttribute(CsdlConstants::Attribute_IsFlags, $enumType->isFlags(), CsdlConstants::Default_IsFlags, [EdmValueWriter::class, 'BooleanAsXml']);
     }
 
     public function WriteDocumentationElement(IDocumentation $documentation): void
@@ -204,8 +204,8 @@ 
     public function WriteAssociationSetEndElementHeader(IEntitySet $entitySet, INavigationProperty $property): void
     {
         $this->xmlWriter->startElement(CsdlConstants::Element_End);
-        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Role, $this->model->GetAssociationEndName($property), [EdmValueWriter::class,'StringAsXml']);
-        $this->WriteRequiredAttribute(CsdlConstants::Attribute_EntitySet, $entitySet->getName(), [EdmValueWriter::class,'StringAsXml']);
+        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Role, $this->model->GetAssociationEndName($property), [EdmValueWriter::class, 'StringAsXml']);
+        $this->WriteRequiredAttribute(CsdlConstants::Attribute_EntitySet, $entitySet->getName(), [EdmValueWriter::class, 'StringAsXml']);
     }
 
     /**
@@ -217,8 +217,8 @@ 
         $this->xmlWriter->startElement(CsdlConstants::Element_End);
         $declaringType = $associationEnd->getDeclaringType();
         assert($declaringType instanceof IEntityType);
-        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Type, $declaringType->FullName(), [EdmValueWriter::class,'StringAsXml']);
-        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Role, $this->model->GetAssociationEndName($associationEnd), [EdmValueWriter::class,'StringAsXml']);
+        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Type, $declaringType->FullName(), [EdmValueWriter::class, 'StringAsXml']);
+        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Role, $this->model->GetAssociationEndName($associationEnd), [EdmValueWriter::class, 'StringAsXml']);
         $this->WriteRequiredAttribute(CsdlConstants::Attribute_Multiplicity, $associationEnd->Multiplicity(), [self::class, 'MultiplicityAsXml']);
     }
 
@@ -229,7 +229,7 @@ 
     public function WriteEntityContainerElementHeader(IEntityContainer $container): void
     {
         $this->xmlWriter->startElement(CsdlConstants::Element_EntityContainer);
-        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Name, $container->getName(), [EdmValueWriter::class,'StringAsXml']);
+        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Name, $container->getName(), [EdmValueWriter::class, 'StringAsXml']);
         if ($container->isDefault()) {
             $this->xmlWriter->writeAttributeNs(CsdlConstants::Prefix_ODataMetadata, CsdlConstants::Attribute_IsDefaultEntityContainer, null, 'true');
         }
@@ -245,8 +245,8 @@ 
     public function WriteEntitySetElementHeader(IEntitySet $entitySet): void
     {
         $this->xmlWriter->startElement(CsdlConstants::Element_EntitySet);
-        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Name, $entitySet->getName(), [EdmValueWriter::class,'StringAsXml']);
-        $this->WriteRequiredAttribute(CsdlConstants::Attribute_EntityType, $entitySet->getElementType()->FullName(), [EdmValueWriter::class,'StringAsXml']);
+        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Name, $entitySet->getName(), [EdmValueWriter::class, 'StringAsXml']);
+        $this->WriteRequiredAttribute(CsdlConstants::Attribute_EntityType, $entitySet->getElementType()->FullName(), [EdmValueWriter::class, 'StringAsXml']);
     }
 
     /**
@@ -256,10 +256,10 @@ 
     public function WriteEntityTypeElementHeader(IEntityType $entityType): void
     {
         $this->xmlWriter->startElement(CsdlConstants::Element_EntityType);
-        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Name, $entityType->getName(), [EdmValueWriter::class,'StringAsXml']);
+        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Name, $entityType->getName(), [EdmValueWriter::class, 'StringAsXml']);
         $this->WriteOptionalAttribute(CsdlConstants::Attribute_BaseType, $entityType->BaseEntityType(), null, [$this, 'TypeDefinitionAsXml']);
         $this->WriteOptionalAttribute(CsdlConstants::Attribute_Abstract, $entityType->isAbstract(), CsdlConstants::Default_Abstract, [EdmValueWriter::class, 'BooleanAsXml']);
-        $this->WriteOptionalAttribute(CsdlConstants::Attribute_OpenType, $entityType->isOpen(), CsdlConstants::Default_OpenType, [EdmValueWriter::class,'BooleanAsXml']);
+        $this->WriteOptionalAttribute(CsdlConstants::Attribute_OpenType, $entityType->isOpen(), CsdlConstants::Default_OpenType, [EdmValueWriter::class, 'BooleanAsXml']);
     }
 
     public function WriteDeclaredKeyPropertiesElementHeader(): void
@@ -274,7 +274,7 @@ 
     public function WritePropertyRefElement(IStructuralProperty $property): void
     {
         $this->xmlWriter->startElement(CsdlConstants::Element_PropertyRef);
-        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Name, $property->getName(), [EdmValueWriter::class,'StringAsXml']);
+        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Name, $property->getName(), [EdmValueWriter::class, 'StringAsXml']);
         $this->WriteEndElement();
     }
 
@@ -285,11 +285,11 @@ 
     public function WriteNavigationPropertyElementHeader(INavigationProperty $member): void
     {
         $this->xmlWriter->startElement(CsdlConstants::Element_NavigationProperty);
-        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Name, $member->getName(), [EdmValueWriter::class,'StringAsXml']);
-        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Relationship, $this->model->GetAssociationFullName($member), [EdmValueWriter::class,'StringAsXml']);
-        $this->WriteRequiredAttribute(CsdlConstants::Attribute_ToRole, $this->model->GetAssociationEndName($member->getPartner()), [EdmValueWriter::class,'StringAsXml']);
-        $this->WriteRequiredAttribute(CsdlConstants::Attribute_FromRole, $this->model->GetAssociationEndName($member), [EdmValueWriter::class,'StringAsXml']);
-        $this->WriteOptionalAttribute(CsdlConstants::Attribute_ContainsTarget, $member->containsTarget(), CsdlConstants::Default_ContainsTarget, [EdmValueWriter::class,'BooleanAsXml']);
+        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Name, $member->getName(), [EdmValueWriter::class, 'StringAsXml']);
+        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Relationship, $this->model->GetAssociationFullName($member), [EdmValueWriter::class, 'StringAsXml']);
+        $this->WriteRequiredAttribute(CsdlConstants::Attribute_ToRole, $this->model->GetAssociationEndName($member->getPartner()), [EdmValueWriter::class, 'StringAsXml']);
+        $this->WriteRequiredAttribute(CsdlConstants::Attribute_FromRole, $this->model->GetAssociationEndName($member), [EdmValueWriter::class, 'StringAsXml']);
+        $this->WriteOptionalAttribute(CsdlConstants::Attribute_ContainsTarget, $member->containsTarget(), CsdlConstants::Default_ContainsTarget, [EdmValueWriter::class, 'BooleanAsXml']);
     }
 
     /**
@@ -300,7 +300,7 @@ 
     public function WriteOperationActionElement(string $elementName, OnDeleteAction $operationAction): void
     {
         $this->xmlWriter->startElement($elementName);
-        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Action, strval($operationAction), [EdmValueWriter::class,'StringAsXml']);
+        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Action, strval($operationAction), [EdmValueWriter::class, 'StringAsXml']);
         $this->WriteEndElement();
     }
 
@@ -314,8 +314,8 @@ 
     {
         $xmlNamespace = self::GetCsdlNamespace($this->version);
         $this->xmlWriter->startElement(CsdlConstants::Element_Schema);
-        $this->WriteOptionalAttribute(CsdlConstants::Attribute_Namespace, $schema->getNamespace(), '', [EdmValueWriter::class,'StringAsXml']);
-        $this->WriteOptionalAttribute(CsdlConstants::Attribute_Alias, $alias, null, [EdmValueWriter::class,'StringAsXml']);
+        $this->WriteOptionalAttribute(CsdlConstants::Attribute_Namespace, $schema->getNamespace(), '', [EdmValueWriter::class, 'StringAsXml']);
+        $this->WriteOptionalAttribute(CsdlConstants::Attribute_Alias, $alias, null, [EdmValueWriter::class, 'StringAsXml']);
         foreach ($mappings as $mappingKey => $mappingValue) {
             $this->xmlWriter->writeAttributeNs(EdmConstants::XmlNamespacePrefix, $mappingKey, null, $mappingValue);
         }
@@ -328,7 +328,7 @@ 
     public function WriteAnnotationsElementHeader(string $annotationsTarget): void
     {
         $this->xmlWriter->startElement(CsdlConstants::Element_Annotations);
-        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Target, $annotationsTarget, [EdmValueWriter::class,'StringAsXml']);
+        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Target, $annotationsTarget, [EdmValueWriter::class, 'StringAsXml']);
     }
 
     /**
@@ -339,13 +339,13 @@ 
     public function WriteStructuralPropertyElementHeader(IStructuralProperty $property, bool $inlineType): void
     {
         $this->xmlWriter->startElement(CsdlConstants::Element_Property);
-        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Name, $property->getName(), [EdmValueWriter::class,'StringAsXml']);
+        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Name, $property->getName(), [EdmValueWriter::class, 'StringAsXml']);
         if ($inlineType) {
             $this->WriteRequiredAttribute(CsdlConstants::Attribute_Type, $property->getType(), [$this, 'TypeReferenceAsXml']);
         }
 
         $this->WriteOptionalAttribute(CsdlConstants::Attribute_ConcurrencyMode, $property->getConcurrencyMode(), CsdlConstants::$Default_ConcurrencyMode, [self::class, 'ConcurrencyModeAsXml']);
-        $this->WriteOptionalAttribute(CsdlConstants::Attribute_DefaultValue, $property->getDefaultValueString(), null, [EdmValueWriter::class,'StringAsXml']);
+        $this->WriteOptionalAttribute(CsdlConstants::Attribute_DefaultValue, $property->getDefaultValueString(), null, [EdmValueWriter::class, 'StringAsXml']);
     }
 
     /**
@@ -355,7 +355,7 @@ 
     public function WriteEnumMemberElementHeader(IEnumMember $member): void
     {
         $this->xmlWriter->startElement(CsdlConstants::Element_Member);
-        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Name, $member->getName(), [EdmValueWriter::class,'StringAsXml']);
+        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Name, $member->getName(), [EdmValueWriter::class, 'StringAsXml']);
         $isExplicit = $member->IsValueExplicit($this->model);
         if (null === $isExplicit || $isExplicit) {
             $this->WriteRequiredAttribute(CsdlConstants::Attribute_Value, $member->getValue(), [EdmValueWriter::class, 'PrimitiveValueAsXml']);
@@ -368,7 +368,7 @@ 
      */
     public function WriteNullableAttribute(ITypeReference $reference): void
     {
-        $this->WriteOptionalAttribute(CsdlConstants::Attribute_Nullable, $reference->getNullable(), CsdlConstants::Default_Nullable, [EdmValueWriter::class,'BooleanAsXml']);
+        $this->WriteOptionalAttribute(CsdlConstants::Attribute_Nullable, $reference->getNullable(), CsdlConstants::Default_Nullable, [EdmValueWriter::class, 'BooleanAsXml']);
     }
 
     /**
@@ -378,12 +378,12 @@ 
     public function WriteBinaryTypeAttributes(IBinaryTypeReference $reference): void
     {
         if ($reference->isUnBounded()) {
-            $this->WriteRequiredAttribute(CsdlConstants::Attribute_MaxLength, CsdlConstants::Value_Max, [EdmValueWriter::class,'StringAsXml']);
+            $this->WriteRequiredAttribute(CsdlConstants::Attribute_MaxLength, CsdlConstants::Value_Max, [EdmValueWriter::class, 'StringAsXml']);
         } else {
             $this->WriteOptionalAttribute(CsdlConstants::Attribute_MaxLength, $reference->getMaxLength(), null, [EdmValueWriter::class, 'IntAsXml']);
         }
 
-        $this->WriteOptionalAttribute(CsdlConstants::Attribute_FixedLength, $reference->isFixedLength(), null, [EdmValueWriter::class,'BooleanAsXml']);
+        $this->WriteOptionalAttribute(CsdlConstants::Attribute_FixedLength, $reference->isFixedLength(), null, [EdmValueWriter::class, 'BooleanAsXml']);
     }
 
     /**
@@ -392,8 +392,8 @@ 
      */
     public function WriteDecimalTypeAttributes(IDecimalTypeReference $reference): void
     {
-        $this->WriteOptionalAttribute(CsdlConstants::Attribute_Precision, $reference->getPrecision(), null, [EdmValueWriter::class,'IntAsXml']);
-        $this->WriteOptionalAttribute(CsdlConstants::Attribute_Scale, $reference->getScale(), null, [EdmValueWriter::class,'IntAsXml']);
+        $this->WriteOptionalAttribute(CsdlConstants::Attribute_Precision, $reference->getPrecision(), null, [EdmValueWriter::class, 'IntAsXml']);
+        $this->WriteOptionalAttribute(CsdlConstants::Attribute_Scale, $reference->getScale(), null, [EdmValueWriter::class, 'IntAsXml']);
     }
 
     /**
@@ -411,15 +411,15 @@ 
      */
     public function WriteStringTypeAttributes(IStringTypeReference $reference): void
     {
-        $this->WriteOptionalAttribute(CsdlConstants::Attribute_Collation, $reference->getCollation(), null, [EdmValueWriter::class,'StringAsXml']);
+        $this->WriteOptionalAttribute(CsdlConstants::Attribute_Collation, $reference->getCollation(), null, [EdmValueWriter::class, 'StringAsXml']);
         if ($reference->isUnbounded()) {
-            $this->WriteRequiredAttribute(CsdlConstants::Attribute_MaxLength, CsdlConstants::Value_Max, [EdmValueWriter::class,'StringAsXml']);
+            $this->WriteRequiredAttribute(CsdlConstants::Attribute_MaxLength, CsdlConstants::Value_Max, [EdmValueWriter::class, 'StringAsXml']);
         } else {
-            $this->WriteOptionalAttribute(CsdlConstants::Attribute_MaxLength, $reference->getMaxLength(), null, [EdmValueWriter::class,'IntAsXml']);
+            $this->WriteOptionalAttribute(CsdlConstants::Attribute_MaxLength, $reference->getMaxLength(), null, [EdmValueWriter::class, 'IntAsXml']);
         }
 
-        $this->WriteOptionalAttribute(CsdlConstants::Attribute_FixedLength, $reference->isFixedLength(), null, [EdmValueWriter::class,'BooleanAsXml']);
-        $this->WriteOptionalAttribute(CsdlConstants::Attribute_Unicode, $reference->isUnicode(), null, [EdmValueWriter::class,'BooleanAsXml']);
+        $this->WriteOptionalAttribute(CsdlConstants::Attribute_FixedLength, $reference->isFixedLength(), null, [EdmValueWriter::class, 'BooleanAsXml']);
+        $this->WriteOptionalAttribute(CsdlConstants::Attribute_Unicode, $reference->isUnicode(), null, [EdmValueWriter::class, 'BooleanAsXml']);
     }
 
     /**
@@ -428,7 +428,7 @@ 
      */
     public function WriteTemporalTypeAttributes(ITemporalTypeReference $reference): void
     {
-        $this->WriteOptionalAttribute(CsdlConstants::Attribute_Precision, $reference->getPrecision(), null, [EdmValueWriter::class,'IntAsXml']);
+        $this->WriteOptionalAttribute(CsdlConstants::Attribute_Precision, $reference->getPrecision(), null, [EdmValueWriter::class, 'IntAsXml']);
     }
 
     public function WriteReferentialConstraintElementHeader(INavigationProperty $constraint): void
@@ -443,7 +443,7 @@ 
     public function WriteReferentialConstraintPrincipalEndElementHeader(INavigationProperty $end): void
     {
         $this->xmlWriter->startElement(CsdlConstants::Element_Principal);
-        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Role, $this->model->GetAssociationEndName($end), [EdmValueWriter::class,'StringAsXml']);
+        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Role, $this->model->GetAssociationEndName($end), [EdmValueWriter::class, 'StringAsXml']);
     }
 
     /**
@@ -453,7 +453,7 @@ 
     public function WriteReferentialConstraintDependentEndElementHeader(INavigationProperty $end): void
     {
         $this->xmlWriter->startElement(CsdlConstants::Element_Dependent);
-        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Role, $this->model->GetAssociationEndName($end), [EdmValueWriter::class,'StringAsXml']);
+        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Role, $this->model->GetAssociationEndName($end), [EdmValueWriter::class, 'StringAsXml']);
     }
 
     /**
@@ -464,8 +464,8 @@ 
     public function WriteNamespaceUsingElement(string $usingNamespace, string $alias): void
     {
         $this->xmlWriter->startElement(CsdlConstants::Element_Using);
-        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Namespace, $usingNamespace, [EdmValueWriter::class,'StringAsXml']);
-        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Alias, $alias, [EdmValueWriter::class,'StringAsXml']);
+        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Namespace, $usingNamespace, [EdmValueWriter::class, 'StringAsXml']);
+        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Alias, $alias, [EdmValueWriter::class, 'StringAsXml']);
         $this->WriteEndElement();
     }
 
@@ -497,7 +497,7 @@ 
     public function WriteFunctionElementHeader(IFunction $function, bool $inlineReturnType): void
     {
         $this->xmlWriter->startElement(CsdlConstants::Element_Function);
-        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Name, $function->getName(), [EdmValueWriter::class,'StringAsXml']);
+        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Name, $function->getName(), [EdmValueWriter::class, 'StringAsXml']);
         if ($inlineReturnType) {
             $this->WriteRequiredAttribute(CsdlConstants::Attribute_ReturnType, $function->getReturnType(), [$this, 'TypeReferenceAsXml']);
         }
@@ -527,21 +527,21 @@ 
         }
 
         $this->xmlWriter->startElement(CsdlConstants::Element_FunctionImport);
-        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Name, $functionImport->getName(), [EdmValueWriter::class,'StringAsXml']);
-        $this->WriteOptionalAttribute(CsdlConstants::Attribute_ReturnType, $functionImport->getReturnType(), null, [$this,'TypeReferenceAsXml']);
+        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Name, $functionImport->getName(), [EdmValueWriter::class, 'StringAsXml']);
+        $this->WriteOptionalAttribute(CsdlConstants::Attribute_ReturnType, $functionImport->getReturnType(), null, [$this, 'TypeReferenceAsXml']);
 
         // IsSideEffecting is optional, however its default applies to non-composable function imports only.
         // Composable function imports can't be side-effecting, so we don't emit false.
         if (!$functionImport->isComposable() && $functionImport->isSideEffecting() != CsdlConstants::Default_IsSideEffecting) {
-            $this->WriteRequiredAttribute(CsdlConstants::Attribute_IsSideEffecting, $functionImport->isSideEffecting(), [EdmValueWriter::class,'BooleanAsXml']);
+            $this->WriteRequiredAttribute(CsdlConstants::Attribute_IsSideEffecting, $functionImport->isSideEffecting(), [EdmValueWriter::class, 'BooleanAsXml']);
         }
 
-        $this->WriteOptionalAttribute(CsdlConstants::Attribute_IsComposable, $functionImport->isComposable(), CsdlConstants::Default_IsComposable, [EdmValueWriter::class,'BooleanAsXml']);
-        $this->WriteOptionalAttribute(CsdlConstants::Attribute_IsBindable, $functionImport->isBindable(), CsdlConstants::Default_IsBindable, [EdmValueWriter::class,'BooleanAsXml']);
+        $this->WriteOptionalAttribute(CsdlConstants::Attribute_IsComposable, $functionImport->isComposable(), CsdlConstants::Default_IsComposable, [EdmValueWriter::class, 'BooleanAsXml']);
+        $this->WriteOptionalAttribute(CsdlConstants::Attribute_IsBindable, $functionImport->isBindable(), CsdlConstants::Default_IsBindable, [EdmValueWriter::class, 'BooleanAsXml']);
         $entitySetReference = $functionImport->getEntitySet();
         if ($functionImport->getEntitySet() != null) {
             if ($entitySetReference instanceof IEntitySetReferenceExpression) {
-                $this->WriteOptionalAttribute(CsdlConstants::Attribute_EntitySet, $entitySetReference->getReferencedEntitySet()->getName(), null, [EdmValueWriter::class,'StringAsXml']);
+                $this->WriteOptionalAttribute(CsdlConstants::Attribute_EntitySet, $entitySetReference->getReferencedEntitySet()->getName(), null, [EdmValueWriter::class, 'StringAsXml']);
             } else {
                 $pathExpression = $functionImport->getEntitySet();
                 if ($pathExpression instanceof IPathExpression) {
@@ -561,9 +561,9 @@ 
     public function WriteFunctionParameterElementHeader(IFunctionParameter $parameter, bool $inlineType): void
     {
         $this->xmlWriter->startElement(CsdlConstants::Element_Parameter);
-        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Name, $parameter->getName(), [EdmValueWriter::class,'StringAsXml']);
+        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Name, $parameter->getName(), [EdmValueWriter::class, 'StringAsXml']);
         if ($inlineType) {
-            $this->WriteRequiredAttribute(CsdlConstants::Attribute_Type, $parameter->getType(), [$this,'TypeReferenceAsXml']);
+            $this->WriteRequiredAttribute(CsdlConstants::Attribute_Type, $parameter->getType(), [$this, 'TypeReferenceAsXml']);
         }
 
         $this->WriteOptionalAttribute(CsdlConstants::Attribute_Mode, $parameter->getMode(), CsdlConstants::$Default_FunctionParameterMode, [self::class, 'FunctionParameterModeAsXml']);
@@ -578,7 +578,7 @@ 
     {
         $this->xmlWriter->startElement(CsdlConstants::Element_CollectionType);
         if ($inlineType) {
-            $this->WriteRequiredAttribute(CsdlConstants::Attribute_ElementType, $collectionType->getElementType(), [$this,'TypeReferenceAsXml']);
+            $this->WriteRequiredAttribute(CsdlConstants::Attribute_ElementType, $collectionType->getElementType(), [$this, 'TypeReferenceAsXml']);
         }
     }
 
@@ -600,7 +600,7 @@ 
                 break;
             case ExpressionKind::BooleanConstant():
                 assert($expression instanceof IBooleanConstantExpression);
-                $this->WriteRequiredAttribute(CsdlConstants::Attribute_Bool, $expression->getValue(), [EdmValueWriter::class,'BooleanAsXml']);
+                $this->WriteRequiredAttribute(CsdlConstants::Attribute_Bool, $expression->getValue(), [EdmValueWriter::class, 'BooleanAsXml']);
                 break;
             case ExpressionKind::DateTimeConstant():
                 assert($expression instanceof IDateTimeConstantExpression);
@@ -616,7 +616,7 @@ 
                 break;
             case ExpressionKind::FloatingConstant():
                 assert($expression instanceof IFloatingConstantExpression);
-                $this->WriteRequiredAttribute(CsdlConstants::Attribute_Float, $expression->getValue(), [EdmValueWriter::class,  'FloatAsXml']);
+                $this->WriteRequiredAttribute(CsdlConstants::Attribute_Float, $expression->getValue(), [EdmValueWriter::class, 'FloatAsXml']);
                 break;
             case ExpressionKind::GuidConstant():
                 assert($expression instanceof IGuidConstantExpression);
@@ -632,7 +632,7 @@ 
                 break;
             case ExpressionKind::StringConstant():
                 assert($expression instanceof IStringConstantExpression);
-                $this->WriteRequiredAttribute(CsdlConstants::Attribute_String, $expression->getValue(), [EdmValueWriter::class,'StringAsXml']);
+                $this->WriteRequiredAttribute(CsdlConstants::Attribute_String, $expression->getValue(), [EdmValueWriter::class, 'StringAsXml']);
                 break;
             case ExpressionKind::TimeConstant():
                 assert($expression instanceof ITimeConstantExpression);
@@ -653,7 +653,7 @@ 
     {
         $this->xmlWriter->startElement(CsdlConstants::Element_ValueAnnotation);
         $this->WriteRequiredAttribute(CsdlConstants::Attribute_Term, $annotation->getTerm(), [$this, 'TermAsXml']);
-        $this->WriteOptionalAttribute(CsdlConstants::Attribute_Qualifier, $annotation->getQualifier(), null, [EdmValueWriter::class,'StringAsXml']);
+        $this->WriteOptionalAttribute(CsdlConstants::Attribute_Qualifier, $annotation->getQualifier(), null, [EdmValueWriter::class, 'StringAsXml']);
         if ($isInline) {
             $this->WriteInlineExpression($annotation->getValue());
         }
@@ -667,7 +667,7 @@ 
     {
         $this->xmlWriter->startElement(CsdlConstants::Element_TypeAnnotation);
         $this->WriteRequiredAttribute(CsdlConstants::Attribute_Term, $annotation->getTerm(), [$this, 'TermAsXml']);
-        $this->WriteOptionalAttribute(CsdlConstants::Attribute_Qualifier, $annotation->getQualifier(), null, [EdmValueWriter::class,'StringAsXml']);
+        $this->WriteOptionalAttribute(CsdlConstants::Attribute_Qualifier, $annotation->getQualifier(), null, [EdmValueWriter::class, 'StringAsXml']);
     }
 
     /**
@@ -678,7 +678,7 @@ 
     public function WritePropertyValueElementHeader(IPropertyValueBinding $value, bool $isInline): void
     {
         $this->xmlWriter->startElement(CsdlConstants::Element_PropertyValue);
-        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Property, $value->getBoundProperty()->getName(), [EdmValueWriter::class,'StringAsXml']);
+        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Property, $value->getBoundProperty()->getName(), [EdmValueWriter::class, 'StringAsXml']);
         if ($isInline) {
             $this->WriteInlineExpression($value->getValue());
         }
@@ -691,7 +691,7 @@ 
     public function WriteRecordExpressionElementHeader(IRecordExpression $expression)
     {
         $this->xmlWriter->startElement(CsdlConstants::Element_Record);
-        $this->WriteOptionalAttribute(CsdlConstants::Attribute_Type, $expression->getDeclaredType(), null, [$this,'TypeReferenceAsXml']);
+        $this->WriteOptionalAttribute(CsdlConstants::Attribute_Type, $expression->getDeclaredType(), null, [$this, 'TypeReferenceAsXml']);
     }
 
     /**
@@ -702,7 +702,7 @@ 
     public function WritePropertyConstructorElementHeader(IPropertyConstructor $constructor, bool $isInline): void
     {
         $this->xmlWriter->startElement(CsdlConstants::Element_PropertyValue);
-        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Property, $constructor->getName(), [EdmValueWriter::class,'StringAsXml']);
+        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Property, $constructor->getName(), [EdmValueWriter::class, 'StringAsXml']);
         if ($isInline) {
             $this->WriteInlineExpression($constructor->getValue());
         }
@@ -816,7 +816,7 @@ 
     public function WriteLabeledElementHeader(ILabeledExpression $labeledElement): void
     {
         $this->xmlWriter->startElement(CsdlConstants::Element_LabeledElement);
-        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Name, $labeledElement->getName(), [EdmValueWriter::class,'StringAsXml']);
+        $this->WriteRequiredAttribute(CsdlConstants::Attribute_Name, $labeledElement->getName(), [EdmValueWriter::class, 'StringAsXml']);
     }
 
     /**
@@ -828,7 +828,7 @@ 
     {
         $this->xmlWriter->startElement(CsdlConstants::Element_IsType);
         if ($inlineType) {
-            $this->WriteRequiredAttribute(CsdlConstants::Attribute_Type, $expression->getType(), [$this,'TypeReferenceAsXml']);
+            $this->WriteRequiredAttribute(CsdlConstants::Attribute_Type, $expression->getType(), [$this, 'TypeReferenceAsXml']);
         }
     }
 
@@ -841,7 +841,7 @@ 
     {
         $this->xmlWriter->startElement(CsdlConstants::Element_AssertType);
         if ($inlineType) {
-            $this->WriteRequiredAttribute(CsdlConstants::Attribute_Type, $expression->getType(), [$this,'TypeReferenceAsXml']);
+            $this->WriteRequiredAttribute(CsdlConstants::Attribute_Type, $expression->getType(), [$this, 'TypeReferenceAsXml']);
         }
     }
 
@@ -1030,7 +1030,7 @@ 
 
     private static function SridAsXml(?int $i): string
     {
-        return $i !== null ? strval($i) :  CsdlConstants::Value_SridVariable;
+        return $i !== null ? strval($i) : CsdlConstants::Value_SridVariable;
     }
 
     /**