From 892d76cf02a18e701425e4273a4a0c64d8abfdbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Proch=C3=A1zka?= Date: Sat, 13 May 2017 17:37:34 +0200 Subject: [PATCH] lock to Nette 2.3 --- .travis.yml | 25 +++++++------------------ composer.json | 52 +++++++++++++++++++++++++-------------------------- 2 files changed, 33 insertions(+), 44 deletions(-) diff --git a/.travis.yml b/.travis.yml index dd58384..82b73d3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,37 +10,26 @@ php: - 5.5 - 5.6 - 7.0 + - 7.1 env: matrix: - - SYMFONY=3.* NETTE=nette-2.4-dev - - SYMFONY=3.* NETTE=nette-2.4 - - SYMFONY=2.* NETTE=nette-2.4 - SYMFONY=3.* NETTE=nette-2.3 - SYMFONY=2.* NETTE=nette-2.3 matrix: include: - - php: 5.6 - env: SYMFONY=3.* NETTE=nette-2.4 COMPOSER_EXTRA_ARGS="--prefer-lowest --prefer-stable" - - php: 5.6 - env: SYMFONY=3.* NETTE=nette-2.3 COMPOSER_EXTRA_ARGS="--prefer-lowest --prefer-stable" - php: 5.4 env: SYMFONY=2.* NETTE=nette-2.3 - php: 5.5 env: SYMFONY=2.* NETTE=nette-2.3 COMPOSER_EXTRA_ARGS="--prefer-lowest --prefer-stable" - - php: 7.0 - env: SYMFONY=3.* NETTE=nette-2.4 COVERAGE="--coverage ./coverage.xml --coverage-src ./src" TESTER_RUNTIME="phpdbg" + - php: 5.6 + env: SYMFONY=3.* NETTE=nette-2.3 COMPOSER_EXTRA_ARGS="--prefer-lowest --prefer-stable" + - php: 7.1 + env: SYMFONY=3.* NETTE=nette-2.3 COVERAGE="--coverage ./coverage.xml --coverage-src ./src" TESTER_RUNTIME="phpdbg" exclude: - - php: 5.5 - env: SYMFONY=3.* NETTE=nette-2.4-dev - - php: 5.5 - env: SYMFONY=3.* NETTE=nette-2.4 - - php: 5.5 - env: SYMFONY=2.* NETTE=nette-2.4 - allow_failures: - - php: 7.0 - env: SYMFONY=3.* NETTE=nette-2.4 COVERAGE="--coverage ./coverage.xml --coverage-src ./src" TESTER_RUNTIME="phpdbg" + - php: 7.1 + env: SYMFONY=3.* NETTE=nette-2.3 before_install: - if [[ $SYMFONY = '2.*' ]]; then composer require --no-update symfony/event-dispatcher:^2.8; fi diff --git a/composer.json b/composer.json index b05ccd2..347614c 100644 --- a/composer.json +++ b/composer.json @@ -17,36 +17,36 @@ "issues": "https://github.com/kdyby/events/issues" }, "require": { - "nette/di": "~2.3@dev", - "nette/utils": "~2.3@dev", - "nette/reflection": "~2.3@dev" + "nette/di": "2.3.*@dev", + "nette/utils": "2.3.*@dev", + "nette/reflection": "2.3.*@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/application": "2.3.*@dev", + "nette/bootstrap": "2.3.*@dev", + "nette/caching": "2.3.*@dev", + "nette/component-model": "2.2.*@dev,<2.4", + "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,<2.4", + "latte/latte": "2.3.*@dev", + "tracy/tracy": "2.3.*@dev", + "nette/utils": "2.3.*@dev", "symfony/event-dispatcher": "~2.3|~3.0", - "nette/tester": "~1.4" + "nette/tester": "~1.7" }, "autoload": { "psr-0": { @@ -61,7 +61,7 @@ }, "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-nette-2.3": "3.0-dev" } } }