@@ -28,8 +28,7 @@ |
||
28 | 28 | public static function validate(IModel $root, $versionOrRuleset, array &$errors): bool |
29 | 29 | { |
30 | 30 | $ruleSet = $versionOrRuleset instanceof Version ? |
31 | - ValidationRuleSet::getEdmModelRuleSet($versionOrRuleset) : |
|
32 | - $versionOrRuleset; |
|
31 | + ValidationRuleSet::getEdmModelRuleSet($versionOrRuleset) : $versionOrRuleset; |
|
33 | 32 | assert($ruleSet instanceof ValidationRuleSet); |
34 | 33 | $errors = InterfaceValidator::validateModelStructureAndSemantics($root, $ruleSet); |
35 | 34 | return count($errors) === 0; |
@@ -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 | { |
@@ -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, |
@@ -94,8 +94,8 @@ |
||
94 | 94 | $errors = [new EdmError(new CsdlLocation(0, 0), EdmErrorCode::UnknownEdmxVersion(), StringConst::Serializer_UnknownEdmxVersion())]; |
95 | 95 | return false; |
96 | 96 | } |
97 | - } elseif (! $edmxVersion = CsdlConstants::edmToEdmxVersions($model->getEdmVersion() ?? Version::v3())) { |
|
98 | - $errors = [new EdmError(new CsdlLocation(0, 0), EdmErrorCode::UnknownEdmVersion(), StringConst::Serializer_UnknownEdmVersion()) ]; |
|
97 | + } elseif (!$edmxVersion = CsdlConstants::edmToEdmxVersions($model->getEdmVersion() ?? Version::v3())) { |
|
98 | + $errors = [new EdmError(new CsdlLocation(0, 0), EdmErrorCode::UnknownEdmVersion(), StringConst::Serializer_UnknownEdmVersion())]; |
|
99 | 99 | return false; |
100 | 100 | } |
101 | 101 |
@@ -330,9 +330,9 @@ |
||
330 | 330 | private static function setProperties(string $ranges, int $value): void |
331 | 331 | { |
332 | 332 | assert(mb_strlen($ranges, 'UTF-8') % 2 === 0); |
333 | - for ($p = 0; $p < mb_strlen($ranges, 'UTF-8'); $p +=2) { |
|
333 | + for ($p = 0; $p < mb_strlen($ranges, 'UTF-8'); $p += 2) { |
|
334 | 334 | $str1 = mb_substr($ranges, $p, 1, 'UTF-8'); |
335 | - $str2 = mb_substr($ranges, $p+1, 1, 'UTF-8'); |
|
335 | + $str2 = mb_substr($ranges, $p + 1, 1, 'UTF-8'); |
|
336 | 336 | for ($i = mb_ord($str1), |
337 | 337 | $last = mb_ord($str2); $i <= $last; $i++) { |
338 | 338 | if (!isset(self::$s_CharProperties[$i])) { |
@@ -204,7 +204,7 @@ discard block |
||
204 | 204 | // If we don't have the applied function we just assume that it will work. |
205 | 205 | $discoveredErrors = []; |
206 | 206 | return true; |
207 | - case ExpressionKind::If(): |
|
207 | + case ExpressionKind::If (): |
|
208 | 208 | assert($expression instanceof IIfExpression); |
209 | 209 | return self::tryAssertIfAsType($expression, $type, $context, $matchExactly, $discoveredErrors); |
210 | 210 | case ExpressionKind::IsType(): |
@@ -306,7 +306,7 @@ discard block |
||
306 | 306 | iterable &$discoveredErrors |
307 | 307 | ): bool { |
308 | 308 | if (!$type->isPrimitive()) { |
309 | - $discoveredErrors = [ |
|
309 | + $discoveredErrors = [ |
|
310 | 310 | new EdmError( |
311 | 311 | $expression->location(), |
312 | 312 | EdmErrorCode::PrimitiveConstantExpressionNotValidForNonPrimitiveType(), |
@@ -770,7 +770,7 @@ discard block |
||
770 | 770 | return self::tryAssertIntegerConstantInRange( |
771 | 771 | $expression, |
772 | 772 | (int)-9223372036854775808, |
773 | - (int)999999999999, |
|
773 | + (int) 999999999999, |
|
774 | 774 | $discoveredErrors |
775 | 775 | ); |
776 | 776 | case PrimitiveTypeKind::Int32(): |
@@ -802,7 +802,7 @@ discard block |
||
802 | 802 | $discoveredErrors |
803 | 803 | ); |
804 | 804 | default: |
805 | - $discoveredErrors = [ |
|
805 | + $discoveredErrors = [ |
|
806 | 806 | new EdmError( |
807 | 807 | $expression->location(), |
808 | 808 | EdmErrorCode::ExpressionPrimitiveKindNotValidForAssertedType(), |
@@ -926,7 +926,7 @@ discard block |
||
926 | 926 | |
927 | 927 | if ($expressionType->getTypeKind()->isPrimitive() && $assertedType->getTypeKind()->isPrimitive()) { |
928 | 928 | $primitiveExpressionType = $expressionType; |
929 | - $primitiveAssertedType = $assertedType ; |
|
929 | + $primitiveAssertedType = $assertedType; |
|
930 | 930 | assert($primitiveExpressionType instanceof IPrimitiveType); |
931 | 931 | assert($primitiveAssertedType instanceof IPrimitiveType); |
932 | 932 | if (!self::promotesTo( |
@@ -28,7 +28,7 @@ |
||
28 | 28 | ); |
29 | 29 | |
30 | 30 | if (null !== $type->getBaseType()) { |
31 | - $visitedTypes = new HashSetInternal(); |
|
31 | + $visitedTypes = new HashSetInternal(); |
|
32 | 32 | $visitedTypes->add($type); |
33 | 33 | /** @var IStructuredType|null $currentBaseType */ |
34 | 34 | for ($currentBaseType = $type->getBaseType(); null !== $currentBaseType; $currentBaseType = $currentBaseType->getBaseType() |
@@ -27,7 +27,7 @@ |
||
27 | 27 | foreach ($annotations as $annotation) { |
28 | 28 | assert($annotation instanceof IDirectValueAnnotation); |
29 | 29 | EdmUtil::checkArgumentNull($annotation->location(), 'annotation->Location'); |
30 | - if (! $annotationNameSet->add($annotation->getNamespaceUri() . ':' . $annotation->getName())) { |
|
30 | + if (!$annotationNameSet->add($annotation->getNamespaceUri() . ':' . $annotation->getName())) { |
|
31 | 31 | EdmUtil::checkArgumentNull($annotation->location(), 'annotation->Location'); |
32 | 32 | $context->addError( |
33 | 33 | $annotation->location(), |
@@ -14,7 +14,7 @@ |
||
14 | 14 | assert($typeRef instanceof ICollectionTypeReference); |
15 | 15 | return null !== $typeRef->getDefinition() && |
16 | 16 | !$typeRef->getDefinition()->getTypeKind()->isCollection() ? |
17 | - [ InterfaceValidator::createTypeRefInterfaceTypeKindValueMismatchError($typeRef)] : null; |
|
17 | + [InterfaceValidator::createTypeRefInterfaceTypeKindValueMismatchError($typeRef)] : null; |
|
18 | 18 | } |
19 | 19 | |
20 | 20 | public function forType(): string |