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

Fixes + Symfony 6.4 + PHP 8.3 #128

Merged
merged 23 commits into from
Oct 5, 2024
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
name: Audit
strategy:
matrix:
php-version: ['8.2']
php-version: ['8.3']
fail-fast: false
runs-on: ubuntu-22.04
steps:
Expand Down Expand Up @@ -51,6 +51,6 @@ jobs:
echo "::endgroup::"

- name: Auditor
uses: docker://nbgrp/auditor:0.20.0
uses: docker://nbgrp/auditor:0.27.0
with:
working-directory: shared/homeless
4 changes: 2 additions & 2 deletions docker/app/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.2.4-fpm-alpine
FROM php:8.3.8-fpm-alpine

#
# Setup Moscow time
Expand Down Expand Up @@ -36,7 +36,7 @@ RUN apk update \
nodejs \
yarn \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer \
&& composer self-update 2.5.1 \
&& composer self-update 2.7.1 \
&& docker-php-ext-install \
bcmath \
gd \
Expand Down
4 changes: 2 additions & 2 deletions docker/local/php/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM php:8.2.4-fpm-alpine
FROM php:8.3.8-fpm-alpine

USER root

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

RUN apk --no-cache add icu-dev libzip-dev libreoffice libpng libpng-dev autoconf build-base linux-headers
RUN docker-php-ext-install pdo_mysql bcmath intl zip gd
Expand Down
11 changes: 10 additions & 1 deletion shared/homeless/.php-cs-fixer.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,23 @@
(new PhpCsFixer\Finder())
->in(__DIR__)
->exclude(['bin', 'migrations', 'var'])
->notPath([
'src/EventListener/PrePersister.php',
'src/EventListener/PreUpdater.php',
'src/Kernel.php',
])
->append([__FILE__])
)
->setRiskyAllowed(true)
->setRules([
// base presets
'@PER' => true,
'@PER-CS' => true,
'@PhpCsFixer' => true,
'@Symfony' => true,
'@PHP82Migration' => true,

// risky presets
'@PER-CS:risky' => true,
'@PhpCsFixer:risky' => true,
'@Symfony:risky' => true,
'@PHP80Migration:risky' => true,
Expand Down Expand Up @@ -82,14 +88,17 @@

// no-preset rules
'date_time_immutable' => true,
'final_class' => true,
'header_comment' => [
'header' => 'SPDX-License-Identifier: BSD-3-Clause',
'location' => 'after_open',
'separate' => 'bottom',
],
'nullable_type_declaration_for_default_null_value' => true,
'php_unit_attributes' => true,
'self_static_accessor' => true,
'simplified_null_return' => true,
'single_line_empty_body' => true,
'static_lambda' => true,
])
;
43 changes: 22 additions & 21 deletions shared/homeless/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
"license": "BSD-3-Clause",
"type": "project",
"require": {
"php": ">=8.2",
"php": ">=8.3",
"ext-intl": "*",
"doctrine/doctrine-bundle": "^2.0",
"doctrine/doctrine-migrations-bundle": "^3.0",
"doctrine/migrations": "^3.0",
"doctrine/orm": "^2.5",
"doctrine/orm": "^3.2.0",
"friendsofsymfony/rest-bundle": "^3.0",
"h4cc/wkhtmltopdf-amd64": "^0.12.3",
"incenteev/composer-parameter-handler": "^2.1",
Expand All @@ -21,47 +21,48 @@
"sonata-project/datagrid-bundle": "^3.0",
"sonata-project/doctrine-extensions": "^2.0",
"sonata-project/doctrine-orm-admin-bundle": "^4.0",
"sonata-project/exporter": "^2.0",
"sonata-project/exporter": "^3.0",
"sonata-project/form-extensions": "^2.1",
"sonata-project/formatter-bundle": "^5.0",
"sonata-project/intl-bundle": "^3.0",
"sonata-project/translation-bundle": "^3.0",
"sonata-project/user-bundle": "^5.0",
"symfony/apache-pack": "^1.0",
"symfony/asset": "~6.3.0",
"symfony/cache": "~6.3.0",
"symfony/config": "~6.3.0",
"symfony/console": "~6.3.0",
"symfony/dependency-injection": "~6.3.0",
"symfony/asset": "~6.4.0",
"symfony/cache": "~6.4.0",
"symfony/config": "~6.4.0",
"symfony/console": "~6.4.0",
"symfony/dependency-injection": "~6.4.0",
"symfony/flex": "^1.19",
"symfony/framework-bundle": "~6.3.0",
"symfony/http-kernel": "~6.3.0",
"symfony/mailer": "~6.3.0",
"symfony/framework-bundle": "~6.4.0",
"symfony/http-kernel": "~6.4.0",
"symfony/mailer": "~6.4.0",
"symfony/monolog-bundle": "^3.0",
"symfony/runtime": "~6.3.0",
"symfony/templating": "~6.3.0",
"symfony/twig-bundle": "~6.3.0",
"symfony/web-link": "~6.3.0",
"symfony/webpack-encore-bundle": "^v2.0.1",
"symfony/runtime": "~6.4.0",
"symfony/templating": "~6.4.0",
"symfony/twig-bundle": "~6.4.0",
"symfony/web-link": "~6.4.0",
"symfony/webpack-encore-bundle": "^2.0.1",
"twbs/bootstrap-sass": "^3.3",
"twig/extra-bundle": "^3.5",
"twig/intl-extra": "^3.5",
"twig/twig": "^3.5",
"vich/uploader-bundle": "^2.1"
},
"require-dev": {
"symfony/dotenv": "~6.3.0",
"symfony/dotenv": "~6.4.0",
"symfony/maker-bundle": "^1.0",
"symfony/var-dumper": "~6.3.0",
"symfony/web-profiler-bundle": "~6.3.0"
"symfony/var-dumper": "~6.4.0",
"symfony/web-profiler-bundle": "~6.4.0"
},
"replace": {
"symfony/polyfill-ctype": "*",
"symfony/polyfill-iconv": "*",
"symfony/polyfill-php72": "*",
"symfony/polyfill-php80": "*",
"symfony/polyfill-php81": "*",
"symfony/polyfill-php82": "*"
"symfony/polyfill-php82": "*",
"symfony/polyfill-php83": "*"
},
"conflict": {
"symfony/symfony": "*"
Expand All @@ -86,7 +87,7 @@
"symfony": {
"allow-contrib": true,
"docker": true,
"require": "6.3.*"
"require": "6.4.*"
},
"symfony-app-dir": "app",
"symfony-assets-install": "relative",
Expand Down
Loading