moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 08:26:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-71036 phpunit: Mock->setMethods() silently deprecated

Browse source 
The current ->setMethods() has been silently (won't emit any
warning) in PHPUnit 9. And will stop working (current plans)
in PHPUnit 10.

Basically the now deprecated method has been split into:

- onlyMethods(): To point to existing methods in the mocked artifact.
- addMethods(): To point to non existing (yet) methods in the mocked
  artifact.

In practice that means that all our current setMethods() calls can be
converted to onlyMethods() (existing) and done. The addMethods() is
mostly useful on development phases, not final testing.

Finally note that <null> isn't accepted anymore as parameter to
double all the methods. Instead empty array [] must be used.

Link: https://github.com/sebastianbergmann/phpunit/issues/3770
This commit is contained in:
Eloy Lafuente (stronk7) 2021-03-11 19:31:28 +01:00
parent 8a14a7bd22
commit 81407f18ec
42 changed files with 181 additions and 181 deletions
Download patch file Download diff file Expand all files Collapse all files

4
files/converter/unoconv/tests/converter_test.php
View file

@ -52,9 +52,9 @@ class fileconverter_unoconv_converter_testcase extends advanced_testcase {
* If no methods are specified, only abstract functions are mocked.
* @return \fileconverter_unoconv\converter
*/
protected function get_testable_mock($mockedmethods = null) {
protected function get_testable_mock($mockedmethods = []) {
$converter = $this->getMockBuilder(\fileconverter_unoconv\converter::class)
->setMethods($mockedmethods)
->onlyMethods($mockedmethods)
->getMock();
return $converter;

18
files/tests/converter_test.php
View file

@ -47,7 +47,7 @@ class core_files_converter_testcase extends advanced_testcase {
*/
protected function get_testable_mock($mockedmethods = []) {
$converter = $this->getMockBuilder(\core_files\converter::class)
->setMethods($mockedmethods)
->onlyMethods($mockedmethods)
->getMockForAbstractClass();
return $converter;
@ -61,7 +61,7 @@ class core_files_converter_testcase extends advanced_testcase {
*/
protected function get_testable_conversion($mockedmethods = []) {
$conversion = $this->getMockBuilder(\core_files\conversion::class)
->setMethods($mockedmethods)
->onlyMethods($mockedmethods)
->setConstructorArgs([0, (object) []])
->getMock();
@ -77,7 +77,7 @@ class core_files_converter_testcase extends advanced_testcase {
*/
protected function get_mocked_converter($mockedmethods = []) {
$converter = $this->getMockBuilder(\core_files\converter_interface::class)
->setMethods($mockedmethods)
->onlyMethods($mockedmethods)
->getMockForAbstractClass();
return $converter;
@ -92,7 +92,7 @@ class core_files_converter_testcase extends advanced_testcase {
* If no methods are specified, only abstract functions are mocked.
* @return stored_file
*/
protected function get_stored_file($filecontent = 'content', $filename = null, $filerecord = [], $mockedmethods = null) {
protected function get_stored_file($filecontent = 'content', $filename = null, $filerecord = [], $mockedmethods = []) {
global $CFG;
$contenthash = sha1($filecontent);
@ -106,7 +106,7 @@ class core_files_converter_testcase extends advanced_testcase {
$filerecord['id'] = 42;
$file = $this->getMockBuilder(stored_file::class)
->setMethods($mockedmethods)
->onlyMethods($mockedmethods)
->setConstructorArgs([get_file_storage(), (object) $filerecord])
->getMock();
@ -145,7 +145,7 @@ class core_files_converter_testcase extends advanced_testcase {
*/
protected function get_file_storage_mock($mockedmethods = []) {
$fs = $this->getMockBuilder(\file_storage::class)
->setMethods($mockedmethods)
->onlyMethods($mockedmethods)
->disableOriginalConstructor()
->getMock();
@ -248,7 +248,7 @@ class core_files_converter_testcase extends advanced_testcase {
*/
public function test_get_document_converter_classes_plugin_class_requirements_not_met() {
$plugin = $this->getMockBuilder(\core_file_converter_requirements_not_met_test::class)
->setMethods()
->onlyMethods([])
->getMock();
$converter = $this->get_testable_mock(['get_enabled_plugins']);
@ -267,7 +267,7 @@ class core_files_converter_testcase extends advanced_testcase {
*/
public function test_get_document_converter_classes_plugin_class_met_not_supported() {
$plugin = $this->getMockBuilder(\core_file_converter_type_not_supported_test::class)
->setMethods()
->onlyMethods([])
->getMock();
$converter = $this->get_testable_mock(['get_enabled_plugins']);
@ -286,7 +286,7 @@ class core_files_converter_testcase extends advanced_testcase {
*/
public function test_get_document_converter_classes_plugin_class_met_and_supported() {
$plugin = $this->getMockBuilder(\core_file_converter_type_supported_test::class)
->setMethods()
->onlyMethods([])
->getMock();
$classname = get_class($plugin);