Update for nette 2.4 and php 7.1

sallyx · Mar 31, 2020 · 7c28300 · 7c28300
1 parent c4cec7e
commit 7c28300
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/composer.json b/composer.json
@@ -10,15 +10,15 @@
 		}
 	],
 	"require": {
-		"php": ">=5.3.0",
-		"nette/di": "~2.3",
-		"nette/bootstrap": "~2.3"
+		"php": ">=7.1.0",
+		"nette/di": "~2.4",
+		"nette/bootstrap": "~2.4"
 	},
 	"require-dev": {
-		"nette/tester": "~1.4.0"
+		"nette/tester": "~2.3.0"
 	},
 	"conflict": {
-		"nette/nette": "<2.2"
+		"nette/nette": "<2.4"
 	},
 	"autoload": {
 		"classmap": ["src/"]

diff --git a/src/Adapters/XmlAdapter.php b/src/Adapters/XmlAdapter.php
@@ -14,8 +14,9 @@
 /**
  * Reading and generating XML files.
  */
-class XmlAdapter extends Nette\Object implements Nette\DI\Config\IAdapter
+class XmlAdapter implements Nette\DI\Config\IAdapter
 {
+	use \Nette\SmartObject;
 
 	const NS = "http://www.sallyx.org/xmlns/nette/config/1.0";
 

diff --git a/tests/php-unix.ini b/tests/php-unix.ini
@@ -1,6 +1,6 @@
 [PHP]
 ;extension_dir = "./ext"
-extension=json.so
-extension=tokenizer.so
+;extension=json.so
+;extension=tokenizer.so
 [Zend]
 ;zend_extension="./ext/zend_extension"