Skip to content

Commit 7c28300

Browse files
committed
Update for nette 2.4 and php 7.1
1 parent c4cec7e commit 7c28300

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
}
1111
],
1212
"require": {
13-
"php": ">=5.3.0",
14-
"nette/di": "~2.3",
15-
"nette/bootstrap": "~2.3"
13+
"php": ">=7.1.0",
14+
"nette/di": "~2.4",
15+
"nette/bootstrap": "~2.4"
1616
},
1717
"require-dev": {
18-
"nette/tester": "~1.4.0"
18+
"nette/tester": "~2.3.0"
1919
},
2020
"conflict": {
21-
"nette/nette": "<2.2"
21+
"nette/nette": "<2.4"
2222
},
2323
"autoload": {
2424
"classmap": ["src/"]

src/Adapters/XmlAdapter.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@
1414
/**
1515
* Reading and generating XML files.
1616
*/
17-
class XmlAdapter extends Nette\Object implements Nette\DI\Config\IAdapter
17+
class XmlAdapter implements Nette\DI\Config\IAdapter
1818
{
19+
use \Nette\SmartObject;
1920

2021
const NS = "http://www.sallyx.org/xmlns/nette/config/1.0";
2122

tests/php-unix.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[PHP]
22
;extension_dir = "./ext"
3-
extension=json.so
4-
extension=tokenizer.so
3+
;extension=json.so
4+
;extension=tokenizer.so
55
[Zend]
66
;zend_extension="./ext/zend_extension"

0 commit comments

Comments
 (0)