Algo-Web / ODataMetadata

src/MetadataV3/edm/IsOKTraits/TPathTrait.php

Doc Comments +3 added lines

@@ -8,6 +8,9 @@
 {
     use xsdRestrictions;
 
+    /**
+     * @param string $string
+     */
     public function isTPathValid($string)
     {
         // The below pattern represents the allowed identifiers in ECMA specification plus the '/' for path segment

tests/MetadataManagerTest.php

Spacing +3 added lines, -3 removed lines

@@ -29,7 +29,7 @@ 
     {
         $ds = DIRECTORY_SEPARATOR;
 
-        $goodxsd = dirname(__DIR__) . $ds . "xsd" . $ds . "Microsoft.Data.Entity.Design.Edmx_3.Fixed.xsd";
+        $goodxsd = dirname(__DIR__).$ds."xsd".$ds."Microsoft.Data.Entity.Design.Edmx_3.Fixed.xsd";
         if (!file_exists($goodxsd)) {
             return true;
         }
@@ -43,7 +43,7 @@ 
         $metadataManager = new MetadataManager();
 
         $eType = $metadataManager->addEntityType("Category");
-        $this->assertNotFalse($eType, "Etype is false not type " . $metadataManager->getLastError());
+        $this->assertNotFalse($eType, "Etype is false not type ".$metadataManager->getLastError());
         $metadataManager->addPropertyToEntityType($eType, "CategoryID", "Int32", null, false, true, "Identity");
         $metadataManager->addPropertyToEntityType($eType, "CategoryName", "String");
         $metadataManager->addPropertyToEntityType($eType, "Description", "String");
@@ -69,7 +69,7 @@ 
         $metadataManager = new MetadataManager();
 
         $CategoryType = $metadataManager->addEntityType("Category");
-        $this->assertNotFalse($CategoryType, "Etype is false not type " . $metadataManager->getLastError());
+        $this->assertNotFalse($CategoryType, "Etype is false not type ".$metadataManager->getLastError());
         $metadataManager->addPropertyToEntityType($CategoryType, "CategoryID", "Int32", null, false, true, "Identity");
         $metadataManager->addPropertyToEntityType($CategoryType, "CategoryName", "String");
         $metadataManager->addPropertyToEntityType($CategoryType, "Description", "String");

tests/TSchemaTypeTest.php

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
         for ($i = 0; $i < 100; $i++) {
             $actualMax = max($type->getRand(), $actualMax);
         }
-        $this->assertTrue($expectedMax >= $actualMax, $actualMax . " must be less than ".$expectedMax);
+        $this->assertTrue($expectedMax >= $actualMax, $actualMax." must be less than ".$expectedMax);
     }
 
     public function testGetRandMinimum()
@@ -42,6 +42,6 @@ 
         for ($i = 0; $i < 100; $i++) {
             $actualMin = min($type->getRand(), $actualMin);
         }
-        $this->assertTrue($expectedMin <= $actualMin, $actualMin . " must be less than ".$expectedMin);
+        $this->assertTrue($expectedMin <= $actualMin, $actualMin." must be less than ".$expectedMin);
     }
 }

tests/EdmxTest.php

Spacing +14 added lines, -14 removed lines

@@ -23,7 +23,7 @@ 
         $edmx = new Edmx();
         $this->assertTrue($edmx->isOK($msg), $msg);
         $this->assertNull($msg);
-        $ymlDir = dirname(__DIR__) . $ds . "src" . $ds . "MetadataV3" . $ds . "JMSmetadata";
+        $ymlDir = dirname(__DIR__).$ds."src".$ds."MetadataV3".$ds."JMSmetadata";
         $serializer =
             \JMS\Serializer\SerializerBuilder::create()
                 ->addMetadataDir($ymlDir)
