@@ -15,8 +15,6 @@ |
||
| 15 | 15 | use AlgoWeb\ODataMetadata\MetadataV3\edm\TEntityPropertyType; |
| 16 | 16 | use AlgoWeb\ODataMetadata\MetadataV3\edm\TEntityTypeType; |
| 17 | 17 | use AlgoWeb\ODataMetadata\MetadataV3\edm\TFunctionImportReturnTypeType; |
| 18 | -use AlgoWeb\ODataMetadata\MetadataV3\edm\TFunctionReturnTypeType; |
|
| 19 | -use AlgoWeb\ODataMetadata\MetadataV3\edm\TFunctionType; |
|
| 20 | 18 | use AlgoWeb\ODataMetadata\MetadataV3\edm\TNavigationPropertyType; |
| 21 | 19 | use AlgoWeb\ODataMetadata\MetadataV3\edm\TPropertyRefType; |
| 22 | 20 | use AlgoWeb\ODataMetadata\MetadataV3\edm\TReferentialConstraintRoleElementType; |
@@ -232,7 +232,7 @@ discard block |
||
| 232 | 232 | array $principalConstraintProperty = null, |
| 233 | 233 | array $dependentConstraintProperty = null |
| 234 | 234 | ) { |
| 235 | - $multCombo = [ '*' => ['*', '1'], '0..1' => ['1'], '1' => ['*', '0..1']]; |
|
| 235 | + $multCombo = ['*' => ['*', '1'], '0..1' => ['1'], '1' => ['*', '0..1']]; |
|
| 236 | 236 | $multKeys = array_keys($multCombo); |
| 237 | 237 | if (null != $dependentNavigationProperty) { |
| 238 | 238 | if ($dependentNavigationProperty->getRelationship() != $principalNavigationProperty->getRelationship()) { |
@@ -253,7 +253,7 @@ discard block |
||
| 253 | 253 | } |
| 254 | 254 | if (!in_array($dependentMultiplicity, $multCombo[$principalMultiplicity])) { |
| 255 | 255 | throw new \InvalidArgumentException( |
| 256 | - "Invalid multiplicity combination - ". $principalMultiplicity . ' ' . $dependentMultiplicity |
|
| 256 | + "Invalid multiplicity combination - " . $principalMultiplicity . ' ' . $dependentMultiplicity |
|
| 257 | 257 | ); |
| 258 | 258 | } |
| 259 | 259 | |
@@ -440,7 +440,7 @@ discard block |
||
| 440 | 440 | * @param $longDescription |
| 441 | 441 | * @param $NewEntity |
| 442 | 442 | */ |
| 443 | - private function addDocumentation($summary, $longDescription, IsOK &$NewEntity) |
|
| 443 | + private function addDocumentation($summary, $longDescription, IsOK & $NewEntity) |
|
| 444 | 444 | { |
| 445 | 445 | if (null != $summary && null != $longDescription) { |
| 446 | 446 | $documentation = $this->generateDocumentation($summary, $longDescription); |
@@ -3,7 +3,6 @@ |
||
| 3 | 3 | namespace AlgoWeb\ODataMetadata\MetadataV3\edm\EntityContainer; |
| 4 | 4 | |
| 5 | 5 | use AlgoWeb\ODataMetadata\IsOK; |
| 6 | -use AlgoWeb\ODataMetadata\IsOKTraits\IsOKToolboxTrait; |
|
| 7 | 6 | use AlgoWeb\ODataMetadata\MetadataV3\edm\EntityContainer\AssociationSetAnonymousType\EndAnonymousType; |
| 8 | 7 | use AlgoWeb\ODataMetadata\MetadataV3\edm\Groups\GEmptyElementExtensibilityTrait; |
| 9 | 8 | use AlgoWeb\ODataMetadata\MetadataV3\edm\IsOKTraits\TQualifiedNameTrait; |
@@ -3,10 +3,8 @@ |
||
| 3 | 3 | namespace AlgoWeb\ODataMetadata\MetadataV3\edm\EntityContainer\AssociationSetAnonymousType; |
| 4 | 4 | |
| 5 | 5 | use AlgoWeb\ODataMetadata\IsOK; |
| 6 | -use AlgoWeb\ODataMetadata\IsOKTraits\IsOKToolboxTrait; |
|
| 7 | 6 | use AlgoWeb\ODataMetadata\MetadataV3\edm\Groups\GEmptyElementExtensibilityTrait; |
| 8 | 7 | use AlgoWeb\ODataMetadata\MetadataV3\edm\IsOKTraits\TSimpleIdentifierTrait; |
| 9 | -use AlgoWeb\ODataMetadata\MetadataV3\edm\TDocumentationType; |
|
| 10 | 8 | |
| 11 | 9 | /** |
| 12 | 10 | * Class representing EndAnonymousType |
@@ -687,12 +687,12 @@ discard block |
||
| 687 | 687 | $counter += isset($this->$name) ? 1 : 0; |
| 688 | 688 | } |
| 689 | 689 | if (-1 < $this->gExpressionMinimum && $counter < $this->gExpressionMinimum) { |
| 690 | - $msg = $counter . " fields not null. Need minimum of ".$this->gExpressionMinimum. ": " |
|
| 690 | + $msg = $counter . " fields not null. Need minimum of " . $this->gExpressionMinimum . ": " |
|
| 691 | 691 | . get_class($this); |
| 692 | 692 | return false; |
| 693 | 693 | } |
| 694 | 694 | if (-1 < $this->gExpressionMaximum && $counter > $this->gExpressionMaximum) { |
| 695 | - $msg = $counter . " fields not null. Need maximum of ".$this->gExpressionMaximum. ": " |
|
| 695 | + $msg = $counter . " fields not null. Need maximum of " . $this->gExpressionMaximum . ": " |
|
| 696 | 696 | . get_class($this); |
| 697 | 697 | return false; |
| 698 | 698 | } |
@@ -725,7 +725,7 @@ discard block |
||
| 725 | 725 | return false; |
| 726 | 726 | } |
| 727 | 727 | if (!$this->isObjectNullOrType($type, $this->$key)) { |
| 728 | - $msg = 'Type mismatch - should be ' .$type. ", is ".get_class($this->$key). ": " . get_class($this); |
|
| 728 | + $msg = 'Type mismatch - should be ' . $type . ", is " . get_class($this->$key) . ": " . get_class($this); |
|
| 729 | 729 | return false; |
| 730 | 730 | } |
| 731 | 731 | } |
@@ -140,7 +140,7 @@ |
||
| 140 | 140 | } |
| 141 | 141 | |
| 142 | 142 | $numParms = count($this->parameter); |
| 143 | - for ($i = 0; $i < $numParms -2; $i++) { |
|
| 143 | + for ($i = 0; $i < $numParms - 2; $i++) { |
|
| 144 | 144 | $outName = $this->parameter[$i]->getName(); |
| 145 | 145 | for ($j = $i + 1; $j < $numParms - 1; $j++) { |
| 146 | 146 | $inName = $this->parameter[$j]->getName(); |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | $numDefaults += $isDefault ? 1 : 0; |
| 148 | 148 | } |
| 149 | 149 | if (1 != $numDefaults) { |
| 150 | - $msg = "Exactly one entityContainer must be set as default container, actually have ".$numDefaults; |
|
| 150 | + $msg = "Exactly one entityContainer must be set as default container, actually have " . $numDefaults; |
|
| 151 | 151 | return false; |
| 152 | 152 | } |
| 153 | 153 | |
@@ -203,7 +203,7 @@ discard block |
||
| 203 | 203 | return false; |
| 204 | 204 | } |
| 205 | 205 | if (!in_array($navProp->getFromRole(), $roles)) { |
| 206 | - $msg = "Navigation Property Role " .$navProp->getToRole() |
|
| 206 | + $msg = "Navigation Property Role " . $navProp->getToRole() |
|
| 207 | 207 | . " lacks a matching Property in the assocation"; |
| 208 | 208 | return false; |
| 209 | 209 | } |
@@ -17,7 +17,7 @@ |
||
| 17 | 17 | |
| 18 | 18 | public function __construct() |
| 19 | 19 | { |
| 20 | - $this->gExpressionMaximum = (0 == count($this->parameters)) ? 1 : 0 ; |
|
| 20 | + $this->gExpressionMaximum = (0 == count($this->parameters)) ? 1 : 0; |
|
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | /** |
@@ -158,7 +158,7 @@ |
||
| 158 | 158 | $msg = 'Type name cannot be null or empty'; |
| 159 | 159 | return false; |
| 160 | 160 | } |
| 161 | - if (null != $this->modificationFunctionMapping && !$this->modificationFunctionMapping>isOK($msg)) { |
|
| 161 | + if (null != $this->modificationFunctionMapping && !$this->modificationFunctionMapping > isOK($msg)) { |
|
| 162 | 162 | return false; |
| 163 | 163 | } |
| 164 | 164 | if (!$this->isValidArray( |