@@ -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)) { |
@@ -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 | |
@@ -450,7 +450,7 @@ discard block |
||
450 | 450 | } |
451 | 451 | foreach ($this->associationSet as $assocationSet) { |
452 | 452 | if (!in_array($assocationSet->getEnd()[0]->getEntitySet(), $entityNames)) { |
453 | - $msg = "The entitysets for assocations must have a valid entity set. " . $assocationSet->getName() . " Does not"; |
|
453 | + $msg = "The entitysets for assocations must have a valid entity set. ".$assocationSet->getName()." Does not"; |
|
454 | 454 | return false; |
455 | 455 | } |
456 | 456 | } |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | die($this->getNamespace()); |
150 | 150 | return false; |
151 | 151 | }*/ |
152 | - $eSetType = str_replace($this->getNamespace() . ".", "", $eSetType); |
|
152 | + $eSetType = str_replace($this->getNamespace().".", "", $eSetType); |
|
153 | 153 | if (!in_array($eSetType, $entityTypeNames)) { |
154 | 154 | $msg = "entitySet Types should have a matching type name in entity Types"; |
155 | 155 | return false; |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | |
159 | 159 | // Check Associations to associationSets |
160 | 160 | if (count($associationSets) != count($associationNames)) { |
161 | - $msg = "we have " . count($associationSets) . "association sets and " . count($associationNames) |
|
161 | + $msg = "we have ".count($associationSets)."association sets and ".count($associationNames) |
|
162 | 162 | . " associations, they should be the same"; |
163 | 163 | } |
164 | 164 | if (count($associationNames) * 2 < count($navigationProperties)) { |
@@ -167,33 +167,33 @@ discard block |
||
167 | 167 | } |
168 | 168 | foreach ($associationNames as $associationName => $associationEnds) { |
169 | 169 | if (!array_key_exists($associationName, $associationSets)) { |
170 | - $msg = "association " . $associationName . " exists without matching associationSet"; |
|
170 | + $msg = "association ".$associationName." exists without matching associationSet"; |
|
171 | 171 | return false; |
172 | 172 | } |
173 | 173 | |
174 | 174 | if (!array_key_exists($associationName, $navigationProperties)) { |
175 | - $msg = "association " . $associationName . " exists without matching Natvigation Property"; |
|
175 | + $msg = "association ".$associationName." exists without matching Natvigation Property"; |
|
176 | 176 | return false; |
177 | 177 | } |
178 | 178 | $roles = [$associationEnds[0]->getRole(), $associationEnds[1]->getRole()]; |
179 | 179 | if (!in_array($associationSets[$associationName][0]->getRole(), $roles)) { |
180 | - $msg = "association Set role " . $associationSets[$associationName][0]->getRole() |
|
180 | + $msg = "association Set role ".$associationSets[$associationName][0]->getRole() |
|
181 | 181 | . "lacks a matching property in the attached association"; |
182 | 182 | return false; |
183 | 183 | } |
184 | 184 | if (!in_array($associationSets[$associationName][1]->getRole(), $roles)) { |
185 | - $msg = "association Set role " . $associationSets[$associationName][1]->getRole() |
|
185 | + $msg = "association Set role ".$associationSets[$associationName][1]->getRole() |
|
186 | 186 | . "lacks a matching property in the attached association"; |
187 | 187 | return false; |
188 | 188 | } |
189 | 189 | foreach ($navigationProperties[$associationName] as $navProp) { |
190 | 190 | if (!in_array($navProp->getToRole(), $roles)) { |
191 | - $msg = "Navigation Property Role " . $navProp->getToRole() |
|
191 | + $msg = "Navigation Property Role ".$navProp->getToRole() |
|
192 | 192 | . " lacks a matching Property in the assocation"; |
193 | 193 | return false; |
194 | 194 | } |
195 | 195 | if (!in_array($navProp->getFromRole(), $roles)) { |
196 | - $msg = "Navigation Property Role " .$navProp->getToRole() |
|
196 | + $msg = "Navigation Property Role ".$navProp->getToRole() |
|
197 | 197 | . " lacks a matching Property in the assocation"; |
198 | 198 | return false; |
199 | 199 | } |
@@ -8,6 +8,9 @@ |
||
8 | 8 | { |
9 | 9 | use xsdRestrictions; |
10 | 10 | |
11 | + /** |
|
12 | + * @param string $string |
|
13 | + */ |
|
11 | 14 | public function isTPathValid($string) |
12 | 15 | { |
13 | 16 | // The below pattern represents the allowed identifiers in ECMA specification plus the '/' for path segment |