Changed self:: to $this-> for expectException* methods

These methods are not static.

Author: michalbundyra

test/AbstractFactory/ConfigAbstractFactoryTest.php

@@ -184,8 +184,8 @@ public function testExceptsWhenConfigNotSet()
     {
         $abstractFactory = new ConfigAbstractFactory();
         $serviceManager = new ServiceManager();
-        self::expectException(ServiceNotCreatedException::class);
-        self::expectExceptionMessage('Cannot find a config array in the container');
+        $this->expectException(ServiceNotCreatedException::class);
+        $this->expectExceptionMessage('Cannot find a config array in the container');
 
         $abstractFactory($serviceManager, 'Dirk_Gently');
     }
@@ -195,8 +195,8 @@ public function testExceptsWhenConfigKeyNotSet()
         $abstractFactory = new ConfigAbstractFactory();
         $serviceManager = new ServiceManager();
         $serviceManager->setService('config', []);
-        self::expectException(ServiceNotCreatedException::class);
-        self::expectExceptionMessage('Cannot find a `' . ConfigAbstractFactory::class . '` key in the config array');
+        $this->expectException(ServiceNotCreatedException::class);
+        $this->expectExceptionMessage('Cannot find a `' . ConfigAbstractFactory::class . '` key in the config array');
 
         $abstractFactory($serviceManager, 'Dirk_Gently');
     }
@@ -206,8 +206,8 @@ public function testExceptsWhenConfigIsNotArray()
         $abstractFactory = new ConfigAbstractFactory();
         $serviceManager = new ServiceManager();
         $serviceManager->setService('config', 'Holistic');
-        self::expectException(ServiceNotCreatedException::class);
-        self::expectExceptionMessage('Config must be an array');
+        $this->expectException(ServiceNotCreatedException::class);
+        $this->expectExceptionMessage('Config must be an array');
 
         $abstractFactory($serviceManager, 'Dirk_Gently');
     }
@@ -222,8 +222,8 @@ public function testExceptsWhenServiceConfigIsNotArray()
                 ConfigAbstractFactory::class => 'Detective_Agency'
             ]
         );
-        self::expectException(ServiceNotCreatedException::class);
-        self::expectExceptionMessage('Dependencies config must exist and be an array');
+        $this->expectException(ServiceNotCreatedException::class);
+        $this->expectExceptionMessage('Dependencies config must exist and be an array');
 
         $abstractFactory($serviceManager, 'Dirk_Gently');
     }
@@ -238,8 +238,8 @@ public function testExceptsWhenServiceConfigDoesNotExist()
                 ConfigAbstractFactory::class => [],
             ]
         );
-        self::expectException(ServiceNotCreatedException::class);
-        self::expectExceptionMessage('Dependencies config must exist and be an array');
+        $this->expectException(ServiceNotCreatedException::class);
+        $this->expectExceptionMessage('Dependencies config must exist and be an array');
 
         $abstractFactory($serviceManager, 'Dirk_Gently');
     }
@@ -256,8 +256,8 @@ public function testExceptsWhenServiceConfigForRequestedNameIsNotArray()
                 ],
             ]
         );
-        self::expectException(ServiceNotCreatedException::class);
-        self::expectExceptionMessage('Dependencies config must exist and be an array');
+        $this->expectException(ServiceNotCreatedException::class);
+        $this->expectExceptionMessage('Dependencies config must exist and be an array');
 
         $abstractFactory($serviceManager, 'Dirk_Gently');
     }
@@ -279,8 +279,8 @@ public function testExceptsWhenServiceConfigForRequestedNameIsNotArrayOfStrings(
                 ],
             ]
         );
-        self::expectException(ServiceNotCreatedException::class);
-        self::expectExceptionMessage(
+        $this->expectException(ServiceNotCreatedException::class);
+        $this->expectExceptionMessage(
             'Service message must be an array of strings, ["string","string","string","integer"] given'
         );
 

test/Tool/ConfigDumperTest.php

@@ -36,16 +36,16 @@ public function setUp()
 
     public function testCreateDependencyConfigExceptsIfClassNameIsNotString()
     {
-        self::expectException(InvalidArgumentException::class);
-        self::expectExceptionMessage('Class name must be a string, integer given');
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Class name must be a string, integer given');
         $this->dumper->createDependencyConfig([], 42);
     }
 
     public function testCreateDependencyConfigExceptsIfClassDoesNotExist()
     {
         $className = 'Dirk\Gentley\Holistic\Detective\Agency';
-        self::expectException(InvalidArgumentException::class);
-        self::expectExceptionMessage('Cannot find class or interface with name ' . $className);
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Cannot find class or interface with name ' . $className);
         $this->dumper->createDependencyConfig([], $className);
     }
 
@@ -92,8 +92,8 @@ public function testCreateDependencyConfigClassWithoutConstructorHandlesAsInvoka
 
     public function testCreateDependencyConfigWithoutTypeHintedParameterExcepts()
     {
-        self::expectException(InvalidArgumentException::class);
-        self::expectExceptionMessage(
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage(
             'Cannot create config for constructor argument "aName", '
             . 'it has no type hint, or non-class/interface type hint'
         );
@@ -105,8 +105,8 @@ public function testCreateDependencyConfigWithoutTypeHintedParameterExcepts()
 
     public function testCreateDependencyConfigWithContainerAndNoServiceWithoutTypeHintedParameterExcepts()
     {
-        self::expectException(InvalidArgumentException::class);
-        self::expectExceptionMessage(
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage(
             'Cannot create config for constructor argument "aName", '
             . 'it has no type hint, or non-class/interface type hint'
         );
@@ -209,16 +209,16 @@ public function testCreateDependencyConfigWorksWithMultipleDependenciesOfSameTyp
 
     public function testCreateFactoryMappingsExceptsIfClassNameIsNotString()
     {
-        self::expectException(InvalidArgumentException::class);
-        self::expectExceptionMessage('Class name must be a string, integer given');
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Class name must be a string, integer given');
         $this->dumper->createFactoryMappings([], 42);
     }
 
     public function testCreateFactoryMappingsExceptsIfClassDoesNotExist()
     {
         $className = 'Dirk\Gentley\Holistic\Detective\Agency';
-        self::expectException(InvalidArgumentException::class);
-        self::expectExceptionMessage('Cannot find class or interface with name ' . $className);
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Cannot find class or interface with name ' . $className);
         $this->dumper->createFactoryMappings([], $className);
     }
 
@@ -265,8 +265,8 @@ public function testCreateFactoryMappingsFromConfigReturnsIfNoConfigKey()
 
     public function testCreateFactoryMappingsFromConfigExceptsWhenConfigNotArray()
     {
-        self::expectException(InvalidArgumentException::class);
-        self::expectExceptionMessage(
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage(
             'Config key for ' . ConfigAbstractFactory::class . ' should be an array, boolean given'
         );