@@ -27,8 +27,7 @@ |
||
27 | 27 | public static function Validate(IModel $root, $versionOrRuleset, array &$errors): bool |
28 | 28 | { |
29 | 29 | $ruleSet = $versionOrRuleset instanceof Version ? |
30 | - ValidationRuleSet::getEdmModelRuleSet($versionOrRuleset) : |
|
31 | - $versionOrRuleset; |
|
30 | + ValidationRuleSet::getEdmModelRuleSet($versionOrRuleset) : $versionOrRuleset; |
|
32 | 31 | assert($ruleSet instanceof ValidationRuleSet); |
33 | 32 | $errors = InterfaceValidator::ValidateModelStructureAndSemantics($root, $ruleSet); |
34 | 33 | return count($errors) === 0; |
@@ -96,7 +96,7 @@ |
||
96 | 96 | if (count($set1) != count($set2)) { |
97 | 97 | return false; |
98 | 98 | } |
99 | - for ($i = count($set1) -1; $i > -1; --$i) { |
|
99 | + for ($i = count($set1) - 1; $i > -1; --$i) { |
|
100 | 100 | if ($set1[$i] !== $set2[$i]) { |
101 | 101 | return false; |
102 | 102 | } |
@@ -20,11 +20,11 @@ |
||
20 | 20 | } |
21 | 21 | public static function getCycleSentinel(): ?stdClass |
22 | 22 | { |
23 | - return (object)[]; |
|
23 | + return (object) []; |
|
24 | 24 | } |
25 | 25 | public static function getSecondPassCycleSentinel(): ?stdClass |
26 | 26 | { |
27 | - return (object)[]; |
|
27 | + return (object) []; |
|
28 | 28 | } |
29 | 29 | public static function GetBoxed(bool $value) |
30 | 30 | { |
@@ -86,7 +86,7 @@ |
||
86 | 86 | $schema = null; |
87 | 87 | if (!array_key_exists($namespaceName, $this->modelSchemas)) { |
88 | 88 | $schema = new EdmSchema($namespaceName); |
89 | - $this->modelSchemas[$namespaceName] = $schema; |
|
89 | + $this->modelSchemas[$namespaceName] = $schema; |
|
90 | 90 | } |
91 | 91 | |
92 | 92 | $this->modelSchemas[$namespaceName]->addSchemaElement($element); |
@@ -11,5 +11,5 @@ |
||
11 | 11 | |
12 | 12 | public $End1Annotations; |
13 | 13 | |
14 | - public $End2Annotations ; |
|
14 | + public $End2Annotations; |
|
15 | 15 | } |
@@ -12,11 +12,11 @@ discard block |
||
12 | 12 | /** |
13 | 13 | * @var IDirectValueAnnotation |
14 | 14 | */ |
15 | - public $Annotations ; |
|
15 | + public $Annotations; |
|
16 | 16 | /** |
17 | 17 | * @var IDirectValueAnnotation |
18 | 18 | */ |
19 | - public $End1Annotations ; |
|
19 | + public $End1Annotations; |
|
20 | 20 | /** |
21 | 21 | * @var IDirectValueAnnotation |
22 | 22 | */ |
@@ -24,5 +24,5 @@ discard block |
||
24 | 24 | /** |
25 | 25 | * @var IDirectValueAnnotation |
26 | 26 | */ |
27 | - public $ConstraintAnnotations ; |
|
27 | + public $ConstraintAnnotations; |
|
28 | 28 | } |
@@ -131,8 +131,7 @@ discard block |
||
131 | 131 | $alias = null; |
132 | 132 | if ($this->namespaceAliasMappings != null) { |
133 | 133 | $alias = array_key_exists($element->getNamespace(), $this->namespaceAliasMappings) ? |
134 | - $this->namespaceAliasMappings[$element->getNamespace()] : |
|
135 | - null; |
|
134 | + $this->namespaceAliasMappings[$element->getNamespace()] : null; |
|
136 | 135 | } |
137 | 136 | |
138 | 137 | $this->schemaWriter->WriteSchemaElementHeader($element, $alias, $mappings); |
@@ -602,7 +601,7 @@ discard block |
||
602 | 601 | protected function ProcessPropertyReferenceExpression(IPropertyReferenceExpression $expression): void |
603 | 602 | { |
604 | 603 | $this->BeginElement($expression, [$this->schemaWriter, 'WritePropertyReferenceExpressionElementHeader']); |
605 | - if ($expression->getBase()!= null) { |
|
604 | + if ($expression->getBase() != null) { |
|
606 | 605 | $this->VisitExpression($expression->getBase()); |
607 | 606 | } |
608 | 607 | |
@@ -933,7 +932,7 @@ discard block |
||
933 | 932 | /** |
934 | 933 | * @var IDirectValueAnnotation[] $end2Annotations |
935 | 934 | */ |
936 | - $end2Annotations =[]; |
|
935 | + $end2Annotations = []; |
|
937 | 936 | $this->model->GetAssociationSetAnnotations( |
938 | 937 | $entitySet, |
939 | 938 | $property, |
@@ -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, |
@@ -1337,8 +1336,8 @@ discard block |
||
1337 | 1336 | ); |
1338 | 1337 | |
1339 | 1338 | $thatAssociationSetAnnotations = []; |
1340 | - $thatEnd1Annotations =[]; |
|
1341 | - $thatEnd2Annotations =[]; |
|
1339 | + $thatEnd1Annotations = []; |
|
1340 | + $thatEnd2Annotations = []; |
|
1342 | 1341 | $this->model->GetAssociationSetAnnotations( |
1343 | 1342 | $thatEntitySet, |
1344 | 1343 | $thatNavprop, |
@@ -91,8 +91,8 @@ |
||
91 | 91 | $errors = [new EdmError(new CsdlLocation(0, 0), EdmErrorCode::UnknownEdmxVersion(), StringConst::Serializer_UnknownEdmxVersion())]; |
92 | 92 | return false; |
93 | 93 | } |
94 | - } elseif (! $edmxVersion = CsdlConstants::EdmToEdmxVersions($model->GetEdmVersion() ?? Version::v3())) { |
|
95 | - $errors = [new EdmError(new CsdlLocation(0, 0), EdmErrorCode::UnknownEdmVersion(), StringConst::Serializer_UnknownEdmVersion()) ]; |
|
94 | + } elseif (!$edmxVersion = CsdlConstants::EdmToEdmxVersions($model->GetEdmVersion() ?? Version::v3())) { |
|
95 | + $errors = [new EdmError(new CsdlLocation(0, 0), EdmErrorCode::UnknownEdmVersion(), StringConst::Serializer_UnknownEdmVersion())]; |
|
96 | 96 | return false; |
97 | 97 | } |
98 | 98 |
@@ -38,6 +38,6 @@ |
||
38 | 38 | public function PrimitiveKind(): PrimitiveTypeKind |
39 | 39 | { |
40 | 40 | $primitive = $this->PrimitiveDefinition(); |
41 | - return $primitive !== null ? $primitive->getPrimitiveKind(): PrimitiveTypeKind::None(); |
|
41 | + return $primitive !== null ? $primitive->getPrimitiveKind() : PrimitiveTypeKind::None(); |
|
42 | 42 | } |
43 | 43 | } |