diff --git a/.gitignore b/.gitignore index 70c2328..f49bfd5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ .idea/ vendor/ - .php_cs.cache .phpunit.cache/ +.php-cs-fixer.cache \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9645199..a7e6fa4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,7 +15,7 @@ before_script: apt-get update -yqq && apt-get upgrade -yqq && apt-get install -yqq git libzip-dev unzip zip libpcre3-dev && docker-php-ext-install zip && pecl install xdebug && docker-php-ext-enable xdebug fi - > - if [ "$CI_JOB_NAME" == "test:7.4" ] || [ "$CI_JOB_NAME" == "test:8.0" ] || [ "$CI_JOB_NAME" == "test:8.1" ]; then + if [ "$CI_JOB_NAME" == "test:7.4" ] || [ "$CI_JOB_NAME" == "test:8.0" ]; then pecl install ds && docker-php-ext-enable ds fi - > @@ -55,22 +55,6 @@ test:8.0-without-ext-ds: image: php:8.0 script: - vendor/bin/phpunit --configuration phpunit.xml --coverage-text --colors=never -test:8.1: - only: - - branches - tags: - - default - image: php:8.1 - script: - - vendor/bin/phpunit --configuration phpunit.xml --coverage-text --colors=never -test:8.1-without-ext-ds: - only: - - branches - tags: - - default - image: php:8.1 - script: - - vendor/bin/phpunit --configuration phpunit.xml --coverage-text --colors=never stages: - test - security diff --git a/composer.json b/composer.json index 5d05433..0dd76e7 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "description": "Generic map for PHP", "type": "library", "require": { - "php": ">=7.4", + "php": "7.4 - 8.0", "php-ds/php-ds": "^1.3", "symfony/polyfill-php80": "^1.22" }, diff --git a/composer.lock b/composer.lock index c707e1a..d2ecdce 100644 --- 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": "714ccb738ce62bf9d3fb5fef95cea1c1", + "content-hash": "3a97b3bda39ca237952799687ed87f15", "packages": [ { "name": "php-ds/php-ds", @@ -4268,7 +4268,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": ">=7.4" + "php": ">=7.4 <8.1" }, "platform-dev": [], "plugin-api-version": "2.3.0"