@@ -8,6 +8,9 @@ |
||
| 8 | 8 | { |
| 9 | 9 | use xsdRestrictions; |
| 10 | 10 | |
| 11 | + /** |
|
| 12 | + * @param string $string |
|
| 13 | + */ |
|
| 11 | 14 | public function isTPathValid($string) |
| 12 | 15 | { |
| 13 | 16 | // The below pattern represents the allowed identifiers in ECMA specification plus the '/' for path segment |
@@ -30,6 +30,9 @@ discard block |
||
| 30 | 30 | return parent::isNullInstanceOf($var, $instanceOf); |
| 31 | 31 | } |
| 32 | 32 | |
| 33 | + /** |
|
| 34 | + * @param string $instanceOf |
|
| 35 | + */ |
|
| 33 | 36 | public function isValidArray(array $arr = null, $instanceOf, $minCount = -1, $maxCount = -1) |
| 34 | 37 | { |
| 35 | 38 | return parent::isValidArray($arr, $instanceOf, $minCount, $maxCount); |
@@ -40,6 +43,9 @@ discard block |
||
| 40 | 43 | return parent::isChildArrayOK($arr, $msg); |
| 41 | 44 | } |
| 42 | 45 | |
| 46 | + /** |
|
| 47 | + * @param null|string $url |
|
| 48 | + */ |
|
| 43 | 49 | public function isURLValid($url) |
| 44 | 50 | { |
| 45 | 51 | return parent::isURLValid($url); |
@@ -50,6 +56,9 @@ discard block |
||
| 50 | 56 | return true; |
| 51 | 57 | } |
| 52 | 58 | |
| 59 | + /** |
|
| 60 | + * @return boolean |
|
| 61 | + */ |
|
| 53 | 62 | public function isObjectNullOrOK(IsOK $object = null, &$msg = null) |
| 54 | 63 | { |
| 55 | 64 | return parent::isObjectNullOrOK($object, $msg); |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | for ($i = 0; $i < 100; $i++) { |
| 32 | 32 | $actualMax = max($type->getRand(), $actualMax); |
| 33 | 33 | } |
| 34 | - $this->assertTrue($expectedMax >= $actualMax, $actualMax . " must be less than ".$expectedMax); |
|
| 34 | + $this->assertTrue($expectedMax >= $actualMax, $actualMax." must be less than ".$expectedMax); |
|
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | public function testGetRandMinimum() |
@@ -42,6 +42,6 @@ discard block |
||
| 42 | 42 | for ($i = 0; $i < 100; $i++) { |
| 43 | 43 | $actualMin = min($type->getRand(), $actualMin); |
| 44 | 44 | } |
| 45 | - $this->assertTrue($expectedMin <= $actualMin, $actualMin . " must be less than ".$expectedMin); |
|
| 45 | + $this->assertTrue($expectedMin <= $actualMin, $actualMin." must be less than ".$expectedMin); |
|
| 46 | 46 | } |
| 47 | 47 | } |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | $edmx = new Edmx(); |
| 27 | 27 | $this->assertTrue($edmx->isOK($msg), $msg); |
| 28 | 28 | $this->assertNull($msg); |
| 29 | - $ymlDir = dirname(__DIR__) . $ds . "src" . $ds . "MetadataV3" . $ds . "JMSmetadata"; |
|
| 29 | + $ymlDir = dirname(__DIR__).$ds."src".$ds."MetadataV3".$ds."JMSmetadata"; |
|
| 30 | 30 | $serializer = |
| 31 | 31 | \JMS\Serializer\SerializerBuilder::create() |
| 32 | 32 | ->addMetadataDir($ymlDir) |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | { |
| 40 | 40 | $ds = DIRECTORY_SEPARATOR; |
| 41 | 41 | |
| 42 | - $goodxsd = dirname(__DIR__) . $ds . "xsd" . $ds . "Microsoft.Data.Entity.Design.Edmx_3.Fixed.xsd"; |
|
| 42 | + $goodxsd = dirname(__DIR__).$ds."xsd".$ds."Microsoft.Data.Entity.Design.Edmx_3.Fixed.xsd"; |
|
| 43 | 43 | if (!file_exists($goodxsd)) { |
| 44 | 44 | return true; |
| 45 | 45 | } |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | */ |
| 66 | 66 | private function checkEdmxSerialiseDeserialiseRoundTrip($ds, $edmx, $msg) |
| 67 | 67 | { |
| 68 | - $ymlDir = dirname(__DIR__) . $ds . "src" . $ds . "MetadataV3" . $ds . "JMSmetadata"; |
|
| 68 | + $ymlDir = dirname(__DIR__).$ds."src".$ds."MetadataV3".$ds."JMSmetadata"; |
|
| 69 | 69 | $serializer = |
| 70 | 70 | \JMS\Serializer\SerializerBuilder::create() |
| 71 | 71 | ->addMetadataDir($ymlDir) |
@@ -112,7 +112,7 @@ discard block |
||
| 112 | 112 | $this->assertNull($msg); |
| 113 | 113 | |
| 114 | 114 | |
| 115 | - $ymlDir = dirname(__DIR__) . $ds . "src" . $ds . "MetadataV3" . $ds . "JMSmetadata"; |
|
| 115 | + $ymlDir = dirname(__DIR__).$ds."src".$ds."MetadataV3".$ds."JMSmetadata"; |
|
| 116 | 116 | $serializer = |
| 117 | 117 | \JMS\Serializer\SerializerBuilder::create() |
| 118 | 118 | ->addMetadataDir($ymlDir) |
@@ -144,10 +144,10 @@ discard block |
||
| 144 | 144 | $ds = DIRECTORY_SEPARATOR; |
| 145 | 145 | $msg = null; |
| 146 | 146 | |
| 147 | - $docLocation = dirname(__DIR__) . $ds . "tests" . $ds . "exampleV3ServiceDocument.xml"; |
|
| 147 | + $docLocation = dirname(__DIR__).$ds."tests".$ds."exampleV3ServiceDocument.xml"; |
|
| 148 | 148 | $document = file_get_contents($docLocation); |
| 149 | 149 | $type = 'AlgoWeb\ODataMetadata\MetadataV3\edmx\TDataServicesType'; |
| 150 | - $ymlDir = dirname(__DIR__) . $ds . "src" . $ds . "MetadataV3" . $ds . "JMSmetadata"; |
|
| 150 | + $ymlDir = dirname(__DIR__).$ds."src".$ds."MetadataV3".$ds."JMSmetadata"; |
|
| 151 | 151 | |
| 152 | 152 | $serializer = |
| 153 | 153 | \JMS\Serializer\SerializerBuilder::create() |
@@ -164,10 +164,10 @@ discard block |
||
| 164 | 164 | $ds = DIRECTORY_SEPARATOR; |
| 165 | 165 | $msg = null; |
| 166 | 166 | |
| 167 | - $docLocation = dirname(__DIR__) . $ds . "tests" . $ds . "exampleV3ServiceMetadata.xml"; |
|
| 167 | + $docLocation = dirname(__DIR__).$ds."tests".$ds."exampleV3ServiceMetadata.xml"; |
|
| 168 | 168 | $document = file_get_contents($docLocation); |
| 169 | 169 | $type = 'AlgoWeb\ODataMetadata\MetadataV3\edmx\Edmx'; |
| 170 | - $ymlDir = dirname(__DIR__) . $ds . "src" . $ds . "MetadataV3" . $ds . "JMSmetadata"; |
|
| 170 | + $ymlDir = dirname(__DIR__).$ds."src".$ds."MetadataV3".$ds."JMSmetadata"; |
|
| 171 | 171 | |
| 172 | 172 | $serializer = |
| 173 | 173 | \JMS\Serializer\SerializerBuilder::create() |
@@ -185,11 +185,11 @@ discard block |
||
| 185 | 185 | $ds = DIRECTORY_SEPARATOR; |
| 186 | 186 | $msg = null; |
| 187 | 187 | |
| 188 | - $docLocation = dirname(__DIR__) . $ds . "tests" . $ds . "exampleV3ServiceMetadata.xml"; |
|
| 188 | + $docLocation = dirname(__DIR__).$ds."tests".$ds."exampleV3ServiceMetadata.xml"; |
|
| 189 | 189 | $document = file_get_contents($docLocation); |
| 190 | 190 | $this->v3MetadataAgainstXSD($document); |
| 191 | 191 | $type = 'AlgoWeb\ODataMetadata\MetadataV3\edmx\Edmx'; |
| 192 | - $ymlDir = dirname(__DIR__) . $ds . "src" . $ds . "MetadataV3" . $ds . "JMSmetadata"; |
|
| 192 | + $ymlDir = dirname(__DIR__).$ds."src".$ds."MetadataV3".$ds."JMSmetadata"; |
|
| 193 | 193 | |
| 194 | 194 | $serializer = |
| 195 | 195 | \JMS\Serializer\SerializerBuilder::create() |
@@ -230,7 +230,7 @@ discard block |
||
| 230 | 230 | $this->assertNull($msg); |
| 231 | 231 | |
| 232 | 232 | |
| 233 | - $ymlDir = dirname(__DIR__) . $ds . "src" . $ds . "MetadataV3" . $ds . "JMSmetadata"; |
|
| 233 | + $ymlDir = dirname(__DIR__).$ds."src".$ds."MetadataV3".$ds."JMSmetadata"; |
|
| 234 | 234 | $serializer = |
| 235 | 235 | \JMS\Serializer\SerializerBuilder::create() |
| 236 | 236 | ->addMetadataDir($ymlDir) |