diff --git a/.github/workflows/code-style.yml b/.github/workflows/code-style.yml index ca5ce00..ce3b7e8 100644 --- a/.github/workflows/code-style.yml +++ b/.github/workflows/code-style.yml @@ -14,7 +14,7 @@ jobs: uses: shivammathur/setup-php@v2 with: coverage: none - php-version: "8.2" + php-version: "8.4" ini-values: memory_limit=-1 tools: phpcs, cs2pr - name: Run PHP Code Sniffer diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 81f7cd9..5cc3b12 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -14,7 +14,7 @@ jobs: - name: Install PHP uses: shivammathur/setup-php@v2 with: - php-version: "8.2" + php-version: "8.4" ini-values: memory_limit=-1 tools: composer:v2 - name: Cache dependencies diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ba60a0a..efbc037 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,8 +11,6 @@ jobs: strategy: matrix: php-version: - - "8.2" - - "8.3" - "8.4" steps: - name: Checkout @@ -41,7 +39,7 @@ jobs: run: make test-coveralls - name: Upload code coverage - if: ${{ matrix.php-version == '8.2' }} + if: ${{ matrix.php-version == '8.4' }} env: COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | diff --git a/Dockerfile b/Dockerfile index 40061cf..5845da5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG PHP_VERSION=8.2 +ARG PHP_VERSION=8.4 FROM php:${PHP_VERSION}-cli-bookworm RUN <<-EOF diff --git a/Makefile b/Makefile index f148a54..5645cc3 100644 --- a/Makefile +++ b/Makefile @@ -31,17 +31,7 @@ test-cleanup: @rm -rf tests/sandbox/* .PHONY: test-container -test-container: test-container-82 - -.PHONY: test-container-82 -test-container-82: - @-docker compose run --rm app82 bash - @docker compose down -v - -.PHONY: test-container-83 -test-container-83: - @-docker compose run --rm app83 bash - @docker compose down -v +test-container: test-container-84 .PHONY: test-container-84 test-container-84: diff --git a/composer.json b/composer.json index 1d1b365..201c5f6 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "icanboogie/bind-symfony-dependency-injection", "type": "library", - "version": "6.0", + "version": "7.0", "description": "Binds symfony/dependency-injection to ICanBoogie", "keywords": [ "dependency", @@ -30,8 +30,8 @@ "minimum-stability": "dev", "prefer-stable": true, "require": { - "php": ">=8.2", - "icanboogie/icanboogie": "^6.0", + "php": ">=8.4", + "icanboogie/icanboogie": "^7.0", "olvlvl/symfony-dependency-injection-proxy": "^6.0", "symfony/config": "^7.0", "symfony/yaml": "^7.0" diff --git a/docker-compose.yaml b/docker-compose.yaml index f13cb79..4dc49ad 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,27 +1,5 @@ --- services: - app82: - build: - context: . - args: - PHP_VERSION: "8.2" - environment: - PHP_IDE_CONFIG: 'serverName=icanboogie-bind-symfony-dependency-injection' - volumes: - - .:/app:delegated - - ~/.composer:/root/.composer:delegated - working_dir: /app - app83: - build: - context: . - args: - PHP_VERSION: "8.3" - environment: - PHP_IDE_CONFIG: 'serverName=icanboogie-bind-symfony-dependency-injection' - volumes: - - .:/app:delegated - - ~/.composer:/root/.composer:delegated - working_dir: /app app84: build: context: .