Skip to content

Commit 273b420

Browse files
dereuromarkdereuromark
authored
Stop using deprecated setOnDelete/setOnUpdate methods (#1047)
Update bake templates and internal code to use the non-deprecated setDelete() and setUpdate() methods instead of the deprecated setOnDelete() and setOnUpdate() methods. Fixes #1045
1 parent 6d4b00d commit 273b420

31 files changed

Lines changed: 152 additions & 153 deletions

‎src/Db/Table/ForeignKey.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,11 @@ public function setOptions(array $options)
100100
throw new RuntimeException(sprintf('"%s" is not a valid foreign key option.', $option));
101101
}
102102

103-
// handle $options['delete'] as $options['update']
103+
// handle $options['delete'] and $options['update']
104104
if ($option === 'delete') {
105-
$this->setOnDelete($value);
105+
$this->delete = $this->normalizeAction($value);
106106
} elseif ($option === 'update') {
107-
$this->setOnUpdate($value);
107+
$this->update = $this->normalizeAction($value);
108108
} elseif ($option === 'deferrable') {
109109
$this->setDeferrableMode($value);
110110
} else {

‎templates/bake/element/add-foreign-keys.twig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
$this->foreignKey({{ columnsList | raw }})
2929
->setReferencedTable('{{ constraint['references'][0] }}')
3030
->setReferencedColumns({{ columnsReference | raw }})
31-
->setOnDelete('{{ Migration.formatConstraintAction(constraint['delete']) | raw }}')
32-
->setOnUpdate('{{ Migration.formatConstraintAction(constraint['update']) | raw }}')
31+
->setDelete('{{ Migration.formatConstraintAction(constraint['delete']) | raw }}')
32+
->setUpdate('{{ Migration.formatConstraintAction(constraint['update']) | raw }}')
3333
->setName('{{ constraintName }}')
3434
)
3535
{%~ endif %}

‎templates/bake/element/change-method-body.twig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@
5959
$this->foreignKey({{ columnsList | raw }})
6060
->setReferencedTable('{{ constraint['references'][0] }}')
6161
->setReferencedColumns({{ columnsReference | raw }})
62-
->setOnDelete('{{ Migration.formatConstraintAction(constraint['delete']) | raw }}')
63-
->setOnUpdate('{{ Migration.formatConstraintAction(constraint['update']) | raw }}')
62+
->setDelete('{{ Migration.formatConstraintAction(constraint['delete']) | raw }}')
63+
->setUpdate('{{ Migration.formatConstraintAction(constraint['update']) | raw }}')
6464
->setName('{{ constraintName }}')
6565
);
6666
{%~ endif %}

‎tests/TestCase/Db/Table/TableTest.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,7 @@ public function testAddForeignKeyWithObject(): void
144144
$key->setColumns('user_id')
145145
->setReferencedTable('users')
146146
->setReferencedColumns(['id'])
147-
->setOnDelete('CASCADE')
148-
->setOnUpdate('CASCADE')
147+
->setOptions(['delete' => 'CASCADE', 'update' => 'CASCADE'])
149148
->setName('fk_user_id'),
150149
);
151150

‎tests/comparisons/Diff/default/the_diff_default_mysql.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ public function up(): void
9999
$this->foreignKey('user_id')
100100
->setReferencedTable('users')
101101
->setReferencedColumns('id')
102-
->setOnDelete('RESTRICT')
103-
->setOnUpdate('RESTRICT')
102+
->setDelete('RESTRICT')
103+
->setUpdate('RESTRICT')
104104
->setName('categories_ibfk_1')
105105
)
106106
->update();
@@ -232,8 +232,8 @@ public function down(): void
232232
$this->foreignKey('user_id')
233233
->setReferencedTable('users')
234234
->setReferencedColumns('id')
235-
->setOnDelete('CASCADE')
236-
->setOnUpdate('CASCADE')
235+
->setDelete('CASCADE')
236+
->setUpdate('CASCADE')
237237
->setName('articles_ibfk_1')
238238
)
239239
->update();

‎tests/comparisons/Diff/default/the_diff_default_pgsql.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ public function up(): void
6464
$this->foreignKey('user_id')
6565
->setReferencedTable('users')
6666
->setReferencedColumns('id')
67-
->setOnDelete('RESTRICT')
68-
->setOnUpdate('RESTRICT')
67+
->setDelete('RESTRICT')
68+
->setUpdate('RESTRICT')
6969
)
7070
->update();
7171

@@ -114,8 +114,8 @@ public function up(): void
114114
$this->foreignKey('category_id')
115115
->setReferencedTable('categories')
116116
->setReferencedColumns('id')
117-
->setOnDelete('NO_ACTION')
118-
->setOnUpdate('NO_ACTION')
117+
->setDelete('NO_ACTION')
118+
->setUpdate('NO_ACTION')
119119
)
120120
->update();
121121

