phpType method renamed

spiral-modules · Feb 21, 2019 · a31ed0c · a31ed0c
1 parent 3066596
commit a31ed0c
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/src/ColumnInterface.php b/src/ColumnInterface.php
@@ -34,7 +34,7 @@ public function getName(): string;
      *
      * @return string
      */
-    public function getType(): string;
+    public function getInternalType(): string;
 
     /**
      * DBMS specific reverse mapping must map database specific type into limited set of abstract
@@ -49,7 +49,7 @@ public function getAbstractType(): string;
      *
      * @return string
      */
-    public function phpType(): string;
+    public function getType(): string;
 
     /**
      * Column size.

diff --git a/src/Driver/Postgres/Schema/PostgresColumn.php b/src/Driver/Postgres/Schema/PostgresColumn.php
@@ -339,7 +339,7 @@ private function normalizeDefault()
                 $this->defaultValue = (strtolower($this->defaultValue) == 'true');
             }
 
-            if ($this->phpType() == self::FLOAT || $this->phpType() == self::INT) {
+            if ($this->getType() == self::FLOAT || $this->getType() == self::INT) {
                 if (preg_match('/^\(?(.*?)\)?(?!::(.+))?$/', $this->defaultValue, $matches)) {
                     //Negative numeric values
                     $this->defaultValue = $matches[1];

diff --git a/src/Driver/SQLServer/Schema/SQLServerColumn.php b/src/Driver/SQLServer/Schema/SQLServerColumn.php
@@ -371,7 +371,7 @@ private function normalizeDefault()
         }
 
         if (
-            $this->phpType() != 'string'
+            $this->getType() != 'string'
             && ($this->defaultValue[0] == '(' && $this->defaultValue[strlen($this->defaultValue) - 1] == ')')
         ) {
             //Cut another braces

diff --git a/src/Schema/AbstractColumn.php b/src/Schema/AbstractColumn.php
@@ -255,15 +255,15 @@ public function __construct(string $table, string $name, \DateTimeZone $timezone
     /**
      * {@inheritdoc}
      */
-    public function getType(): string
+    public function getInternalType(): string
     {
         return $this->type;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function phpType(): string
+    public function getType(): string
     {
         $schemaType = $this->getAbstractType();
         foreach ($this->phpMapping as $phpType => $candidates) {
@@ -335,7 +335,7 @@ public function getDefaultValue()
             return $this->formatDatetime($this->getAbstractType(), $this->defaultValue);
         }
 
-        switch ($this->phpType()) {
+        switch ($this->getType()) {
             case 'int':
                 return (int)$this->defaultValue;
             case 'float':
@@ -619,7 +619,7 @@ public function __debugInfo()
             'type' => [
                 'database' => $this->type,
                 'schema'   => $this->getAbstractType(),
-                'php'      => $this->phpType(),
+                'php'      => $this->getType(),
             ],
         ];
 
@@ -722,15 +722,15 @@ protected function quoteDefault(DriverInterface $driver): string
             return $defaultValue->sqlStatement();
         }
 
-        if ($this->phpType() == 'bool') {
+        if ($this->getType() == 'bool') {
             return $defaultValue ? 'TRUE' : 'FALSE';
         }
 
-        if ($this->phpType() == 'float') {
+        if ($this->getType() == 'float') {
             return sprintf('%F', $defaultValue);
         }
 
-        if ($this->phpType() == 'int') {
+        if ($this->getType() == 'int') {
             return strval($defaultValue);
         }
 

diff --git a/tests/Database/BaseTest.php b/tests/Database/BaseTest.php
@@ -204,8 +204,8 @@ protected function assertSameAsInDB(AbstractTable $current)
     protected function compareColumns(AbstractColumn $a, AbstractColumn $b)
     {
         $this->assertSame(
-            $a->getType(),
-            $b->getType(),
+            $a->getInternalType(),
+            $b->getInternalType(),
             "Column {$a} type has been changed"
         );
 

diff --git a/tests/Database/Postgres/ConsistencyTest.php b/tests/Database/Postgres/ConsistencyTest.php
@@ -39,7 +39,7 @@ public function testPrimary()
         $schema = $d->getSchema('table');
         $this->assertTrue($schema->exists());
 
-        $this->assertSame($schema->column('target')->getType(), $column->getType());
+        $this->assertSame($schema->column('target')->getInternalType(), $column->getInternalType());
 
         $this->assertInstanceOf(
             FragmentInterface::class,
@@ -73,7 +73,7 @@ public function testBigPrimary()
         $schema = $this->schema('table');
         $this->assertTrue($schema->exists());
 
-        $this->assertSame($schema->column('target')->getType(), $column->getType());
+        $this->assertSame($schema->column('target')->getInternalType(), $column->getInternalType());
 
         $this->assertInstanceOf(
             FragmentInterface::class,