Algo-Web / ODataMetadata

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

tests/TSchemaTypeTest.php

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
         for ($i = 0; $i < 100; $i++) {
             $actualMax = max($type->getRand(), $actualMax);
         }
-        $this->assertTrue($expectedMax >= $actualMax, $actualMax . ' must be less than '.$expectedMax);
+        $this->assertTrue($expectedMax >= $actualMax, $actualMax . ' must be less than ' . $expectedMax);
     }
 
     public function testGetRandMinimum()
@@ -42,6 +42,6 @@ 
         for ($i = 0; $i < 100; $i++) {
             $actualMin = min($type->getRand(), $actualMin);
         }
-        $this->assertTrue($expectedMin <= $actualMin, $actualMin . ' must be less than '.$expectedMin);
+        $this->assertTrue($expectedMin <= $actualMin, $actualMin . ' must be less than ' . $expectedMin);
     }
 }

tests/TestTypeTest.php

Spacing +1 added lines, -1 removed lines

@@ -194,7 +194,7 @@
 
         $msg = null;
         $expected = 'OH NOES!';
-        $arr = [ $bar ];
+        $arr = [$bar];
 
         $foo = new testType();
         $this->assertFalse($foo->isChildArrayOK($arr, $msg), $msg);

tests/v3/edm/EntityContainer/AssociationSetAnonymousTypeTest.php

Spacing +1 added lines, -1 removed lines

