@@ -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)) { |
@@ -467,20 +467,20 @@ |
||
| 467 | 467 | $pArray = []; |
| 468 | 468 | foreach ($this->getProperty() as $prop) { |
| 469 | 469 | if (in_array($prop->getName(), $pArray)) { |
| 470 | - $msg = "Property Names, and Navigation Property Must Be Unique " . __CLASS__; |
|
| 470 | + $msg = "Property Names, and Navigation Property Must Be Unique ".__CLASS__; |
|
| 471 | 471 | return false; |
| 472 | 472 | } |
| 473 | 473 | $pArray[] = $prop->getName(); |
| 474 | 474 | } |
| 475 | 475 | foreach ($this->getNavigationProperty() as $prop) { |
| 476 | 476 | if (in_array($prop->getName(), $pArray)) { |
| 477 | - $msg = "Property Names, and Navigation Property Must Be Unique " . __CLASS__; |
|
| 477 | + $msg = "Property Names, and Navigation Property Must Be Unique ".__CLASS__; |
|
| 478 | 478 | return false; |
| 479 | 479 | } |
| 480 | 480 | $pArray[] = $prop->getName(); |
| 481 | 481 | } |
| 482 | 482 | if (in_array($this->getName(), $pArray)) { |
| 483 | - $msg = "entity types can not contain a property with the same name " . __CLASS__; |
|
| 483 | + $msg = "entity types can not contain a property with the same name ".__CLASS__; |
|
| 484 | 484 | return false; |
| 485 | 485 | } |
| 486 | 486 | return true; |
@@ -13,7 +13,7 @@ |
||
| 13 | 13 | $regex = "/[\p{L}\p{Nl}][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}(\.[\p{L}\p{Nl}][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}){0,}/"; |
| 14 | 14 | |
| 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 ($this->isEDMSimpleTypeValid($string)) { |
@@ -17,7 +17,7 @@ |
||
| 17 | 17 | $regex = "/Collection\([^ \t]{1,}(\.[^ \t]{1,}){0,}\)/"; |
| 18 | 18 | |
| 19 | 19 | if (!is_string($string)) { |
| 20 | - $msg = "Input must be a string: ". get_class($this); |
|
| 20 | + $msg = "Input must be a string: ".get_class($this); |
|
| 21 | 21 | throw new \InvalidArgumentException($msg); |
| 22 | 22 | } |
| 23 | 23 | if ($this->isEDMSimpleTypeValid($string)) { |
@@ -17,7 +17,7 @@ |
||
| 17 | 17 | $regex = '/[^ \t]{1,}(\.[^ \t]{1,}){0,}/'; |
| 18 | 18 | |
| 19 | 19 | if (!is_string($string)) { |
| 20 | - $msg = "Input must be a string: ". get_class($this); |
|
| 20 | + $msg = "Input must be a string: ".get_class($this); |
|
| 21 | 21 | throw new \InvalidArgumentException($msg); |
| 22 | 22 | } |
| 23 | 23 | if ($this->isTQualifiedNameValid($string)) { |
@@ -17,7 +17,7 @@ |
||
| 17 | 17 | $regex = '/(Collection|Ref)\([^ \t]{1,}(\.[^ \t]{1,}){0,}\/)'; |
| 18 | 18 | |
| 19 | 19 | if (!is_string($string)) { |
| 20 | - $msg = "Input must be a string: ". get_class($this); |
|
| 20 | + $msg = "Input must be a string: ".get_class($this); |
|
| 21 | 21 | throw new \InvalidArgumentException($msg); |
| 22 | 22 | } |
| 23 | 23 | if ($this->isTQualifiedNameValid($string)) { |