@@ -207,8 +207,8 @@ public function down(): void
207207
$this->foreignKey('user_id')
208208
->setReferencedTable('users')
209209
->setReferencedColumns('id')
210-
->setOnDelete('CASCADE')
211-
->setOnUpdate('CASCADE')
210+
->setDelete('CASCADE')
211+
->setUpdate('CASCADE')
212212
)
213213
->update();
214214

‎tests/comparisons/Diff/simple/the_diff_simple_mysql.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ public function up(): void
7070
$this->foreignKey('user_id')
7171
->setReferencedTable('users')
7272
->setReferencedColumns('id')
73-
->setOnDelete('RESTRICT')
74-
->setOnUpdate('RESTRICT')
73+
->setDelete('RESTRICT')
74+
->setUpdate('RESTRICT')
7575
->setName('articles_ibfk_1')
7676
)
7777
->update();

‎tests/comparisons/Migration/pgsql/test_snapshot_auto_id_disabled_pgsql.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -370,8 +370,8 @@ public function up(): void
370370
$this->foreignKey('category_id')
371371
->setReferencedTable('categories')
372372
->setReferencedColumns('id')
373-
->setOnDelete('NO_ACTION')
374-
->setOnUpdate('NO_ACTION')
373+
->setDelete('NO_ACTION')
374+
->setUpdate('NO_ACTION')
375375
->setName('articles_category_fk')
376376
)
377377
->update();
@@ -387,8 +387,8 @@ public function up(): void
387387
'category_id',
388388
'id',
389389
])
390-
->setOnDelete('CASCADE')
391-
->setOnUpdate('CASCADE')
390+
->setDelete('CASCADE')
391+
->setUpdate('CASCADE')
392392
->setName('orders_product_fk')
393393
)
394394
->update();
@@ -398,8 +398,8 @@ public function up(): void
398398
$this->foreignKey('category_id')
399399
->setReferencedTable('categories')
400400
->setReferencedColumns('id')
401-
->setOnDelete('CASCADE')
402-
->setOnUpdate('CASCADE')
401+
->setDelete('CASCADE')
402+
->setUpdate('CASCADE')
403403
->setName('products_category_fk')
404404
)
405405
->update();

‎tests/comparisons/Migration/pgsql/test_snapshot_not_empty_pgsql.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -310,8 +310,8 @@ public function up(): void
310310
$this->foreignKey('category_id')
311311
->setReferencedTable('categories')
312312
->setReferencedColumns('id')
313-
->setOnDelete('NO_ACTION')
314-
->setOnUpdate('NO_ACTION')
313+
->setDelete('NO_ACTION')
314+
->setUpdate('NO_ACTION')
315315
->setName('articles_category_fk')
316316
)
317317
->update();
@@ -327,8 +327,8 @@ public function up(): void
327327
'category_id',
328328
'id',
329329
])
330-
->setOnDelete('CASCADE')
331-
->setOnUpdate('CASCADE')
330+
->setDelete('CASCADE')
331+
->setUpdate('CASCADE')
332332
->setName('orders_product_fk')
333333
)
334334
->update();
@@ -338,8 +338,8 @@ public function up(): void
338338
$this->foreignKey('category_id')
339339
->setReferencedTable('categories')
340340
->setReferencedColumns('id')
341-
->setOnDelete('CASCADE')
342-
->setOnUpdate('CASCADE')
341+
->setDelete('CASCADE')
342+
->setUpdate('CASCADE')
343343
->setName('products_category_fk')
344344
)
345345
->update();

‎tests/comparisons/Migration/pgsql/test_snapshot_plugin_blog_pgsql.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -310,8 +310,8 @@ public function up(): void
310310
$this->foreignKey('category_id')
311311
->setReferencedTable('categories')
312312
->setReferencedColumns('id')
313-
->setOnDelete('NO_ACTION')
314-
->setOnUpdate('NO_ACTION')
313+
->setDelete('NO_ACTION')
314+
->setUpdate('NO_ACTION')
315315
->setName('articles_category_fk')
316316
)
317317
->update();
@@ -327,8 +327,8 @@ public function up(): void
327327
'category_id',
328328
'id',
329329
])
330-
->setOnDelete('CASCADE')
331-
->setOnUpdate('CASCADE')
330+
->setDelete('CASCADE')
331+
->setUpdate('CASCADE')
332332
->setName('orders_product_fk')
333333
)
334334
->update();
@@ -338,8 +338,8 @@ public function up(): void
338338
$this->foreignKey('category_id')
339339
->setReferencedTable('categories')
340340
->setReferencedColumns('id')
341-
->setOnDelete('CASCADE')
342-
->setOnUpdate('CASCADE')
341+
->setDelete('CASCADE')
342+
->setUpdate('CASCADE')
343343
->setName('products_category_fk')
344344
)
345345
->update();

0 commit comments

Comments
 (0)