Skip to content

Commit

Permalink
Merge pull request shlinkio#87 from acelaya-forks/feature/php-81-support
Browse files Browse the repository at this point in the history
Feature/php 81 support
  • Loading branch information
acelaya authored Dec 2, 2021
2 parents ba2fe7a + 4922f13 commit fba59e9
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com), and this project adheres to [Semantic Versioning](https://semver.org).

## [Unreleased]
## [4.1.0] - 2021-12-02
### Added
* Added support for symfony/mercure 0.6
* Added official support for PHP 8.1
* Added support for Symfony 6

### Changed
* Moved ci workflow to external repo and reused
Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
"psr/http-server-middleware": "^1.0",
"psr/log": "^1.1",
"shlinkio/shlink-config": "^1.2",
"symfony/cache": "^5.3",
"symfony/lock": "^5.3",
"symfony/mercure": "^0.5.3 || ^0.6",
"symfony/string": "^5.3",
"symfony/cache": "^6.0 || ^5.4",
"symfony/lock": "^6.0 || ^5.4",
"symfony/mercure": "^0.6",
"symfony/string": "^6.0 || ^5.4",
"symfony/translation-contracts": "^2.4"
},
"require-dev": {
Expand All @@ -47,7 +47,7 @@
"phpunit/phpunit": "^9.5",
"roave/security-advisories": "dev-master",
"shlinkio/php-coding-standard": "~2.2.0",
"symfony/var-dumper": "^5.3"
"symfony/var-dumper": "^6.0"
},
"suggest": {
"mezzio/mezzio-problem-details": "To log ProblemDetailsMiddleware errors using the ErrorLogger",
Expand Down
2 changes: 1 addition & 1 deletion indocker
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/usr/bin/env bash

docker-compose run shlink_common_php /bin/sh -c "$*"
docker-compose run --rm shlink_common_php /bin/sh -c "$*"

0 comments on commit fba59e9

Please sign in to comment.