Skip to content

Commit

Permalink
increase dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
garak committed Dec 10, 2023
1 parent 89f791e commit b11e63f
Show file tree
Hide file tree
Showing 11 changed files with 35 additions and 64 deletions.
21 changes: 0 additions & 21 deletions .docker/base/php74/Dockerfile

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.0-fpm
FROM php:8.3-fpm

USER root

Expand Down
5 changes: 0 additions & 5 deletions .docker/development/php80/Dockerfile

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM pugx/poser:php74
FROM pugx/poser:php83

USER root

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
cs-fix:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
name: PHP-CS-Fixer
steps:
- name: Checkout
Expand All @@ -20,7 +20,7 @@ jobs:

strategy:
matrix:
container: [ "php74", "php80", "php81", "php82" ]
container: [ "php81", "php82", "php83" ]

runs-on: ubuntu-latest
container: pugx/poser:${{ matrix.container }}
Expand Down
3 changes: 1 addition & 2 deletions .php-cs-fixer.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
->setRules([
'@Symfony' => true,
'@Symfony:risky' => true,
'@PHP74Migration:risky' => true,
'@PHPUnit75Migration:risky' => true,
'@PHP81Migration' => true,
'declare_strict_types' => false,
'native_function_invocation' => ['include' => ['@all']],
'concat_space' => ['spacing' => 'one'],
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

### Added
* add compatibility to Symfony v7 and PHP 8.3
* drop compatibility to Symfony v4 and PHP 7.4

## [v2.3.1] - 2022-02-21

### Fixed
Expand Down
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ composer behat

```bash
docker-compose up --build -d
docker-compose exec php74 composer install
docker-compose exec php74 composer phpspec
docker-compose exec php74 composer behat
docker-compose exec php74 composer php-cs-fixer
docker-compose exec php83 composer install
docker-compose exec php83 composer phpspec
docker-compose exec php83 composer behat
docker-compose exec php83 composer php-cs-fixer
```

or
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ This library is used by https://poser.pugx.org

## Dependencies

* PHP 7.4 or higher
* PHP 8.1 or higher
* GD extension

to use the library with lower php version use the tag [v1.4](https://github.com/badges/poser/tree/v1.4.0)
you can still use the library with lower PHP versions, using the old releases

## Use as command

Expand Down
26 changes: 14 additions & 12 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,19 @@
}
],
"require": {
"php": ">=7.4",
"php": "^8.1",
"ext-gd": "*",
"ext-simplexml": "*",
"kartsims/easysvg": "^2.4",
"symfony/console": "^4.0|^5.0|^6.0"
"kartsims/easysvg": "^2.5",
"symfony/console": "^5.0 || ^6.0 || ^7.0"
},
"require-dev": {
"behat/behat": "^3.8",
"phpspec/phpspec": "^7.0",
"friends-of-phpspec/phpspec-code-coverage": "^6.0",
"friendsofphp/php-cs-fixer": "^3.5",
"behat/behat": "^3.13",
"phpspec/phpspec": "^7.4",
"friends-of-phpspec/phpspec-code-coverage": "^6.3",
"friendsofphp/php-cs-fixer": "^3.41",
"moave/phpspec-data-provider-extension": "dev-feat/add-compatibility-to-php80",
"vimeo/psalm": "^4.3"
"vimeo/psalm": "^4.30"
},
"config": {
"bin-dir": "bin",
Expand All @@ -60,10 +60,12 @@
"phpspec": "bin/phpspec run --format=pretty --ansi",
"phpspec-coverage": "bin/phpspec run -f progress -c phpspec-coverage.yml --ansi",
"behat": "bin/behat --snippets-for",
"docker:build:php74": "docker build -t pugx/poser:php74 -f .docker/base/php74/Dockerfile .",
"docker:push:php74": "docker push pugx/poser:php74",
"docker:build:php80": "docker build -t pugx/poser:php80 -f .docker/base/php80/Dockerfile .",
"docker:push:php80": "docker push pugx/poser:php80"
"docker:build:php81": "docker build -t pugx/poser:php81 -f .docker/base/php81/Dockerfile .",
"docker:push:php81": "docker push pugx/poser:php81",
"docker:build:php82": "docker build -t pugx/poser:php82 -f .docker/base/php80/Dockerfile .",
"docker:push:php82": "docker push pugx/poser:php82",
"docker:build:php83": "docker build -t pugx/poser:php83 -f .docker/base/php80/Dockerfile .",
"docker:push:php83": "docker push pugx/poser:php83"
},
"extra": {
"branch-alias": {
Expand Down
20 changes: 6 additions & 14 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,25 @@
version: '3.7'
services:

php74:
build:
context: .docker/development/php74
working_dir: /application
stdin_open: true
volumes:
- .:/application:cached

php80:
php81:
build:
context: .docker/development/php80
context: .docker/development/php81
working_dir: /application
stdin_open: true
volumes:
- .:/application:cached

php81:
php82:
build:
context: .docker/development/php81
context: .docker/development/php82
working_dir: /application
stdin_open: true
volumes:
- .:/application:cached

php82:
php83:
build:
context: .docker/development/php82
context: .docker/development/php83
working_dir: /application
stdin_open: true
volumes:
Expand Down

0 comments on commit b11e63f

Please sign in to comment.