From b1baca99f280570d0336b4d71ad1f9dca213a35b Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sun, 27 Sep 2020 14:07:08 +0200 Subject: Convert legacy PHPUnit @expected* to new ->expect* Converted automatically using https://github.com/ArthurHoaro/convert-legacy-phpunit-expect --- tests/config/ConfigJsonTest.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'tests/config/ConfigJsonTest.php') diff --git a/tests/config/ConfigJsonTest.php b/tests/config/ConfigJsonTest.php index f1612e9b..f884b0c6 100644 --- a/tests/config/ConfigJsonTest.php +++ b/tests/config/ConfigJsonTest.php @@ -38,12 +38,12 @@ class ConfigJsonTest extends \PHPUnit\Framework\TestCase /** * Read a non existent config file -> empty array. - * - * @expectedException \Exception - * @expectedExceptionMessageRegExp /An error occurred while parsing JSON configuration file \([\w\/\.]+\): error code #4/ */ public function testReadInvalidJson() { + $this->expectException(\Exception::class); + $this->expectExceptionMessageRegExp(' /An error occurred while parsing JSON configuration file \\([\\w\\/\\.]+\\): error code #4/'); + $this->configIO->read('tests/utils/config/configInvalid.json.php'); } @@ -110,22 +110,22 @@ class ConfigJsonTest extends \PHPUnit\Framework\TestCase /** * Write to invalid path. - * - * @expectedException \Shaarli\Exceptions\IOException */ public function testWriteInvalidArray() { + $this->expectException(\Shaarli\Exceptions\IOException::class); + $conf = array('conf' => 'value'); @$this->configIO->write(array(), $conf); } /** * Write to invalid path. - * - * @expectedException \Shaarli\Exceptions\IOException */ public function testWriteInvalidBlank() { + $this->expectException(\Shaarli\Exceptions\IOException::class); + $conf = array('conf' => 'value'); @$this->configIO->write('', $conf); } -- cgit v1.2.3