@@ -7,7 +7,7 @@ |
||
7 | 7 | public function isTConcurrencyModeValid($string) |
8 | 8 | { |
9 | 9 | if (!is_string($string)) { |
10 | - $msg = 'Input must be a string: ' . get_class($this); |
|
10 | + $msg = 'Input must be a string: '.get_class($this); |
|
11 | 11 | throw new \InvalidArgumentException($msg); |
12 | 12 | } |
13 | 13 | return 'Fixed' == $string || 'None' == $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)) { |
@@ -17,7 +17,7 @@ |
||
17 | 17 | //$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,}/"; |
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 (isset(static::$v3PropertyTypeCache[$string])) { |
@@ -311,7 +311,7 @@ |
||
311 | 311 | } |
312 | 312 | foreach ($this->returnType as $type) { |
313 | 313 | if (!is_string($type) || !$this->isTCommandTextValid($type)) { |
314 | - $msg = implode($type) . ' must be a valid TCommandText'; |
|
314 | + $msg = implode($type).' must be a valid TCommandText'; |
|
315 | 315 | return false; |
316 | 316 | } |
317 | 317 | } |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | public function setName($name) |
88 | 88 | { |
89 | 89 | if (!$this->isTSimpleIdentifierValid($name)) { |
90 | - $msg = 'Name(' . $name . ') must be a valid TSimpleIdentifier'; |
|
90 | + $msg = 'Name('.$name.') must be a valid TSimpleIdentifier'; |
|
91 | 91 | throw new \InvalidArgumentException($msg); |
92 | 92 | } |
93 | 93 | $this->name = $name; |
@@ -427,7 +427,7 @@ discard block |
||
427 | 427 | public function isOK(&$msg = null) |
428 | 428 | { |
429 | 429 | if (!$this->isTSimpleIdentifierValid($this->name)) { |
430 | - $msg = 'Name(' . $this->name . ') must be a valid TSimpleIdentifier ' . __FILE__ . ':' . __LINE__; |
|
430 | + $msg = 'Name('.$this->name.') must be a valid TSimpleIdentifier '.__FILE__.':'.__LINE__; |
|
431 | 431 | return false; |
432 | 432 | } |
433 | 433 | |
@@ -483,7 +483,7 @@ discard block |
||
483 | 483 | } |
484 | 484 | foreach ($this->associationSet as $assocationSet) { |
485 | 485 | if (!in_array($assocationSet->getEnd()[0]->getEntitySet(), $entityNames)) { |
486 | - $msg = 'The entitysets for assocations must have a valid entity set. ' . $assocationSet->getName() . ' Does not'; |
|
486 | + $msg = 'The entitysets for assocations must have a valid entity set. '.$assocationSet->getName().' Does not'; |
|
487 | 487 | return false; |
488 | 488 | } |
489 | 489 | } |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | public function setStoreGeneratedPattern($storeGeneratedPattern) |
68 | 68 | { |
69 | 69 | if (null != $storeGeneratedPattern && !$this->isTGenerationPatternValid($storeGeneratedPattern)) { |
70 | - $msg = 'Store generation pattern must be a valid TGenerationPattern: ' . get_class($this); |
|
70 | + $msg = 'Store generation pattern must be a valid TGenerationPattern: '.get_class($this); |
|
71 | 71 | throw new \InvalidArgumentException($msg); |
72 | 72 | } |
73 | 73 | $this->storeGeneratedPattern = $storeGeneratedPattern; |
@@ -283,7 +283,7 @@ discard block |
||
283 | 283 | public function isOK(&$msg = null) |
284 | 284 | { |
285 | 285 | if (null != $this->storeGeneratedPattern && !$this->isTGenerationPatternValid($this->storeGeneratedPattern)) { |
286 | - $msg = 'Store generation pattern must be a valid TGenerationPattern: ' . get_class($this); |
|
286 | + $msg = 'Store generation pattern must be a valid TGenerationPattern: '.get_class($this); |
|
287 | 287 | return false; |
288 | 288 | } |
289 | 289 | if (!$this->isValidArrayOK( |
@@ -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 | |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | die($this->getNamespace()); |
160 | 160 | return false; |
161 | 161 | }*/ |
162 | - $eSetType = str_replace($this->getNamespace() . '.', '', $eSetType); |
|
162 | + $eSetType = str_replace($this->getNamespace().'.', '', $eSetType); |
|
163 | 163 | if (!in_array($eSetType, $entityTypeNames)) { |
164 | 164 | $msg = 'entitySet Types should have a matching type name in entity Types'; |
165 | 165 | return false; |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | |
169 | 169 | // Check Associations to associationSets |
170 | 170 | if (count($associationSets) != count($associationNames)) { |
171 | - $msg = 'we have ' . count($associationSets) . 'association sets and ' . count($associationNames) |
|
171 | + $msg = 'we have '.count($associationSets).'association sets and '.count($associationNames) |
|
172 | 172 | . ' associations, they should be the same'; |
173 | 173 | } |
174 | 174 | if (count($associationNames) * 2 < count($navigationProperties)) { |
@@ -177,33 +177,33 @@ discard block |
||
177 | 177 | } |
178 | 178 | foreach ($associationNames as $associationName => $associationEnds) { |
179 | 179 | if (!array_key_exists($associationName, $associationSets)) { |
180 | - $msg = 'association ' . $associationName . ' exists without matching associationSet'; |
|
180 | + $msg = 'association '.$associationName.' exists without matching associationSet'; |
|
181 | 181 | return false; |
182 | 182 | } |
183 | 183 | |
184 | 184 | if (!array_key_exists($associationName, $navigationProperties)) { |
185 | - $msg = 'association ' . $associationName . ' exists without matching Natvigation Property'; |
|
185 | + $msg = 'association '.$associationName.' exists without matching Natvigation Property'; |
|
186 | 186 | return false; |
187 | 187 | } |
188 | 188 | $roles = [$associationEnds[0]->getRole(), $associationEnds[1]->getRole()]; |
189 | 189 | if (!in_array($associationSets[$associationName][0]->getRole(), $roles)) { |
190 | - $msg = 'association Set role ' . $associationSets[$associationName][0]->getRole() |
|
190 | + $msg = 'association Set role '.$associationSets[$associationName][0]->getRole() |
|
191 | 191 | . 'lacks a matching property in the attached association'; |
192 | 192 | return false; |
193 | 193 | } |
194 | 194 | if (!in_array($associationSets[$associationName][1]->getRole(), $roles)) { |
195 | - $msg = 'association Set role ' . $associationSets[$associationName][1]->getRole() |
|
195 | + $msg = 'association Set role '.$associationSets[$associationName][1]->getRole() |
|
196 | 196 | . 'lacks a matching property in the attached association'; |
197 | 197 | return false; |
198 | 198 | } |
199 | 199 | foreach ($navigationProperties[$associationName] as $navProp) { |
200 | 200 | if (!in_array($navProp->getToRole(), $roles)) { |
201 | - $msg = 'Navigation Property Role ' . $navProp->getToRole() |
|
201 | + $msg = 'Navigation Property Role '.$navProp->getToRole() |
|
202 | 202 | . ' lacks a matching Property in the assocation'; |
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 | } |
@@ -469,20 +469,20 @@ |
||
469 | 469 | $pArray = []; |
470 | 470 | foreach ($this->getProperty() as $prop) { |
471 | 471 | if (in_array($prop->getName(), $pArray)) { |
472 | - $msg = 'Property Names, and Navigation Property Must Be Unique ' . __CLASS__; |
|
472 | + $msg = 'Property Names, and Navigation Property Must Be Unique '.__CLASS__; |
|
473 | 473 | return false; |
474 | 474 | } |
475 | 475 | $pArray[] = $prop->getName(); |
476 | 476 | } |
477 | 477 | foreach ($this->getNavigationProperty() as $prop) { |
478 | 478 | if (in_array($prop->getName(), $pArray)) { |
479 | - $msg = 'Property Names, and Navigation Property Must Be Unique ' . __CLASS__; |
|
479 | + $msg = 'Property Names, and Navigation Property Must Be Unique '.__CLASS__; |
|
480 | 480 | return false; |
481 | 481 | } |
482 | 482 | $pArray[] = $prop->getName(); |
483 | 483 | } |
484 | 484 | if (in_array($this->getName(), $pArray)) { |
485 | - $msg = 'entity types can not contain a property with the same name ' . __CLASS__; |
|
485 | + $msg = 'entity types can not contain a property with the same name '.__CLASS__; |
|
486 | 486 | return false; |
487 | 487 | } |
488 | 488 | return true; |
@@ -299,39 +299,39 @@ |
||
299 | 299 | public function isTFacetAttributesTraitValid(&$msg = null) |
300 | 300 | { |
301 | 301 | if ($this->nullable !== boolval($this->nullable)) { |
302 | - $msg = 'Nullable must be boolean: ' . get_class($this); |
|
302 | + $msg = 'Nullable must be boolean: '.get_class($this); |
|
303 | 303 | return false; |
304 | 304 | } |
305 | 305 | if (null != $this->defaultValue && !is_string($this->defaultValue)) { |
306 | - $msg = 'Default value must be a string: ' . get_class($this); |
|
306 | + $msg = 'Default value must be a string: '.get_class($this); |
|
307 | 307 | return false; |
308 | 308 | } |
309 | 309 | if (null != $this->collation && !$this->isTCollationFacetValid($this->collation)) { |
310 | - $msg = 'Collation must be a valid TCollationFacet: ' . get_class($this); |
|
310 | + $msg = 'Collation must be a valid TCollationFacet: '.get_class($this); |
|
311 | 311 | return false; |
312 | 312 | } |
313 | 313 | if (null != $this->maxLength && !$this->isTMaxLengthFacetValid($this->maxLength)) { |
314 | - $msg = 'Max length must be a valid TMaxLengthFacet: ' . get_class($this); |
|
314 | + $msg = 'Max length must be a valid TMaxLengthFacet: '.get_class($this); |
|
315 | 315 | return false; |
316 | 316 | } |
317 | 317 | if (null != $this->fixedLength && !$this->isTIsFixedLengthFacetTraitValid($this->fixedLength)) { |
318 | - $msg = 'Fixed length must be a valid TFixedLengthFacet: ' . get_class($this); |
|
318 | + $msg = 'Fixed length must be a valid TFixedLengthFacet: '.get_class($this); |
|
319 | 319 | return false; |
320 | 320 | } |
321 | 321 | if (null != $this->precision && !$this->isTPrecisionFacetValid($this->precision)) { |
322 | - $msg = 'Precision must be a valid TPrecisionFacet: ' . get_class($this); |
|
322 | + $msg = 'Precision must be a valid TPrecisionFacet: '.get_class($this); |
|
323 | 323 | return false; |
324 | 324 | } |
325 | 325 | if (null != $this->scale && !$this->isTScaleFacetValid($this->scale)) { |
326 | - $msg = 'Scale must be a valid TScaleFacet: ' . get_class($this); |
|
326 | + $msg = 'Scale must be a valid TScaleFacet: '.get_class($this); |
|
327 | 327 | return false; |
328 | 328 | } |
329 | 329 | if (null != $this->sRID && !$this->isTSridFacetValid($this->sRID)) { |
330 | - $msg = 'SRID must be a valid TSridFacet: ' . get_class($this); |
|
330 | + $msg = 'SRID must be a valid TSridFacet: '.get_class($this); |
|
331 | 331 | return false; |
332 | 332 | } |
333 | 333 | if (null != $this->unicode && !$this->isTIsUnicodeFacetTraitValid($this->unicode)) { |
334 | - $msg = 'Unicode must be a valid TUnicodeFacet: ' . get_class($this); |
|
334 | + $msg = 'Unicode must be a valid TUnicodeFacet: '.get_class($this); |
|
335 | 335 | return false; |
336 | 336 | } |
337 | 337 |