Skip to content

Commit 44cde37

Browse files
garakgarak
committed
🔀 various improvements
1 parent 8971957 commit 44cde37

File tree

7 files changed

+40
-36
lines changed

7 files changed

+40
-36
lines changed

‎composer.json

+6-5
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
"ext-iconv": "*",
2020
"ext-intl": "*",
2121
"ext-mbstring": "*",
22-
"symfony/flex": "^2.4"
22+
"symfony/flex": "^2.5"
2323
},
2424
"flex-require": {
25-
"doctrine/doctrine-bundle": "^2.12",
25+
"doctrine/doctrine-bundle": "^2.13",
2626
"doctrine/orm": "^3.3",
2727
"ramsey/uuid-doctrine": "^2.1",
2828
"symfony/asset": "^6.4",
@@ -57,11 +57,12 @@
5757
"beelab/test-bundle": "^7.0",
5858
"dama/doctrine-test-bundle": "^8.2",
5959
"deployer/deployer": "^7.5",
60-
"doctrine/doctrine-fixtures-bundle": "^3.6",
61-
"phpunit/phpunit": "^11.4",
60+
"doctrine/doctrine-fixtures-bundle": "^4.0",
61+
"phpunit/phpunit": "^12.0",
6262
"symfony/debug-bundle": "^6.4",
63+
"symfony/phpunit-bridge": "^7.2",
6364
"symfony/profiler-pack": "^1.0",
64-
"vincentlanglet/twig-cs-fixer": "^3.0"
65+
"vincentlanglet/twig-cs-fixer": "^3.5"
6566
},
6667
"config": {
6768
"allow-plugins": {

‎config/docker/nginx/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ RUN apt update && apt install -y --no-install-recommends curl
44

55
# Install phpmyadmin
66
RUN set -ex; \
7-
curl -k --output phpMyAdmin.tar.gz --location https://files.phpmyadmin.net/phpMyAdmin/5.2.1/phpMyAdmin-5.2.1-all-languages.tar.gz; \
7+
curl -k --output phpMyAdmin.tar.gz --location https://files.phpmyadmin.net/phpMyAdmin/5.2.2/phpMyAdmin-5.2.2-all-languages.tar.gz; \
88
tar -xf phpMyAdmin.tar.gz -C /usr/src; \
99
rm -r phpMyAdmin.tar.gz; \
10-
mv /usr/src/phpMyAdmin-5.2.1-all-languages /usr/src/phpmyadmin; \
11-
rm -rf /usr/src/phpmyadmin/setup/ /usr/src/phpmyadmin/examples/ /usr/src/phpmyadmin/test/ /usr/src/phpmyadmin/po/ /usr/src/phpmyadmin/composer.json /usr/src/phpmyadmin/RELEASE-DATE-5.2.1; \
10+
mv /usr/src/phpMyAdmin-5.2.2-all-languages /usr/src/phpmyadmin; \
11+
rm -rf /usr/src/phpmyadmin/setup/ /usr/src/phpmyadmin/examples/ /usr/src/phpmyadmin/test/ /usr/src/phpmyadmin/po/ /usr/src/phpmyadmin/composer.json /usr/src/phpmyadmin/RELEASE-DATE-5.2.2; \
1212
sed -i "s@define('CONFIG_DIR'.*@define('CONFIG_DIR', '/usr/src/phpmyadmin/');@" /usr/src/phpmyadmin/libraries/vendor_config.php; \
1313
cp /usr/src/phpmyadmin/config.sample.inc.php /usr/src/phpmyadmin/config.inc.php; \
1414
sed -i "s/'localhost'/'database'/" /usr/src/phpmyadmin/config.inc.php; \

‎config/docker/nginx/nginx.conf

+15-14
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,21 @@ server {
66

77
# https://gist.github.com/tsolar/6429503
88
location /phpmyadmin {
9-
root /usr/src/;
10-
index index.php index.html index.htm;
11-
location ~ ^/phpmyadmin/(.+\.php)$ {
12-
try_files $uri =404;
13-
root /usr/src/;
14-
fastcgi_pass php:9000;
15-
fastcgi_index index.php;
16-
fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
17-
fastcgi_read_timeout 180;
18-
include fastcgi_params;
19-
}
20-
location ~* ^/phpmyadmin/(.+\.(jpg|jpeg|gif|css|png|js|ico|html|xml|txt))$ {
21-
root /usr/src/;
22-
}
9+
root /usr/src/;
10+
index index.php index.html index.htm;
11+
location ~ ^/phpmyadmin/(.+\.php)$ {
12+
try_files $uri =404;
13+
root /usr/src/;
14+
fastcgi_pass php:9000;
15+
fastcgi_index index.php;
16+
fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
17+
fastcgi_param PHP_VALUE "error_reporting=E_ALL & ~E_DEPRECATED";
18+
fastcgi_read_timeout 180;
19+
include fastcgi_params;
20+
}
21+
location ~* ^/phpmyadmin/(.+\.(jpg|jpeg|gif|css|png|js|ico|html|xml|txt))$ {
22+
root /usr/src/;
23+
}
2324
}
2425

2526
location / {

‎config/docker/php-fpm/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN apt update && apt install -y --no-install-recommends zlib1g-dev libicu-dev g
1414
RUN docker-php-ext-install pdo pdo_mysql intl mysqli iconv xsl
1515

1616
# Install xdebug
17-
RUN pecl install xdebug-3.4.0 && docker-php-ext-enable xdebug
17+
RUN pecl install xdebug-3.4.2 && docker-php-ext-enable xdebug
1818
RUN { \
1919
echo 'error_reporting = E_ALL'; \
2020
echo 'display_startup_errors = On'; \
@@ -41,11 +41,11 @@ COPY --from=composer /usr/bin/composer /usr/local/bin/composer
4141

4242
# Install phpmyadmin
4343
RUN set -ex; \
44-
curl -k --output phpMyAdmin.tar.xz --location https://files.phpmyadmin.net/phpMyAdmin/5.2.1/phpMyAdmin-5.2.1-all-languages.tar.xz; \
44+
curl -k --output phpMyAdmin.tar.xz --location https://files.phpmyadmin.net/phpMyAdmin/5.2.2/phpMyAdmin-5.2.2-all-languages.tar.xz; \
4545
tar -xf phpMyAdmin.tar.xz -C /usr/src; \
4646
rm -r phpMyAdmin.tar.xz; \
47-
mv /usr/src/phpMyAdmin-5.2.1-all-languages /usr/src/phpmyadmin; \
48-
rm -rf /usr/src/phpmyadmin/setup/ /usr/src/phpmyadmin/examples/ /usr/src/phpmyadmin/test/ /usr/src/phpmyadmin/po/ /usr/src/phpmyadmin/composer.json /usr/src/phpmyadmin/RELEASE-DATE-5.2.1; \
47+
mv /usr/src/phpMyAdmin-5.2.2-all-languages /usr/src/phpmyadmin; \
48+
rm -rf /usr/src/phpmyadmin/setup/ /usr/src/phpmyadmin/examples/ /usr/src/phpmyadmin/test/ /usr/src/phpmyadmin/po/ /usr/src/phpmyadmin/composer.json /usr/src/phpmyadmin/RELEASE-DATE-5.2.2; \
4949
sed -i "s@define('CONFIG_DIR'.*@define('CONFIG_DIR', '/usr/src/phpmyadmin/');@" /usr/src/phpmyadmin/libraries/vendor_config.php; \
5050
cp /usr/src/phpmyadmin/config.sample.inc.php /usr/src/phpmyadmin/config.inc.php; \
5151
sed -i "s/'localhost'/'database'/" /usr/src/phpmyadmin/config.inc.php; \

‎package.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
"bootstrap": "^5.3.3"
1515
},
1616
"devDependencies": {
17-
"@babel/core": "^7.26.0",
18-
"@babel/preset-env": "^7.26.0",
19-
"@symfony/webpack-encore": "^5.0.1",
20-
"eslint": "^9.17.0",
21-
"sass": "^1.83.0",
22-
"sass-loader": "^16.0.4",
23-
"stylelint": "^16.12.0",
24-
"stylelint-config-standard": "^36.0.1",
17+
"@babel/core": "^7.26.10",
18+
"@babel/preset-env": "^7.26.9",
19+
"@symfony/webpack-encore": "^5.1.0",
20+
"eslint": "^9.21.0",
21+
"sass": "^1.85.1",
22+
"sass-loader": "^16.0.5",
23+
"stylelint": "^16.15.0",
24+
"stylelint-config-standard": "^37.0.0",
2525
"stylelint-config-standard-scss": "^14.0.0"
2626
},
2727
"author": "Massimiliano Arione",

‎phpunit.xml.dist

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3-
<!-- https://docs.phpunit.de/en/11.2/configuration.html -->
3+
<!-- https://docs.phpunit.de/en/12.0/configuration.html -->
44
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
55
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
66
bootstrap="tests/bootstrap.php"
@@ -16,6 +16,7 @@
1616
<php>
1717
<ini name="error_reporting" value="-1"/>
1818
<server name="APP_ENV" value="test" force="true"/>
19+
<server name="APP_DEBUG" value="0" force="true"/>
1920
<server name="SHELL_VERBOSITY" value="-1"/>
2021
<env name="KERNEL_CLASS" value="Infrastructure\Kernel"/>
2122
<env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0"/>
@@ -29,5 +30,6 @@
2930

3031
<extensions>
3132
<bootstrap class="DAMA\DoctrineTestBundle\PHPUnit\PHPUnitExtension"/>
33+
<bootstrap class="Symfony\Bridge\PhpUnit\SymfonyExtension"/>
3234
</extensions>
3335
</phpunit>

‎templates/layout.html.twig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<html lang="{{ app.request.locale }}" class="h-100">
33
<head>
4-
<meta charset="utf-8">
4+
<meta charset="UTF-8">
55
<meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
66
<title>{% block title "Beelab" %}</title>
77
<link rel="icon" type="image/x-icon" href="{{ asset('favicon.ico') }}">

0 commit comments

Comments
 (0)