- minor inspection driven improvements

spiral-modules · Nov 21, 2019 · e3de3c3 · e3de3c3
1 parent fc53c15
commit e3de3c3
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/src/Schema/AbstractColumn.php b/src/Schema/AbstractColumn.php
@@ -781,12 +781,14 @@ protected function formatDatetime(string $type, $value)
 
         if ($value instanceof \DateTimeInterface) {
             $datetime = clone $value;
-        } elseif (is_numeric($value)) {
-            //Presumably timestamp
-            $datetime = new \DateTime('now', $this->timezone);
-            $datetime->setTimestamp($value);
         } else {
-            $datetime = new \DateTime($value, $this->timezone);
+            if (is_numeric($value)) {
+                //Presumably timestamp
+                $datetime = new \DateTime('now', $this->timezone);
+                $datetime->setTimestamp($value);
+            } else {
+                $datetime = new \DateTime($value, $this->timezone);
+            }
         }
 
         switch ($type) {

diff --git a/src/Schema/AbstractTable.php b/src/Schema/AbstractTable.php
@@ -270,7 +270,7 @@ public function getInitialName(): string
      */
     public function declareDropped(): void
     {
-        if ($this->status == self::STATUS_NEW) {
+        if ($this->status === self::STATUS_NEW) {
             throw new SchemaException('Unable to drop non existed table');
         }
 
@@ -668,8 +668,11 @@ public function save(int $operation = HandlerInterface::DO_ALL, bool $reset = tr
         if ($this->status === self::STATUS_NEW) {
             //Executing table creation
             $handler->createTable($prepared);
-        } elseif ($this->hasChanges()) {
-            $handler->syncTable($prepared, $operation);
+        } else {
+            //Executing table syncing
+            if ($this->hasChanges()) {
+                $handler->syncTable($prepared, $operation);
+            }
         }
 
         // Syncing our schemas

diff --git a/src/Schema/State.php b/src/Schema/State.php
@@ -193,7 +193,7 @@ public function registerForeignKey(AbstractForeignKey $reference): void
     public function forgetColumn(AbstractColumn $column): State
     {
         foreach ($this->columns as $name => $columnSchema) {
-            if ($columnSchema === $column) {
+            if ($columnSchema == $column) {
                 unset($this->columns[$name]);
                 break;
             }
@@ -210,7 +210,7 @@ public function forgetColumn(AbstractColumn $column): State
     public function forgetIndex(AbstractIndex $index): void
     {
         foreach ($this->indexes as $name => $indexSchema) {
-            if ($indexSchema === $index) {
+            if ($indexSchema == $index) {
                 unset($this->indexes[$name]);
                 break;
             }
@@ -225,7 +225,7 @@ public function forgetIndex(AbstractIndex $index): void
     public function forgerForeignKey(AbstractForeignKey $foreignKey): void
     {
         foreach ($this->foreignKeys as $name => $foreignSchema) {
-            if ($foreignSchema === $foreignKey) {
+            if ($foreignSchema == $foreignKey) {
                 unset($this->foreignKeys[$name]);
                 break;
             }