Algo-Web / ODataMetadata

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/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());
@@ -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/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
 {

tests/v3/edm/ssdl/TEntityPropertyTypeTest.php

Unused Use Statements -1 removed lines

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

src/StringTraits/XSDTopLevelTrait.php

Spacing +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
             $rawDate = $input;
         }
 
-        return $rawDate->format('Y-m-d') . 'T' . $rawDate->format('H:i:s');
+        return $rawDate->format('Y-m-d').'T'.$rawDate->format('H:i:s');
     }
 
     public function hexBinary($input)

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/IsOKTraits/TQualifiedNameTrait.php

Doc Comments +3 added lines

@@ -9,6 +9,9 @@
 {
     use xsdRestrictions;
 
+    /**
+     * @return boolean
+     */
     public function isTQualifiedNameValid($string)
     {
         assert($this instanceof IsOK);

tests/MetadataManagerNavigationTest.php

Unused Use Statements -14 removed lines

@@ -2,21 +2,7 @@
 
 namespace AlgoWeb\ODataMetadata\Tests;
 
-use AlgoWeb\ODataMetadata\IsOK;
 use AlgoWeb\ODataMetadata\MetadataManager;
-use AlgoWeb\ODataMetadata\MetadataV3\edm\EntityContainer;
-use AlgoWeb\ODataMetadata\MetadataV3\edm\Schema;
-use AlgoWeb\ODataMetadata\MetadataV3\edm\TAssociationType;
-use AlgoWeb\ODataMetadata\MetadataV3\edm\TComplexTypePropertyType;
-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;
-use Mockery as m;
 
 class MetadataManagerNavigationTest extends \PHPUnit_Framework_TestCase
 {

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

src/MetadataManager.php

Doc Comments +18 added lines

@@ -52,6 +52,11 @@ 
         return $cereal->serialize($this->getEdmx(), 'xml');
     }
 
+    /**
+     * @param string $name
+     * @param TTextType $summary
+     * @param TTextType $longDescription
+     */
     public function addEntityType($name, $accessType = 'Public', $summary = null, $longDescription = null)
     {
         $NewEntity = new TEntityTypeType();
@@ -116,6 +121,14 @@ 
         return $NewProperty;
     }
 
+    /**
+     * @param string $name
+     * @param string $type
+     * @param string $defaultValue
+     * @param string $storeGeneratedPattern
+     * @param TTextType $summary
+     * @param TTextType $longDescription
+     */
     public function addPropertyToEntityType(
         TEntityTypeType $entityType,
         $name,
@@ -145,6 +158,11 @@ 
         return $NewProperty;
     }
 
+    /**
+     * @param string $principalMultiplicity
+     * @param string $principalProperty
+     * @param string $dependentMultiplicity
+     */
     public function addNavigationPropertyToEntityType(
         TEntityTypeType $principalType,
         $principalMultiplicity,

Spacing +13 added lines, -13 removed lines

@@ -61,7 +61,7 @@ 
         $entitySet = new EntitySetAnonymousType();
         $entitySet->setName(Str::plural($NewEntity->getName()));
         $namespace = $this->getNamespace();
-        $entityTypeName = $namespace . $NewEntity->getName();
+        $entityTypeName = $namespace.$NewEntity->getName();
         $entitySet->setEntityType($entityTypeName);
         $entitySet->setGetterAccess($accessType);
 
@@ -165,17 +165,17 @@ 
     ) {
         $principalEntitySetName = Str::plural($principalType->getName());
         $dependentEntitySetName = Str::plural($dependentType->getName());
-        $relationName = $principalType->getName() . '_' . $principalProperty . '_'
-                        . $dependentType->getName() . '_' . $dependentProperty;
+        $relationName = $principalType->getName().'_'.$principalProperty.'_'
+                        . $dependentType->getName().'_'.$dependentProperty;
         $relationName = trim($relationName, '_');
 
         $namespace = $this->getNamespace();
-        $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);
@@ -185,8 +185,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);
@@ -251,13 +251,13 @@ 
         }
         if (!in_array($dependentMultiplicity, $multCombo[$principalMultiplicity])) {
             throw new \InvalidArgumentException(
-                'Invalid multiplicity combination - ' . $principalMultiplicity . ' ' . $dependentMultiplicity
+                'Invalid multiplicity combination - '.$principalMultiplicity.' '.$dependentMultiplicity
             );
         }
 
         $namespace = $this->getNamespace();
-        $principalTypeFQName = $namespace . $principalType->getName();
-        $dependentTypeFQName = $namespace . $dependentType->getName();
+        $principalTypeFQName = $namespace.$principalType->getName();
+        $dependentTypeFQName = $namespace.$dependentType->getName();
         $association = new TAssociationType();
         $relationship = $principalNavigationProperty->getRelationship();
         if (false !== strpos($relationship, '.')) {
@@ -312,7 +312,7 @@ 
         $name = $association->getName();
         $as->setName($name);
         $namespace = $this->getNamespace();
-        $associationSetName = $namespace . $association->getName();
+        $associationSetName = $namespace.$association->getName();
         $as->setAssociation($associationSetName);
         $end1 = new EndAnonymousType();
         $end1->setRole($association->getEnd()[0]->getRole());
@@ -372,7 +372,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)