Algo-Web / ODataMetadata

src/MetadataV3/edm/Groups/TTypeAttributesTrait.php

Spacing +2 added lines, -2 removed lines

@@ -46,11 +46,11 @@
     public function isTTypeAttributesValid(&$msg = null)
     {
         if (null == $this->name) {
-            $msg = 'Name cannot be null: ' . get_class($this);
+            $msg = 'Name cannot be null: '.get_class($this);
             return false;
         }
         if (!$this->isTSimpleIdentifierValid($this->name)) {
-            $msg = 'Name must be a valid TSimpleIdentifier: ' . get_class($this);
+            $msg = 'Name must be a valid TSimpleIdentifier: '.get_class($this);
             return false;
         }
         

src/MetadataV3/edm/Groups/GInlineExpressionsTrait.php

Spacing +11 added lines, -11 removed lines

@@ -314,47 +314,47 @@
     public function isGInlineExpressionsValid(&$msg = null)
     {
         if (null != $this->string && !is_string($this->string)) {
-            $msg = 'String must be a string: ' . get_class($this);
+            $msg = 'String must be a string: '.get_class($this);
             return false;
         }
         if (null != $this->binary && !$this->hexBinary($this->binary)) {
-            $msg = 'Binary must be hexadecimal: ' . get_class($this);
+            $msg = 'Binary must be hexadecimal: '.get_class($this);
             return false;
         }
         if (null != $this->int && $this->int !== intval($this->int)) {
-            $msg = 'Integer must be integral: ' . get_class($this);
+            $msg = 'Integer must be integral: '.get_class($this);
             return false;
         }
         if (null != $this->float && $this->float !== floatval($this->float)) {
-            $msg = 'Float must be floating-point: ' . get_class($this);
+            $msg = 'Float must be floating-point: '.get_class($this);
             return false;
         }
         if (null != $this->guid && !$this->isTGuidLiteralValid($this->guid)) {
-            $msg = 'Guid must be valid GUID: ' . get_class($this);
+            $msg = 'Guid must be valid GUID: '.get_class($this);
             return false;
         }
         if (null != $this->bool && $this->bool !== boolval($this->bool)) {
-            $msg = 'Bool must be boolean: ' . get_class($this);
+            $msg = 'Bool must be boolean: '.get_class($this);
             return false;
         }
         if (null != $this->decimal && $this->decimal !== floatval($this->decimal)) {
-            $msg = 'Decimal must be decimal: ' . get_class($this);
+            $msg = 'Decimal must be decimal: '.get_class($this);
             return false;
         }
         if (null != $this->enum && !$this->isTQualifiedNameValid($this->enum)) {
-            $msg = 'Enum must be a valid TQualifiedName: ' . get_class($this);
+            $msg = 'Enum must be a valid TQualifiedName: '.get_class($this);
             return false;
         }
         if (null != $this->path && !$this->isTQualifiedNameValid($this->path)) {
-            $msg = 'Path must be a valid TQualifiedName: ' . get_class($this);
+            $msg = 'Path must be a valid TQualifiedName: '.get_class($this);
             return false;
         }
         if (null != $this->dateTime && $this->dateTime !== $this->dateTime($this->dateTime)) {
-            $msg = 'DateTime must be a valid date/time: ' . get_class($this);
+            $msg = 'DateTime must be a valid date/time: '.get_class($this);
             return false;
         }
         if (null != $this->dateTimeOffset && $this->dateTimeOffset !== $this->dateTime($this->dateTimeOffset)) {
-            $msg = 'DateTimeOffset must be a valid date/time: ' . get_class($this);
+            $msg = 'DateTimeOffset must be a valid date/time: '.get_class($this);
             return false;
         }
 

tests/EdmxTest.php

Spacing +11 added lines, -11 removed lines

@@ -26,7 +26,7 @@ 
         $edmx = new Edmx();
         $this->assertTrue($edmx->isOK($msg), $msg);
         $this->assertNull($msg);
-        $ymlDir = dirname(__DIR__) . $ds . 'src' . $ds . 'MetadataV3' . $ds . 'JMSmetadata';
+        $ymlDir = dirname(__DIR__).$ds.'src'.$ds.'MetadataV3'.$ds.'JMSmetadata';
         $serializer =
             \JMS\Serializer\SerializerBuilder::create()
                 ->addMetadataDir($ymlDir)
@@ -39,7 +39,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;
         }
@@ -66,7 +66,7 @@ 
      */
     private function checkEdmxSerialiseDeserialiseRoundTrip($ds, $edmx, $msg)
     {
-        $ymlDir = dirname(__DIR__) . $ds . 'src' . $ds . 'MetadataV3' . $ds . 'JMSmetadata';
+        $ymlDir = dirname(__DIR__).$ds.'src'.$ds.'MetadataV3'.$ds.'JMSmetadata';
         $serializer =
             \JMS\Serializer\SerializerBuilder::create()
                 ->addMetadataDir($ymlDir)
@@ -113,7 +113,7 @@ 
         $this->assertNull($msg);
 
 
-        $ymlDir = dirname(__DIR__) . $ds . 'src' . $ds . 'MetadataV3' . $ds . 'JMSmetadata';
+        $ymlDir = dirname(__DIR__).$ds.'src'.$ds.'MetadataV3'.$ds.'JMSmetadata';
         $serializer =
             \JMS\Serializer\SerializerBuilder::create()
                 ->addMetadataDir($ymlDir)
@@ -145,10 +145,10 @@ 
         $ds = DIRECTORY_SEPARATOR;
         $msg = null;
 
-        $docLocation = dirname(__DIR__) . $ds . 'tests' . $ds . 'exampleV3ServiceDocument.xml';
+        $docLocation = dirname(__DIR__).$ds.'tests'.$ds.'exampleV3ServiceDocument.xml';
         $document = file_get_contents($docLocation);
         $type = 'AlgoWeb\ODataMetadata\MetadataV3\edmx\TDataServicesType';
-        $ymlDir = dirname(__DIR__) . $ds . 'src' . $ds . 'MetadataV3' . $ds . 'JMSmetadata';
+        $ymlDir = dirname(__DIR__).$ds.'src'.$ds.'MetadataV3'.$ds.'JMSmetadata';
 
         $serializer =
             \JMS\Serializer\SerializerBuilder::create()
@@ -165,10 +165,10 @@ 
         $ds = DIRECTORY_SEPARATOR;
         $msg = null;
 
-        $docLocation = dirname(__DIR__) . $ds . 'tests' . $ds . 'exampleV3ServiceMetadata.xml';
+        $docLocation = dirname(__DIR__).$ds.'tests'.$ds.'exampleV3ServiceMetadata.xml';
         $document = file_get_contents($docLocation);
         $type = 'AlgoWeb\ODataMetadata\MetadataV3\edmx\Edmx';
-        $ymlDir = dirname(__DIR__) . $ds . 'src' . $ds . 'MetadataV3' . $ds . 'JMSmetadata';
+        $ymlDir = dirname(__DIR__).$ds.'src'.$ds.'MetadataV3'.$ds.'JMSmetadata';
 
         $serializer =
             \JMS\Serializer\SerializerBuilder::create()
@@ -186,11 +186,11 @@ 
         $ds = DIRECTORY_SEPARATOR;
         $msg = null;
 
-        $docLocation = dirname(__DIR__) . $ds . 'tests' . $ds . 'exampleV3ServiceMetadata.xml';
+        $docLocation = dirname(__DIR__).$ds.'tests'.$ds.'exampleV3ServiceMetadata.xml';
         $document = file_get_contents($docLocation);
         $this->v3MetadataAgainstXSD($document);
         $type = 'AlgoWeb\ODataMetadata\MetadataV3\edmx\Edmx';
-        $ymlDir = dirname(__DIR__) . $ds . 'src' . $ds . 'MetadataV3' . $ds . 'JMSmetadata';
+        $ymlDir = dirname(__DIR__).$ds.'src'.$ds.'MetadataV3'.$ds.'JMSmetadata';
 
         $serializer =
             \JMS\Serializer\SerializerBuilder::create()
@@ -231,7 +231,7 @@ 
         $this->assertNull($msg);
 
 
-        $ymlDir = dirname(__DIR__) . $ds . 'src' . $ds . 'MetadataV3' . $ds . 'JMSmetadata';
+        $ymlDir = dirname(__DIR__).$ds.'src'.$ds.'MetadataV3'.$ds.'JMSmetadata';
         $serializer =
             \JMS\Serializer\SerializerBuilder::create()
                 ->addMetadataDir($ymlDir)

tests/MetadataManagerTest.php

Spacing +20 added lines, -20 removed lines

@@ -37,7 +37,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;
         }
@@ -52,7 +52,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');
@@ -79,7 +79,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');
@@ -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());
@@ -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, $accessType, $summary, $longDescription);
+        list($result,) = $metadataManager->addEntityType($name, $accessType, $summary, $longDescription);
         $this->assertNotNull($result->getDocumentation());
     }
 
