Skip to content

Commit 6746815

Browse files
committed
lock to Nette 2.3
1 parent 3ec741f commit 6746815

File tree

2 files changed

+31
-40
lines changed

2 files changed

+31
-40
lines changed

.travis.yml

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,31 +11,22 @@ php:
1111
- 5.5
1212
- 5.6
1313
- 7.0
14+
- 7.1
1415

1516
env:
1617
matrix:
17-
- NETTE=nette-2.4-dev
18-
- NETTE=nette-2.4
18+
- NETTE=nette-2.3-dev
1919
- NETTE=nette-2.3
2020

2121
matrix:
2222
include:
2323
- php: 5.6
2424
env: NETTE=nette-2.3 COMPOSER_EXTRA_ARGS="--prefer-lowest --prefer-stable"
25-
- php: 7.0
26-
env: NETTE=nette-2.4 COVERAGE="--coverage ./coverage.xml --coverage-src ./src" TESTER_RUNTIME="phpdbg"
27-
exclude:
28-
- php: 5.4
29-
env: NETTE=nette-2.4-dev
30-
- php: 5.4
31-
env: NETTE=nette-2.4
32-
- php: 5.5
33-
env: NETTE=nette-2.4-dev
34-
- php: 5.5
35-
env: NETTE=nette-2.4
25+
- php: 7.1
26+
env: NETTE=nette-2.3 COVERAGE="--coverage ./coverage.xml --coverage-src ./src" TESTER_RUNTIME="phpdbg"
3627
allow_failures:
37-
- php: 7.0
38-
env: NETTE=nette-2.4 COVERAGE="--coverage ./coverage.xml --coverage-src ./src" TESTER_RUNTIME="phpdbg"
28+
- php: 7.1
29+
env: NETTE=nette-2.3 COVERAGE="--coverage ./coverage.xml --coverage-src ./src" TESTER_RUNTIME="phpdbg"
3930

4031
before_install:
4132
- travis_retry composer self-update
@@ -46,7 +37,7 @@ install:
4637
- travis_retry composer update --no-interaction --prefer-dist $COMPOSER_EXTRA_ARGS
4738
- travis_retry composer create-project --no-interaction jakub-onderka/php-parallel-lint /tmp/php-parallel-lint
4839
- travis_retry composer create-project --no-interaction kdyby/code-checker /tmp/code-checker
49-
- travis_retry wget -O /tmp/coveralls.phar https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar
40+
- if [ "$COVERAGE" != "" ]; then travis_retry wget -O /tmp/coveralls.phar https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar; fi
5041

5142
script:
5243
- vendor/bin/tester $COVERAGE -s -p ${TESTER_RUNTIME:-php} -c ./tests/php.ini-unix ./tests/KdybyTests/

composer.json

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -18,33 +18,33 @@
1818
},
1919
"require": {
2020
"php": ">=5.4",
21-
"nette/di": "~2.3@dev",
22-
"nette/caching": "~2.3@dev",
21+
"nette/di": "2.3.*@dev",
22+
"nette/caching": "2.3.*@dev",
2323

2424
"doctrine/cache": "~1.5"
2525
},
2626
"require-dev": {
27-
"nette/application": "~2.3@dev",
28-
"nette/bootstrap": "~2.3@dev",
29-
"nette/caching": "~2.3@dev",
30-
"nette/component-model": "~2.2@dev",
31-
"nette/database": "~2.3@dev",
32-
"nette/deprecated": "~2.3@dev",
33-
"nette/di": "~2.3@dev",
34-
"nette/finder": "~2.3@dev",
35-
"nette/forms": "~2.3@dev",
36-
"nette/http": "~2.3@dev",
37-
"nette/mail": "~2.3@dev",
38-
"nette/neon": "~2.3@dev",
39-
"nette/php-generator": "~2.3@dev",
40-
"nette/reflection": "~2.3@dev",
41-
"nette/robot-loader": "~2.3@dev",
42-
"nette/safe-stream": "~2.3@dev",
43-
"nette/security": "~2.3@dev",
44-
"nette/tokenizer": "~2.2@dev",
45-
"nette/utils": "~2.3@dev",
46-
"latte/latte": "~2.3@dev",
47-
"tracy/tracy": "~2.3@dev",
27+
"nette/application": "2.3.*@dev",
28+
"nette/bootstrap": "2.3.*@dev",
29+
"nette/caching": "2.3.*@dev",
30+
"nette/component-model": "~2.2@dev,<2.4",
31+
"nette/database": "2.3.*@dev",
32+
"nette/deprecated": "2.3.*@dev",
33+
"nette/di": "2.3.*@dev",
34+
"nette/finder": "2.3.*@dev",
35+
"nette/forms": "2.3.*@dev",
36+
"nette/http": "2.3.*@dev",
37+
"nette/mail": "2.3.*@dev",
38+
"nette/neon": "2.3.*@dev",
39+
"nette/php-generator": "2.3.*@dev",
40+
"nette/reflection": "2.3.*@dev",
41+
"nette/robot-loader": "2.3.*@dev",
42+
"nette/safe-stream": "2.3.*@dev",
43+
"nette/security": "2.3.*@dev",
44+
"nette/tokenizer": "~2.2@dev,<2.4",
45+
"nette/utils": "2.3.*@dev",
46+
"latte/latte": "2.3.*@dev",
47+
"tracy/tracy": "2.3.*@dev",
4848

4949
"nette/tester": "~1.3@rc"
5050
},
@@ -58,7 +58,7 @@
5858
},
5959
"extra": {
6060
"branch-alias": {
61-
"dev-master": "2.5-dev"
61+
"dev-nette-2.3": "2.5-dev"
6262
}
6363
}
6464
}

0 commit comments

Comments
 (0)