Change HasOne type to integer by default (#811)

Author: mvorisek

src/Reference/HasOne.php

@@ -20,11 +20,10 @@ class HasOne extends Reference
      *
      * Values are: 'string', 'text', 'boolean', 'integer', 'money', 'float',
      *             'date', 'datetime', 'time', 'array', 'object'.
-     * Can also be set to unspecified type for your own custom handling.
      *
      * @var string
      */
-    public $type;
+    public $type = 'integer';
 
     /**
      * Is it system field?

tests/RandomTest.php

@@ -182,7 +182,7 @@ public function testSameTable()
         $m = new Model_Item($db, 'item');
 
         $this->assertSame(
-            ['id' => 3, 'name' => 'Smith', 'parent_item_id' => '2', 'parent_item' => 'Sue'],
+            ['id' => 3, 'name' => 'Smith', 'parent_item_id' => 2, 'parent_item' => 'Sue'],
             $m->load(3)->get()
         );
     }
@@ -206,7 +206,7 @@ public function testSameTable2()
         $m = new Model_Item2($db, 'item');
 
         $this->assertSame(
-            ['id' => 3, 'name' => 'Smith', 'parent_item_id' => '2', 'parent_item' => 'Sue'],
+            ['id' => 3, 'name' => 'Smith', 'parent_item_id' => 2, 'parent_item' => 'Sue'],
             $m->load(3)->get()
         );
     }

tests/ReferenceSqlTest.php

@@ -390,21 +390,21 @@ public function testReferenceHasOneTraversing()
         $firstUserOrders->setOrder('id');
 
         $this->assertEquals([
-            ['id' => '1', 'company_id' => '1', 'description' => 'Vinny Company Order 1', 'amount' => 50.0],
-            ['id' => '3', 'company_id' => '1', 'description' => 'Vinny Company Order 2', 'amount' => 15.0],
+            ['id' => '1', 'company_id' => 1, 'description' => 'Vinny Company Order 1', 'amount' => 50.0],
+            ['id' => '3', 'company_id' => 1, 'description' => 'Vinny Company Order 2', 'amount' => 15.0],
         ], $firstUserOrders->export());
 
         $user->unload();
 
         $this->assertEquals([
-            ['id' => '1', 'company_id' => '1', 'description' => 'Vinny Company Order 1', 'amount' => 50.0],
-            ['id' => '3', 'company_id' => '1', 'description' => 'Vinny Company Order 2', 'amount' => 15.0],
+            ['id' => '1', 'company_id' => 1, 'description' => 'Vinny Company Order 1', 'amount' => 50.0],
+            ['id' => '3', 'company_id' => 1, 'description' => 'Vinny Company Order 2', 'amount' => 15.0],
         ], $firstUserOrders->export());
 
         $this->assertEquals([
-            ['id' => '1', 'company_id' => '1', 'description' => 'Vinny Company Order 1', 'amount' => 50.0],
-            ['id' => '2', 'company_id' => '2', 'description' => 'Zoe Company Order', 'amount' => 10.0],
-            ['id' => '3', 'company_id' => '1', 'description' => 'Vinny Company Order 2', 'amount' => 15.0],
+            ['id' => '1', 'company_id' => 1, 'description' => 'Vinny Company Order 1', 'amount' => 50.0],
+            ['id' => '2', 'company_id' => 2, 'description' => 'Zoe Company Order', 'amount' => 10.0],
+            ['id' => '3', 'company_id' => 1, 'description' => 'Vinny Company Order 2', 'amount' => 15.0],
         ], $user->ref('Company')->ref('Orders')->setOrder('id')->export());
     }
 
@@ -464,8 +464,8 @@ public function testIdFieldReferenceOurFieldCase()
                 ['name' => 'Ronaldo'],
             ],
             'stadium' => [
-                ['name' => 'Sue bernabeu', 'player_id' => '3'],
-                ['name' => 'John camp', 'player_id' => '1'],
+                ['name' => 'Sue bernabeu', 'player_id' => 3],
+                ['name' => 'John camp', 'player_id' => 1],
             ],
         ]);
 
@@ -480,7 +480,7 @@ public function testIdFieldReferenceOurFieldCase()
         $p->load(2);
         $p->ref('Stadium')->import([['name' => 'Nou camp nou']]);
         $this->assertSame('Nou camp nou', $p->ref('Stadium')->get('name'));
-        $this->assertSame('2', $p->ref('Stadium')->get('player_id'));
+        $this->assertSame(2, $p->ref('Stadium')->get('player_id'));
     }
 
     public function testModelProperty()

tests/SmboTransferTest.php

@@ -64,8 +64,8 @@ public function testTransfer()
             return $e1['id'] < $e2['id'] ? -1 : 1;
         });
         $this->assertSame([
-            ['id' => 1, 'transfer_document_id' => '2'],
-            ['id' => 2, 'transfer_document_id' => '1'],
+            ['id' => 1, 'transfer_document_id' => 2],
+            ['id' => 2, 'transfer_document_id' => 1],
         ], $data);
     }