@@ -23,8 +23,7 @@ |
||
| 23 | 23 | assert($functionImport instanceof IFunctionImport); |
| 24 | 24 | if ($functionImport->getReturnType() != null) { |
| 25 | 25 | $elementType = $functionImport->getReturnType()->IsCollection() ? |
| 26 | - $functionImport->getReturnType()->AsCollection()->ElementType() : |
|
| 27 | - $functionImport->getReturnType(); |
|
| 26 | + $functionImport->getReturnType()->AsCollection()->ElementType() : $functionImport->getReturnType(); |
|
| 28 | 27 | if ( |
| 29 | 28 | !$elementType->IsPrimitive() && |
| 30 | 29 | !$elementType->IsEntity() && |
@@ -36,8 +36,7 @@ |
||
| 36 | 36 | ) ?? false |
| 37 | 37 | )) { |
| 38 | 38 | $error = null; |
| 39 | - if (! |
|
| 40 | - ValidationHelper::ValidateValueCanBeWrittenAsXmlElementAnnotation( |
|
| 39 | + if (!ValidationHelper::ValidateValueCanBeWrittenAsXmlElementAnnotation( |
|
| 41 | 40 | $stringValue, |
| 42 | 41 | $annotation->getNamespaceUri(), |
| 43 | 42 | $annotation->getName(), |
@@ -37,7 +37,7 @@ |
||
| 37 | 37 | |
| 38 | 38 | // Note: this check can be done without the try/catch block, but we need XmlConvert.IsStartNCNameChar and XmlConvert.IsNCNameChar, which are not available in 3.5. |
| 39 | 39 | if (!XmlConvert::VerifyNCName($annotation->getName())) { |
| 40 | - $value = $annotation->getValue() ; |
|
| 40 | + $value = $annotation->getValue(); |
|
| 41 | 41 | $errorLocation = ($value === null || !($value instanceof IValue)) ? null : $value->Location(); |
| 42 | 42 | $context->AddRawError(new EdmError($errorLocation, EdmErrorCode::InvalidName(), StringConst::EdmModel_Validator_Syntactic_EdmModel_NameIsNotAllowed($annotation->getName()))); |
| 43 | 43 | } |
@@ -12,6 +12,6 @@ |
||
| 12 | 12 | { |
| 13 | 13 | public function getValidatedType(): string |
| 14 | 14 | { |
| 15 | - return IPrimitiveValue::class ; |
|
| 15 | + return IPrimitiveValue::class; |
|
| 16 | 16 | } |
| 17 | 17 | } |
@@ -34,11 +34,11 @@ discard block |
||
| 34 | 34 | $target = $annotation->getTarget(); |
| 35 | 35 | $foundTarget = false; |
| 36 | 36 | |
| 37 | - $entityContainer = $target ; |
|
| 37 | + $entityContainer = $target; |
|
| 38 | 38 | if ($entityContainer instanceof IEntityContainer) { |
| 39 | 39 | $foundTarget = ($context->getModel()->findEntityContainer($entityContainer->FullName()) != null); |
| 40 | 40 | } else { |
| 41 | - $entitySet = $target ; |
|
| 41 | + $entitySet = $target; |
|
| 42 | 42 | if ($entitySet instanceof IEntitySet) { |
| 43 | 43 | $container = $entitySet->getContainer(); |
| 44 | 44 | if ($container != null && $context instanceof IEntityContainer) { |
@@ -49,9 +49,9 @@ discard block |
||
| 49 | 49 | if ($schemaType != null && $schemaType instanceof ISchemaType) { |
| 50 | 50 | $foundTarget = ($context->getModel()->FindType($schemaType->FullName()) != null); |
| 51 | 51 | } else { |
| 52 | - $term = $target ; |
|
| 52 | + $term = $target; |
|
| 53 | 53 | if ($term != null && $term instanceof ITerm) { |
| 54 | - $foundTarget = ($context->getModel()->FindValueTerm($term->FullName())!= null); |
|
| 54 | + $foundTarget = ($context->getModel()->FindValueTerm($term->FullName()) != null); |
|
| 55 | 55 | } else { |
| 56 | 56 | $function = $target; |
| 57 | 57 | if ($function != null && $function instanceof IFunction) { |
@@ -48,7 +48,7 @@ |
||
| 48 | 48 | */ |
| 49 | 49 | public function getSchemaElementKind(): SchemaElementKind |
| 50 | 50 | { |
| 51 | - return SchemaElementKind::Function(); |
|
| 51 | + return SchemaElementKind::Function (); |
|
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | /** |
@@ -48,7 +48,7 @@ |
||
| 48 | 48 | */ |
| 49 | 49 | public function getSchemaElementKind(): SchemaElementKind |
| 50 | 50 | { |
| 51 | - return SchemaElementKind::Function(); |
|
| 51 | + return SchemaElementKind::function(); |
|
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | /** |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | ); |
| 36 | 36 | }; |
| 37 | 37 | assert( |
| 38 | - $expectedReflection->getNumberOfRequiredParameters() === $actualReflection->getNumberOfRequiredParameters(), |
|
| 38 | + $expectedReflection->getNumberOfRequiredParameters() === $actualReflection->getNumberOfRequiredParameters(), |
|
| 39 | 39 | $messageBuilder('Incorrect Parameter Count') |
| 40 | 40 | ); |
| 41 | 41 | if ($expectedReflection->hasReturnType()) { |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | $parameterString = ''; |
| 86 | 86 | if ($parameter->hasType()) { |
| 87 | 87 | $parameterString .= $parameter->getType()->allowsNull() ? '?' : ''; |
| 88 | - $parameterString .=$parameter->getType()->getName() . ' '; |
|
| 88 | + $parameterString .= $parameter->getType()->getName() . ' '; |
|
| 89 | 89 | } |
| 90 | 90 | $parameterString .= $parameter->isVariadic() ? '...$' : '$'; |
| 91 | 91 | $parameterString .= $parameter->getName(); |
@@ -48,7 +48,7 @@ |
||
| 48 | 48 | */ |
| 49 | 49 | public function getSchemaElementKind(): SchemaElementKind |
| 50 | 50 | { |
| 51 | - return SchemaElementKind::Function(); |
|
| 51 | + return SchemaElementKind::Function (); |
|
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | /** |
@@ -48,7 +48,7 @@ |
||
| 48 | 48 | */ |
| 49 | 49 | public function getSchemaElementKind(): SchemaElementKind |
| 50 | 50 | { |
| 51 | - return SchemaElementKind::Function(); |
|
| 51 | + return SchemaElementKind::function(); |
|
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | /** |
@@ -334,7 +334,7 @@ |
||
| 334 | 334 | $str1 = mb_substr($ranges, $p, 1, 'UTF-8'); |
| 335 | 335 | $str2 = mb_substr($ranges, $p+1, 1, 'UTF-8'); |
| 336 | 336 | for ($i = mb_ord($str1), |
| 337 | - $last = mb_ord($str2); $i <= $last; $i++) { |
|
| 337 | + $last = mb_ord($str2); $i <= $last; $i++) { |
|
| 338 | 338 | if (!isset(self::$s_CharProperties[$i])) { |
| 339 | 339 | self::$s_CharProperties[$i] = $value; |
| 340 | 340 | } |
@@ -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])) { |