Commit bcbb6975 authored by catch's avatar catch
Browse files

Issue #3126333 by mondrake, longwave: Replace usage of the optional...

Issue #3126333 by mondrake, longwave: Replace usage of the optional $canonicalize parameter of assertEquals(), that is deprecated
parent df1d6896
......@@ -110,7 +110,7 @@ public function testConditionSubquerySelect2() {
// FROM test t
// WHERE t.age < (SELECT AVG(t2.age) FROM test t2)
$people = $select->execute()->fetchCol();
$this->assertEquals(['John', 'Paul'], $people, 'Returned Paul and John.', 0.0, 10, TRUE);
$this->assertEqualsCanonicalizing(['John', 'Paul'], $people, 'Returned Paul and John.');
}
/**
......@@ -136,7 +136,7 @@ public function testConditionSubquerySelect3() {
// FROM test t
// WHERE (SELECT AVG(tt.priority) FROM test_task tt WHERE tt.pid = t.id) > (SELECT AVG(tt2.priority) FROM test_task tt2)
$people = $select->execute()->fetchCol();
$this->assertEquals(['John'], $people, 'Returned John.', 0.0, 10, TRUE);
$this->assertEqualsCanonicalizing(['John'], $people, 'Returned John.');
}
/**
......@@ -174,7 +174,7 @@ public function testConditionSubquerySelect4() {
// BETWEEN (SELECT MIN(tt2.priority) AS expression FROM {test_task} tt2 WHERE (tt2.pid <> t.id))
// AND (SELECT AVG(tt3.priority) AS expression FROM {test_task} tt3 WHERE (tt3.pid <> t.id));
$people = $select->execute()->fetchCol();
$this->assertEquals(['George', 'Paul'], $people, 'Returned George and Paul.', 0.0, 10, TRUE);
$this->assertEqualsCanonicalizing(['George', 'Paul'], $people, 'Returned George and Paul.');
}
/**
......
......@@ -29,7 +29,6 @@ trait PHPUnit8Warnings {
'assertInternalType() is deprecated and will be removed in PHPUnit 9. Refactor your test to use assertIsArray(), assertIsBool(), assertIsFloat(), assertIsInt(), assertIsNumeric(), assertIsObject(), assertIsResource(), assertIsString(), assertIsScalar(), assertIsCallable(), or assertIsIterable() instead.',
'readAttribute() is deprecated and will be removed in PHPUnit 9.',
'getObjectAttribute() is deprecated and will be removed in PHPUnit 9.',
'The optional $canonicalize parameter of assertEquals() is deprecated and will be removed in PHPUnit 9. Refactor your test to use assertEqualsCanonicalizing() instead.',
'assertAttributeEquals() is deprecated and will be removed in PHPUnit 9.',
'assertAttributeSame() is deprecated and will be removed in PHPUnit 9.',
'assertAttributeInstanceOf() is deprecated and will be removed in PHPUnit 9.',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment