Algo-Web / ODataMetadata

src/MetadataV3/edm/TEntityTypeType.php

Spacing +3 added lines, -3 removed lines

@@ -467,20 +467,20 @@
         $pArray = [];
         foreach ($this->getProperty() as $prop) {
             if (in_array($prop->getName(), $pArray)) {
-                $msg = "Property Names, and Navigation Property Must Be Unique " . __CLASS__;
+                $msg = "Property Names, and Navigation Property Must Be Unique ".__CLASS__;
                 return false;
             }
             $pArray[] = $prop->getName();
         }
         foreach ($this->getNavigationProperty() as $prop) {
             if (in_array($prop->getName(), $pArray)) {
-                $msg = "Property Names, and Navigation Property Must Be Unique " . __CLASS__;
+                $msg = "Property Names, and Navigation Property Must Be Unique ".__CLASS__;
                 return false;
             }
             $pArray[] = $prop->getName();
         }
         if (in_array($this->getName(), $pArray)) {
-            $msg = "entity types can not contain a property with the same name " . __CLASS__;
+            $msg = "entity types can not contain a property with the same name ".__CLASS__;
             return false;
         }
         return true;

src/MetadataV3/edm/IsOKTraits/TPropertyTypeTrait.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
         $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,}/";
 
         if (!is_string($string)) {
-            $msg = "Input must be a string: ". get_class($this);
+            $msg = "Input must be a string: ".get_class($this);
             throw new \InvalidArgumentException($msg);
         }
         if ($this->isEDMSimpleTypeValid($string)) {

src/MetadataV3/edm/IsOKTraits/TFunctionImportParameterAndReturnTypeTrait.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
         $regex = "/Collection\([^ \t]{1,}(\.[^ \t]{1,}){0,}\)/";
 
         if (!is_string($string)) {
-            $msg = "Input must be a string: ". get_class($this);
+            $msg = "Input must be a string: ".get_class($this);
             throw new \InvalidArgumentException($msg);
         }
         if ($this->isEDMSimpleTypeValid($string)) {

src/MetadataV3/edm/IsOKTraits/TUnwrappedFunctionTypeTrait.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
         $regex = '/[^ \t]{1,}(\.[^ \t]{1,}){0,}/';
 
         if (!is_string($string)) {
-            $msg = "Input must be a string: ". get_class($this);
+            $msg = "Input must be a string: ".get_class($this);
             throw new \InvalidArgumentException($msg);
         }
         if ($this->isTQualifiedNameValid($string)) {

src/MetadataV3/edm/IsOKTraits/TWrappedFunctionTypeTrait.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
         $regex = '/(Collection|Ref)\([^ \t]{1,}(\.[^ \t]{1,}){0,}\/)';
 
         if (!is_string($string)) {
-            $msg = "Input must be a string: ". get_class($this);
+            $msg = "Input must be a string: ".get_class($this);
             throw new \InvalidArgumentException($msg);
         }
         if ($this->isTQualifiedNameValid($string)) {

src/MetadataV3/edm/EntityContainer.php

Spacing +3 added lines, -3 removed lines

@@ -82,7 +82,7 @@ 
     public function setName($name)
     {
         if (!$this->isTSimpleIdentifierValid($name)) {
-            $msg = "Name(" . $name . ") must be a valid TSimpleIdentifier";
+            $msg = "Name(".$name.") must be a valid TSimpleIdentifier";
             throw new \InvalidArgumentException($msg);
         }
         $this->name = $name;
@@ -397,7 +397,7 @@ 
     public function isOK(&$msg = null)
     {
         if (!$this->isTSimpleIdentifierValid($this->name)) {
-            $msg = "Name(" . $this->name . ") must be a valid TSimpleIdentifier " . __FILE__ . ":" . __LINE__;
+            $msg = "Name(".$this->name.") must be a valid TSimpleIdentifier ".__FILE__.":".__LINE__;
             return false;
         }
 
@@ -450,7 +450,7 @@ 
         }
         foreach ($this->associationSet as $assocationSet) {
             if (!in_array($assocationSet->getEnd()[0]->getEntitySet(), $entityNames)) {
-                $msg = "The entitysets for assocations must have a valid entity set. " . $assocationSet->getName() . " Does not";
+                $msg = "The entitysets for assocations must have a valid entity set. ".$assocationSet->getName()." Does not";
                 return false;
             }
         }

src/MetadataV3/edm/TSchemaType.php

Spacing +8 added lines, -8 removed lines

@@ -149,7 +149,7 @@ 
                 die($this->getNamespace());
                 return false;
             }*/
-            $eSetType = str_replace($this->getNamespace() . ".", "", $eSetType);
+            $eSetType = str_replace($this->getNamespace().".", "", $eSetType);
             if (!in_array($eSetType, $entityTypeNames)) {
                 $msg = "entitySet Types should have a matching type name in entity Types";
                 return false;
@@ -158,7 +158,7 @@ 
 
         // Check Associations to associationSets
         if (count($associationSets) != count($associationNames)) {
-            $msg = "we have " . count($associationSets) . "association sets and " . count($associationNames)
+            $msg = "we have ".count($associationSets)."association sets and ".count($associationNames)
                    . " associations, they should be the same";
         }
         if (count($associationNames) * 2 < count($navigationProperties)) {
@@ -167,33 +167,33 @@ 
         }
         foreach ($associationNames as $associationName => $associationEnds) {
             if (!array_key_exists($associationName, $associationSets)) {
-                $msg = "association " . $associationName . " exists without matching associationSet";
+                $msg = "association ".$associationName." exists without matching associationSet";
                 return false;
             }
 
             if (!array_key_exists($associationName, $navigationProperties)) {
-                $msg = "association " . $associationName . " exists without matching Natvigation Property";
+                $msg = "association ".$associationName." exists without matching Natvigation Property";
                 return false;
             }
             $roles = [$associationEnds[0]->getRole(), $associationEnds[1]->getRole()];
             if (!in_array($associationSets[$associationName][0]->getRole(), $roles)) {
-                $msg = "association Set role " . $associationSets[$associationName][0]->getRole()
+                $msg = "association Set role ".$associationSets[$associationName][0]->getRole()
                        . "lacks a matching property in the attached association";
                 return false;
             }
             if (!in_array($associationSets[$associationName][1]->getRole(), $roles)) {
-                $msg = "association Set role " . $associationSets[$associationName][1]->getRole()
+                $msg = "association Set role ".$associationSets[$associationName][1]->getRole()
                        . "lacks a matching property in the attached association";
                 return false;
             }
             foreach ($navigationProperties[$associationName] as $navProp) {
                 if (!in_array($navProp->getToRole(), $roles)) {
-                    $msg = "Navigation Property Role " . $navProp->getToRole()
+                    $msg = "Navigation Property Role ".$navProp->getToRole()
                          . " lacks a matching Property in the assocation";
                     return false;
                 }
                 if (!in_array($navProp->getFromRole(), $roles)) {
-                    $msg = "Navigation Property Role " .$navProp->getToRole()
+                    $msg = "Navigation Property Role ".$navProp->getToRole()
                          . " lacks a matching Property in the assocation";
                     return false;
                 }

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 +11 added lines, -11 removed lines

@@ -26,7 +26,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)
@@ -39,7 +39,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;
         }
@@ -65,7 +65,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)
@@ -112,7 +112,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)
@@ -144,10 +144,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()
@@ -164,10 +164,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()
@@ -185,11 +185,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()
@@ -230,7 +230,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)