Algo-Web / ODataMetadata

src/MetadataManager.php

Spacing +15 added lines, -15 removed lines

@@ -30,7 +30,7 @@ 
         if (!$this->V3Edmx->isOK($msg)) {
             throw new \Exception($msg);
         }
-        $ymlDir = __DIR__ . DIRECTORY_SEPARATOR . "MetadataV3" . DIRECTORY_SEPARATOR . "JMSmetadata";
+        $ymlDir = __DIR__.DIRECTORY_SEPARATOR."MetadataV3".DIRECTORY_SEPARATOR."JMSmetadata";
         $this->serializer =
             SerializerBuilder::create()
                 ->addMetadataDir($ymlDir)
@@ -65,7 +65,7 @@ 
         if (0 == strlen(trim($namespace))) {
             $entityTypeName = $NewEntity->getName();
         } else {
-            $entityTypeName = $namespace . "." . $NewEntity->getName();
+            $entityTypeName = $namespace.".".$NewEntity->getName();
         }
         $entitySet->setEntityType($entityTypeName);
         $entitySet->setGetterAccess($accessType);
@@ -106,11 +106,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';
         }
     }
 
@@ -185,21 +185,21 @@ 
         $this->startEdmxTransaction();
         $principalEntitySetName = $this->pluralize(2, $principalType->getName());
         $dependentEntitySetName = $this->pluralize(2, $dependentType->getName());
-        $relationName = $principalType->getName() . "_" . $principalProperty . "_"
-                        . $dependentType->getName() . "_" . $dependentProperty;
+        $relationName = $principalType->getName()."_".$principalProperty."_"
+                        . $dependentType->getName()."_".$dependentProperty;
         $relationName = trim($relationName, "_");
 
         $namespace = $this->V3Edmx->getDataServices()[0]->getNamespace();
         if (0 == strlen(trim($namespace))) {
             $relationFQName = $relationName;
         } else {
-            $relationFQName = $namespace . "." . $relationName;
+            $relationFQName = $namespace.".".$relationName;
         }
 
         $principalNavigationProperty = new TNavigationPropertyType();
         $principalNavigationProperty->setName($principalProperty);
-        $principalNavigationProperty->setToRole($dependentEntitySetName . "_" . $dependentProperty);
-        $principalNavigationProperty->setFromRole($principalEntitySetName . "_" . $principalProperty);
+        $principalNavigationProperty->setToRole($dependentEntitySetName."_".$dependentProperty);
+        $principalNavigationProperty->setFromRole($principalEntitySetName."_".$principalProperty);
         $principalNavigationProperty->setRelationship($relationFQName);
         $principalNavigationProperty->setGetterAccess($principalGetterAccess);
         $principalNavigationProperty->setSetterAccess($principalSetterAccess);
@@ -215,8 +215,8 @@ 
         if (!empty($dependentProperty)) {
             $dependentNavigationProperty = new TNavigationPropertyType();
             $dependentNavigationProperty->setName($dependentProperty);
-            $dependentNavigationProperty->setToRole($principalEntitySetName . "_" . $principalProperty);
-            $dependentNavigationProperty->setFromRole($dependentEntitySetName . "_" . $dependentProperty);
+            $dependentNavigationProperty->setToRole($principalEntitySetName."_".$principalProperty);
+            $dependentNavigationProperty->setFromRole($dependentEntitySetName."_".$dependentProperty);
             $dependentNavigationProperty->setRelationship($relationFQName);
             $dependentNavigationProperty->setGetterAccess($dependentGetterAccess);
             $dependentNavigationProperty->setSetterAccess($dependentSetterAccess);
@@ -287,8 +287,8 @@ 
             $principalTypeFQName = $principalType->getName();
             $dependentTypeFQName = $dependentType->getName();
         } else {
-            $principalTypeFQName = $namespace . "." . $principalType->getName();
-            $dependentTypeFQName = $namespace . "." . $dependentType->getName();
+            $principalTypeFQName = $namespace.".".$principalType->getName();
+            $dependentTypeFQName = $namespace.".".$dependentType->getName();
         }
         $association = new TAssociationType();
         $relationship = $principalNavigationProperty->getRelationship();
@@ -354,7 +354,7 @@ 
         if (0 == strlen(trim($namespace))) {
             $associationSetName = $association->getName();
         } else {
-            $associationSetName = $namespace . "." . $association->getName();
+            $associationSetName = $namespace.".".$association->getName();
         }
         $as->setAssociation($associationSetName);
         $end1 = new EndAnonymousType();

src/MetadataV3/edm/TSchemaType.php

Spacing +6 added lines, -6 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)) {
@@ -168,22 +168,22 @@ 
 
         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;
             }