Merge pull request #25 from xificurk/php72

PHP 7.2 support

.travis.yml

@@ -11,17 +11,18 @@ php:
   - 5.5
   - 5.6
   - 7.0
+  - 7.1
+  - 7.2
 
 env:
   matrix:
     - NETTE=nette-2.4-dev
     - NETTE=nette-2.4
-    - NETTE=nette-2.3
 
 matrix:
   include:
     - php: 5.6
-      env: NETTE=nette-2.3 COMPOSER_EXTRA_ARGS="--prefer-lowest --prefer-stable"
+      env: NETTE=nette-2.4 COMPOSER_EXTRA_ARGS="--prefer-lowest --prefer-stable"
     - php: 7.0
       env: NETTE=nette-2.4 COVERAGE="--coverage ./coverage.xml --coverage-src ./src" TESTER_RUNTIME="phpdbg"
   exclude:
@@ -45,7 +46,7 @@ before_install:
 install:
   - travis_retry composer update --no-interaction --prefer-dist $COMPOSER_EXTRA_ARGS
   - travis_retry composer create-project --no-interaction jakub-onderka/php-parallel-lint /tmp/php-parallel-lint
-  - travis_retry composer create-project --no-interaction kdyby/code-checker /tmp/code-checker
+  - travis_retry composer create-project --no-interaction kdyby/code-checker:dev-kdyby /tmp/code-checker
   - travis_retry wget -O /tmp/coveralls.phar https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar
 
 script:

composer.json

@@ -17,35 +17,31 @@
 		"issues": "https://github.com/kdyby/autowired/issues"
 	},
 	"require": {
-		"nette/di": "~2.3@dev",
-		"nette/application": "~2.3@dev",
-		"nette/reflection": "~2.3@dev",
-		"tracy/tracy": "~2.3@dev"
+		"nette/di": "^2.4.7@dev",
+		"nette/application": "^2.4@dev",
+		"nette/reflection": "^2.4.2@dev",
+		"tracy/tracy": "^2.4@dev"
 	},
 	"require-dev": {
-		"nette/application": "~2.3@dev",
-		"nette/bootstrap": "~2.3@dev",
-		"nette/caching": "~2.3@dev",
-		"nette/component-model": "~2.2@dev",
-		"nette/database": "~2.3@dev",
-		"nette/deprecated": "~2.3@dev",
-		"nette/di": "~2.3@dev",
-		"nette/finder": "~2.3@dev",
-		"nette/forms": "~2.3@dev",
-		"nette/http": "~2.3@dev",
-		"nette/mail": "~2.3@dev",
-		"nette/neon": "~2.3@dev",
-		"nette/php-generator": "~2.3@dev",
-		"nette/reflection": "~2.3@dev",
-		"nette/robot-loader": "~2.3@dev",
-		"nette/safe-stream": "~2.3@dev",
-		"nette/security": "~2.3@dev",
-		"nette/tokenizer": "~2.2@dev",
-		"latte/latte": "~2.3@dev",
-		"tracy/tracy": "~2.3@dev",
-		"nette/utils": "~2.3@dev",
+		"nette/bootstrap": "^2.4@dev",
+		"nette/caching": "^2.5@dev",
+		"nette/component-model": "^2.3@dev",
+		"nette/database": "^2.4@dev",
+		"nette/deprecated": "^2.4@dev",
+		"nette/finder": "^2.4@dev",
+		"nette/forms": "^2.4@dev",
+		"nette/http": "^2.4.7@dev",
+		"nette/mail": "^2.4@dev",
+		"nette/neon": "^2.4@dev",
+		"nette/php-generator": "^2.4@dev",
+		"nette/robot-loader": "^2.4@dev",
+		"nette/safe-stream": "^2.3@dev",
+		"nette/security": "^2.4@dev",
+		"nette/tokenizer": "^2.2@dev",
+		"latte/latte": "^2.4@dev",
+		"nette/utils": "^2.4.5@dev",
 
-		"nette/tester": "~1.7"
+		"nette/tester": "^1.7"
 	},
 	"autoload": {
 		"psr-0": {

src/Kdyby/Autowired/Diagnostics/Panel.php

@@ -21,9 +21,11 @@
 /**
  * @author Filip Procházka <[email protected]>
  */
-class Panel extends Nette\Object
+class Panel
 {
 
+	use Nette\SmartObject;
+
 
 	public static function registerBluescreen()
 	{

tests/KdybyTests/Autowired/AutowireComponentFactories.phpt

@@ -143,7 +143,7 @@ class SillyComponent extends Nette\Application\UI\PresenterComponent
 
 
 
-class NonPresenterComponent_AcfProperties extends Nette\Object
+class NonPresenterComponent_AcfProperties
 {
 	use Kdyby\Autowired\AutowireComponentFactories;
 }

tests/KdybyTests/Autowired/AutowireProperties.phpt

@@ -161,10 +161,6 @@ class AutowirePropertiesTest extends ContainerTestCase
 
 	public function testTraitUsage()
 	{
-		if (!method_exists('Nette\Reflection\Helpers', 'getDeclaringClass')) {
-			Tester\Environment::skip('Correct raits usage requires nette/reflection 2.3.');
-		}
-
 		$presenter = new WithTraitPresenter();
 
 		$this->container->callMethod([$presenter, 'injectProperties']);
@@ -230,7 +226,7 @@ class WithMissingServiceFactoryPresenter_ap extends Nette\Application\UI\Present
 }
 
 
-class NonPresenterComponent_ap extends Nette\Object
+class NonPresenterComponent_ap
 {
 	use Kdyby\Autowired\AutowireProperties;
 }