get rid of using deprecated expectException annotations

tests/IntegrationTest/ServiceLocatorTest.php

@@ -32,11 +32,12 @@ public function testServiceLocator(ContainerBuilder $builder)
 
     /**
      * @dataProvider provideContainer
-     * @expectedException \DI\NotFoundException
-     * @expectedExceptionMessage Service 'baz' is not defined.
      */
     public function testServiceLocatorThrowsForInvalidService(ContainerBuilder $builder)
     {
+        $this->expectException(\DI\NotFoundException::class);
+        $this->expectExceptionMessage('Service \'baz\' is not defined.');
+
         $builder->addDefinitions([
             'baz' => 'baz',
         ]);
@@ -99,11 +100,12 @@ public function testOverrideServiceInRepositoryDefinition(ContainerBuilder $buil
 
     /**
      * @dataProvider provideContainer
-     * @expectedException \LogicException
-     * @expectedExceptionMessage Service 'foo' for 'DI\Test\IntegrationTest\ServiceLocatorTest\ServiceSubscriber' cannot be overridden - ServiceLocator is already created.
      */
     public function testCannotOverrideServiceForAlreadyInstantiatedSubscriber(ContainerBuilder $builder)
     {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Service \'foo\' for \'DI\Test\IntegrationTest\ServiceLocatorTest\ServiceSubscriber\' cannot be overridden - ServiceLocator is already created.');
+
         $container = $builder->build();
 
         $container->get(ServiceLocatorTest\ServiceSubscriber::class);

tests/UnitTest/Definition/ReferenceTest.php

@@ -102,22 +102,24 @@ public function should_not_be_a_service_locator_entry()
 
     /**
      * @test
-     * @expectedException \DI\Definition\Exception\InvalidDefinition
-     * @expectedExceptionMessage Invalid service locator definition ('bar' for 'foo')
      */
     public function should_throw_on_invalid_service_locator_entry()
     {
+        $this->expectException(\DI\Definition\Exception\InvalidDefinition::class);
+        $this->expectExceptionMessage('Invalid service locator definition (\'bar\' for \'foo\')');
+
         $definition = new Reference('bar', 'foo');
         $definition->getServiceLocatorDefinition();
     }
 
     /**
      * @test
-     * @expectedException \DI\Definition\Exception\InvalidDefinition
-     * @expectedExceptionMessage Invalid service locator definition ('DI\ServiceLocator' for '')
      */
     public function should_throw_on_invalid_service_locator_entry2()
     {
+        $this->expectException(\DI\Definition\Exception\InvalidDefinition::class);
+        $this->expectExceptionMessage('Invalid service locator definition (\'DI\ServiceLocator\' for \'\')');
+
         $definition = new Reference(Reference::$serviceLocatorClass);
         $definition->getServiceLocatorDefinition();
     }

tests/UnitTest/Definition/ServiceLocatorDefinitionTest.php

@@ -33,11 +33,12 @@ public function should_have_a_name_and_requesting_name()
 
     /**
      * @test
-     * @expectedException \DI\ServiceSubscriberException
-     * @expectedExceptionMessage The class DI\Test\UnitTest\Fixtures\Singleton does not implement ServiceSubscriberInterface.
      */
     public function cannot_resolve_without_proper_subscriber()
     {
+        $this->expectException(\DI\ServiceSubscriberException::class);
+        $this->expectExceptionMessage('The class DI\Test\UnitTest\Fixtures\Singleton does not implement ServiceSubscriberInterface.');
+
         $container = $this->easyMock(ContainerInterface::class);
         $definition = new ServiceLocatorDefinition(ServiceLocator::class, Singleton::class);
 

tests/UnitTest/ServiceLocator/ServiceLocatorRepositoryTest.php

@@ -33,12 +33,11 @@ public function testCreateServiceLocator()
         $this->assertEquals($expectedServices, $serviceLocator->getServices());
     }
 
-    /**
-     * @expectedException \DI\NotFoundException
-     * @expectedExceptionMessage Service locator for entry 'something' is not initialized.
-     */
     public function testServiceLocatorNotCreated()
     {
+        $this->expectException(\DI\NotFoundException::class);
+        $this->expectExceptionMessage('Service locator for entry \'something\' is not initialized.');
+
         $container = ContainerBuilder::buildDevContainer();
         $repository = new ServiceLocatorRepository($container);
         $repository->get('something');
@@ -94,12 +93,11 @@ public function testCanCreateMultipleWithSameServices()
         $this->assertSame($locator3, $locator5);
     }
 
-    /**
-     * @expectedException \LogicException
-     * @expectedExceptionMessage ServiceLocator for 'test' cannot be recreated with different services.
-     */
     public function testCannotCreateMultipleWithDifferentServices()
     {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('ServiceLocator for \'test\' cannot be recreated with different services.');
+
         $container = ContainerBuilder::buildDevContainer();
         $repository = new ServiceLocatorRepository($container);
 

tests/UnitTest/ServiceLocator/ServiceLocatorTest.php

@@ -33,12 +33,11 @@ public function testInstantiation()
         $this->assertEquals('test', $serviceLocator->getSubscriber());
     }
 
-    /**
-     * @expectedException \DI\NotFoundException
-     * @expectedExceptionMessage Service 'something' is not defined.
-     */
     public function testServiceNotDefined()
     {
+        $this->expectException(\DI\NotFoundException::class);
+        $this->expectExceptionMessage('Service \'something\' is not defined.');
+
         $container = ContainerBuilder::buildDevContainer();
         $serviceLocator = new ServiceLocator($container, [], 'test');
         $serviceLocator->get('something');