Algo-Web / ODataMetadata

src/MetadataV3/edm/Groups/TFacetAttributesTrait.php

Spacing +9 added lines, -9 removed lines

@@ -301,39 +301,39 @@
     public function isTFacetAttributesTraitValid(&$msg = null)
     {
         if ($this->nullable !== boolval($this->nullable)) {
-            $msg = "Nullable must be boolean: " . get_class($this);
+            $msg = "Nullable must be boolean: ".get_class($this);
             return false;
         }
         if (null != $this->defaultValue && !is_string($this->defaultValue)) {
-            $msg = "Default value must be a string: " . get_class($this);
+            $msg = "Default value must be a string: ".get_class($this);
             return false;
         }
         if (null != $this->collation && !$this->isTCollationFacetValid($this->collation)) {
-            $msg = "Collation must be a valid TCollationFacet: " . get_class($this);
+            $msg = "Collation must be a valid TCollationFacet: ".get_class($this);
             return false;
         }
         if (null != $this->maxLength && !$this->isTMaxLengthFacetValid($this->maxLength)) {
-            $msg = "Max length must be a valid TMaxLengthFacet: " . get_class($this);
+            $msg = "Max length must be a valid TMaxLengthFacet: ".get_class($this);
             return false;
         }
         if (null != $this->fixedLength && !$this->isTIsFixedLengthFacetTraitValid($this->fixedLength)) {
-            $msg = "Fixed length must be a valid TFixedLengthFacet: " . get_class($this);
+            $msg = "Fixed length must be a valid TFixedLengthFacet: ".get_class($this);
             return false;
         }
         if (null != $this->precision && !$this->isTPrecisionFacetValid($this->precision)) {
-            $msg = "Precision must be a valid TPrecisionFacet: " . get_class($this);
+            $msg = "Precision must be a valid TPrecisionFacet: ".get_class($this);
             return false;
         }
         if (null != $this->scale && !$this->isTScaleFacetValid($this->scale)) {
-            $msg = "Scale must be a valid TScaleFacet: " . get_class($this);
+            $msg = "Scale must be a valid TScaleFacet: ".get_class($this);
             return false;
         }
         if (null != $this->sRID && !$this->isTSridFacetValid($this->sRID)) {
-            $msg = "SRID must be a valid TSridFacet: " . get_class($this);
+            $msg = "SRID must be a valid TSridFacet: ".get_class($this);
             return false;
         }
         if (null != $this->unicode && !$this->isTIsUnicodeFacetTraitValid($this->unicode)) {
-            $msg = "Unicode must be a valid TUnicodeFacet: " . get_class($this);
+            $msg = "Unicode must be a valid TUnicodeFacet: ".get_class($this);
             return false;
         }
 

src/MetadataV3/edm/Groups/TCommonPropertyAttributesTrait.php

Spacing +14 added lines, -14 removed lines

@@ -476,59 +476,59 @@
     public function isTCommonPropertyAttributesValid(&$msg = null)
     {
         if (!$this->isTSimpleIdentifierValid($this->name)) {
-            $msg = "Name must be a valid TSimpleIdentifier: " . get_class($this);
+            $msg = "Name must be a valid TSimpleIdentifier: ".get_class($this);
             return false;
         }
         if (!$this->isTPropertyTypeValid($this->type)) {
-            $msg = "Type must be a valid TPropertyType: " . get_class($this);
+            $msg = "Type must be a valid TPropertyType: ".get_class($this);
             return false;
         }
         if (null != $this->nullable && $this->nullable !== boolval($this->nullable)) {
-            $msg = "Nullable must be boolean: " . get_class($this);
+            $msg = "Nullable must be boolean: ".get_class($this);
             return false;
         }
         if (null != $this->defaultValue && !is_string($this->defaultValue)) {
-            $msg = "Default value must be a string: " . get_class($this);
+            $msg = "Default value must be a string: ".get_class($this);
             return false;
         }
         if (null != $this->maxLength && !$this->isTMaxLengthFacetValid($this->maxLength)) {
-            $msg = "Max length must be a valid TMaxLengthFacet: " . get_class($this);
+            $msg = "Max length must be a valid TMaxLengthFacet: ".get_class($this);
             return false;
         }
         if (null != $this->fixedLength && !$this->isTIsFixedLengthFacetTraitValid($this->fixedLength)) {
-            $msg = "Max length must be a valid TFixedLengthFacet: " . get_class($this);
+            $msg = "Max length must be a valid TFixedLengthFacet: ".get_class($this);
             return false;
         }
         if (null != $this->precision && !$this->isTPrecisionFacetValid($this->precision)) {
-            $msg = "Precision must be a valid TPrecisionFacet: " . get_class($this);
+            $msg = "Precision must be a valid TPrecisionFacet: ".get_class($this);
             return false;
         }
         if (null != $this->scale && !$this->isTScaleFacetValid($this->scale)) {
-            $msg = "Scale must be a valid TScaleFacet: " . get_class($this);
+            $msg = "Scale must be a valid TScaleFacet: ".get_class($this);
             return false;
         }
         if (null != $this->unicode && !$this->isTIsUnicodeFacetTraitValid($this->unicode)) {
-            $msg = "Unicode must be a valid TUnicodeFacet: " . get_class($this);
+            $msg = "Unicode must be a valid TUnicodeFacet: ".get_class($this);
             return false;
         }
         if (null != $this->collation && !$this->isTCollationFacetValid($this->collation)) {
-            $msg = "Collation must be a valid TCollationFacet: " . get_class($this);
+            $msg = "Collation must be a valid TCollationFacet: ".get_class($this);
             return false;
         }
         if (null != $this->sRID && !$this->isTSridFacetValid($this->sRID)) {
-            $msg = "SRID must be a valid TSridFacet: " . get_class($this);
+            $msg = "SRID must be a valid TSridFacet: ".get_class($this);
             return false;
         }
         if (null != $this->concurrencyMode && !$this->isTConcurrencyModeValid($this->concurrencyMode)) {
-            $msg = "ConcurrencyMode must be a valid TConcurrencyMode: " . get_class($this);
+            $msg = "ConcurrencyMode must be a valid TConcurrencyMode: ".get_class($this);
             return false;
         }
         if (null != $this->setterAccess && !$this->isTAccessOk($this->setterAccess)) {
-            $msg = "Setter access must be a valid TAccess: " . get_class($this);
+            $msg = "Setter access must be a valid TAccess: ".get_class($this);
             return false;
         }
         if (null != $this->getterAccess && !$this->isTAccessOk($this->getterAccess)) {
-            $msg = "Getter access must be a valid TAccess: " . get_class($this);
+            $msg = "Getter access must be a valid TAccess: ".get_class($this);
             return false;
         }
 

src/MetadataV3/edm/Groups/TEntitySetAttributesTrait.php

Spacing +3 added lines, -3 removed lines

@@ -109,15 +109,15 @@
     public function isTEntitySetAttributesOK(&$msg = null)
     {
         if (null != $this->name && !$this->isTSimpleIdentifierValid($this->name)) {
-            $msg = "Name must be a valid TSimpleIdentifier: " . get_class($this);
+            $msg = "Name must be a valid TSimpleIdentifier: ".get_class($this);
             return false;
         }
         if (null != $this->entityType && !$this->isTQualifiedNameValid($this->entityType)) {
-            $msg = "Entity type must be a valid TQualifiedName: " . get_class($this);
+            $msg = "Entity type must be a valid TQualifiedName: ".get_class($this);
             return false;
         }
         if (null != $this->getterAccess && !$this->isTAccessOk($this->getterAccess)) {
-            $msg = "Getter access must be a valid TAccess: " . get_class($this);
+            $msg = "Getter access must be a valid TAccess: ".get_class($this);
             return false;
         }
 

src/IsOKTraits/IsOKToolboxTrait.php

Spacing +3 added lines, -3 removed lines

@@ -75,7 +75,7 @@ 
             return true;
         }
         if (!$object instanceof $instanceOf) {
-            $msg = "Supplied object not an instance of ".$instanceOf. ": " . get_class($this);
+            $msg = "Supplied object not an instance of ".$instanceOf.": ".get_class($this);
             return false;
         }
         return $object->isOK($msg);
@@ -85,7 +85,7 @@ 
     {
         $result = $this->isValidArray($arr, $instanceOf, $minCount, $maxCount);
         if (!$result) {
-            $msg = "Supplied array not a valid array: " . get_class($this);
+            $msg = "Supplied array not a valid array: ".get_class($this);
             return false;
         }
 
@@ -120,7 +120,7 @@ 
         }
         foreach ($arr as $item) {
             if (!($item instanceof IsOK)) {
-                $msg = "Child item is not an instance of IsOK: " . get_class($this);
+                $msg = "Child item is not an instance of IsOK: ".get_class($this);
                 return false;
             }
             if (!$item->isOK($msg)) {

src/MetadataV3/edm/IsOKTraits/EDMSimpleTypeTrait.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
             "GeometricMultiPoint", "GeometricMultiLineString", "GeometricMultiPolygon", "GeometryCollection",
             "Guid", "Int16", "Int32", "Int64", "String", "SByte"];
         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 (!in_array($string, $validType)) {

src/MetadataV3/edm/EntityContainer.php

Spacing +2 added lines, -2 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;
         }
 

src/MetadataV3/edm/TEntityPropertyType.php

Spacing +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
     public function setStoreGeneratedPattern($storeGeneratedPattern)
     {
         if (null != $storeGeneratedPattern && !$this->isTGenerationPatternValid($storeGeneratedPattern)) {
-            $msg = "Store generation pattern must be a valid TGenerationPattern: " . get_class($this);
+            $msg = "Store generation pattern must be a valid TGenerationPattern: ".get_class($this);
             throw new \InvalidArgumentException($msg);
         }
         $this->storeGeneratedPattern = $storeGeneratedPattern;
@@ -281,7 +281,7 @@ 
     public function isOK(&$msg = null)
     {
         if (null != $this->storeGeneratedPattern && !$this->isTGenerationPatternValid($this->storeGeneratedPattern)) {
-            $msg = "Store generation pattern must be a valid TGenerationPattern: " . get_class($this);
+            $msg = "Store generation pattern must be a valid TGenerationPattern: ".get_class($this);
             return false;
         }
         if (!$this->isValidArrayOK(

tests/EdmxTest.php

Spacing +7 added lines, -7 removed lines

@@ -20,7 +20,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)
@@ -34,7 +34,7 @@ 
         $ds = DIRECTORY_SEPARATOR;
         $xml = new \DOMDocument();
         $xml->loadXML($data);
-        $xml->schemaValidate(dirname(__DIR__) . $ds . "xsd" . $ds . "/Microsoft.Data.Entity.Design.Edmx_3.xsd");
+        $xml->schemaValidate(dirname(__DIR__).$ds."xsd".$ds."/Microsoft.Data.Entity.Design.Edmx_3.xsd");
     }
 
     public function testWithSingleEntitySerializeOk()
@@ -51,7 +51,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)
@@ -88,7 +88,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)
@@ -114,11 +114,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';
         }
     }
 }

src/MetadataV3/edm/TSchemaType.php

Spacing +2 added lines, -2 removed lines

@@ -122,10 +122,10 @@
         foreach ($entitySets as $eset) {
             $eSetType = $eset->getEntityType();
             if (substr($eSetType, 0, strlen($this->getNamespace())) != $this->getNamespace()) {
-                $msg = "Types for Entity Sets should have the namespace at the beginning " . __CLASS__;
+                $msg = "Types for Entity Sets should have the namespace at the beginning ".__CLASS__;
                 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;