Merge 426fb62 into 75fcf8b

composer.json

@@ -17,7 +17,7 @@
   "require": {
     "php": "^7.1",
     "ext-json": "*",
-    "nette/di": "^2.4",
+    "nette/di": "^3.0",
     "php-http/client-common": "^2.0",
     "php-http/client-implementation": "^1.0",
     "php-http/discovery": "^1.0",
@@ -27,11 +27,11 @@
   "require-dev": {
     "freezy-bee/nette-caching-psr6": "^1.1",
     "mockery/mockery": "^1.1",
-    "nette/application": "^2.4",
-    "nette/bootstrap": "^2.4",
-    "nette/tester": "^2.0",
+    "nette/application": "^3.0",
+    "nette/bootstrap": "^3.0",
+    "nette/tester": "^2.3",
     "nyholm/psr7": "^1.1",
-    "php-http/cache-plugin": "^1.4",
+    "php-http/cache-plugin": "1.6.0",
     "php-http/curl-client": "^2.0",
     "php-http/guzzle6-adapter": "^2.0",
     "php-http/logger-plugin": "^1.0",

src/DI/HttplugExtension.php

@@ -82,7 +82,7 @@ public function loadConfiguration(): void
         $config = $this->config;
 
         $factories = $this->loadFromFile(__DIR__ . '/factories.neon');
-        Compiler::loadDefinitions($containerBuilder, $factories, $this->name);
+        $this->loadDefinitionsFromConfig($factories);
 
         $this->debugMode = $config['tracy']['debugger'];