Code style

Author: phpfui

Tests/Unit/DeleteTest.php

@@ -4,19 +4,6 @@
 
 class DeleteTest extends \PHPUnit\Framework\TestCase
 	{
-	public function testRecordDelete() : void
-		{
-		$table = new \Tests\App\Table\Customer();
-		$this->assertEquals(29, $table->count());
-		$transaction = new \PHPFUI\ORM\Transaction();
-		$customer = new \Tests\App\Record\Customer(9);
-		$this->assertEquals('Company I', $customer->company);
-		$customer->delete();
-		$this->assertEquals(28, $table->count());
-		$this->assertTrue($transaction->rollBack());
-		$this->assertEquals(29, $table->count());
-		}
-
 	public function testDeleteChildren() : void
 		{
 		$order = new \Tests\Fixtures\Record\Order(31);
@@ -31,6 +18,19 @@ public function testDeleteChildren() : void
 		$this->assertCount(3, $orderDetailTable);
 		}
 
+	public function testRecordDelete() : void
+		{
+		$table = new \Tests\App\Table\Customer();
+		$this->assertEquals(29, $table->count());
+		$transaction = new \PHPFUI\ORM\Transaction();
+		$customer = new \Tests\App\Record\Customer(9);
+		$this->assertEquals('Company I', $customer->company);
+		$customer->delete();
+		$this->assertEquals(28, $table->count());
+		$this->assertTrue($transaction->rollBack());
+		$this->assertEquals(29, $table->count());
+		}
+
 	public function testTableDelete() : void
 		{
 		$table = new \Tests\App\Table\Customer();

src/PHPFUI/ORM/Children.php

@@ -21,6 +21,7 @@ class Children extends \PHPFUI\ORM\VirtualField
 	public function delete(array $parameters) : void
 		{
 		$table = $this->getTable(\array_shift($parameters));
+
 		foreach ($table->getRecordCursor() as $record)
 			{
 			$record->delete();

src/PHPFUI/ORM/Record.php

@@ -439,14 +439,6 @@ public function insertOrUpdate() : int | bool
 		return $this->privateInsert(true);
 		}
 
-	/**
-	 * Save the record, will either update if it exists or insert if not
-	 */
-	public function save() : int | bool
-		{
-		return $this->privateInsert(true);
-		}
-
 	/**
 	 * @return bool  true if loaded from the disk
 	 */
@@ -546,6 +538,14 @@ public function reload() : bool
 		return $this->read($keys);
 		}
 
+	/**
+	 * Save the record, will either update if it exists or insert if not
+	 */
+	public function save() : int | bool
+		{
+		return $this->privateInsert(true);
+		}
+
 	/**
 	 * Set a custom validator class
 	 */

src/PHPFUI/ORM/Table.php

@@ -703,16 +703,6 @@ public function getWhereCondition() : \PHPFUI\ORM\Condition
 		return $this->whereCondition;
 		}
 
-	/**
-	 * Inserts current data into table or ignores duplicate key if found
-	 *
-	 * @param array<\PHPFUI\ORM\Record> $records
-	 */
-	public function insertOrIgnore(array $records) : bool
-		{
-		return $this->insert($records, 'ignore ');
-		}
-
 	/**
 	 * Mass insertion.  Does not use a transaction, so surround by a transaction if needed
 	 *
@@ -768,6 +758,16 @@ public function insert(array $records, string $ignore = '') : bool
 		return 0 == \PHPFUI\ORM::getLastErrorCode();
 		}
 
+	/**
+	 * Inserts current data into table or ignores duplicate key if found
+	 *
+	 * @param array<\PHPFUI\ORM\Record> $records
+	 */
+	public function insertOrIgnore(array $records) : bool
+		{
+		return $this->insert($records, 'ignore ');
+		}
+
 	public function setDistinct(string $distinct = 'DISTINCT') : static
 		{
 		$this->distinct = $distinct;