@@ -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 | } |
@@ -108,8 +108,12 @@ |
||
108 | 108 | */ |
109 | 109 | public static function pluralize($quantity, $singular, $plural = null) |
110 | 110 | { |
111 | - if ($quantity == 1 || !strlen($singular)) return $singular; |
|
112 | - if ($plural !== null) return $plural; |
|
111 | + if ($quantity == 1 || !strlen($singular)) { |
|
112 | + return $singular; |
|
113 | + } |
|
114 | + if ($plural !== null) { |
|
115 | + return $plural; |
|
116 | + } |
|
113 | 117 | |
114 | 118 | $last_letter = strtolower($singular[strlen($singular) - 1]); |
115 | 119 | switch ($last_letter) { |
@@ -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 |
@@ -66,8 +66,12 @@ |
||
66 | 66 | */ |
67 | 67 | public static function pluralize($quantity, $singular, $plural = null) |
68 | 68 | { |
69 | - if ($quantity == 1 || !strlen($singular)) return $singular; |
|
70 | - if ($plural !== null) return $plural; |
|
69 | + if ($quantity == 1 || !strlen($singular)) { |
|
70 | + return $singular; |
|
71 | + } |
|
72 | + if ($plural !== null) { |
|
73 | + return $plural; |
|
74 | + } |
|
71 | 75 | |
72 | 76 | $last_letter = strtolower($singular[strlen($singular) - 1]); |
73 | 77 | switch ($last_letter) { |