@@ -301,39 +301,39 @@ |
||
| 301 | 301 | public function isTFacetAttributesTraitValid(&$msg = null) |
| 302 | 302 | { |
| 303 | 303 | if ($this->nullable !== boolval($this->nullable)) { |
| 304 | - $msg = "Nullable must be boolean: " . get_class($this); |
|
| 304 | + $msg = "Nullable must be boolean: ".get_class($this); |
|
| 305 | 305 | return false; |
| 306 | 306 | } |
| 307 | 307 | if (null != $this->defaultValue && !is_string($this->defaultValue)) { |
| 308 | - $msg = "Default value must be a string: " . get_class($this); |
|
| 308 | + $msg = "Default value must be a string: ".get_class($this); |
|
| 309 | 309 | return false; |
| 310 | 310 | } |
| 311 | 311 | if (null != $this->collation && !$this->isTCollationFacetValid($this->collation)) { |
| 312 | - $msg = "Collation must be a valid TCollationFacet: " . get_class($this); |
|
| 312 | + $msg = "Collation must be a valid TCollationFacet: ".get_class($this); |
|
| 313 | 313 | return false; |
| 314 | 314 | } |
| 315 | 315 | if (null != $this->maxLength && !$this->isTMaxLengthFacetValid($this->maxLength)) { |
| 316 | - $msg = "Max length must be a valid TMaxLengthFacet: " . get_class($this); |
|
| 316 | + $msg = "Max length must be a valid TMaxLengthFacet: ".get_class($this); |
|
| 317 | 317 | return false; |
| 318 | 318 | } |
| 319 | 319 | if (null != $this->fixedLength && !$this->isTIsFixedLengthFacetTraitValid($this->fixedLength)) { |
| 320 | - $msg = "Fixed length must be a valid TFixedLengthFacet: " . get_class($this); |
|
| 320 | + $msg = "Fixed length must be a valid TFixedLengthFacet: ".get_class($this); |
|
| 321 | 321 | return false; |
| 322 | 322 | } |
| 323 | 323 | if (null != $this->precision && !$this->isTPrecisionFacetValid($this->precision)) { |
| 324 | - $msg = "Precision must be a valid TPrecisionFacet: " . get_class($this); |
|
| 324 | + $msg = "Precision must be a valid TPrecisionFacet: ".get_class($this); |
|
| 325 | 325 | return false; |
| 326 | 326 | } |
| 327 | 327 | if (null != $this->scale && !$this->isTScaleFacetValid($this->scale)) { |
| 328 | - $msg = "Scale must be a valid TScaleFacet: " . get_class($this); |
|
| 328 | + $msg = "Scale must be a valid TScaleFacet: ".get_class($this); |
|
| 329 | 329 | return false; |
| 330 | 330 | } |
| 331 | 331 | if (null != $this->sRID && !$this->isTSridFacetValid($this->sRID)) { |
| 332 | - $msg = "SRID must be a valid TSridFacet: " . get_class($this); |
|
| 332 | + $msg = "SRID must be a valid TSridFacet: ".get_class($this); |
|
| 333 | 333 | return false; |
| 334 | 334 | } |
| 335 | 335 | if (null != $this->unicode && !$this->isTIsUnicodeFacetTraitValid($this->unicode)) { |
| 336 | - $msg = "Unicode must be a valid TUnicodeFacet: " . get_class($this); |
|
| 336 | + $msg = "Unicode must be a valid TUnicodeFacet: ".get_class($this); |
|
| 337 | 337 | return false; |
| 338 | 338 | } |
| 339 | 339 | |
@@ -476,59 +476,59 @@ |
||
| 476 | 476 | public function isTCommonPropertyAttributesValid(&$msg = null) |
| 477 | 477 | { |
| 478 | 478 | if (!$this->isTSimpleIdentifierValid($this->name)) { |
| 479 | - $msg = "Name must be a valid TSimpleIdentifier: " . get_class($this); |
|
| 479 | + $msg = "Name must be a valid TSimpleIdentifier: ".get_class($this); |
|
| 480 | 480 | return false; |
| 481 | 481 | } |
| 482 | 482 | if (!$this->isTPropertyTypeValid($this->type)) { |
| 483 | - $msg = "Type must be a valid TPropertyType: " . get_class($this); |
|
| 483 | + $msg = "Type must be a valid TPropertyType: ".get_class($this); |
|
| 484 | 484 | return false; |
| 485 | 485 | } |
| 486 | 486 | if (null != $this->nullable && $this->nullable !== boolval($this->nullable)) { |
| 487 | - $msg = "Nullable must be boolean: " . get_class($this); |
|
| 487 | + $msg = "Nullable must be boolean: ".get_class($this); |
|
| 488 | 488 | return false; |
| 489 | 489 | } |
| 490 | 490 | if (null != $this->defaultValue && !is_string($this->defaultValue)) { |
| 491 | - $msg = "Default value must be a string: " . get_class($this); |
|
| 491 | + $msg = "Default value must be a string: ".get_class($this); |
|
| 492 | 492 | return false; |
| 493 | 493 | } |
| 494 | 494 | if (null != $this->maxLength && !$this->isTMaxLengthFacetValid($this->maxLength)) { |
| 495 | - $msg = "Max length must be a valid TMaxLengthFacet: " . get_class($this); |
|
| 495 | + $msg = "Max length must be a valid TMaxLengthFacet: ".get_class($this); |
|
| 496 | 496 | return false; |
| 497 | 497 | } |
| 498 | 498 | if (null != $this->fixedLength && !$this->isTIsFixedLengthFacetTraitValid($this->fixedLength)) { |
| 499 | - $msg = "Max length must be a valid TFixedLengthFacet: " . get_class($this); |
|
| 499 | + $msg = "Max length must be a valid TFixedLengthFacet: ".get_class($this); |
|
| 500 | 500 | return false; |
| 501 | 501 | } |
| 502 | 502 | if (null != $this->precision && !$this->isTPrecisionFacetValid($this->precision)) { |
| 503 | - $msg = "Precision must be a valid TPrecisionFacet: " . get_class($this); |
|
| 503 | + $msg = "Precision must be a valid TPrecisionFacet: ".get_class($this); |
|
| 504 | 504 | return false; |
| 505 | 505 | } |
| 506 | 506 | if (null != $this->scale && !$this->isTScaleFacetValid($this->scale)) { |
| 507 | - $msg = "Scale must be a valid TScaleFacet: " . get_class($this); |
|
| 507 | + $msg = "Scale must be a valid TScaleFacet: ".get_class($this); |
|
| 508 | 508 | return false; |
| 509 | 509 | } |
| 510 | 510 | if (null != $this->unicode && !$this->isTIsUnicodeFacetTraitValid($this->unicode)) { |
| 511 | - $msg = "Unicode must be a valid TUnicodeFacet: " . get_class($this); |
|
| 511 | + $msg = "Unicode must be a valid TUnicodeFacet: ".get_class($this); |
|
| 512 | 512 | return false; |
| 513 | 513 | } |
| 514 | 514 | if (null != $this->collation && !$this->isTCollationFacetValid($this->collation)) { |
| 515 | - $msg = "Collation must be a valid TCollationFacet: " . get_class($this); |
|
| 515 | + $msg = "Collation must be a valid TCollationFacet: ".get_class($this); |
|
| 516 | 516 | return false; |
| 517 | 517 | } |
| 518 | 518 | if (null != $this->sRID && !$this->isTSridFacetValid($this->sRID)) { |
| 519 | - $msg = "SRID must be a valid TSridFacet: " . get_class($this); |
|
| 519 | + $msg = "SRID must be a valid TSridFacet: ".get_class($this); |
|
| 520 | 520 | return false; |
| 521 | 521 | } |
| 522 | 522 | if (null != $this->concurrencyMode && !$this->isTConcurrencyModeValid($this->concurrencyMode)) { |
| 523 | - $msg = "ConcurrencyMode must be a valid TConcurrencyMode: " . get_class($this); |
|
| 523 | + $msg = "ConcurrencyMode must be a valid TConcurrencyMode: ".get_class($this); |
|
| 524 | 524 | return false; |
| 525 | 525 | } |
| 526 | 526 | if (null != $this->setterAccess && !$this->isTAccessOk($this->setterAccess)) { |
| 527 | - $msg = "Setter access must be a valid TAccess: " . get_class($this); |
|
| 527 | + $msg = "Setter access must be a valid TAccess: ".get_class($this); |
|
| 528 | 528 | return false; |
| 529 | 529 | } |
| 530 | 530 | if (null != $this->getterAccess && !$this->isTAccessOk($this->getterAccess)) { |
| 531 | - $msg = "Getter access must be a valid TAccess: " . get_class($this); |
|
| 531 | + $msg = "Getter access must be a valid TAccess: ".get_class($this); |
|
| 532 | 532 | return false; |
| 533 | 533 | } |
| 534 | 534 | |
@@ -109,15 +109,15 @@ |
||
| 109 | 109 | public function isTEntitySetAttributesOK(&$msg = null) |
| 110 | 110 | { |
| 111 | 111 | if (null != $this->name && !$this->isTSimpleIdentifierValid($this->name)) { |
| 112 | - $msg = "Name must be a valid TSimpleIdentifier: " . get_class($this); |
|
| 112 | + $msg = "Name must be a valid TSimpleIdentifier: ".get_class($this); |
|
| 113 | 113 | return false; |
| 114 | 114 | } |
| 115 | 115 | if (null != $this->entityType && !$this->isTQualifiedNameValid($this->entityType)) { |
| 116 | - $msg = "Entity type must be a valid TQualifiedName: " . get_class($this); |
|
| 116 | + $msg = "Entity type must be a valid TQualifiedName: ".get_class($this); |
|
| 117 | 117 | return false; |
| 118 | 118 | } |
| 119 | 119 | if (null != $this->getterAccess && !$this->isTAccessOk($this->getterAccess)) { |
| 120 | - $msg = "Getter access must be a valid TAccess: " . get_class($this); |
|
| 120 | + $msg = "Getter access must be a valid TAccess: ".get_class($this); |
|
| 121 | 121 | return false; |
| 122 | 122 | } |
| 123 | 123 | |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | return true; |
| 76 | 76 | } |
| 77 | 77 | if (!$object instanceof $instanceOf) { |
| 78 | - $msg = "Supplied object not an instance of ".$instanceOf. ": " . get_class($this); |
|
| 78 | + $msg = "Supplied object not an instance of ".$instanceOf.": ".get_class($this); |
|
| 79 | 79 | return false; |
| 80 | 80 | } |
| 81 | 81 | return $object->isOK($msg); |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | { |
| 86 | 86 | $result = $this->isValidArray($arr, $instanceOf, $minCount, $maxCount); |
| 87 | 87 | if (!$result) { |
| 88 | - $msg = "Supplied array not a valid array: " . get_class($this); |
|
| 88 | + $msg = "Supplied array not a valid array: ".get_class($this); |
|
| 89 | 89 | return false; |
| 90 | 90 | } |
| 91 | 91 | |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | } |
| 121 | 121 | foreach ($arr as $item) { |
| 122 | 122 | if (!($item instanceof IsOK)) { |
| 123 | - $msg = "Child item is not an instance of IsOK: " . get_class($this); |
|
| 123 | + $msg = "Child item is not an instance of IsOK: ".get_class($this); |
|
| 124 | 124 | return false; |
| 125 | 125 | } |
| 126 | 126 | if (!$item->isOK($msg)) { |
@@ -13,7 +13,7 @@ |
||
| 13 | 13 | "GeometricMultiPoint", "GeometricMultiLineString", "GeometricMultiPolygon", "GeometryCollection", |
| 14 | 14 | "Guid", "Int16", "Int32", "Int64", "String", "SByte"]; |
| 15 | 15 | if (!is_string($string)) { |
| 16 | - $msg = "Input must be a string: ". get_class($this); |
|
| 16 | + $msg = "Input must be a string: ".get_class($this); |
|
| 17 | 17 | throw new \InvalidArgumentException($msg); |
| 18 | 18 | } |
| 19 | 19 | if (!in_array($string, $validType)) { |
@@ -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 |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | public function setStoreGeneratedPattern($storeGeneratedPattern) |
| 69 | 69 | { |
| 70 | 70 | if (null != $storeGeneratedPattern && !$this->isTGenerationPatternValid($storeGeneratedPattern)) { |
| 71 | - $msg = "Store generation pattern must be a valid TGenerationPattern: " . get_class($this); |
|
| 71 | + $msg = "Store generation pattern must be a valid TGenerationPattern: ".get_class($this); |
|
| 72 | 72 | throw new \InvalidArgumentException($msg); |
| 73 | 73 | } |
| 74 | 74 | $this->storeGeneratedPattern = $storeGeneratedPattern; |
@@ -281,7 +281,7 @@ discard block |
||
| 281 | 281 | public function isOK(&$msg = null) |
| 282 | 282 | { |
| 283 | 283 | if (null != $this->storeGeneratedPattern && !$this->isTGenerationPatternValid($this->storeGeneratedPattern)) { |
| 284 | - $msg = "Store generation pattern must be a valid TGenerationPattern: " . get_class($this); |
|
| 284 | + $msg = "Store generation pattern must be a valid TGenerationPattern: ".get_class($this); |
|
| 285 | 285 | return false; |
| 286 | 286 | } |
| 287 | 287 | if (!$this->isValidArrayOK( |
@@ -8,6 +8,9 @@ |
||
| 8 | 8 | { |
| 9 | 9 | use xsdRestrictions; |
| 10 | 10 | |
| 11 | + /** |
|
| 12 | + * @param string $TSimpleIdentifier |
|
| 13 | + */ |
|
| 11 | 14 | protected function isTSimpleIdentifierValid($TSimpleIdentifier) |
| 12 | 15 | { |
| 13 | 16 | if (!$this->isNCName($TSimpleIdentifier)) { |