| @@ -39,7 +39,7 @@ | ||
| 39 | 39 | $this->lookup[ValueKind::Floating()->getValue()] = IFloatingValue::class; | 
| 40 | 40 | $this->lookup[ValueKind::Guid()->getValue()] = IGuidValue::class; | 
| 41 | 41 | $this->lookup[ValueKind::Integer()->getValue()] = IIntegerValue::class; | 
| 42 | - $this->lookup[ValueKind::Null()->getValue()] = INullValue::class; | |
| 42 | + $this->lookup[ValueKind::null()->getValue()] = INullValue::class; | |
| 43 | 43 | $this->lookup[ValueKind::String()->getValue()] = IStringValue::class; | 
| 44 | 44 | $this->lookup[ValueKind::Structured()->getValue()] = IStructuredValue::class; | 
| 45 | 45 | $this->lookup[ValueKind::Time()->getValue()] = ITimeValue::class; | 
| @@ -1294,7 +1294,7 @@ discard block | ||
| 1294 | 1294 | |
| 1295 | 1295 | // Association Set | 
| 1296 | 1296 | if (!($this->model->GetAssociationSetName($thisEntitySet, $thisNavprop) == | 
| 1297 | - $this->model->GetAssociationSetName($thatEntitySet, $thatNavprop) && | |
| 1297 | + $this->model->GetAssociationSetName($thatEntitySet, $thatNavprop) && | |
| 1298 | 1298 |              $this->model->GetAssociationFullName($thisNavprop) == $this->model->GetAssociationFullName($thatNavprop))) { | 
| 1299 | 1299 | return false; | 
| 1300 | 1300 | } | 
| @@ -1316,7 +1316,7 @@ discard block | ||
| 1316 | 1316 | |
| 1317 | 1317 |          if (null !== $thisOtherEntitySet) { | 
| 1318 | 1318 | if (!($this->model->GetAssociationEndName($thisNavprop->getPartner()) == | 
| 1319 | - $this->model->GetAssociationEndName($thatNavprop->getPartner()) && | |
| 1319 | + $this->model->GetAssociationEndName($thatNavprop->getPartner()) && | |
| 1320 | 1320 |                    $thisOtherEntitySet->getName() == $thatOtherEntitySet->getName())) { | 
| 1321 | 1321 | return false; | 
| 1322 | 1322 | } | 
| @@ -132,8 +132,7 @@ discard block | ||
| 132 | 132 | $alias = null; | 
| 133 | 133 |          if ($this->namespaceAliasMappings != null) { | 
| 134 | 134 | $alias = array_key_exists($element->getNamespace(), $this->namespaceAliasMappings) ? | 
| 135 | - $this->namespaceAliasMappings[$element->getNamespace()] : | |
| 136 | - null; | |
| 135 | + $this->namespaceAliasMappings[$element->getNamespace()] : null; | |
| 137 | 136 | } | 
| 138 | 137 | |
| 139 | 138 | $this->schemaWriter->WriteSchemaElementHeader($element, $alias, $mappings); | 
| @@ -609,7 +608,7 @@ discard block | ||
| 609 | 608 | protected function ProcessPropertyReferenceExpression(IPropertyReferenceExpression $expression): void | 
| 610 | 609 |      { | 
| 611 | 610 | $this->BeginElement($expression, [$this->schemaWriter, 'WritePropertyReferenceExpressionElementHeader']); | 
| 612 | -        if ($expression->getBase()!= null) { | |
| 611 | +        if ($expression->getBase() != null) { | |
| 613 | 612 | $this->VisitExpression($expression->getBase()); | 
| 614 | 613 | } | 
| 615 | 614 | |
| @@ -1208,10 +1207,10 @@ discard block | ||
| 1208 | 1207 | return false; | 
| 1209 | 1208 | } | 
| 1210 | 1209 | |
| 1211 | - $thisAssociationAnnotations =[]; | |
| 1210 | + $thisAssociationAnnotations = []; | |
| 1212 | 1211 | $thisEnd1Annotations = []; | 
| 1213 | - $thisEnd2Annotations =[]; | |
| 1214 | - $thisConstraintAnnotations =[]; | |
| 1212 | + $thisEnd2Annotations = []; | |
| 1213 | + $thisConstraintAnnotations = []; | |
| 1215 | 1214 | $this->model->GetAssociationAnnotations( | 
| 1216 | 1215 | $thisPrimary, | 
| 1217 | 1216 | $thisAssociationAnnotations, | 
| @@ -1223,7 +1222,7 @@ discard block | ||
| 1223 | 1222 | $thatAssociationAnnotations = []; | 
| 1224 | 1223 | $thatEnd1Annotations = []; | 
| 1225 | 1224 | $thatEnd2Annotations = []; | 
| 1226 | - $thatConstraintAnnotations =[]; | |
| 1225 | + $thatConstraintAnnotations = []; | |
| 1227 | 1226 | $this->model->GetAssociationAnnotations( | 
| 1228 | 1227 | $thatPrimary, | 
| 1229 | 1228 | $thatAssociationAnnotations, | 
| @@ -1268,7 +1267,7 @@ discard block | ||
| 1268 | 1267 |          if (null === $theseProperties || null === $thoseProperties) { | 
| 1269 | 1268 | return false; | 
| 1270 | 1269 | } | 
| 1271 | - $numProp = count($theseProperties); | |
| 1270 | + $numProp = count($theseProperties); | |
| 1272 | 1271 |          if ($numProp != count($thoseProperties)) { | 
| 1273 | 1272 | return false; | 
| 1274 | 1273 | } | 
| @@ -1339,8 +1338,8 @@ discard block | ||
| 1339 | 1338 | ); | 
| 1340 | 1339 | |
| 1341 | 1340 | $thatAssociationSetAnnotations = []; | 
| 1342 | - $thatEnd1Annotations =[]; | |
| 1343 | - $thatEnd2Annotations =[]; | |
| 1341 | + $thatEnd1Annotations = []; | |
| 1342 | + $thatEnd2Annotations = []; | |
| 1344 | 1343 | $this->model->GetAssociationSetAnnotations( | 
| 1345 | 1344 | $thatEntitySet, | 
| 1346 | 1345 | $thatNavprop, | 
| @@ -24,8 +24,7 @@ | ||
| 24 | 24 | assert($functionImport instanceof IFunctionImport); | 
| 25 | 25 |          if (null !== $functionImport->getReturnType()) { | 
| 26 | 26 | $elementType = $functionImport->getReturnType()->IsCollection() ? | 
| 27 | - $functionImport->getReturnType()->AsCollection()->ElementType() : | |
| 28 | - $functionImport->getReturnType(); | |
| 27 | + $functionImport->getReturnType()->AsCollection()->ElementType() : $functionImport->getReturnType(); | |
| 29 | 28 | if (!$elementType->IsPrimitive() && | 
| 30 | 29 | !$elementType->IsEntity() && | 
| 31 | 30 | !$elementType->IsComplex() && | 
| @@ -19,7 +19,7 @@ | ||
| 19 | 19 | /** @var IVocabularyAnnotation $annotation */ | 
| 20 | 20 | $annotation = $this; | 
| 21 | 21 | return $annotation->GetSerializationLocation($model) == | 
| 22 | - EdmVocabularyAnnotationSerializationLocation::Inline || null === $annotation->TargetString(); | |
| 22 | + EdmVocabularyAnnotationSerializationLocation::Inline || null === $annotation->TargetString(); | |
| 23 | 23 | } | 
| 24 | 24 | |
| 25 | 25 | public function TargetString(): string | 
| @@ -53,7 +53,7 @@ discard block | ||
| 53 | 53 | case $element instanceof IProperty: | 
| 54 | 54 | assert($element instanceof IProperty); | 
| 55 | 55 | $type = $element->getType(); | 
| 56 | - return $element->getName() ?? '' . ':' . ($type !== null ? self::ToTraceString($type) :''); | |
| 56 | + return $element->getName() ?? '' . ':' . ($type !== null ? self::ToTraceString($type) : ''); | |
| 57 | 57 | case $element instanceof IEntityReferenceType: | 
| 58 | 58 | assert($element instanceof IEntityReferenceType); | 
| 59 | 59 |                  return strval(TypeKind::EntityReference()->getKey()) . '(' . (null !== $element->getEntityType() ? | 
| @@ -188,7 +188,7 @@ discard block | ||
| 188 | 188 | $sb, | 
| 189 | 189 | EdmConstants::FacetName_Srid, | 
| 190 | 190 | null !== $type->getSpatialReferenceIdentifier() | 
| 191 | - ? $type->getSpatialReferenceIdentifier(): EdmConstants::Value_SridVariable | |
| 191 | + ? $type->getSpatialReferenceIdentifier() : EdmConstants::Value_SridVariable | |
| 192 | 192 | ); | 
| 193 | 193 | return $sb; | 
| 194 | 194 | } | 
| @@ -32,8 +32,7 @@ | ||
| 32 | 32 |          if (null !== $functionImport->getEntitySet() && null !== $returnType) { | 
| 33 | 33 | /** @var ITypeReference $elementType */ | 
| 34 | 34 | $elementType = $returnType->IsCollection() ? | 
| 35 | - $returnType->AsCollection()->ElementType() : | |
| 36 | - $returnType; | |
| 35 | + $returnType->AsCollection()->ElementType() : $returnType; | |
| 37 | 36 | EdmUtil::checkArgumentNull($elementType->getDefinition(), 'elementType->getDefinition'); | 
| 38 | 37 |              if ($elementType->IsEntity()) { | 
| 39 | 38 | $returnedEntityType = $elementType->AsEntity()->EntityDefinition(); |