Skip to content

Commit

Permalink
Merge branch 'php74'
Browse files Browse the repository at this point in the history
  • Loading branch information
JanTvrdik committed Jan 18, 2020
2 parents 9f65453 + 17c5ffa commit eb26600
Show file tree
Hide file tree
Showing 13 changed files with 33 additions and 9 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ jobs:
dist: xenial
- php: 7.3
dist: xenial
- php: 7.4
dist: xenial

matrix:
fast_finish: true
Expand Down
3 changes: 2 additions & 1 deletion tests/matrix/dbal/dibi-4.0.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/usr/bin/env bash
PHP_VERSION_MIN="70100"
PHP_VERSION_MAX="70399"
PHP_VERSION_MAX="70499"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE dibi/dibi:~4.0"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/tester:~2.3"
DBAL="dibi"
File renamed without changes.
6 changes: 6 additions & 0 deletions tests/matrix/dbal/doctrine-2.0-php-7.4.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/usr/bin/env bash
PHP_VERSION_MIN="70400"
PHP_VERSION_MAX="70499"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/dbal:~2.5"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/tester:~2.3"
DBAL="doctrine"
3 changes: 2 additions & 1 deletion tests/matrix/dbal/nette-2.0-php-7.2-to-7.3.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/usr/bin/env bash
PHP_VERSION_MIN="70200"
PHP_VERSION_MAX="70399"
PHP_VERSION_MAX="70499"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/database:~2.4"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/caching:~2.4"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/tester:~2.3"
DBAL="nette"
3 changes: 2 additions & 1 deletion tests/matrix/dbal/nette-3.0.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/usr/bin/env bash
PHP_VERSION_MIN="70100"
PHP_VERSION_MAX="70399"
PHP_VERSION_MAX="70499"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/database:~3.0"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/caching:~3.0"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/tester:~2.3"
DBAL="nette"
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
PHP_VERSION_MIN="70000"
PHP_VERSION_MAX="70399"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nextras/dbal:~3.0"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/tester:~2.0"
DBAL="nextras"
6 changes: 6 additions & 0 deletions tests/matrix/dbal/nextras-3.0-php-7.4.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/usr/bin/env bash
PHP_VERSION_MIN="70400"
PHP_VERSION_MAX="70499"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nextras/dbal:~3.1.1"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/tester:~2.3"
DBAL="nextras"
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
#!/usr/bin/env bash
PHP_VERSION_MIN="70300"
PHP_VERSION_MAX="70399"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/di:~2.4.7"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/utils:~2.4.5"
PHP_VERSION_MAX="70499"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/di:~2.4.16"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/utils:~2.5.4"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE dibi/dibi:~4.0"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/dbal:~2.5"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/orm:~2.6.3"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nextras/dbal:~3.0"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/console:~4.0"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/tester:~2.3"
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
#!/usr/bin/env bash
PHP_VERSION_MIN="70300"
PHP_VERSION_MAX="70399"
PHP_VERSION_MAX="70499"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/di:~3.0.0"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/utils:~3.0.0"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE dibi/dibi:~4.0"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/dbal:~2.5"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/orm:~2.6.3"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nextras/dbal:~3.0"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/console:~4.0"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/tester:~2.3"
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
PHP_VERSION_MIN="70300"
PHP_VERSION_MAX="70399"
PHP_VERSION_MAX="70499"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/dbal:~2.5"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/orm:~2.6.3"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/doctrine-bundle:~1.0"
Expand All @@ -11,4 +11,6 @@ COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/doctrine-bridge:~3.3"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/framework-bundle:~3.3"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/http-kernel:~3.3"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/yaml:~3.3"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/tester:~2.3"

DBAL='doctrine'
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
PHP_VERSION_MIN="70300"
PHP_VERSION_MAX="70399"
PHP_VERSION_MAX="70499"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/dbal:~2.5"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/orm:~2.6.3"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/doctrine-bundle"
Expand All @@ -11,4 +11,5 @@ COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/doctrine-bridge:~4.0"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/framework-bundle:~4.0"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/http-kernel:~4.0"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/yaml:~4.0"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/tester:~2.3"
DBAL='doctrine'
1 change: 1 addition & 0 deletions tests/matrix/symfony-bundle/symfony-5.0-php-7.2-to-7.4.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@ COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/doctrine-bridge:~5.0"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/framework-bundle:~5.0"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/http-kernel:~5.0"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/yaml:~5.0"
COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/tester:~2.3"
DBAL='doctrine'

0 comments on commit eb26600

Please sign in to comment.