Algo-Web / ODataMetadata

tests/EdmxTest.php

Doc Comments +3 added lines

@@ -29,6 +29,9 @@
         $this->v3MetadataAgainstXSD($d);
     }
 
+    /**
+     * @param string $data
+     */
     public function v3MetadataAgainstXSD($data)
     {
         $ds = DIRECTORY_SEPARATOR;

Spacing +7 added lines, -7 removed lines

@@ -20,7 +20,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)
@@ -34,7 +34,7 @@ 
         $ds = DIRECTORY_SEPARATOR;
         $xml = new \DOMDocument();
         $xml->loadXML($data);
-        $xml->schemaValidate(dirname(__DIR__) . $ds . "xsd" . $ds . "/Microsoft.Data.Entity.Design.Edmx_3.xsd");
+        $xml->schemaValidate(dirname(__DIR__).$ds."xsd".$ds."/Microsoft.Data.Entity.Design.Edmx_3.xsd");
     }
 
     public function testWithSingleEntitySerializeOk()
@@ -51,7 +51,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)
@@ -88,7 +88,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)
@@ -114,11 +114,11 @@ 
         $last_letter = strtolower($singular[strlen($singular) - 1]);
         switch ($last_letter) {
             case 'y':
-                return substr($singular, 0, -1) . 'ies';
+                return substr($singular, 0, -1).'ies';
             case 's':
-                return $singular . 'es';
+                return $singular.'es';
             default:
-                return $singular . 's';
+                return $singular.'s';
         }
     }
 }

Braces +6 added lines, -2 removed lines

@@ -66,8 +66,12 @@
      */
     public static function pluralize($quantity, $singular, $plural = null)
     {
-        if ($quantity == 1 || !strlen($singular)) return $singular;
-        if ($plural !== null) return $plural;
+        if ($quantity == 1 || !strlen($singular)) {
+         return $singular;
+        }
+        if ($plural !== null) {
+         return $plural;
+        }
 
         $last_letter = strtolower($singular[strlen($singular) - 1]);
         switch ($last_letter) {

src/MetadataV3/edm/IsOKTraits/EDMSimpleTypeTrait.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
             "GeometricMultiPoint", "GeometricMultiLineString", "GeometricMultiPolygon", "GeometryCollection",
             "Guid", "Int16", "Int32", "Int64", "String", "SByte"];
         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 (!in_array($string, $validType)) {

src/MetadataV3/edm/EntityContainer/AssociationSetAnonymousType.php

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 namespace AlgoWeb\ODataMetadata\MetadataV3\edm\EntityContainer;
 
 use AlgoWeb\ODataMetadata\IsOK;
-use AlgoWeb\ODataMetadata\IsOKTraits\IsOKToolboxTrait;
 use AlgoWeb\ODataMetadata\MetadataV3\edm\EntityContainer\AssociationSetAnonymousType\EndAnonymousType;
 use AlgoWeb\ODataMetadata\MetadataV3\edm\Groups\GEmptyElementExtensibilityTrait;
 use AlgoWeb\ODataMetadata\MetadataV3\edm\IsOKTraits\TQualifiedNameTrait;

src/MetadataV3/edm/EntityContainer/AssociationSetAnonymousType/EndAnonymousType.php

Unused Use Statements -2 removed lines

@@ -3,10 +3,8 @@
 namespace AlgoWeb\ODataMetadata\MetadataV3\edm\EntityContainer\AssociationSetAnonymousType;
 
 use AlgoWeb\ODataMetadata\IsOK;
-use AlgoWeb\ODataMetadata\IsOKTraits\IsOKToolboxTrait;
 use AlgoWeb\ODataMetadata\MetadataV3\edm\Groups\GEmptyElementExtensibilityTrait;
 use AlgoWeb\ODataMetadata\MetadataV3\edm\IsOKTraits\TSimpleIdentifierTrait;
-use AlgoWeb\ODataMetadata\MetadataV3\edm\TDocumentationType;
 
 /**
  * Class representing EndAnonymousType

src/MetadataV3/edm/EntityContainer.php

Spacing +2 added lines, -2 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;
         }
 

src/MetadataV3/edm/TEntityPropertyType.php

Spacing +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
     public function setStoreGeneratedPattern($storeGeneratedPattern)
     {
         if (null != $storeGeneratedPattern && !$this->isTGenerationPatternValid($storeGeneratedPattern)) {
-            $msg = "Store generation pattern must be a valid TGenerationPattern: " . get_class($this);
+            $msg = "Store generation pattern must be a valid TGenerationPattern: ".get_class($this);
             throw new \InvalidArgumentException($msg);
         }
         $this->storeGeneratedPattern = $storeGeneratedPattern;
@@ -281,7 +281,7 @@ 
     public function isOK(&$msg = null)
     {
         if (null != $this->storeGeneratedPattern && !$this->isTGenerationPatternValid($this->storeGeneratedPattern)) {
-            $msg = "Store generation pattern must be a valid TGenerationPattern: " . get_class($this);
+            $msg = "Store generation pattern must be a valid TGenerationPattern: ".get_class($this);
             return false;
         }
         if (!$this->isValidArrayOK(

src/MetadataV4/edm/IsOKTraits/TSimpleIdentifierTrait.php

Doc Comments +3 added lines

@@ -8,6 +8,9 @@
 {
     use xsdRestrictions;
 
+    /**
+     * @param string $TSimpleIdentifier
+     */
     protected function isTSimpleIdentifierValid($TSimpleIdentifier)
     {
         if (!$this->isNCName($TSimpleIdentifier)) {

src/MetadataManager.php

Spacing +5 added lines, -5 removed lines

@@ -17,7 +17,7 @@ 
         if (!$this->V3Edmx->isOK($msg)) {
             throw new \Exception($msg);
         }
-        $ymlDir = dirname(__DIR__) . DIRECTORY_SEPARATOR . "MetadataV3" . DIRECTORY_SEPARATOR . "JMSmetadata";
+        $ymlDir = dirname(__DIR__).DIRECTORY_SEPARATOR."MetadataV3".DIRECTORY_SEPARATOR."JMSmetadata";
         $this->serializer =
             \JMS\Serializer\SerializerBuilder::create()
                 ->addMetadataDir($ymlDir)
@@ -46,7 +46,7 @@ 
         if (0 == strlen(trim($namespace))) {
             $entityTypeName = $NewEntity->getName();
         } else {
-            $entityTypeName = $namespace . "." . $NewEntity->getName();
+            $entityTypeName = $namespace.".".$NewEntity->getName();
         }
         $entitySet->setEntityType($entityTypeName);
         $entitySet->setGetterAccess($accessType);
@@ -72,11 +72,11 @@ 
         $last_letter = strtolower($singular[strlen($singular) - 1]);
         switch ($last_letter) {
             case 'y':
-                return substr($singular, 0, -1) . 'ies';
+                return substr($singular, 0, -1).'ies';
             case 's':
-                return $singular . 'es';
+                return $singular.'es';
             default:
-                return $singular . 's';
+                return $singular.'s';
         }
     }
 

Braces +6 added lines, -2 removed lines

@@ -66,8 +66,12 @@
      */
     public static function pluralize($quantity, $singular, $plural = null)
     {
-        if ($quantity == 1 || !strlen($singular)) return $singular;
-        if ($plural !== null) return $plural;
+        if ($quantity == 1 || !strlen($singular)) {
+         return $singular;
+        }
+        if ($plural !== null) {
+         return $plural;
+        }
 
         $last_letter = strtolower($singular[strlen($singular) - 1]);
         switch ($last_letter) {

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(), $prop)) {
-            $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;