Algo-Web / ODataMetadata

tests/MetadataManagerTest.php

Unused Use Statements -2 removed lines

@@ -8,8 +8,6 @@
 use AlgoWeb\ODataMetadata\MetadataV3\edm\Schema;
 use AlgoWeb\ODataMetadata\MetadataV3\edm\TAssociationType;
 use AlgoWeb\ODataMetadata\MetadataV3\edm\TEntityTypeType;
-use AlgoWeb\ODataMetadata\MetadataV3\edm\TFunctionReturnTypeType;
-use AlgoWeb\ODataMetadata\MetadataV3\edm\TFunctionType;
 use AlgoWeb\ODataMetadata\MetadataV3\edmx\Edmx;
 use Mockery as m;
 

Spacing +7 added lines, -7 removed lines

@@ -32,7 +32,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;
         }
@@ -47,7 +47,7 @@ 
         $result = null;
 
         list($eType, $result) = $metadataManager->addEntityType("Category");
-        $this->assertNotFalse($eType, "Etype is false not type " . $metadataManager->getLastError());
+        $this->assertNotFalse($eType, "Etype is false not type ".$metadataManager->getLastError());
         $metadataManager->addPropertyToEntityType($eType, "CategoryID", "Int32", null, false, true, "Identity");
         $metadataManager->addPropertyToEntityType($eType, "CategoryName", "String");
         $metadataManager->addPropertyToEntityType($eType, "Description", "String");
@@ -74,7 +74,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");
@@ -502,7 +502,7 @@ 
     {
         list(, $metadataManager, $CategoryType, $CustomerType) = $this->setUpMetadataForNavTests();
 
-        $expected =  "Invalid multiplicity combination - 1 1";
+        $expected = "Invalid multiplicity combination - 1 1";
         $actual = null;
 
         try {
@@ -524,7 +524,7 @@ 
     {
         list(, $metadataManager, $CategoryType, $CustomerType) = $this->setUpMetadataForNavTests();
 
-        $expected =  "Invalid multiplicity combination - * 0..1";
+        $expected = "Invalid multiplicity combination - * 0..1";
         $actual = null;
 
         try {
@@ -551,8 +551,8 @@ 
         $metadataManager = new MetadataManager("Data", "Container");
         $result = null;
 
-        list($CategoryType, ) = $metadataManager->addEntityType("Category");
-        list($CustomerType, ) = $metadataManager->addEntityType("Customer");
+        list($CategoryType,) = $metadataManager->addEntityType("Category");
+        list($CustomerType,) = $metadataManager->addEntityType("Customer");
         $this->assertTrue($CategoryType->isOK($msg), $msg);
         $this->assertTrue($CustomerType->isOK($msg), $msg);
         return array($msg, $metadataManager, $CategoryType, $CustomerType);

src/MetadataManager.php

Spacing +14 added lines, -14 removed lines

@@ -69,7 +69,7 @@ 
         if (0 == strlen(trim($namespace))) {
             $entityTypeName = $NewEntity->getName();
         } else {
-            $entityTypeName = $namespace . "." . $NewEntity->getName();
+            $entityTypeName = $namespace.".".$NewEntity->getName();
         }
         $entitySet->setEntityType($entityTypeName);
         $entitySet->setGetterAccess($accessType);
@@ -190,21 +190,21 @@ 
     ) {
         $principalEntitySetName = Str::plural($principalType->getName(), 2);
         $dependentEntitySetName = Str::plural($dependentType->getName(), 2);
-        $relationName = $principalType->getName() . "_" . $principalProperty . "_"
-                        . $dependentType->getName() . "_" . $dependentProperty;
+        $relationName = $principalType->getName()."_".$principalProperty."_"
+                        . $dependentType->getName()."_".$dependentProperty;
         $relationName = trim($relationName, "_");
 
         $namespace = $this->V3Edmx->getDataServiceType()->getSchema()[0]->getNamespace();
         if (0 == strlen(trim($namespace))) {
             $relationFQName = $relationName;
         } else {
-            $relationFQName = $namespace . "." . $relationName;
+            $relationFQName = $namespace.".".$relationName;
         }
 
         $principalNavigationProperty = new TNavigationPropertyType();
         $principalNavigationProperty->setName($principalProperty);
-        $principalNavigationProperty->setToRole(trim($dependentEntitySetName . "_" . $dependentProperty, "_"));
-        $principalNavigationProperty->setFromRole($principalEntitySetName . "_" . $principalProperty);
+        $principalNavigationProperty->setToRole(trim($dependentEntitySetName."_".$dependentProperty, "_"));
+        $principalNavigationProperty->setFromRole($principalEntitySetName."_".$principalProperty);
         $principalNavigationProperty->setRelationship($relationFQName);
         $principalNavigationProperty->setGetterAccess($principalGetterAccess);
         $principalNavigationProperty->setSetterAccess($principalSetterAccess);
@@ -219,8 +219,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);
@@ -271,7 +271,7 @@ 
         array $principalConstraintProperty = null,
         array $dependentConstraintProperty = null
     ) {
-        $multCombo = [ '*' => ['*', '1'], '0..1' => ['1'], '1' => ['*', '0..1']];
+        $multCombo = ['*' => ['*', '1'], '0..1' => ['1'], '1' => ['*', '0..1']];
         $multKeys = array_keys($multCombo);
         if (null != $dependentNavigationProperty) {
             if ($dependentNavigationProperty->getRelationship() != $principalNavigationProperty->getRelationship()) {
@@ -290,7 +290,7 @@ 
         }
         if (!in_array($dependentMultiplicity, $multCombo[$principalMultiplicity])) {
             throw new \InvalidArgumentException(
-                "Invalid multiplicity combination - ". $principalMultiplicity . ' ' . $dependentMultiplicity
+                "Invalid multiplicity combination - ".$principalMultiplicity.' '.$dependentMultiplicity
             );
         }
 
@@ -300,8 +300,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();
@@ -369,7 +369,7 @@ 
         if (0 == strlen(trim($namespace))) {
             $associationSetName = $association->getName();
         } else {
-            $associationSetName = $namespace . "." . $association->getName();
+            $associationSetName = $namespace.".".$association->getName();
         }
         $as->setAssociation($associationSetName);
         $end1 = new EndAnonymousType();
@@ -435,7 +435,7 @@ 
 
     private function initSerialiser()
     {
-        $ymlDir = __DIR__ . DIRECTORY_SEPARATOR . "MetadataV3" . DIRECTORY_SEPARATOR . "JMSmetadata";
+        $ymlDir = __DIR__.DIRECTORY_SEPARATOR."MetadataV3".DIRECTORY_SEPARATOR."JMSmetadata";
         $this->serializer =
             SerializerBuilder::create()
                 ->addMetadataDir($ymlDir)