c-harris / ODataMetadata

src/MetadataV3/edm/TSchemaType.php

Spacing +1 added lines, -1 removed lines

@@ -203,7 +203,7 @@
                     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;
                 }

src/MetadataV3/edm/Groups/GExpressionTrait.php

Spacing +2 added lines, -2 removed lines

@@ -687,12 +687,12 @@
                 $counter += isset($this->$name) ? 1 : 0;
             }
             if (-1 < $this->gExpressionMinimum && $counter < $this->gExpressionMinimum) {
-                $msg = $counter . " fields not null.  Need minimum of ".$this->gExpressionMinimum. ": "
+                $msg = $counter . " fields not null.  Need minimum of " . $this->gExpressionMinimum . ": "
                         . get_class($this);
                 return false;
             }
             if (-1 < $this->gExpressionMaximum && $counter > $this->gExpressionMaximum) {
-                $msg = $counter . " fields not null.  Need maximum of ".$this->gExpressionMaximum. ": "
+                $msg = $counter . " fields not null.  Need maximum of " . $this->gExpressionMaximum . ": "
                         . get_class($this);
                 return false;
             }

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/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

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