@@ -278,7 +278,7 @@ |
||
278 | 278 | } |
279 | 279 | foreach ($this->returnType as $type) { |
280 | 280 | if (!is_string($type) || !$this->isTCommandTextValid($type)) { |
281 | - $msg = $type . " must be a valid TCommandText"; |
|
281 | + $msg = $type." must be a valid TCommandText"; |
|
282 | 282 | return false; |
283 | 283 | } |
284 | 284 | } |
@@ -348,7 +348,7 @@ |
||
348 | 348 | public function isOK(&$msg = null) |
349 | 349 | { |
350 | 350 | if (!$this->isTSimpleIdentifierValid($this->name)) { |
351 | - $msg = "Name(" . $this->name . ") must be a valid TSimpleIdentifier " . __FILE__ . ":" . __LINE__; |
|
351 | + $msg = "Name(".$this->name.") must be a valid TSimpleIdentifier ".__FILE__.":".__LINE__; |
|
352 | 352 | return false; |
353 | 353 | } |
354 | 354 |
@@ -17,7 +17,7 @@ |
||
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) |
@@ -6,7 +6,6 @@ |
||
6 | 6 | use AlgoWeb\ODataMetadata\IsOKTraits\IsOKToolboxTrait; |
7 | 7 | use AlgoWeb\ODataMetadata\MetadataV3\edm\Groups\GEmptyElementExtensibilityTrait; |
8 | 8 | use AlgoWeb\ODataMetadata\MetadataV3\edm\IsOKTraits\TSimpleIdentifierTrait; |
9 | -use AlgoWeb\ODataMetadata\MetadataV3\edm\TDocumentationType; |
|
10 | 9 | |
11 | 10 | /** |
12 | 11 | * Class representing EndAnonymousType |
@@ -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) |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | $this->assertNull($msg); |
79 | 79 | |
80 | 80 | |
81 | - $ymlDir = dirname(__DIR__) . $ds . "src" . $ds . "MetadataV3" . $ds . "JMSmetadata"; |
|
81 | + $ymlDir = dirname(__DIR__).$ds."src".$ds."MetadataV3".$ds."JMSmetadata"; |
|
82 | 82 | $serializer = |
83 | 83 | \JMS\Serializer\SerializerBuilder::create() |
84 | 84 | ->addMetadataDir($ymlDir) |
@@ -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; |
@@ -11,7 +11,7 @@ |
||
11 | 11 | public function isTGenerationPatternValid($string) |
12 | 12 | { |
13 | 13 | if (!is_string($string)) { |
14 | - $msg = "Input must be a string: " . get_class($this); |
|
14 | + $msg = "Input must be a string: ".get_class($this); |
|
15 | 15 | throw new \InvalidArgumentException($msg); |
16 | 16 | } |
17 | 17 | return 'None' == $string || 'Identity' == $string || 'Computed' == $string; |
@@ -11,7 +11,7 @@ |
||
11 | 11 | public function isTCommandTextValid($string) |
12 | 12 | { |
13 | 13 | if (!is_string($string)) { |
14 | - $msg = "Input must be a string: ". get_class($this); |
|
14 | + $msg = "Input must be a string: ".get_class($this); |
|
15 | 15 | throw new \InvalidArgumentException($msg); |
16 | 16 | } |
17 | 17 | 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)) { |
@@ -13,7 +13,7 @@ |
||
13 | 13 | $regex = '(Collection|Ref)\([^ \t]{1,}(\.[^ \t]{1,}){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->isTQualifiedNameValid($string)) { |