@@ -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; |
@@ -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 | } |
@@ -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)) { |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | if (!$this->V3Edmx->isOK($msg)) { |
18 | 18 | throw new \Exception($msg); |
19 | 19 | } |
20 | - $ymlDir = dirname(__DIR__) . DIRECTORY_SEPARATOR . "MetadataV3" . DIRECTORY_SEPARATOR . "JMSmetadata"; |
|
20 | + $ymlDir = dirname(__DIR__).DIRECTORY_SEPARATOR."MetadataV3".DIRECTORY_SEPARATOR."JMSmetadata"; |
|
21 | 21 | $this->serializer = |
22 | 22 | \JMS\Serializer\SerializerBuilder::create() |
23 | 23 | ->addMetadataDir($ymlDir) |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | if (0 == strlen(trim($namespace))) { |
47 | 47 | $entityTypeName = $NewEntity->getName(); |
48 | 48 | } else { |
49 | - $entityTypeName = $namespace . "." . $NewEntity->getName(); |
|
49 | + $entityTypeName = $namespace.".".$NewEntity->getName(); |
|
50 | 50 | } |
51 | 51 | $entitySet->setEntityType($entityTypeName); |
52 | 52 | $entitySet->setGetterAccess($accessType); |
@@ -72,11 +72,11 @@ discard block |
||
72 | 72 | $last_letter = strtolower($singular[strlen($singular) - 1]); |
73 | 73 | switch ($last_letter) { |
74 | 74 | case 'y': |
75 | - return substr($singular, 0, -1) . 'ies'; |
|
75 | + return substr($singular, 0, -1).'ies'; |
|
76 | 76 | case 's': |
77 | - return $singular . 'es'; |
|
77 | + return $singular.'es'; |
|
78 | 78 | default: |
79 | - return $singular . 's'; |
|
79 | + return $singular.'s'; |
|
80 | 80 | } |
81 | 81 | } |
82 | 82 |
@@ -122,10 +122,10 @@ |
||
122 | 122 | foreach ($entitySets as $eset) { |
123 | 123 | $eSetType = $eset->getEntityType(); |
124 | 124 | if (substr($eSetType, 0, strlen($this->getNamespace())) != $this->getNamespace()) { |
125 | - $msg = "Types for Entity Sets should have the namespace at the beginning " . __CLASS__; |
|
125 | + $msg = "Types for Entity Sets should have the namespace at the beginning ".__CLASS__; |
|
126 | 126 | return false; |
127 | 127 | } |
128 | - $eSetType = str_replace($this->getNamespace() . ".", "", $eSetType); |
|
128 | + $eSetType = str_replace($this->getNamespace().".", "", $eSetType); |
|
129 | 129 | if (!in_array($eSetType, $entityTypeNames)) { |
130 | 130 | $msg = "entitySet Types should have a matching type name in entity Types"; |
131 | 131 | return false; |