@@ -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 |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | public function setName($name) |
83 | 83 | { |
84 | 84 | if (!$this->isTSimpleIdentifierValid($name)) { |
85 | - $msg = "Name(" . $name . ") must be a valid TSimpleIdentifier"; |
|
85 | + $msg = "Name(".$name.") must be a valid TSimpleIdentifier"; |
|
86 | 86 | throw new \InvalidArgumentException($msg); |
87 | 87 | } |
88 | 88 | $this->name = $name; |
@@ -397,7 +397,7 @@ discard block |
||
397 | 397 | public function isOK(&$msg = null) |
398 | 398 | { |
399 | 399 | if (!$this->isTSimpleIdentifierValid($this->name)) { |
400 | - $msg = "Name(" . $this->name . ") must be a valid TSimpleIdentifier " . __FILE__ . ":" . __LINE__; |
|
400 | + $msg = "Name(".$this->name.") must be a valid TSimpleIdentifier ".__FILE__.":".__LINE__; |
|
401 | 401 | return false; |
402 | 402 | } |
403 | 403 |
@@ -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)) { |