Skip to content

Commit

Permalink
Merge pull request #243 from workivate/CPS-2151_php82_upgrade
Browse files Browse the repository at this point in the history
[CPS-2151] PHP82 upgrade
  • Loading branch information
alexandruVlad12 committed May 13, 2024
2 parents f6be2ab + aeed394 commit 2d98965
Show file tree
Hide file tree
Showing 18 changed files with 691 additions and 622 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/php-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
fail-fast: false
matrix:
operating-system: ['ubuntu-latest']
php-versions: [7.3, 7.4, 8.0, 8.1]
php-versions: [7.3, 7.4, 8.0, 8.1, 8.2]
steps:
- name: Setup PHP, with composer and extensions
uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@2.12.0
with:
php-version: 8.1
php-version: 8.2
coverage: pcov

- name: Get composer cache directory
Expand Down Expand Up @@ -65,7 +65,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@2.12.0
with:
php-version: 8.1
php-version: 8.2

- name: Get composer cache directory
id: composer-cache
Expand Down
21 changes: 21 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
FROM php:8.2-cli

ENV PHP_MEMORY_LIMIT=512M

RUN apt-get update -y && apt-get install -y \
git \
libzip-dev \
unzip \
libicu-dev \
libmcrypt-dev \
&& apt-get clean && rm -rf /var/lib/apt/lists/*

RUN docker-php-ext-install intl

RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer

WORKDIR /app

CMD bash -c "composer install \
&& vendor/bin/phpstan analyse -c phpstan.neon --memory-limit 1G \
&& vendor/bin/phpunit"
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"source": "https://github.com/workivate/php-saml/"
},
"require": {
"php": "^8.1",
"php": "^8.2",
"robrichards/xmlseclibs": ">=3.1.1"
},
"require-dev": {
Expand All @@ -32,7 +32,7 @@
},
"config": {
"platform": {
"php": "8.1.0"
"php": "8.2.18"
},
"optimize-autoloader": true,
"sort-packages": true
Expand Down

0 comments on commit 2d98965

Please sign in to comment.