Skip to content

Commit

Permalink
Allow php 8
Browse files Browse the repository at this point in the history
  • Loading branch information
greg0ire committed May 25, 2020
1 parent 54a6f7b commit 3e34103
Show file tree
Hide file tree
Showing 4 changed files with 112 additions and 3 deletions.
10 changes: 10 additions & 0 deletions .travis.yml
Expand Up @@ -44,7 +44,17 @@ after_script:
fi
jobs:
allow_failures:
- php: nightly

include:
- stage: Test
php: nightly
before_install:
- composer config platform.php 7.4.99
install:
- travis_retry composer update --prefer-dist


- stage: Smoke Testing
php: 7.4
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Expand Up @@ -32,7 +32,7 @@
{"name": "Jonathan Wage", "email": "jonwage@gmail.com"}
],
"require": {
"php": "^7.3",
"php": "^7.3 || ^8.0",
"doctrine/cache": "^1.0",
"doctrine/event-manager": "^1.0",
"ocramius/package-versions": "^1.4"
Expand Down
77 changes: 77 additions & 0 deletions composer.json.orig
@@ -0,0 +1,77 @@
{
"name": "doctrine/dbal",
"type": "library",
"description": "Powerful PHP database abstraction layer (DBAL) with many features for database schema introspection and management.",
"keywords": [
"abstraction",
"database",
"dbal",
"db2",
"mariadb",
"mssql",
"mysql",
"pgsql",
"postgresql",
"oci8",
"oracle",
"pdo",
"queryobject",
"sasql",
"sql",
"sqlanywhere",
"sqlite",
"sqlserver",
"sqlsrv"
],
"homepage": "https://www.doctrine-project.org/projects/dbal.html",
"license": "MIT",
"authors": [
{"name": "Guilherme Blanco", "email": "guilhermeblanco@gmail.com"},
{"name": "Roman Borschel", "email": "roman@code-factory.org"},
{"name": "Benjamin Eberlei", "email": "kontakt@beberlei.de"},
{"name": "Jonathan Wage", "email": "jonwage@gmail.com"}
],
"require": {
<<<<<<< HEAD
"php": "^7.3",
=======
"php": "^7.2 || ^8.0",
"ext-pdo": "*",
>>>>>>> 1c56eed85... Allow php 8
"doctrine/cache": "^1.0",
"doctrine/event-manager": "^1.0",
"ocramius/package-versions": "^1.4"
},
"require-dev": {
"doctrine/coding-standard": "^7.0",
"jetbrains/phpstorm-stubs": "^2019.1",
"nikic/php-parser": "^4.4",
"phpstan/phpstan": "^0.12.18",
"phpstan/phpstan-strict-rules": "^0.12.2",
"phpunit/phpunit": "^9.1.1",
"symfony/console": "^2.0.5|^3.0|^4.0|^5.0",
"vimeo/psalm": "^3.11"
},
"suggest": {
"symfony/console": "For helpful console commands such as SQL execution and import of files."
},
"bin": ["bin/doctrine-dbal"],
"config": {
"platform": {
"php": "7.3.0"
},
"sort-packages": true
},
"autoload": {
"psr-4": { "Doctrine\\DBAL\\": "src" }
},
"autoload-dev": {
"psr-4": { "Doctrine\\DBAL\\Tests\\": "tests" }
},
"extra": {
"branch-alias": {
"dev-master": "2.10.x-dev",
"dev-develop": "3.0.x-dev"
}
}
}
26 changes: 24 additions & 2 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 3e34103

Please sign in to comment.