Algo-Web / ODataMetadata

src/MetadataV3/edm/IsOKTraits/EDMSimpleTypeTrait.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
     public function isEDMSimpleTypeValid($string)
     {
         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, static::$v3EDMSimpleType)) {

src/MetadataV3/edm/EntityContainer/FunctionImportAnonymousType.php

Spacing +1 added lines, -1 removed lines

@@ -146,7 +146,7 @@
             for ($j = $i + 1; $j < $numParms; $j++) {
                 assert(
                     $this->parameter[$j] instanceof TFunctionImportParameterType,
-                    get_class($this->parameter[$j]). ' ' . $j
+                    get_class($this->parameter[$j]).' '.$j
                 );
                 $inName = $this->parameter[$j]->getName();
                 if ($outName == $inName) {

src/MetadataV3/edm/IsOKTraits/TPropertyTypeTrait.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,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 (isset(static::$v3PropertyTypeCache[$string])) {

tests/MetadataManagerNavigationTest.php

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
         $result = null;
 
         list($CategoryType, $result) = $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");
@@ -113,7 +113,7 @@ 
         $this->assertTrue($metadataManager->getEdmx()->isOK($msg), $msg);
 
         $expectedRelation = "Data.Category_Products_Product_Category";
-        list($principalNav, ) = $metadataManager->addNavigationPropertyToEntityType(
+        list($principalNav,) = $metadataManager->addNavigationPropertyToEntityType(
             $CategoryType, "*", "Products", $ProductType, "1", "Category", ["CategoryID"], ["CategoryID"]
         );
         $this->assertEquals($expectedRelation, $principalNav->getRelationship());

src/MetadataV3/edm/TTypeRefType.php

Spacing +2 added lines, -7 removed lines

@@ -32,7 +32,7 @@ 
      */
     private $type = null;
 
-<<<<<<< HEAD
+<< << <<< HEAD
         /**
          * Gets as type
          *
@@ -75,9 +75,4 @@ 
         if (!$this->isExtensibilityElementOK($msg)) {
             return false;
         }
-        if (!$this->isTFacetAttributesTraitValid($msg)) {
-            return false;
-        }
-        return true;
-    }
-}
+        if (!$this->isTFacetAttributesTraitValid($msg
\ No newline at end of file

src/MetadataV3/edmx/TDataServicesType.php

Spacing +2 added lines, -8 removed lines

@@ -153,7 +153,7 @@ 
     {
         if (!$this->isValidArrayOK(
             $dataServices,
-<<<<<<< HEAD
+<< << <<< HEAD
             '\AlgoWeb\ODataMetadata\MetadataV3\edm\Schema',
             $msg,
             1
@@ -176,10 +176,4 @@ 
             return false;
         }
 
-        if (!$this->isValidArrayOK($this->schema, '\AlgoWeb\ODataMetadata\MetadataV3\edm\Schema', $msg, 1)) {
-            return false;
-        }
-
-        return true;
-    }
-}
+        if (!$this->isValidArrayOK($this->schema, '\AlgoWeb\ODataMetadata\MetadataV3\edm\Schema', $msg
\ No newline at end of file