@@ -36,7 +36,7 @@ 
     {
         $ds = DIRECTORY_SEPARATOR;
 
-        $goodxsd = dirname(__DIR__) . $ds . "xsd" . $ds . "Microsoft.Data.Entity.Design.Edmx_3.Fixed.xsd";
+        $goodxsd = dirname(__DIR__).$ds."xsd".$ds."Microsoft.Data.Entity.Design.Edmx_3.Fixed.xsd";
         if (!file_exists($goodxsd)) {
             return true;
         }
@@ -62,7 +62,7 @@ 
      */
     private function checkEdmxSerialiseDeserialiseRoundTrip($ds, $edmx, $msg)
     {
-        $ymlDir = dirname(__DIR__) . $ds . "src" . $ds . "MetadataV3" . $ds . "JMSmetadata";
+        $ymlDir = dirname(__DIR__).$ds."src".$ds."MetadataV3".$ds."JMSmetadata";
         $serializer =
             \JMS\Serializer\SerializerBuilder::create()
                 ->addMetadataDir($ymlDir)
@@ -109,7 +109,7 @@ 
         $this->assertNull($msg);
 
 
-        $ymlDir = dirname(__DIR__) . $ds . "src" . $ds . "MetadataV3" . $ds . "JMSmetadata";
+        $ymlDir = dirname(__DIR__).$ds."src".$ds."MetadataV3".$ds."JMSmetadata";
         $serializer =
             \JMS\Serializer\SerializerBuilder::create()
                 ->addMetadataDir($ymlDir)
@@ -141,10 +141,10 @@ 
         $ds = DIRECTORY_SEPARATOR;
         $msg = null;
 
-        $docLocation = dirname(__DIR__) . $ds . "tests" . $ds . "exampleV3ServiceDocument.xml";
+        $docLocation = dirname(__DIR__).$ds."tests".$ds."exampleV3ServiceDocument.xml";
         $document = file_get_contents($docLocation);
         $type = 'AlgoWeb\ODataMetadata\MetadataV3\edmx\TDataServicesType';
-        $ymlDir = dirname(__DIR__) . $ds . "src" . $ds . "MetadataV3" . $ds . "JMSmetadata";
+        $ymlDir = dirname(__DIR__).$ds."src".$ds."MetadataV3".$ds."JMSmetadata";
 
         $serializer =
             \JMS\Serializer\SerializerBuilder::create()
@@ -161,10 +161,10 @@ 
         $ds = DIRECTORY_SEPARATOR;
         $msg = null;
 
-        $docLocation = dirname(__DIR__) . $ds . "tests" . $ds . "exampleV3ServiceMetadata.xml";
+        $docLocation = dirname(__DIR__).$ds."tests".$ds."exampleV3ServiceMetadata.xml";
         $document = file_get_contents($docLocation);
         $type = 'AlgoWeb\ODataMetadata\MetadataV3\edmx\Edmx';
-        $ymlDir = dirname(__DIR__) . $ds . "src" . $ds . "MetadataV3" . $ds . "JMSmetadata";
+        $ymlDir = dirname(__DIR__).$ds."src".$ds."MetadataV3".$ds."JMSmetadata";
 
         $serializer =
             \JMS\Serializer\SerializerBuilder::create()
@@ -182,11 +182,11 @@ 
         $ds = DIRECTORY_SEPARATOR;
         $msg = null;
 
-        $docLocation = dirname(__DIR__) . $ds . "tests" . $ds . "exampleV3ServiceMetadata.xml";
+        $docLocation = dirname(__DIR__).$ds."tests".$ds."exampleV3ServiceMetadata.xml";
         $document = file_get_contents($docLocation);
         $this->v3MetadataAgainstXSD($document);
         $type = 'AlgoWeb\ODataMetadata\MetadataV3\edmx\Edmx';
-        $ymlDir = dirname(__DIR__) . $ds . "src" . $ds . "MetadataV3" . $ds . "JMSmetadata";
+        $ymlDir = dirname(__DIR__).$ds."src".$ds."MetadataV3".$ds."JMSmetadata";
 
         $serializer =
             \JMS\Serializer\SerializerBuilder::create()
@@ -227,7 +227,7 @@ 
         $this->assertNull($msg);
 
 
-        $ymlDir = dirname(__DIR__) . $ds . "src" . $ds . "MetadataV3" . $ds . "JMSmetadata";
+        $ymlDir = dirname(__DIR__).$ds."src".$ds."MetadataV3".$ds."JMSmetadata";
         $serializer =
             \JMS\Serializer\SerializerBuilder::create()
                 ->addMetadataDir($ymlDir)
@@ -256,11 +256,11 @@ 
         $last_letter = strtolower($singular[strlen($singular) - 1]);
         switch ($last_letter) {
             case 'y':
-                return substr($singular, 0, -1) . 'ies';
+                return substr($singular, 0, -1).'ies';
             case 's':
-                return $singular . 'es';
+                return $singular.'es';
             default:
-                return $singular . 's';
+                return $singular.'s';
         }
     }