Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for PHP 8.0 #580

Merged
merged 54 commits into from
Dec 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
77b0cc1
Update sentry
xvilo Apr 6, 2022
732606a
Update buddy-works package
xvilo Apr 6, 2022
6c92396
Upgrade php version
xvilo Apr 6, 2022
9cf8891
Update CI docker tag name
xvilo Apr 7, 2022
e16c30d
Allow PHP 7.4 and 8.0
xvilo Apr 27, 2022
ba33d60
Configure paths
xvilo Apr 27, 2022
44b0c84
Configure baseline file
xvilo Apr 27, 2022
e023a9a
Update baseline on php 8
xvilo Apr 27, 2022
55155ce
Update composer.json
xvilo May 5, 2022
b541260
Merge branch 'master' into feat/php-8.0
xvilo May 5, 2022
4a68854
Use IgnoreErrorsIntergration instead
xvilo May 6, 2022
fb1d921
Sync composer.lock
xvilo May 6, 2022
d1e4b54
Don't lock a specific version for buddy-works/buddy-works-php
xvilo May 7, 2022
45832c3
Update Dockerfile
xvilo May 19, 2022
64ad24e
Install PHP 7.4 compatible dependency set
xvilo Jun 15, 2022
18fa872
Make PHPStan compatible
xvilo Jun 15, 2022
78e896c
Apply suggestions from code review
xvilo Jun 15, 2022
d329638
Install nyholm/psr7
xvilo Jun 15, 2022
d6530d1
Fix Git default branch
giggsey Jul 27, 2022
504810c
Remove usages to deprecated method
xvilo May 23, 2023
55b5257
Loose comparison via == is not allowed, use strict comparison via ===…
xvilo May 23, 2023
d8950c9
Fix php-cs-fixer
xvilo May 23, 2023
df58fe9
Update http client configs
xvilo Jul 8, 2023
9c3aa38
Introduce GitHub actions for PHPUnit tests
xvilo Jul 9, 2023
fb6b877
Update coduo/php-matcher
xvilo Jul 9, 2023
3e021ee
Update test
xvilo Jul 9, 2023
782a2b2
Fix CS
xvilo Jul 9, 2023
5fb793b
Update .github/workflows/unit-tests.yml
xvilo Jul 9, 2023
68e3f33
Update .github/workflows/unit-tests.yml
xvilo Jul 10, 2023
c924170
Rename file
xvilo Jul 10, 2023
2085807
Remove unnceccesary comment
xvilo Jul 10, 2023
2e2a61d
Update lock files
xvilo Jul 10, 2023
84d7638
Update lock files
xvilo Jul 10, 2023
f518ad5
Remove comment
xvilo Jul 10, 2023
3c7ef25
Rename key
xvilo Jul 10, 2023
b9c5da4
Update postgres version(s)
xvilo Jul 10, 2023
02eac9b
Fix error
xvilo Jul 10, 2023
0bf712e
Remove install
xvilo Jul 10, 2023
121654a
Merge remote-tracking branch 'origin/master' into php8.0
marmichalski Dec 17, 2023
41016e6
Drop phpunit-tests workflow
marmichalski Dec 17, 2023
8fe6e8f
Add PHP 8.0 to tests workflow
marmichalski Dec 17, 2023
57af54f
Merge remote-tracking branch 'origin/master' into feat/php-8.0
marmichalski Dec 17, 2023
4ffc230
Specify image version for PHP 8.0 :(
marmichalski Dec 17, 2023
45dbf7c
Merge remote-tracking branch 'origin/master' into feat/php-8.0
marmichalski Dec 17, 2023
afe2b18
Try to checkout to PR repo?
marmichalski Dec 17, 2023
59c3ae8
Bump php 7.4 in CI :angry:
marmichalski Dec 17, 2023
d1a7045
see with debug :sad:
marmichalski Dec 17, 2023
6651400
Revert debug output
marmichalski Dec 17, 2023
46cf30b
let install-php-extensions install required os dependencies
marmichalski Dec 17, 2023
e77d36d
See previous workflow
marmichalski Dec 17, 2023
b9e9422
Remove old file
xvilo Dec 18, 2023
c5c3269
Add fetch-tags directive
xvilo Dec 18, 2023
de444c3
Configure git safe directories
xvilo Dec 18, 2023
8b24958
Update .github/workflows/tests.yaml
xvilo Dec 18, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/security.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: "Setup PHP"
uses: "shivammathur/setup-php@v2"
with:
php-version: '7.4.1'
php-version: '7.4.2'

- name: "Run composer audit"
run: "composer audit --no-dev --locked"
11 changes: 8 additions & 3 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,20 @@ jobs:
matrix:
php:
- "7.4"
- "8.0"
postgresql:
- "11"
include:
- php: "7.4"
php-version: "7.4.1"
php-version: "7.4.2"
- php: "8.0"
php-version: "8.0.30"
- postgresql: "11"
postgresql-version: "11.7"

steps:
- name: "Install OS dependencies"
run: "apk add --no-cache bash git icu-dev libzip-dev unzip zip"
run: "apk add --no-cache bash git"

- name: "Adjust allowed PHP memory"
run: echo 'memory_limit = -1' > $PHP_INI_DIR/conf.d/memory-limit.ini;
Expand All @@ -59,6 +62,7 @@ jobs:
uses: "actions/checkout@v4"
with:
ref: ${{ github.event.pull_request.head.ref || '' }}
repository: ${{ github.event.pull_request.head.repo.full_name || github.repository }}
show-progress: false

- name: "Install composer dependencies"
Expand Down Expand Up @@ -88,11 +92,12 @@ jobs:
- name: "Validate database schema"
run: "bin/console doctrine:schema:validate"

- name: "Set git committer info"
- name: "Set git committer info and configure git options"
shell: bash
run: |
git config --global user.name "${GITHUB_ACTOR}"
git config --global user.email "${GITHUB_ACTOR_ID}+${GITHUB_ACTOR}@users.noreply.github.com"
git config --global --add safe.directory '*'

- name: "Run unit tests"
run: "composer phpunit:unit"
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:7.4.5-fpm-alpine
FROM php:8.0.19-fpm-alpine

ARG TIMEZONE="UTC"

Expand Down
4 changes: 2 additions & 2 deletions buddy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
type: "BUILD"
working_directory: "/buddy/repman"
docker_image_name: "library/php"
docker_image_tag: "7.4.1"
docker_image_tag: "8.0.19"
execute_commands:
- "composer validate"
- "composer install"
Expand Down Expand Up @@ -83,7 +83,7 @@
type: "BUILD"
working_directory: "/buddy/repman"
docker_image_name: "library/php"
docker_image_tag: "7.4.1"
docker_image_tag: "8.0.19"
execute_commands:
- "/local-php-security-checker"
setup_commands:
Expand Down
11 changes: 6 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
],
"license": "MIT",
"require": {
"php": "^7.4.1",
"php": "^7.4.2 || ^8.0",
"ext-ctype": "*",
"ext-curl": "*",
"ext-iconv": "*",
Expand All @@ -25,7 +25,7 @@
"ext-zip": "*",
"async-aws/ses": "^1.4",
"bitbucket/client": "^4.0",
"buddy-works/buddy-works-php-api": "1.3.0",
xvilo marked this conversation as resolved.
Show resolved Hide resolved
"buddy-works/buddy-works-php-api": "^1.3",
"buddy-works/oauth2-client": "^1.0",
"cbschuld/browser.php": "^1.9",
"clue/mq-react": "^1.2",
Expand All @@ -46,11 +46,12 @@
"munusphp/munus": "^0.4.0",
"nelmio/api-doc-bundle": "^4.3",
"nelmio/cors-bundle": "^2.1",
"nyholm/psr7": "^1.5",
"omines/oauth2-gitlab": "^3.2",
"ramsey/uuid-doctrine": "^1.5",
"react/http": "^1.0",
"sensio/framework-extra-bundle": "^5.5",
"sentry/sentry-symfony": "^3.4",
"sentry/sentry-symfony": "^4.0",
xvilo marked this conversation as resolved.
Show resolved Hide resolved
"stevenmaguire/oauth2-bitbucket": "^3.0",
"symfony/amazon-mailer": "5.4.*",
"symfony/asset": "5.4.*",
Expand Down Expand Up @@ -87,7 +88,7 @@
"symfony/symfony": "*"
},
"require-dev": {
"coduo/php-matcher": "^4.0",
"coduo/php-matcher": "^6.0",
"dama/doctrine-test-bundle": "^6.3",
"doctrine/doctrine-fixtures-bundle": "^3.3",
"ekino/phpstan-banned-code": "^1.0.0",
Expand All @@ -111,7 +112,7 @@
},
"config": {
"platform": {
"php": "7.4.1"
"php": "7.4.2"
},
"preferred-install": {
"*": "dist"
Expand Down
Loading