Revert "[#14213] - More corrections"

This reverts commit 1d535fd.
phalcon · Jul 4, 2019 · bf2a23d · bf2a23d
1 parent 6ecab89
commit bf2a23d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 19 deletions.
diff --git a/tests/integration/Mvc/Model/Refactor-ModelsRelationsMagicCest.php b/tests/integration/Mvc/Model/Refactor-ModelsRelationsMagicCest.php
@@ -4,7 +4,6 @@
 
 use IntegrationTester;
 use Phalcon\Mvc\Model\AbstractModel;
-use Phalcon\Mvc\Model\Enum;
 use Phalcon\Test\Fixtures\Traits\DiTrait;
 use Phalcon\Test\Models\AlbumORama\Albums;
 use Phalcon\Test\Models\AlbumORama\Artists;
@@ -108,7 +107,7 @@ private function executeSaveRelatedBelongsTo(IntegrationTester $I)
 //
         //The artists must no be saved
         $I->assertEquals(
-            Enum::DIRTY_STATE_TRANSIENT,
+            Model::DIRTY_STATE_TRANSIENT,
             $artist->getDirtyState()
         );
 
@@ -134,12 +133,12 @@ private function executeSaveRelatedBelongsTo(IntegrationTester $I)
 
         //The artist model was saved correctly but album not
         $I->assertEquals(
-            Enum::DIRTY_STATE_PERSISTENT,
+            Model::DIRTY_STATE_PERSISTENT,
             $artist->getDirtyState()
         );
 
         $I->assertEquals(
-            Enum::DIRTY_STATE_TRANSIENT,
+            Model::DIRTY_STATE_TRANSIENT,
             $album->getDirtyState()
         );
 
@@ -164,12 +163,12 @@ private function executeSaveRelatedBelongsTo(IntegrationTester $I)
 
         //Both messages must be saved correctly
         $I->assertEquals(
-            Enum::DIRTY_STATE_PERSISTENT,
+            Model::DIRTY_STATE_PERSISTENT,
             $artist->getDirtyState()
         );
 
         $I->assertEquals(
-            Enum::DIRTY_STATE_PERSISTENT,
+            Model::DIRTY_STATE_PERSISTENT,
             $album->getDirtyState()
         );
     }

diff --git a/tests/integration/Mvc/Model/Refactor-SnapshotCest.php b/tests/integration/Mvc/Model/Refactor-SnapshotCest.php
@@ -612,7 +612,7 @@ public function testDisabledSnapshotUpdate(IntegrationTester $I)
         $I->skipTest('TODO = Check test');
         $robots = Robots::findFirst();
 
-        AbstractModel::setup(
+        Model::setup(
             [
                 'updateSnapshotOnSave' => false,
             ]
@@ -638,7 +638,7 @@ public function testDisabledSnapshotUpdate(IntegrationTester $I)
             $robots->hasChanged('name')
         );
 
-        AbstractModel::setup(
+        Model::setup(
             [
                 'updateSnapshotOnSave' => true,
             ]

diff --git a/tests/integration/Mvc/Model/SaveCest.php b/tests/integration/Mvc/Model/SaveCest.php
@@ -14,7 +14,6 @@
 
 use IntegrationTester;
 use Phalcon\Mvc\Model\AbstractModel;
-use Phalcon\Mvc\Model\Enum;
 use Phalcon\Mvc\Model\MetaData;
 use Phalcon\Test\Fixtures\Traits\DiTrait;
 use Phalcon\Test\Models\AlbumORama\Albums;
@@ -187,17 +186,17 @@ public function mvcModelSaveWithRelatedRecords(IntegrationTester $I)
         );
 
         $I->assertEquals(
-            Enum::DIRTY_STATE_PERSISTENT,
+            Model::DIRTY_STATE_PERSISTENT,
             $robotPart->getDirtyState()
         );
 
         $I->assertEquals(
-            Enum::DIRTY_STATE_PERSISTENT,
+            Model::DIRTY_STATE_PERSISTENT,
             $robotPart->robot->getDirtyState()
         );
 
         $I->assertEquals(
-            Enum::DIRTY_STATE_PERSISTENT,
+            Model::DIRTY_STATE_PERSISTENT,
             $part->getDirtyState()
         );
 

diff --git a/tests/integration/Mvc/Model/UnderscoreSetCest.php b/tests/integration/Mvc/Model/UnderscoreSetCest.php
@@ -13,7 +13,6 @@
 
 use IntegrationTester;
 use Phalcon\Mvc\Model\AbstractModel;
-use Phalcon\Mvc\Model\Enum;
 use Phalcon\Test\Fixtures\Traits\DiTrait;
 use Phalcon\Test\Models;
 
@@ -134,7 +133,7 @@ public function mvcModelUnderscoreSetWithBelongsToRelatedRecord(IntegrationTeste
         );
 
         $I->assertEquals(
-            Enum::DIRTY_STATE_TRANSIENT,
+            Model::DIRTY_STATE_TRANSIENT,
             $robotPart->getDirtyState()
         );
     }
@@ -161,7 +160,7 @@ public function mvcModelUnderscoreSetWithArrayOfBelongsToRelatedRecord(Integrati
 
         $I->assertEquals(
             $robotPart->getDirtyState(),
-            Enum::DIRTY_STATE_TRANSIENT
+            Model::DIRTY_STATE_TRANSIENT
         );
 
         $I->assertEquals(
@@ -191,7 +190,7 @@ public function mvcModelUnderscoreSetWithHasOneRelatedRecord(IntegrationTester $
         );
 
         $I->assertEquals(
-            Enum::DIRTY_STATE_TRANSIENT,
+            Model::DIRTY_STATE_TRANSIENT,
             $customer->getDirtyState()
         );
     }
@@ -217,7 +216,7 @@ public function mvcModelUnderscoreSetWithArrayOfHasOneRelatedRecord(IntegrationT
         );
 
         $I->assertEquals(
-            Enum::DIRTY_STATE_TRANSIENT,
+            Model::DIRTY_STATE_TRANSIENT,
             $customer->getDirtyState()
         );
 
@@ -261,7 +260,7 @@ public function mvcModelUnderscoreSetWithHasManyRelatedRecords(IntegrationTester
         );
 
         $I->assertEquals(
-            Enum::DIRTY_STATE_TRANSIENT,
+            Model::DIRTY_STATE_TRANSIENT,
             $robot->getDirtyState()
         );
     }
@@ -300,7 +299,7 @@ public function mvcModelUnderscoreSetWithHasManyToManyRelatedRecords(Integration
         );
 
         $I->assertEquals(
-            Enum::DIRTY_STATE_TRANSIENT,
+            Model::DIRTY_STATE_TRANSIENT,
             $robot->getDirtyState()
         );
     }