Use ::class

contributte · Feb 9, 2017 · dad60d6 · dad60d6
1 parent 2c31f48
commit dad60d6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/src/DI/HttpExtension.php b/src/DI/HttpExtension.php
@@ -4,7 +4,11 @@
 
 namespace Arachne\Codeception\DI;
 
+use Arachne\Codeception\Http\Request;
+use Arachne\Codeception\Http\Response;
 use Nette\DI\CompilerExtension;
+use Nette\Http\IRequest;
+use Nette\Http\IResponse;
 
 /**
  * @author Jáchym Toušek <enumag@gmail.com>
@@ -15,18 +19,18 @@ public function beforeCompile()
     {
         $builder = $this->getContainerBuilder();
 
-        $request = $builder->getByType('Nette\Http\IRequest') ?: 'httpRequest';
+        $request = $builder->getByType(IRequest::class) ?: 'httpRequest';
         if ($builder->hasDefinition($request)) {
             $builder->getDefinition($request)
-                ->setClass('Nette\Http\Request')
-                ->setFactory('Arachne\Codeception\Http\Request');
+                ->setClass(IRequest::class)
+                ->setFactory(Request::class);
         }
 
-        $response = $builder->getByType('Nette\Http\IResponse') ?: 'httpResponse';
+        $response = $builder->getByType(IResponse::class) ?: 'httpResponse';
         if ($builder->hasDefinition($response)) {
             $builder->getDefinition($response)
-                ->setClass('Nette\Http\IResponse')
-                ->setFactory('Arachne\Codeception\Http\Response');
+                ->setClass(IResponse::class)
+                ->setFactory(Response::class);
         }
     }
 }
diff --git a/src/Module/NetteDIModule.php b/src/Module/NetteDIModule.php
@@ -10,6 +10,7 @@
 use Nette\Caching\Storages\SQLiteJournal;
 use Nette\Configurator;
 use Nette\DI\Container;
+use Nette\DI\Extensions\ExtensionsExtension;
 use Nette\DI\MissingServiceException;
 use Nette\Http\Session;
 use Nette\Utils\FileSystem;
@@ -120,7 +121,7 @@ private function createContainer(): void
         $configurator = new Configurator();
         if ($this->config['removeDefaultExtensions']) {
             $configurator->defaultExtensions = [
-                'extensions' => 'Nette\DI\Extensions\ExtensionsExtension',
+                'extensions' => ExtensionsExtension::class,
             ];
         }