diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2018-12-30 11:36:08 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-05-09 21:40:06 +0200 |
| commit | ebac54aa9e705e99a562d2fe2c0f57bc6af8dd32 (patch) | |
| tree | a6f45f42c8861ba60216517687bfe72084ba7dcb /tests/di | |
| parent | d968392b4d4aa45afc7fbe75e0ad0a1d06e9275e (diff) | |
| download | forums-ebac54aa9e705e99a562d2fe2c0f57bc6af8dd32.tar forums-ebac54aa9e705e99a562d2fe2c0f57bc6af8dd32.tar.gz forums-ebac54aa9e705e99a562d2fe2c0f57bc6af8dd32.tar.bz2 forums-ebac54aa9e705e99a562d2fe2c0f57bc6af8dd32.tar.xz forums-ebac54aa9e705e99a562d2fe2c0f57bc6af8dd32.zip | |
[ticket/14948] Adjust calls for twig and phpunit updates
PHPBB3-14948
Diffstat (limited to 'tests/di')
| -rw-r--r-- | tests/di/create_container_test.php | 2 | ||||
| -rw-r--r-- | tests/di/ordered_service_collection_test.php | 2 | ||||
| -rw-r--r-- | tests/di/service_collection_test.php | 8 |
3 files changed, 7 insertions, 5 deletions
diff --git a/tests/di/create_container_test.php b/tests/di/create_container_test.php index 1fd2cbd7ee..8ecad71412 100644 --- a/tests/di/create_container_test.php +++ b/tests/di/create_container_test.php @@ -26,7 +26,7 @@ namespace protected $phpbb_root_path; protected $filename; - public function setUp() + public function setUp(): void { $this->phpbb_root_path = dirname(__FILE__) . '/'; $this->config_php = new \phpbb\config_php_file($this->phpbb_root_path . 'fixtures/', 'php'); diff --git a/tests/di/ordered_service_collection_test.php b/tests/di/ordered_service_collection_test.php index 47e6d23744..baa9776573 100644 --- a/tests/di/ordered_service_collection_test.php +++ b/tests/di/ordered_service_collection_test.php @@ -18,7 +18,7 @@ class phpbb_ordered_service_collection_test extends \phpbb_test_case */ protected $service_collection; - public function setUp() + public function setUp(): void { $container = new phpbb_mock_container_builder(); $container->set('foo', new StdClass); diff --git a/tests/di/service_collection_test.php b/tests/di/service_collection_test.php index 5815b4367d..97c13ab163 100644 --- a/tests/di/service_collection_test.php +++ b/tests/di/service_collection_test.php @@ -18,7 +18,7 @@ class phpbb_service_collection_test extends \phpbb_test_case */ protected $service_collection; - public function setUp() + public function setUp(): void { $container = new phpbb_mock_container_builder(); $container->set('foo', new StdClass); @@ -56,14 +56,16 @@ class phpbb_service_collection_test extends \phpbb_test_case public function test_get_by_class_many_services_exception() { - $this->setExpectedException('RuntimeException', 'More than one service definitions found for class "bar_class" in collection.'); + $this->expectException('RuntimeException'); + $this->expectExceptionMessage('More than one service definitions found for class "bar_class" in collection.'); $this->service_collection->get_by_class('bar_class'); } public function test_get_by_class_no_service_exception() { - $this->setExpectedException('RuntimeException', 'No service found for class "baz_class" in collection.'); + $this->expectException('RuntimeException'); + $this->expectExceptionMessage('No service found for class "baz_class" in collection.'); $this->service_collection->get_by_class('baz_class'); } |