@@ -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)) { |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | $edmx = new Edmx(); |
21 | 21 | $this->assertTrue($edmx->isOK($msg), $msg); |
22 | 22 | $this->assertNull($msg); |
23 | - $ymlDir = dirname(__DIR__) . $ds . "src" . $ds . "MetadataV3" . $ds . "JMSmetadata"; |
|
23 | + $ymlDir = dirname(__DIR__).$ds."src".$ds."MetadataV3".$ds."JMSmetadata"; |
|
24 | 24 | $serializer = |
25 | 25 | \JMS\Serializer\SerializerBuilder::create() |
26 | 26 | ->addMetadataDir($ymlDir) |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | $ds = DIRECTORY_SEPARATOR; |
35 | 35 | $xml = new \DOMDocument(); |
36 | 36 | $xml->loadXML($data); |
37 | - $xml->schemaValidate(dirname(__DIR__) . $ds . "xsd" . $ds . "/Microsoft.Data.Entity.Design.Edmx_3.xsd"); |
|
37 | + $xml->schemaValidate(dirname(__DIR__).$ds."xsd".$ds."/Microsoft.Data.Entity.Design.Edmx_3.xsd"); |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | public function testWithSingleEntitySerializeOk() |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | $this->assertNull($msg); |
52 | 52 | |
53 | 53 | |
54 | - $ymlDir = dirname(__DIR__) . $ds . "src" . $ds . "MetadataV3" . $ds . "JMSmetadata"; |
|
54 | + $ymlDir = dirname(__DIR__).$ds."src".$ds."MetadataV3".$ds."JMSmetadata"; |
|
55 | 55 | $serializer = |
56 | 56 | \JMS\Serializer\SerializerBuilder::create() |
57 | 57 | ->addMetadataDir($ymlDir) |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | $this->assertNull($msg); |
89 | 89 | |
90 | 90 | |
91 | - $ymlDir = dirname(__DIR__) . $ds . "src" . $ds . "MetadataV3" . $ds . "JMSmetadata"; |
|
91 | + $ymlDir = dirname(__DIR__).$ds."src".$ds."MetadataV3".$ds."JMSmetadata"; |
|
92 | 92 | $serializer = |
93 | 93 | \JMS\Serializer\SerializerBuilder::create() |
94 | 94 | ->addMetadataDir($ymlDir) |
@@ -114,11 +114,11 @@ discard block |
||
114 | 114 | $last_letter = strtolower($singular[strlen($singular) - 1]); |
115 | 115 | switch ($last_letter) { |
116 | 116 | case 'y': |
117 | - return substr($singular, 0, -1) . 'ies'; |
|
117 | + return substr($singular, 0, -1).'ies'; |
|
118 | 118 | case 's': |
119 | - return $singular . 'es'; |
|
119 | + return $singular.'es'; |
|
120 | 120 | default: |
121 | - return $singular . 's'; |
|
121 | + return $singular.'s'; |
|
122 | 122 | } |
123 | 123 | } |
124 | 124 | } |
@@ -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; |
@@ -29,6 +29,9 @@ |
||
29 | 29 | $this->v3MetadataAgainstXSD($d); |
30 | 30 | } |
31 | 31 | |
32 | + /** |
|
33 | + * @param string $data |
|
34 | + */ |
|
32 | 35 | public function v3MetadataAgainstXSD($data) |
33 | 36 | { |
34 | 37 | $ds = DIRECTORY_SEPARATOR; |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | $ds = DIRECTORY_SEPARATOR; |
31 | 31 | $xml = new \DOMDocument(); |
32 | 32 | $xml->loadXML($data); |
33 | - $xml->schemaValidate(dirname(__DIR__) . $ds . "xsd" . $ds . "/Microsoft.Data.Entity.Design.Edmx_3.xsd"); |
|
33 | + $xml->schemaValidate(dirname(__DIR__).$ds."xsd".$ds."/Microsoft.Data.Entity.Design.Edmx_3.xsd"); |
|
34 | 34 | } |
35 | 35 | |
36 | 36 | public function testEntitysAndProperties() |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | $metadataManager = new MetadataManager(); |
39 | 39 | |
40 | 40 | $eType = $metadataManager->addEntityType("Category"); |
41 | - $this->assertNotFalse($eType, "Etype is false not type " . $metadataManager->getLastError()); |
|
41 | + $this->assertNotFalse($eType, "Etype is false not type ".$metadataManager->getLastError()); |
|
42 | 42 | $metadataManager->addPropertyToEntityType($eType, "CategoryID", "Int32", null, false, true, "Identity"); |
43 | 43 | $metadataManager->addPropertyToEntityType($eType, "CategoryName", "String"); |
44 | 44 | $metadataManager->addPropertyToEntityType($eType, "Description", "String"); |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | $metadataManager = new MetadataManager(); |
64 | 64 | |
65 | 65 | $CategoryType = $metadataManager->addEntityType("Category"); |
66 | - $this->assertNotFalse($CategoryType, "Etype is false not type " . $metadataManager->getLastError()); |
|
66 | + $this->assertNotFalse($CategoryType, "Etype is false not type ".$metadataManager->getLastError()); |
|
67 | 67 | $metadataManager->addPropertyToEntityType($CategoryType, "CategoryID", "Int32", null, false, true, "Identity"); |
68 | 68 | $metadataManager->addPropertyToEntityType($CategoryType, "CategoryName", "String"); |
69 | 69 | $metadataManager->addPropertyToEntityType($CategoryType, "Description", "String"); |
@@ -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 | } |