diff --git a/.travis.yml b/.travis.yml index 8811db40d..3115ab6ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: php php: - - '5.6' - - '7.0' + - 7.2 + - 7.3 services: - mysql before_script: diff --git a/composer.json b/composer.json old mode 100644 new mode 100755 index b0d98efd0..13d1bd5fa --- a/composer.json +++ b/composer.json @@ -5,7 +5,7 @@ "license": "GPLv2+", "type": "project", "require": { - "php": ">=5.5.9", + "php": ">=5.5.9 <7.4", "laravel/lumen-framework": "5.1.*", "vlucas/phpdotenv": "~1.0", "illuminate/mail": "~5.1", @@ -14,7 +14,7 @@ "torann/geoip": "^1.0", "geoip2/geoip2": "^2.4", "nesbot/carbon": "^1.22", - "doctrine/dbal": "^2.5", + "doctrine/dbal": "<2.10", "google/recaptcha": "~1.1", "symfony/http-foundation": "2.7.51" }, diff --git a/composer.lock b/composer.lock old mode 100644 new mode 100755 index 636374e68..878e76790 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "09b953d160500e6dfbcaa6c916371495", + "content-hash": "f4eab7ae8aca9ec102d2f33902a32b84", "packages": [ { "name": "composer/ca-bundle", @@ -230,33 +230,31 @@ }, { "name": "doctrine/dbal", - "version": "2.11.1", + "version": "v2.9.3", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "6e6903cd5e3a5be60a79439e3ee8fe126f78fe86" + "reference": "7345cd59edfa2036eb0fa4264b77ae2576842035" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/6e6903cd5e3a5be60a79439e3ee8fe126f78fe86", - "reference": "6e6903cd5e3a5be60a79439e3ee8fe126f78fe86", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/7345cd59edfa2036eb0fa4264b77ae2576842035", + "reference": "7345cd59edfa2036eb0fa4264b77ae2576842035", "shasum": "" }, "require": { "doctrine/cache": "^1.0", "doctrine/event-manager": "^1.0", "ext-pdo": "*", - "php": "^7.3" + "php": "^7.1" }, "require-dev": { - "doctrine/coding-standard": "^8.1", - "jetbrains/phpstorm-stubs": "^2019.1", - "nikic/php-parser": "^4.4", - "phpstan/phpstan": "^0.12.40", - "phpunit/phpunit": "^9.3", - "psalm/plugin-phpunit": "^0.10.0", - "symfony/console": "^2.0.5|^3.0|^4.0|^5.0", - "vimeo/psalm": "^3.14.2" + "doctrine/coding-standard": "^5.0", + "jetbrains/phpstorm-stubs": "^2018.1.2", + "phpstan/phpstan": "^0.10.1", + "phpunit/phpunit": "^7.4", + "symfony/console": "^2.0.5|^3.0|^4.0", + "symfony/phpunit-bridge": "^3.4.5|^4.0.5" }, "suggest": { "symfony/console": "For helpful console commands such as SQL execution and import of files." @@ -267,7 +265,8 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0.x-dev" + "dev-master": "2.9.x-dev", + "dev-develop": "3.0.x-dev" } }, "autoload": { @@ -302,39 +301,14 @@ "keywords": [ "abstraction", "database", - "db2", "dbal", - "mariadb", - "mssql", "mysql", - "oci8", - "oracle", - "pdo", + "persistence", "pgsql", - "postgresql", - "queryobject", - "sasql", - "sql", - "sqlanywhere", - "sqlite", - "sqlserver", - "sqlsrv" - ], - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fdbal", - "type": "tidelift" - } + "php", + "queryobject" ], - "time": "2020-09-27T04:09:41+00:00" + "time": "2019-11-02T22:19:34+00:00" }, { "name": "doctrine/event-manager", @@ -5498,7 +5472,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": ">=5.5.9" + "php": ">=5.5.9 <7.4" }, "platform-dev": [], "plugin-api-version": "1.1.0" diff --git a/docs/user-guide/installation.md b/docs/user-guide/installation.md index 96feef938..7d66d3c05 100644 --- a/docs/user-guide/installation.md +++ b/docs/user-guide/installation.md @@ -11,7 +11,7 @@ you may be interested in looking at a [legacy 1.x release](https://github.com/cy - Apache, nginx, IIS, or lighttpd (Apache preferred) - - PHP >= 5.5.9 + - PHP >= 7.2 and < 7.4 - MariaDB or MySQL >= 5.5, SQLite alternatively - composer - PHP requirements: