Algo-Web / ODataMetadata

src/MetadataV3/edm/IsOKTraits/TPropertyTypeTrait.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
         $regex = "/[\p{L}\p{Nl}][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}(\.[\p{L}\p{Nl}][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}){0,}/";
 
         if (!is_string($string)) {
-            $msg = "Input must be a string: ". get_class($this);
+            $msg = "Input must be a string: ".get_class($this);
             throw new \InvalidArgumentException($msg);
         }
         if ($this->isEDMSimpleTypeValid($string)) {

src/MetadataV3/edm/IsOKTraits/TFunctionImportParameterAndReturnTypeTrait.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
         $regex = "/Collection\([^ \t]{1,}(\.[^ \t]{1,}){0,}\)/";
 
         if (!is_string($string)) {
-            $msg = "Input must be a string: ". get_class($this);
+            $msg = "Input must be a string: ".get_class($this);
             throw new \InvalidArgumentException($msg);
         }
         if ($this->isEDMSimpleTypeValid($string)) {

src/MetadataV3/edm/IsOKTraits/TUnwrappedFunctionTypeTrait.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
         $regex = '/[^ \t]{1,}(\.[^ \t]{1,}){0,}/';
 
         if (!is_string($string)) {
-            $msg = "Input must be a string: ". get_class($this);
+            $msg = "Input must be a string: ".get_class($this);
             throw new \InvalidArgumentException($msg);
         }
         if ($this->isTQualifiedNameValid($string)) {

src/MetadataV3/edm/IsOKTraits/TWrappedFunctionTypeTrait.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
         $regex = '/(Collection|Ref)\([^ \t]{1,}(\.[^ \t]{1,}){0,}\/)';
 
         if (!is_string($string)) {
-            $msg = "Input must be a string: ". get_class($this);
+            $msg = "Input must be a string: ".get_class($this);
             throw new \InvalidArgumentException($msg);
         }
         if ($this->isTQualifiedNameValid($string)) {

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

src/MetadataV3/edm/TSchemaType.php

Spacing +8 added lines, -8 removed lines

@@ -149,7 +149,7 @@ 
                 die($this->getNamespace());
                 return false;
             }*/
-            $eSetType = str_replace($this->getNamespace() . ".", "", $eSetType);
+            $eSetType = str_replace($this->getNamespace().".", "", $eSetType);
             if (!in_array($eSetType, $entityTypeNames)) {
                 $msg = "entitySet Types should have a matching type name in entity Types";
                 return false;
@@ -158,7 +158,7 @@ 
 
         // Check Associations to associationSets
         if (count($associationSets) != count($associationNames)) {
-            $msg = "we have " . count($associationSets) . "association sets and " . count($associationNames)
+            $msg = "we have ".count($associationSets)."association sets and ".count($associationNames)
                    . " associations, they should be the same";
         }
         if (count($associationNames) * 2 < count($navigationProperties)) {
@@ -167,33 +167,33 @@ 
         }
         foreach ($associationNames as $associationName => $associationEnds) {
             if (!array_key_exists($associationName, $associationSets)) {
-                $msg = "association " . $associationName . " exists without matching associationSet";
+                $msg = "association ".$associationName." exists without matching associationSet";
                 return false;
             }
 
             if (!array_key_exists($associationName, $navigationProperties)) {
-                $msg = "association " . $associationName . " exists without matching Natvigation Property";
+                $msg = "association ".$associationName." exists without matching Natvigation Property";
                 return false;
             }
             $roles = [$associationEnds[0]->getRole(), $associationEnds[1]->getRole()];
             if (!in_array($associationSets[$associationName][0]->getRole(), $roles)) {
-                $msg = "association Set role " . $associationSets[$associationName][0]->getRole()
+                $msg = "association Set role ".$associationSets[$associationName][0]->getRole()
                        . "lacks a matching property in the attached association";
                 return false;
             }
             if (!in_array($associationSets[$associationName][1]->getRole(), $roles)) {
-                $msg = "association Set role " . $associationSets[$associationName][1]->getRole()
+                $msg = "association Set role ".$associationSets[$associationName][1]->getRole()
                        . "lacks a matching property in the attached association";
                 return false;
             }
             foreach ($navigationProperties[$associationName] as $navProp) {
                 if (!in_array($navProp->getToRole(), $roles)) {
-                    $msg = "Navigation Property Role " . $navProp->getToRole()
+                    $msg = "Navigation Property Role ".$navProp->getToRole()
                          . " lacks a matching Property in the assocation";
                     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/IsOKTraits/TPathTrait.php

Doc Comments +3 added lines

@@ -8,6 +8,9 @@
 {
     use xsdRestrictions;
 
+    /**
+     * @param string $string
+     */
     public function isTPathValid($string)
     {
         // The below pattern represents the allowed identifiers in ECMA specification plus the '/' for path segment

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

Spacing +3 added lines, -3 removed lines

@@ -29,7 +29,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;
         }
@@ -43,7 +43,7 @@ 
         $metadataManager = new MetadataManager();
 
         $eType = $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");
@@ -69,7 +69,7 @@ 
         $metadataManager = new MetadataManager();
 
         $CategoryType = $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");

Unused Use Statements -3 removed lines

@@ -5,10 +5,7 @@
 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\TEntityTypeType;
-use AlgoWeb\ODataMetadata\MetadataV3\edm\TFunctionReturnTypeType;
-use AlgoWeb\ODataMetadata\MetadataV3\edm\TFunctionType;
 use AlgoWeb\ODataMetadata\MetadataV3\edmx\Edmx;
 use Mockery as m;