@@ -111,7 +111,7 @@
 
     public function testTooManyEnds()
     {
-        $expected = 'Supplied array not a valid array: '.
+        $expected = 'Supplied array not a valid array: ' .
                     'AlgoWeb\ODataMetadata\MetadataV3\edm\EntityContainer\AssociationSetAnonymousType';
         $actual = null;
 

tests/MetadataManagerNavigationTest.php

Spacing +2 added lines, -2 removed lines

@@ -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());
@@ -147,7 +147,7 @@ 
         $associationType = null;
         foreach ($dom->getElementsByTagName('Association') as $eType) {
             foreach ($eType->attributes as $aType) {
-                if ($aType->name == 'Name' && 'Data.'.$aType->value == $ProductRelationship) {
+                if ($aType->name == 'Name' && 'Data.' . $aType->value == $ProductRelationship) {
                     $associationType = $eType;
                 }
             }

tests/MetadataManagerTest.php

Spacing +22 added lines, -22 removed lines

@@ -165,7 +165,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());
@@ -211,7 +211,7 @@ 
         $this->assertTrue($assoc instanceof TAssociationType);
         $this->assertTrue($assoc->isOK($msg), $msg);
 
-        $this->assertEquals('Data.'.$assoc->getName(), $principal->getRelationship());
+        $this->assertEquals('Data.' . $assoc->getName(), $principal->getRelationship());
         $ends = $assoc->getEnd();
 
         $this->assertEquals(2, count($ends));
@@ -245,7 +245,7 @@ 
         $this->assertTrue($assoc instanceof TAssociationType);
         $this->assertTrue($assoc->isOK($msg), $msg);
 
-        $this->assertEquals('Data.'.$assoc->getName(), $principal->getRelationship());
+        $this->assertEquals('Data.' . $assoc->getName(), $principal->getRelationship());
         $ends = $assoc->getEnd();
 
         $this->assertEquals(2, count($ends));
@@ -279,7 +279,7 @@ 
         $this->assertTrue($assoc instanceof TAssociationType);
         $this->assertTrue($assoc->isOK($msg), $msg);
 
-        $this->assertEquals('Data.'.$assoc->getName(), $principal->getRelationship());
+        $this->assertEquals('Data.' . $assoc->getName(), $principal->getRelationship());
         $ends = $assoc->getEnd();
 
         $this->assertEquals(2, count($ends));
@@ -313,7 +313,7 @@ 
         $this->assertTrue($assoc instanceof TAssociationType);
         $this->assertTrue($assoc->isOK($msg), $msg);
 
-        $this->assertEquals('Data.'.$assoc->getName(), $principal->getRelationship());
+        $this->assertEquals('Data.' . $assoc->getName(), $principal->getRelationship());
         $ends = $assoc->getEnd();
 
         $this->assertEquals(2, count($ends));
@@ -347,7 +347,7 @@ 
         $this->assertTrue($assoc instanceof TAssociationType);
         $this->assertTrue($assoc->isOK($msg), $msg);
 
-        $this->assertEquals('Data.'.$assoc->getName(), $principal->getRelationship());
+        $this->assertEquals('Data.' . $assoc->getName(), $principal->getRelationship());
         $ends = $assoc->getEnd();
 
         $this->assertEquals(2, count($ends));
@@ -550,7 +550,7 @@ 
     {
         list(, $metadataManager, $CategoryType, $CustomerType) = $this->setUpMetadataForNavTests();
 
-        $expected =  'Invalid multiplicity combination - 1 1';
+        $expected = 'Invalid multiplicity combination - 1 1';
         $actual = null;
 
         try {
@@ -572,7 +572,7 @@ 
     {
         list(, $metadataManager, $CategoryType, $CustomerType) = $this->setUpMetadataForNavTests();
 
-        $expected =  'Invalid multiplicity combination - * 0..1';
+        $expected = 'Invalid multiplicity combination - * 0..1';
         $actual = null;
 
         try {
@@ -592,7 +592,7 @@ 
 
     public function testAddComplexType()
     {
-        list(, $metadataManager, , ) = $this->setUpMetadataForNavTests();
+        list(, $metadataManager,,) = $this->setUpMetadataForNavTests();
 
         $name = 'Name';
         $accessType = 'Public';
@@ -604,7 +604,7 @@ 
         $result = $metadataManager->addComplexType($name, $accessType, $summary, $longDescription);
 
         $newCount = count($metadataManager->getEdmx()->getDataServiceType()->getSchema()[0]->getComplexType());
-        $this->assertEquals($oldCount+1, $newCount);
+        $this->assertEquals($oldCount + 1, $newCount);
         $this->assertNotNull($result);
         $this->assertTrue($result instanceof TComplexTypeType, get_class($result));
         $this->assertNotNull($result->getDocumentation());
@@ -612,7 +612,7 @@ 
 
     public function testAddComplexTypeWithOnlySummary()
     {
-        list(, $metadataManager, , ) = $this->setUpMetadataForNavTests();
+        list(, $metadataManager,,) = $this->setUpMetadataForNavTests();
 
         $name = 'Name';
         $accessType = 'Public';
@@ -624,7 +624,7 @@ 
         $result = $metadataManager->addComplexType($name, $accessType, $summary, $longDescription);
 
         $newCount = count($metadataManager->getEdmx()->getDataServiceType()->getSchema()[0]->getComplexType());
-        $this->assertEquals($oldCount+1, $newCount);
+        $this->assertEquals($oldCount + 1, $newCount);
         $this->assertNotNull($result);
         $this->assertTrue($result instanceof TComplexTypeType, get_class($result));
         $this->assertNull($result->getDocumentation());
@@ -632,7 +632,7 @@ 
 
     public function testAddComplexTypeWithOnlyDescription()
     {
-        list(, $metadataManager, , ) = $this->setUpMetadataForNavTests();
+        list(, $metadataManager,,) = $this->setUpMetadataForNavTests();
 
         $name = 'Name';
         $accessType = 'Public';
@@ -644,7 +644,7 @@ 
         $result = $metadataManager->addComplexType($name, $accessType, $summary, $longDescription);
 
         $newCount = count($metadataManager->getEdmx()->getDataServiceType()->getSchema()[0]->getComplexType());
-        $this->assertEquals($oldCount+1, $newCount);
+        $this->assertEquals($oldCount + 1, $newCount);
         $this->assertNotNull($result);
         $this->assertTrue($result instanceof TComplexTypeType, get_class($result));
         $this->assertNull($result->getDocumentation());
@@ -655,7 +655,7 @@ 
         $expected = 'Default value cannot be object or array';
         $actual = null;
 
-        list(, $metadataManager, , ) = $this->setUpMetadataForNavTests();
+        list(, $metadataManager,,) = $this->setUpMetadataForNavTests();
         $complex = m::mock(TComplexTypeType::class);
         $name = 'name';
         $type = 'type';
@@ -674,7 +674,7 @@ 
         $expected = 'Default value cannot be object or array';
         $actual = null;
 
-        list(, $metadataManager, , ) = $this->setUpMetadataForNavTests();
+        list(, $metadataManager,,) = $this->setUpMetadataForNavTests();
         $complex = m::mock(TComplexTypeType::class);
         $name = 'name';
         $type = 'type';
@@ -690,7 +690,7 @@ 
 
     public function testAddPropertyToComplexTypeDefaultValueBoolean()
     {
-        list(, $metadataManager, , ) = $this->setUpMetadataForNavTests();
+        list(, $metadataManager,,) = $this->setUpMetadataForNavTests();
         $complex = m::mock(TComplexTypeType::class);
         $complex->shouldReceive('addToProperty')
             ->with(m::type(TComplexTypePropertyType::class))->andReturnNull()->once();
@@ -716,7 +716,7 @@ 
 
     public function testAddPropertyToComplexTypeDefaultValueBooleanOnlySummary()
     {
-        list(, $metadataManager, , ) = $this->setUpMetadataForNavTests();
+        list(, $metadataManager,,) = $this->setUpMetadataForNavTests();
         $complex = m::mock(TComplexTypeType::class);
         $complex->shouldReceive('addToProperty')
             ->with(m::type(TComplexTypePropertyType::class))->andReturnNull()->once();
@@ -743,7 +743,7 @@ 
 
     public function testAddPropertyToComplexTypeDefaultValueBooleanOnlyDescription()
     {
-        list(, $metadataManager, , ) = $this->setUpMetadataForNavTests();
+        list(, $metadataManager,,) = $this->setUpMetadataForNavTests();
         $complex = m::mock(TComplexTypeType::class);
         $complex->shouldReceive('addToProperty')
             ->with(m::type(TComplexTypePropertyType::class))->andReturnNull()->once();
@@ -862,7 +862,7 @@ 
         $longDescription = new TTextType();
 
         $metadataManager = new MetadataManager();
-        list($result, ) = $metadataManager->addEntityType($name, null, false, $accessType, $summary, $longDescription);
+        list($result,) = $metadataManager->addEntityType($name, null, false, $accessType, $summary, $longDescription);
         $this->assertNotNull($result->getDocumentation());
     }
 
@@ -874,7 +874,7 @@ 
         $longDescription = null;
 
         $metadataManager = new MetadataManager();
-        list($result, ) = $metadataManager->addEntityType($name, null, false, $accessType, $summary, $longDescription);
+        list($result,) = $metadataManager->addEntityType($name, null, false, $accessType, $summary, $longDescription);
         $this->assertNull($result->getDocumentation());
     }
 
@@ -886,7 +886,7 @@ 
         $longDescription = new TTextType();
 
         $metadataManager = new MetadataManager();
-        list($result, ) = $metadataManager->addEntityType($name, null, false, $accessType, $summary, $longDescription);
+        list($result,) = $metadataManager->addEntityType($name, null, false, $accessType, $summary, $longDescription);
         $this->assertNull($result->getDocumentation());
     }
 

src/MetadataManager.php

Spacing +2 added lines, -2 removed lines

@@ -64,7 +64,7 @@ 
         $newEntity->setName($name);
         $this->addDocumentation($summary, $longDescription, $newEntity);
         $newEntity->setAbstract($isAbstract);
-        $newEntity->setBaseType(null === $baseType ? null:$this->getNamespace() . $baseType->getName());
+        $newEntity->setBaseType(null === $baseType ? null : $this->getNamespace() . $baseType->getName());
 
         $entitySet = new EntitySetAnonymousType();
         $entitySet->setName(Str::plural($newEntity->getName()));
@@ -369,7 +369,7 @@ 
 
         $namespace = $this->getNamespace();
         $typeName = $expectedReturnType->getName();
-        $fqTypeName = $namespace.$typeName;
+        $fqTypeName = $namespace . $typeName;
         $fqSetName = ($entitySet == null) ? $typeName : $entitySet->getName();
 
         $returnType = new TFunctionImportReturnTypeType();