Merge remote-tracking branch 'origin/v0.6'

# Conflicts: # composer.json
Arachne · Sep 29, 2017 · 457f87d · 457f87d
2 parents 4fa43fc + 9adb87d
commit 457f87d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,7 @@ cache:
 
 php:
     - 7.1
+    - 7.2
     - nightly
 
 matrix:

diff --git a/composer.json b/composer.json
@@ -17,14 +17,15 @@
         "doctrine/annotations": "^1.3.0",
         "kdyby/annotations": "^2.3.0",
         "nette/application": "^2.4.0",
-        "nette/di": "^2.4.0"
+        "nette/di": "^2.4.10"
     },
     "require-dev": {
         "arachne/codeception": "^0.7.3",
         "codeception/codeception": "^2.3.2",
         "eloquent/phony": "^2.0.0",
         "eloquent/phony-phpunit": "^3.0.0",
         "friendsofphp/php-cs-fixer": "^2.7.0@dev",
+        "kdyby/doctrine-cache": "^2.6.1@dev",
         "latte/latte": "^2.4.0",
         "phpstan/phpstan": "^0.8.5",
         "phpstan/phpstan-nette": "^0.8.3"

diff --git a/src/DI/ComponentsProtectionExtension.php b/src/DI/ComponentsProtectionExtension.php
@@ -17,7 +17,7 @@ public function loadConfiguration(): void
         $builder = $this->getContainerBuilder();
 
         $builder->addDefinition($this->prefix('handler'))
-            ->setClass(ActionsRuleHandler::class)
+            ->setType(ActionsRuleHandler::class)
             ->addTag(
                 VerifierExtension::TAG_HANDLER,
                 [