Algo-Web / ODataMetadata

src/MetadataV3/edm/TEntityTypeType.php

Spacing +3 added lines, -3 removed lines

@@ -467,20 +467,20 @@
         $pArray = [];
         foreach ($this->getProperty() as $prop) {
             if (in_array($prop->getName(), $pArray)) {
-                $msg = "Property Names, and Navigation Property Must Be Unique " . __CLASS__;
+                $msg = "Property Names, and Navigation Property Must Be Unique ".__CLASS__;
                 return false;
             }
             $pArray[] = $prop->getName();
         }
         foreach ($this->getNavigationProperty() as $prop) {
             if (in_array($prop->getName(), $pArray)) {
-                $msg = "Property Names, and Navigation Property Must Be Unique " . __CLASS__;
+                $msg = "Property Names, and Navigation Property Must Be Unique ".__CLASS__;
                 return false;
             }
             $pArray[] = $prop->getName();
         }
         if (in_array($this->getName(), $pArray)) {
-            $msg = "entity types can not contain a property with the same name " . __CLASS__;
+            $msg = "entity types can not contain a property with the same name ".__CLASS__;
             return false;
         }
         return true;

src/MetadataV3/edm/EntityContainer.php

Spacing +3 added lines, -3 removed lines

@@ -82,7 +82,7 @@ 
     public function setName($name)
     {
         if (!$this->isTSimpleIdentifierValid($name)) {
-            $msg = "Name(" . $name . ") must be a valid TSimpleIdentifier";
+            $msg = "Name(".$name.") must be a valid TSimpleIdentifier";
             throw new \InvalidArgumentException($msg);
         }
         $this->name = $name;
@@ -397,7 +397,7 @@ 
     public function isOK(&$msg = null)
     {
         if (!$this->isTSimpleIdentifierValid($this->name)) {
-            $msg = "Name(" . $this->name . ") must be a valid TSimpleIdentifier " . __FILE__ . ":" . __LINE__;
+            $msg = "Name(".$this->name.") must be a valid TSimpleIdentifier ".__FILE__.":".__LINE__;
             return false;
         }
 
@@ -450,7 +450,7 @@ 
         }
         foreach ($this->associationSet as $assocationSet) {
             if (!in_array($assocationSet->getEnd()[0]->getEntitySet(), $entityNames)) {
-                $msg = "The entitysets for assocations must have a valid entity set. " . $assocationSet->getName() . " Does not";
+                $msg = "The entitysets for assocations must have a valid entity set. ".$assocationSet->getName()." Does not";
                 return false;
             }
         }

tests/testType.php

Doc Comments +9 added lines

@@ -30,6 +30,9 @@ 
         return parent::isNullInstanceOf($var, $instanceOf);
     }
 
+    /**
+     * @param string $instanceOf
+     */
     public function isValidArray(array $arr = null, $instanceOf, $minCount = -1, $maxCount = -1)
     {
         return parent::isValidArray($arr, $instanceOf, $minCount, $maxCount);
@@ -40,6 +43,9 @@ 
         return parent::isChildArrayOK($arr, $msg);
     }
 
+    /**
+     * @param null|string $url
+     */
     public function isURLValid($url)
     {
         return parent::isURLValid($url);
@@ -50,6 +56,9 @@ 
         return true;
     }
 
+    /**
+     * @return boolean
+     */
     public function isObjectNullOrOK(IsOK $object = null, &$msg = null)
     {
         return parent::isObjectNullOrOK($object, $msg);

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/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;
         }
@@ -65,7 +65,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)
@@ -112,7 +112,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)
@@ -144,10 +144,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()
@@ -164,10 +164,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()
@@ -185,11 +185,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()
@@ -230,7 +230,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)

src/MetadataV3/edm/TFunctionType.php

Spacing +1 added lines, -1 removed lines

@@ -308,7 +308,7 @@
         }
         foreach ($this->returnType as $type) {
             if (!is_string($type) || !$this->isTCommandTextValid($type)) {
-                $msg = implode($type) . " must be a valid TCommandText";
+                $msg = implode($type)." must be a valid TCommandText";
                 return false;
             }
         }

tests/MetadataManagerTest.php

Unused Use Statements -2 removed lines

@@ -11,8 +11,6 @@
 use AlgoWeb\ODataMetadata\MetadataV3\edm\TComplexTypeType;
 use AlgoWeb\ODataMetadata\MetadataV3\edm\TEntityPropertyType;
 use AlgoWeb\ODataMetadata\MetadataV3\edm\TEntityTypeType;
-use AlgoWeb\ODataMetadata\MetadataV3\edm\TFunctionReturnTypeType;
-use AlgoWeb\ODataMetadata\MetadataV3\edm\TFunctionType;
 use AlgoWeb\ODataMetadata\MetadataV3\edm\TNavigationPropertyType;
 use AlgoWeb\ODataMetadata\MetadataV3\edm\TTextType;
 use AlgoWeb\ODataMetadata\MetadataV3\edmx\Edmx;

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());
@@ -610,7 +610,7 @@ 
     {
         list(, $metadataManager, $CategoryType, $CustomerType) = $this->setUpMetadataForNavTests();
 
-        $expected =  "Invalid multiplicity combination - 1 1";
+        $expected = "Invalid multiplicity combination - 1 1";
         $actual = null;
 
         try {
@@ -632,7 +632,7 @@ 
     {
         list(, $metadataManager, $CategoryType, $CustomerType) = $this->setUpMetadataForNavTests();
 
-        $expected =  "Invalid multiplicity combination - * 0..1";
+        $expected = "Invalid multiplicity combination - * 0..1";
         $actual = null;
 
         try {
@@ -652,7 +652,7 @@ 
 
     public function testAddComplexType()
     {
-        list(, $metadataManager, , ) = $this->setUpMetadataForNavTests();
+        list(, $metadataManager,,) = $this->setUpMetadataForNavTests();
 
         $name = "Name";
         $accessType = "Public";
@@ -664,7 +664,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());
@@ -672,7 +672,7 @@ 
 
     public function testAddComplexTypeWithOnlySummary()
     {
-        list(, $metadataManager, , ) = $this->setUpMetadataForNavTests();
+        list(, $metadataManager,,) = $this->setUpMetadataForNavTests();
 
         $name = "Name";
         $accessType = "Public";
@@ -684,7 +684,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());
@@ -692,7 +692,7 @@ 
 
     public function testAddComplexTypeWithOnlyDescription()
     {
-        list(, $metadataManager, , ) = $this->setUpMetadataForNavTests();
+        list(, $metadataManager,,) = $this->setUpMetadataForNavTests();
 
         $name = "Name";
         $accessType = "Public";
@@ -704,7 +704,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());
@@ -715,7 +715,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";
@@ -734,7 +734,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";
@@ -750,7 +750,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();
@@ -776,7 +776,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();
@@ -803,7 +803,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();
@@ -922,7 +922,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());
     }
 
@@ -934,7 +934,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());
     }
 
@@ -946,7 +946,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());
     }
 

src/MetadataV3/edm/Groups/TFunctionImportAttributesTrait.php

Spacing +3 added lines, -3 removed lines

@@ -265,7 +265,7 @@ 
     public function isTFunctionImportAttributesValid(&$msg)
     {
         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;
         }
         if ($this->isComposable && $this->isSideEffecting) {
@@ -278,11 +278,11 @@ 
             return false;
         }*/
         if (!$this->isObjectNullOrType('\AlgoWeb\ODataMetadata\MetadataV3\edm\TOperandType', $this->entitySet)) {
-            $msg = "Entity set must be either null or an instance of TOperandType: " . get_class($this);
+            $msg = "Entity set must be either null or an instance of TOperandType: ".get_class($this);
             return false;
         }
         if (null != $this->methodAccess && !$this->isTAccessOk($this->methodAccess)) {
-            $msg = "Method access must be a valid TAccess: " . get_class($this);
+            $msg = "Method access must be a valid TAccess: ".get_class($this);
             return false;
         }
         if (!$this->isValidArrayOK(

Doc Comments +2 added lines, -2 removed lines

@@ -93,7 +93,7 @@ 
     /**
      * isset returnType
      *
-     * @param  scalar $index
+     * @param  integer $index
      * @return boolean
      */
     public function issetReturnType($index)
@@ -104,7 +104,7 @@ 
     /**
      * unset returnType
      *
-     * @param  scalar $index
+     * @param  integer $index
      * @return void
      */
     public function unsetReturnType($index)

tests/v3/edm/TEntityPropertyTypeTest.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use AlgoWeb\ODataMetadata\MetadataV3\edm\TEntityPropertyType;
 use AlgoWeb\ODataMetadata\Tests\TestCase;
-use Mockery as m;
 
 class TEntityPropertyTypeTest extends TestCase
 {