diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 23c6e3c..bac21a3 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -18,14 +18,6 @@ jobs: matrix: include: # MySQL 5.7 - - os: ubuntu-20.04 - database: 'mysql' - database-version: '5.7' - php-version: '7.4' - - os: ubuntu-20.04 - database: 'mysql' - database-version: '5.7' - php-version: '8.0' - os: ubuntu-20.04 database: 'mysql' database-version: '5.7' @@ -39,14 +31,6 @@ jobs: database-version: '5.7' php-version: '8.3' # MySQL 8.0 - - os: ubuntu-latest - database: 'mysql' - database-version: '8.0' - php-version: '7.4' - - os: ubuntu-latest - database: 'mysql' - database-version: '8.0' - php-version: '8.0' - os: ubuntu-latest database: 'mysql' database-version: '8.0' @@ -60,14 +44,6 @@ jobs: database-version: '8.0' php-version: '8.3' # MariaDB 10.11 LTS - - os: ubuntu-20.04 - database: 'mariadb' - database-version: '10.11' - php-version: '7.4' - - os: ubuntu-20.04 - database: 'mariadb' - database-version: '10.11' - php-version: '8.0' - os: ubuntu-20.04 database: 'mariadb' database-version: '10.11' diff --git a/Dockerfile b/Dockerfile index b1dac9d..241b1ad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,6 +16,10 @@ FROM druidfi/php:8.2 as php-82 RUN sudo apk --update -X https://dl-cdn.alpinelinux.org/alpine/edge/community --no-cache add php82-pdo php82-pdo_mysql +FROM druidfi/php:8.3 as php-83 + +RUN sudo apk --update -X https://dl-cdn.alpinelinux.org/alpine/edge/community --no-cache add php82-pdo php82-pdo_mysql + FROM php-${PHP_SHORT_VERSION} RUN sudo apk --update --no-cache add bash mysql-client \ diff --git a/README.md b/README.md index 27cba71..3f64bef 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Out of the box, `mysqldump-php` supports backing up table structures, the data i ## Requirements -- PHP 7.4 or 8.x with PDO - [see supported versions](https://www.php.net/supported-versions.php) +- PHP 8.x with PDO - [see supported versions](https://www.php.net/supported-versions.php) - MySQL 5.7 or newer (and compatible MariaDB) ## Installing diff --git a/composer.json b/composer.json index dcbb9a2..100f3e2 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "druidfi/mysqldump-php", "description": "PHP version of mysqldump cli that comes with MySQL", "type": "library", - "keywords": ["mysql", "mysqldump", "pdo", "php7", "php8", "database", "php", "sql", "mariadb", "mysql-backup"], + "keywords": ["mysql", "mysqldump", "pdo", "php8", "database", "php", "sql", "mariadb", "mysql-backup"], "homepage": "https://github.com/druidfi/mysqldump-php", "license": "GPL-3.0-or-later", "minimum-stability": "stable", @@ -18,13 +18,13 @@ } ], "require": { - "php": "^7.4 || ^8.0", + "php": "^8.1", "composer-runtime-api": "^2", "ext-pdo": "*" }, "require-dev": { "squizlabs/php_codesniffer": "3.*", - "phpunit/phpunit": "^8.5.15 || ^9" + "phpunit/phpunit": "^9" }, "autoload": { "psr-4": { diff --git a/docker-compose.yml b/docker-compose.yml index 30a4f1a..dafd60d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3.7' - services: db: @@ -16,7 +14,7 @@ services: db3: container_name: "mysqldump-php-mariadb-80" - image: druidfi/mariadb:10.6-drupal + image: druidfi/mariadb:10.11-drupal-lts ports: - 3306