Skip to content

Commit

Permalink
Require PHP 8.4+
Browse files Browse the repository at this point in the history
  • Loading branch information
olvlvl committed Nov 29, 2024
1 parent edde3cb commit 111fb96
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 28 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/code-style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ jobs:
strategy:
matrix:
php-version:
- "8.2"
- "8.3"
- "8.4"
steps:
- name: Checkout
Expand Down Expand Up @@ -40,7 +38,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: |
Expand Down
26 changes: 25 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,35 @@
# CHANGELOG

## v5.x to v6.0
## v7.0

### New Requirements

PHP 8.4+

### New features

None

### Deprecated Features

None

### Backward Incompatible Changes

None

### Other Changes

None



## v5.x to v6.0

### New Requirements

PHP 8.2+

### New features

None
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG PHP_VERSION=8.2
ARG PHP_VERSION=8.4
FROM php:${PHP_VERSION}-cli-bookworm

RUN <<-EOF
Expand Down
7 changes: 1 addition & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,7 @@ test-coveralls: test-dependencies
@$(PHPUNIT) --coverage-clover ../build/logs/clover.xml

.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
test-container: test-container-84

.PHONY: test-container-84
test-container-84:
Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Binds icanboogie/http to ICanBoogie",
"homepage": "https://icanboogie.org/",
"license": "MIT",
"version": "6.0",
"version": "7.0",
"authors": [
{
"name": "Olivier Laviale",
Expand All @@ -26,9 +26,9 @@
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"php": ">=8.2",
"icanboogie/icanboogie": "^6.0",
"icanboogie/http": "^6.0"
"php": ">=8.4",
"icanboogie/icanboogie": "^7.0",
"icanboogie/http": "^7.0"
},
"require-dev": {
"phpstan/phpstan": "^2.0",
Expand Down
11 changes: 0 additions & 11 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,16 +1,5 @@
---
services:
app82:
build:
context: .
args:
PHP_VERSION: "8.2"
environment:
PHP_IDE_CONFIG: 'serverName=icanboogie-bind-http'
volumes:
- .:/app:delegated
- ~/.composer:/root/.composer:delegated
working_dir: /app
app84:
build:
context: .
Expand Down

0 comments on commit 111fb96

Please sign in to comment.