fix syntax error in Test Fixture

This commit is contained in:
Dario Rekowski on RockPI 2019-11-29 14:51:15 +00:00
parent 422d9eaa9a
commit 68a9c42d8b

View File

@ -15,11 +15,7 @@ class TransactionCreationsFixture extends TestFixture
*/
// @codingStandardsIgnoreStart
public $fields = [
<<<<<<< HEAD
'id' => ['type' => 'integer', 'length' => 11, 'unsigned' => false, 'null' => false, 'default' => null, 'comment' => '', 'precision' => null, 'autoIncrement' => null],
=======
'id' => ['type' => 'integer', 'length' => 11, 'unsigned' => false, 'null' => false, 'default' => null, 'comment' => '', 'autoIncrement' => true, 'precision' => null],
>>>>>>> cd32fbe27a5e24b63a58d9b0b47c11917d31bcbc
'transaction_id' => ['type' => 'integer', 'length' => 11, 'unsigned' => false, 'null' => false, 'default' => null, 'comment' => '', 'precision' => null, 'autoIncrement' => null],
'state_user_id' => ['type' => 'integer', 'length' => 11, 'unsigned' => false, 'null' => false, 'default' => null, 'comment' => '', 'precision' => null, 'autoIncrement' => null],
'amount' => ['type' => 'biginteger', 'length' => 20, 'unsigned' => false, 'null' => false, 'default' => null, 'comment' => '', 'precision' => null, 'autoIncrement' => null],