@@ -1293,7 +1293,7 @@ discard block |
||
| 1293 | 1293 | |
| 1294 | 1294 | // Association Set |
| 1295 | 1295 | if (!($this->model->GetAssociationSetName($thisEntitySet, $thisNavprop) == |
| 1296 | - $this->model->GetAssociationSetName($thatEntitySet, $thatNavprop) && |
|
| 1296 | + $this->model->GetAssociationSetName($thatEntitySet, $thatNavprop) && |
|
| 1297 | 1297 | $this->model->GetAssociationFullName($thisNavprop) == $this->model->GetAssociationFullName($thatNavprop))) { |
| 1298 | 1298 | return false; |
| 1299 | 1299 | } |
@@ -1318,7 +1318,7 @@ discard block |
||
| 1318 | 1318 | } |
| 1319 | 1319 | |
| 1320 | 1320 | if (!($this->model->GetAssociationEndName($thisNavprop->getPartner()) == |
| 1321 | - $this->model->GetAssociationEndName($thatNavprop->getPartner()) && |
|
| 1321 | + $this->model->GetAssociationEndName($thatNavprop->getPartner()) && |
|
| 1322 | 1322 | $thisOtherEntitySet->getName() == $thatOtherEntitySet->getName())) { |
| 1323 | 1323 | return false; |
| 1324 | 1324 | } |
@@ -25,13 +25,13 @@ |
||
| 25 | 25 | assert($enumMember instanceof IEnumMember); |
| 26 | 26 | $discoveredErrors = []; |
| 27 | 27 | if ( |
| 28 | - !$context->checkIsBad($enumMember->getDeclaringType()) && |
|
| 28 | + !$context->checkIsBad($enumMember->getDeclaringType()) && |
|
| 29 | 29 | !$context->checkIsBad($enumMember->getDeclaringType()->getUnderlyingType()) && |
| 30 | 30 | !ExpressionTypeChecker::TryAssertPrimitiveAsType( |
| 31 | - $enumMember->getValue(), |
|
| 32 | - EdmTypeSemantics::GetPrimitiveTypeReference($enumMember->getDeclaringType()->getUnderlyingType(), false), |
|
| 33 | - $discoveredErrors |
|
| 34 | - )) { |
|
| 31 | + $enumMember->getValue(), |
|
| 32 | + EdmTypeSemantics::GetPrimitiveTypeReference($enumMember->getDeclaringType()->getUnderlyingType(), false), |
|
| 33 | + $discoveredErrors |
|
| 34 | + )) { |
|
| 35 | 35 | $context->AddError( |
| 36 | 36 | $enumMember->Location(), |
| 37 | 37 | EdmErrorCode::EnumMemberTypeMustMatchEnumUnderlyingType(), |
@@ -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 | } |
@@ -36,5 +36,5 @@ |
||
| 36 | 36 | /** |
| 37 | 37 | * @return IPropertyValueBinding[] gets the value annotations for the properties of the type |
| 38 | 38 | */ |
| 39 | - abstract public function getPropertyValueBindings(): array; |
|
| 39 | + abstract public function getPropertyValueBindings(): array; |
|
| 40 | 40 | } |
@@ -51,8 +51,12 @@ discard block |
||
| 51 | 51 | if(!function_exists('iterable_to_array')) { |
| 52 | 52 | function iterable_to_array(?iterable $it): array |
| 53 | 53 | { |
| 54 | - if(null === $it) return []; |
|
| 55 | - if (is_array($it)) return $it; |
|
| 54 | + if(null === $it) { |
|
| 55 | + return []; |
|
| 56 | + } |
|
| 57 | + if (is_array($it)) { |
|
| 58 | + return $it; |
|
| 59 | + } |
|
| 56 | 60 | $ret = []; |
| 57 | 61 | array_push($ret, ...$it); |
| 58 | 62 | return $ret; |
@@ -62,7 +66,9 @@ discard block |
||
| 62 | 66 | |
| 63 | 67 | function iterable_to_traversable(?iterable $it): Traversable |
| 64 | 68 | { |
| 65 | - if(null === $it) $it = []; |
|
| 69 | + if(null === $it) { |
|
| 70 | + $it = []; |
|
| 71 | + } |
|
| 66 | 72 | yield from $it; |
| 67 | 73 | } |
| 68 | 74 | } |
| 69 | 75 | \ No newline at end of file |