@@ -874,7 +874,7 @@ 
         $longDescription = null;
 
         $metadataManager = new MetadataManager();
-        list($result, ) = $metadataManager->addEntityType($name, $accessType, $summary, $longDescription);
+        list($result,) = $metadataManager->addEntityType($name, $accessType, $summary, $longDescription);
         $this->assertNull($result->getDocumentation());
     }
 
@@ -886,7 +886,7 @@ 
         $longDescription = new TTextType();
 
         $metadataManager = new MetadataManager();
-        list($result, ) = $metadataManager->addEntityType($name, $accessType, $summary, $longDescription);
+        list($result,) = $metadataManager->addEntityType($name, $accessType, $summary, $longDescription);
         $this->assertNull($result->getDocumentation());
     }
 

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 +6 added lines, -6 removed lines

@@ -187,14 +187,14 @@ 
     {
         $bar = m::mock(testType::class);
         // closure needs to return true to match the matcher and thus trip the andReturn(false) bit
-        $bar->shouldReceive('isOK')->with(m::on(function (&$msg) {
+        $bar->shouldReceive('isOK')->with(m::on(function(&$msg) {
             $msg = 'OH NOES!';
             return true;
         }))->andReturn(false);
 
         $msg = null;
         $expected = 'OH NOES!';
-        $arr = [ $bar ];
+        $arr = [$bar];
 
         $foo = new testType();
         $this->assertFalse($foo->isChildArrayOK($arr, $msg), $msg);
@@ -246,7 +246,7 @@ 
         $msg = null;
         $obj = m::mock(testType::class);
         // closure needs to return true to match the matcher and thus trip the andReturn(false) bit
-        $obj->shouldReceive('isOK')->with(m::on(function (&$msg) {
+        $obj->shouldReceive('isOK')->with(m::on(function(&$msg) {
             $msg = null;
             return true;
         }))->andReturn(true);
@@ -259,7 +259,7 @@ 
         $msg = null;
         $obj = m::mock(testType::class);
         // closure needs to return true to match the matcher and thus trip the andReturn(false) bit
-        $obj->shouldReceive('isOK')->with(m::on(function (&$msg) {
+        $obj->shouldReceive('isOK')->with(m::on(function(&$msg) {
             $msg = 'OH NOES!';
             return true;
         }))->andReturn(false);
@@ -285,7 +285,7 @@ 
     {
         $foo = m::mock(testType::class)->makePartial();
         $foo->shouldReceive('isValidArray')->withAnyArgs()->andReturn(true);
-        $foo->shouldReceive('isChildArrayOK')->with(m::any(), m::on(function (&$msg) {
+        $foo->shouldReceive('isChildArrayOK')->with(m::any(), m::on(function(&$msg) {
             $msg = 'OH NOES!';
             return true;
         }))->andReturn(false);
@@ -299,7 +299,7 @@ 
     {
         $foo = m::mock(testType::class)->makePartial();
         $foo->shouldReceive('isValidArray')->withAnyArgs()->andReturn(true);
-        $foo->shouldReceive('isChildArrayOK')->with(m::any(), m::on(function (&$msg) {
+        $foo->shouldReceive('isChildArrayOK')->with(m::any(), m::on(function(&$msg) {
             $msg = null;
             return true;
         }))->andReturn(true);

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());