Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit c690ebb

Browse files
author
DKravtsov
committed
php 8.4 & xdebug 3.4.0, symfony 7.2, mysql 8.4.3, rabbitmq 4, phpcpd 8.0.0, updated composer dependencies, refactoring.
1 parent d1cd1eb commit c690ebb

File tree

69 files changed

+3031
-2942
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+3031
-2942
lines changed

‎.circleci/config.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,11 @@ jobs:
4343
command: |
4444
make report-code-coverage
4545
46+
- run:
47+
name: Checks for security vulnerability advisories for installed packages
48+
command: |
49+
make composer-audit
50+
4651
- run:
4752
name: Check coding standard & CodeSniffer
4853
command: |

‎.env

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ WEB_PORT_SSL=443
2727
# XDEBUG_CONFIG possible values: main|osx. Use main value for Linux and Windows, osx value for MacOS.
2828
XDEBUG_CONFIG=main
2929
# Sometimes we need to use different xdebug versions, list of versions can be found here - https://pecl.php.net/package/xdebug
30-
XDEBUG_VERSION=3.3.2
30+
XDEBUG_VERSION=3.4.0
3131
###< XDebug docker configuration ###
3232

3333
###> MySQL docker configuration. Can be overridden in: .env.local, .env.staging, .env.prod. ###
34-
# MySQL version, recommend values: 9.1.0|9.0.1|8.4.2|8.3.0|8.2.0|8.1.0|8.0.39
35-
MYSQL_VERSION=8.4.2
34+
# MySQL version, recommend values: 9.1.0|9.0.1|8.4.3|8.3.0|8.2.0|8.1.0|8.0.39
35+
MYSQL_VERSION=8.4.3
3636
# MySQL INNODB_USE_NATIVE_AIO possible values: 1|0. Set to 0 when AIO interface is not supported on OSX. https://dev.mysql.com/doc/refman/8.0/en/innodb-parameters.html#sysvar_innodb_use_native_aio
3737
INNODB_USE_NATIVE_AIO=1
3838
# Sometimes AWS MySQL RDS has SQL_MODE="NO_ENGINE_SUBSTITUTION" (https://github.com/awsdocs/amazon-rds-user-guide/issues/160) but MySQL default described here - https://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html#sysvar_sql_mode

‎.github/workflows/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ jobs:
5050
with:
5151
name: php-coverage-data
5252
path: reports/clover.xml
53+
- name: Checks for security vulnerability advisories for installed packages
54+
run: make composer-audit
5355
- name: Run coding standard
5456
run: make ecs
5557
- name: Run codeSniffer

‎.gitlab-ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ build:
3737
- make elastic-create-or-update-template
3838
- *general_scripts
3939
- make phpunit
40+
- make composer-audit
4041
- make ecs
4142
- make phpcs
4243
- make phpstan

‎.idea/PMDPlugin.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/htdocs.iml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/php.xml

Lines changed: 375 additions & 358 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Dockerfile

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# syntax=docker/dockerfile:1.7-labs
2-
FROM php:8.3-fpm
2+
FROM php:8.4-fpm
33

44
# set main params
55
ARG BUILD_ARGUMENT_ENV=dev
@@ -12,8 +12,9 @@ ARG INSIDE_DOCKER_CONTAINER=1
1212
ENV INSIDE_DOCKER_CONTAINER=$INSIDE_DOCKER_CONTAINER
1313
ARG XDEBUG_CONFIG=main
1414
ENV XDEBUG_CONFIG=$XDEBUG_CONFIG
15-
ARG XDEBUG_VERSION=3.3.2
15+
ARG XDEBUG_VERSION=3.4.0
1616
ENV XDEBUG_VERSION=$XDEBUG_VERSION
17+
ENV PHP_CS_FIXER_IGNORE_ENV=1
1718

1819
# check environment
1920
RUN if [ "$BUILD_ARGUMENT_ENV" = "default" ]; then echo "Set BUILD_ARGUMENT_ENV in docker build-args like --build-arg BUILD_ARGUMENT_ENV=dev" && exit 2; \
@@ -114,10 +115,6 @@ RUN if [ "$BUILD_ARGUMENT_ENV" = "dev" ] || [ "$BUILD_ARGUMENT_ENV" = "test" ];
114115
else export APP_ENV=$BUILD_ARGUMENT_ENV && COMPOSER_MEMORY_LIMIT=-1 composer install --optimize-autoloader --no-interaction --no-progress --no-dev; \
115116
fi
116117

117-
# checks for security vulnerability advisories for installed packages in case dev/test environment
118-
RUN if [ "$BUILD_ARGUMENT_ENV" = "dev" ] || [ "$BUILD_ARGUMENT_ENV" = "test" ]; then COMPOSER_MEMORY_LIMIT=-1 composer audit; \
119-
fi
120-
121118
# create cached config file .env.local.php in case staging/prod environment
122119
RUN if [ "$BUILD_ARGUMENT_ENV" = "staging" ] || [ "$BUILD_ARGUMENT_ENV" = "prod" ]; then composer dump-env $BUILD_ARGUMENT_ENV; \
123120
fi

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ else
392392
endif
393393

394394
phpcpd: ## Runs php copy/paste detector
395-
@make exec cmd="php phpcpd.phar --fuzzy src tests"
395+
@make exec cmd="php phpcpd.phar --fuzzy --verbose src tests"
396396

397397
phpmd: ## Runs php mess detector
398398
@make exec cmd="php ./vendor/bin/phpmd src,tests text phpmd_ruleset.xml --suffixes php"

‎bitbucket-pipelines.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ pipelines:
2323
- make elastic-create-or-update-template
2424
- make info
2525
- make phpunit
26+
- make composer-audit
2627
- make ecs
2728
- make phpcs
2829
- make phpstan

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /