Skip to content

Commit

Permalink
[ALL] Upgrade phpunit to ^11.3 (#292)
Browse files Browse the repository at this point in the history
---------

Co-authored-by: Martin Poirier Théorêt <[email protected]>
  • Loading branch information
DumitracheAdrian and mpoiriert authored Sep 25, 2024
1 parent 4bbd617 commit de9c5f6
Show file tree
Hide file tree
Showing 92 changed files with 615 additions and 630 deletions.
8 changes: 4 additions & 4 deletions .docker/php/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.1.5-fpm
FROM php:8.2-fpm

RUN apt-get update \
&& apt-get install -y --no-install-recommends vim curl debconf subversion git apt-transport-https apt-utils \
Expand All @@ -14,8 +14,8 @@ RUN docker-php-ext-configure gd --with-jpeg
RUN docker-php-ext-install pdo pdo_mysql gd zip pcntl

COPY php.ini /usr/local/etc/php/php.ini
COPY php.ini /etc/php/8.1.5/php.ini
COPY php-fpm-pool.conf /etc/php/8.1.5/pool.d/www.conf
COPY php.ini /etc/php/8.2/php.ini
COPY php-fpm-pool.conf /etc/php/8.2/pool.d/www.conf

#COMPOSER
RUN curl -sSk https://getcomposer.org/installer | php -- --disable-tls && \
Expand All @@ -34,7 +34,7 @@ RUN apt-get install -y --no-install-recommends awscli
#XDEBUG
ARG xdebug
RUN if [ $xdebug = "1" ] ; then \
pecl install -f xdebug-3.1.4 \
pecl install -f xdebug-3.3.1 \
&& docker-php-ext-enable xdebug \
; fi

Expand Down
4 changes: 2 additions & 2 deletions .github/actions/git-split/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# THIS IS BASE IMAGE
FROM php:8.3-cli-alpine
FROM php:8.2-cli-alpine

RUN apk add --no-cache git git-subtree

Expand All @@ -14,4 +14,4 @@ WORKDIR /splitter
COPY entrypoint.sh .

# see https://nickjanetakis.com/blog/docker-tip-86-always-make-your-entrypoint-scripts-executable
ENTRYPOINT ["sh", "/splitter/entrypoint.sh"]
ENTRYPOINT ["sh", "/splitter/entrypoint.sh"]
4 changes: 2 additions & 2 deletions .github/workflows/after_splitting_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
- name: PHP Setup
uses: 'shivammathur/setup-php@v2'
with:
php-version: '8.1'
php-version: '8.2'
coverage: none

- name: Setup MySQL
Expand All @@ -68,7 +68,7 @@ jobs:
- name: 'Composer Setup'
run: |
composer install --no-progress
vendor-bin/monorepo/vendor/bin/monorepo-builder localize-composer-paths composer.json
vendor-bin/monorepo/vendor/bin/monorepo-builder localize-composer-paths packages/${{ matrix.package_name }}/composer.json
cd packages/${{ matrix.package_name }}
composer update --no-progress
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php-versions: ['8.1', '8.2', '8.3']
php-versions: ['8.2', '8.3']
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/phpcs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.1'
php-version: '8.2'
tools: composer
- name: Composer
run: composer install
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/phpstan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.1'
php-version: '8.2'
tools: composer
- name: Composer
run: composer install
Expand Down
6 changes: 3 additions & 3 deletions app/src/Resources/skeleton/draw-package/composer.json.twig
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
}
],
"require": {
"php": ">=8.1"
"php": ">=8.2"
},
"require-dev": {
"phpunit/phpunit": "^10.0"
"phpunit/phpunit": "^11.3"
},
"minimum-stability": "dev",
"prefer-stable": true,
Expand All @@ -28,4 +28,4 @@
"dev-master": "0.11-dev"
}
}
}
}
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
"jms/serializer-bundle": "^5.4.0",
"knplabs/doctrine-behaviors": "*",
"nesbot/carbon": "^2.0",
"php": ">=8.1",
"php": ">=8.2",
"phpdocumentor/reflection-docblock": "^5.2",
"phpunit/phpunit": "^10.0",
"phpunit/phpunit": "^11.3",
"psr/http-message": "^1.0",
"psr/log": "^3",
"ramsey/uuid": "^4.2",
Expand Down
Loading

0 comments on commit de9c5f6

Please sign in to comment.