diff --git a/.env.test b/.env.test
index 0de10b3..f66943c 100644
--- a/.env.test
+++ b/.env.test
@@ -3,7 +3,8 @@ APP_SECRET=test
APP_LOCALE=de
APP_CACHE_DIR=/var/www/wirhub/var/cache
PANTHER_APP_ENV=test
-PANTHER_CHROME_ARGUMENTS="--ignore-certificate-errors --disable-dev-shm-usage --log-level=DEBUG --log-path=/var/www/wirhub/var/log --user-data-dir=/var/www/wirhub/var/chrome"
+PANTHER_NO_HEADLESS=true
+PANTHER_CHROME_ARGUMENTS="--ignore-certificate-errors --disable-dev-shm-usage --verbose --log-path=/var/www/wirhub/var/log --user-data-dir=/var/www/wirhub/var/chrome --headless=old --window-size=1280,1100 --disable-gpu --disable-extensions --remote-debugging-port=9222"
PANTHER_EXTERNAL_BASE_URI=http://localhost
PANTHER_NO_SANDBOX=1
PANTHER_WEB_SERVER_DIR=./public
diff --git a/Dockerfile b/Dockerfile
index f9cd0c1..69094d8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -62,12 +62,16 @@ RUN sed -i 's/post_max_size = 8M/post_max_size = 64M/g' /etc/php/8.2/apache2/php
RUN sed -i 's/;date.timezone =/date.timezone = Europe\/Berlin/g' /etc/php/8.2/cli/php.ini
RUN sed -i 's/;date.timezone =/date.timezone = Europe\/Berlin/g' /etc/php/8.2/apache2/php.ini
+RUN rm /etc/php/8.2/apache2/conf.d/10-opcache.ini
+COPY dockerfiles/php/10-opcache.ini /etc/php/8.2/apache2/conf.d
+
+
# vorerst die alte 00-default.conf löschen und ersetzen. so funktionert es ohne https
RUN rm /etc/apache2/sites-available/000-default.conf
COPY dockerfiles/virtual_hosts /etc/apache2/sites-available
### Configure Webserver
-RUN echo "Apache server started: cd /var/www/html/index.html
" > /var/www/html/index.html
+RUN echo "Webserver running
" > /var/www/html/index.html
RUN a2enmod rewrite
# setting the correct server timezone
diff --git a/Makefile b/Makefile
index 094627c..ab45229 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,12 @@
init:
- COMPOSER_ALLOW_SUPERUSER=1 composer install --no-dev --optimize-autoloader
+ COMPOSER_ALLOW_SUPERUSER=1 composer install --no-dev
COMPOSER_ALLOW_SUPERUSER=1 composer dump-env prod
+ COMPOSER_ALLOW_SUPERUSER=1 composer dump-autoload --no-dev --classmap-authoritative
php bin/console doctrine:migrations:migrate --no-interaction
php bin/console app:theme:refresh
php bin/console app:update
+ php bin/console app:theme:refresh
+
ifeq ($(shell id -u), 0)
chown -R www-data:www-data public/
chown -R www-data:www-data var/
diff --git a/composer.json b/composer.json
index 80468e3..063d51b 100644
--- a/composer.json
+++ b/composer.json
@@ -75,7 +75,7 @@
"symfony/framework-bundle": "7.1.*",
"symfony/runtime": "7.1.*",
"symfony/yaml": "7.1.*",
- "wirdesign-communication-ag/wirhub": "^3.0.31"
+ "wirdesign-communication-ag/wirhub": "wip/kws-81-2-dev"
},
"scripts": {
"auto-scripts": {
diff --git a/composer.lock b/composer.lock
index aabe9a9..ed5a658 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "844893db80b22bd53ab85ab425a6a9db",
+ "content-hash": "86b2e7d40d37d4834d0b09b349b7dc9a",
"packages": [
{
"name": "aws/aws-crt-php",
@@ -62,16 +62,16 @@
},
{
"name": "aws/aws-sdk-php",
- "version": "3.320.6",
+ "version": "3.321.0",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
- "reference": "73c66ce8f9d593a08409f564cd796abe6976f1b4"
+ "reference": "cea02601e77af2b164746087aa4f75270cfd0426"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/73c66ce8f9d593a08409f564cd796abe6976f1b4",
- "reference": "73c66ce8f9d593a08409f564cd796abe6976f1b4",
+ "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/cea02601e77af2b164746087aa4f75270cfd0426",
+ "reference": "cea02601e77af2b164746087aa4f75270cfd0426",
"shasum": ""
},
"require": {
@@ -154,9 +154,9 @@
"support": {
"forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
"issues": "https://github.com/aws/aws-sdk-php/issues",
- "source": "https://github.com/aws/aws-sdk-php/tree/3.320.6"
+ "source": "https://github.com/aws/aws-sdk-php/tree/3.321.0"
},
- "time": "2024-08-22T18:28:28+00:00"
+ "time": "2024-08-28T18:11:46+00:00"
},
{
"name": "chillerlan/php-qrcode",
@@ -1383,16 +1383,16 @@
},
{
"name": "doctrine/migrations",
- "version": "3.8.0",
+ "version": "3.8.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/migrations.git",
- "reference": "535a70dcbd88b8c6ba945be050977457f4f4c06c"
+ "reference": "7760fbd0b7cb58bfb50415505a7bab821adf0877"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/migrations/zipball/535a70dcbd88b8c6ba945be050977457f4f4c06c",
- "reference": "535a70dcbd88b8c6ba945be050977457f4f4c06c",
+ "url": "https://api.github.com/repos/doctrine/migrations/zipball/7760fbd0b7cb58bfb50415505a7bab821adf0877",
+ "reference": "7760fbd0b7cb58bfb50415505a7bab821adf0877",
"shasum": ""
},
"require": {
@@ -1415,6 +1415,7 @@
"doctrine/persistence": "^2 || ^3",
"doctrine/sql-formatter": "^1.0",
"ext-pdo_sqlite": "*",
+ "fig/log-test": "^1",
"phpstan/phpstan": "^1.10",
"phpstan/phpstan-deprecation-rules": "^1.1",
"phpstan/phpstan-phpunit": "^1.3",
@@ -1465,7 +1466,7 @@
],
"support": {
"issues": "https://github.com/doctrine/migrations/issues",
- "source": "https://github.com/doctrine/migrations/tree/3.8.0"
+ "source": "https://github.com/doctrine/migrations/tree/3.8.1"
},
"funding": [
{
@@ -1481,7 +1482,7 @@
"type": "tidelift"
}
],
- "time": "2024-06-26T14:12:46+00:00"
+ "time": "2024-08-28T13:17:28+00:00"
},
{
"name": "doctrine/orm",
@@ -8327,20 +8328,20 @@
},
{
"name": "twig/extra-bundle",
- "version": "v3.11.0",
+ "version": "v3.12.0",
"source": {
"type": "git",
"url": "https://github.com/twigphp/twig-extra-bundle.git",
- "reference": "bf8a304eac15838d7724fdf64c345bdefbb75f03"
+ "reference": "a5427976a23c50b98d034d2f4c215ffaaaf5875f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twigphp/twig-extra-bundle/zipball/bf8a304eac15838d7724fdf64c345bdefbb75f03",
- "reference": "bf8a304eac15838d7724fdf64c345bdefbb75f03",
+ "url": "https://api.github.com/repos/twigphp/twig-extra-bundle/zipball/a5427976a23c50b98d034d2f4c215ffaaaf5875f",
+ "reference": "a5427976a23c50b98d034d2f4c215ffaaaf5875f",
"shasum": ""
},
"require": {
- "php": ">=7.2.5",
+ "php": ">=8.0.2",
"symfony/framework-bundle": "^5.4|^6.4|^7.0",
"symfony/twig-bundle": "^5.4|^6.4|^7.0",
"twig/twig": "^3.0"
@@ -8385,7 +8386,7 @@
"twig"
],
"support": {
- "source": "https://github.com/twigphp/twig-extra-bundle/tree/v3.11.0"
+ "source": "https://github.com/twigphp/twig-extra-bundle/tree/v3.12.0"
},
"funding": [
{
@@ -8397,24 +8398,24 @@
"type": "tidelift"
}
],
- "time": "2024-06-21T06:25:01+00:00"
+ "time": "2024-08-10T10:32:24+00:00"
},
{
"name": "twig/intl-extra",
- "version": "v3.11.0",
+ "version": "v3.12.0",
"source": {
"type": "git",
"url": "https://github.com/twigphp/intl-extra.git",
- "reference": "e9cadd61342e71e45b2f4f0558122433fd7e4566"
+ "reference": "61e1189333120a475d2b67b93664b8002668fc27"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twigphp/intl-extra/zipball/e9cadd61342e71e45b2f4f0558122433fd7e4566",
- "reference": "e9cadd61342e71e45b2f4f0558122433fd7e4566",
+ "url": "https://api.github.com/repos/twigphp/intl-extra/zipball/61e1189333120a475d2b67b93664b8002668fc27",
+ "reference": "61e1189333120a475d2b67b93664b8002668fc27",
"shasum": ""
},
"require": {
- "php": ">=7.2.5",
+ "php": ">=8.0.2",
"symfony/intl": "^5.4|^6.4|^7.0",
"twig/twig": "^3.10"
},
@@ -8449,7 +8450,7 @@
"twig"
],
"support": {
- "source": "https://github.com/twigphp/intl-extra/tree/v3.11.0"
+ "source": "https://github.com/twigphp/intl-extra/tree/v3.12.0"
},
"funding": [
{
@@ -8461,24 +8462,24 @@
"type": "tidelift"
}
],
- "time": "2024-06-21T06:25:01+00:00"
+ "time": "2024-08-10T10:32:24+00:00"
},
{
"name": "twig/string-extra",
- "version": "v3.11.0",
+ "version": "v3.12.0",
"source": {
"type": "git",
"url": "https://github.com/twigphp/string-extra.git",
- "reference": "d25c61baf38705a72ebb5a92d2e9ecb7c473b8ac"
+ "reference": "0abea0e39f24db0bd847165533d77c93fcbb5025"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twigphp/string-extra/zipball/d25c61baf38705a72ebb5a92d2e9ecb7c473b8ac",
- "reference": "d25c61baf38705a72ebb5a92d2e9ecb7c473b8ac",
+ "url": "https://api.github.com/repos/twigphp/string-extra/zipball/0abea0e39f24db0bd847165533d77c93fcbb5025",
+ "reference": "0abea0e39f24db0bd847165533d77c93fcbb5025",
"shasum": ""
},
"require": {
- "php": ">=7.2.5",
+ "php": ">=8.0.2",
"symfony/string": "^5.4|^6.4|^7.0",
"symfony/translation-contracts": "^1.1|^2|^3",
"twig/twig": "^3.0"
@@ -8516,7 +8517,7 @@
"unicode"
],
"support": {
- "source": "https://github.com/twigphp/string-extra/tree/v3.11.0"
+ "source": "https://github.com/twigphp/string-extra/tree/v3.12.0"
},
"funding": [
{
@@ -8528,28 +8529,27 @@
"type": "tidelift"
}
],
- "time": "2024-08-07T17:34:09+00:00"
+ "time": "2024-08-10T10:32:24+00:00"
},
{
"name": "twig/twig",
- "version": "v3.11.0",
+ "version": "v3.12.0",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
- "reference": "e80fb8ebba85c7341a97a9ebf825d7fd4b77708d"
+ "reference": "4d19472d4ac1838e0b1f0e029ce1fa4040eb34ea"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twigphp/Twig/zipball/e80fb8ebba85c7341a97a9ebf825d7fd4b77708d",
- "reference": "e80fb8ebba85c7341a97a9ebf825d7fd4b77708d",
+ "url": "https://api.github.com/repos/twigphp/Twig/zipball/4d19472d4ac1838e0b1f0e029ce1fa4040eb34ea",
+ "reference": "4d19472d4ac1838e0b1f0e029ce1fa4040eb34ea",
"shasum": ""
},
"require": {
- "php": ">=7.2.5",
+ "php": ">=8.0.2",
"symfony/deprecation-contracts": "^2.5|^3",
"symfony/polyfill-ctype": "^1.8",
"symfony/polyfill-mbstring": "^1.3",
- "symfony/polyfill-php80": "^1.22",
"symfony/polyfill-php81": "^1.29"
},
"require-dev": {
@@ -8596,7 +8596,7 @@
],
"support": {
"issues": "https://github.com/twigphp/Twig/issues",
- "source": "https://github.com/twigphp/Twig/tree/v3.11.0"
+ "source": "https://github.com/twigphp/Twig/tree/v3.12.0"
},
"funding": [
{
@@ -8608,20 +8608,20 @@
"type": "tidelift"
}
],
- "time": "2024-08-08T16:15:16+00:00"
+ "time": "2024-08-29T09:51:12+00:00"
},
{
"name": "wirdesign-communication-ag/wirhub",
- "version": "3.0.32",
+ "version": "dev-wip/kws-81-2",
"source": {
"type": "git",
"url": "git@github.com:wirDesign-communication-AG/wirhub.git",
- "reference": "a6d31ad07b2a273ef2cd58cbd367ecfc4f12b49d"
+ "reference": "93ba6bbe492b6fad935698fddfd3ae35ef26c469"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/wirDesign-communication-AG/wirhub/zipball/a6d31ad07b2a273ef2cd58cbd367ecfc4f12b49d",
- "reference": "a6d31ad07b2a273ef2cd58cbd367ecfc4f12b49d",
+ "url": "https://api.github.com/repos/wirDesign-communication-AG/wirhub/zipball/93ba6bbe492b6fad935698fddfd3ae35ef26c469",
+ "reference": "93ba6bbe492b6fad935698fddfd3ae35ef26c469",
"shasum": ""
},
"require": {
@@ -8703,10 +8703,10 @@
],
"description": "wirDesign wirHub, formerly known as brandHub and StyleGuide",
"support": {
- "source": "https://github.com/wirDesign-communication-AG/wirhub/tree/v3.0.32",
+ "source": "https://github.com/wirDesign-communication-AG/wirhub/tree/wip/kws-81-2",
"issues": "https://github.com/wirDesign-communication-AG/wirhub/issues"
},
- "time": "2024-08-23T14:44:46+00:00"
+ "time": "2024-08-29T14:44:43+00:00"
}
],
"packages-dev": [
@@ -8776,16 +8776,16 @@
},
{
"name": "composer/pcre",
- "version": "3.3.0",
+ "version": "3.3.1",
"source": {
"type": "git",
"url": "https://github.com/composer/pcre.git",
- "reference": "1637e067347a0c40bbb1e3cd786b20dcab556a81"
+ "reference": "63aaeac21d7e775ff9bc9d45021e1745c97521c4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/pcre/zipball/1637e067347a0c40bbb1e3cd786b20dcab556a81",
- "reference": "1637e067347a0c40bbb1e3cd786b20dcab556a81",
+ "url": "https://api.github.com/repos/composer/pcre/zipball/63aaeac21d7e775ff9bc9d45021e1745c97521c4",
+ "reference": "63aaeac21d7e775ff9bc9d45021e1745c97521c4",
"shasum": ""
},
"require": {
@@ -8835,7 +8835,7 @@
],
"support": {
"issues": "https://github.com/composer/pcre/issues",
- "source": "https://github.com/composer/pcre/tree/3.3.0"
+ "source": "https://github.com/composer/pcre/tree/3.3.1"
},
"funding": [
{
@@ -8851,7 +8851,7 @@
"type": "tidelift"
}
],
- "time": "2024-08-19T19:43:53+00:00"
+ "time": "2024-08-27T18:44:43+00:00"
},
{
"name": "composer/semver",
@@ -9334,16 +9334,16 @@
},
{
"name": "friendsofphp/php-cs-fixer",
- "version": "v3.62.0",
+ "version": "v3.63.2",
"source": {
"type": "git",
"url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
- "reference": "627692f794d35c43483f34b01d94740df2a73507"
+ "reference": "9d427f3f14984403a6ae9fc726b61765ca0c005e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/627692f794d35c43483f34b01d94740df2a73507",
- "reference": "627692f794d35c43483f34b01d94740df2a73507",
+ "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/9d427f3f14984403a6ae9fc726b61765ca0c005e",
+ "reference": "9d427f3f14984403a6ae9fc726b61765ca0c005e",
"shasum": ""
},
"require": {
@@ -9425,7 +9425,7 @@
],
"support": {
"issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
- "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.62.0"
+ "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.63.2"
},
"funding": [
{
@@ -9433,7 +9433,7 @@
"type": "github"
}
],
- "time": "2024-08-07T17:03:09+00:00"
+ "time": "2024-08-28T10:47:21+00:00"
},
{
"name": "liip/test-fixtures-bundle",
@@ -9900,16 +9900,16 @@
},
{
"name": "phpstan/phpstan",
- "version": "1.11.11",
+ "version": "1.12.0",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
- "reference": "707c2aed5d8d0075666e673a5e71440c1d01a5a3"
+ "reference": "384af967d35b2162f69526c7276acadce534d0e1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan/zipball/707c2aed5d8d0075666e673a5e71440c1d01a5a3",
- "reference": "707c2aed5d8d0075666e673a5e71440c1d01a5a3",
+ "url": "https://api.github.com/repos/phpstan/phpstan/zipball/384af967d35b2162f69526c7276acadce534d0e1",
+ "reference": "384af967d35b2162f69526c7276acadce534d0e1",
"shasum": ""
},
"require": {
@@ -9954,7 +9954,7 @@
"type": "github"
}
],
- "time": "2024-08-19T14:37:29+00:00"
+ "time": "2024-08-27T09:18:05+00:00"
},
{
"name": "phpunit/php-code-coverage",
@@ -12601,7 +12601,9 @@
],
"aliases": [],
"minimum-stability": "dev",
- "stability-flags": [],
+ "stability-flags": {
+ "wirdesign-communication-ag/wirhub": 20
+ },
"prefer-stable": true,
"prefer-lowest": false,
"platform": {
diff --git a/dockerfiles/php/10-opcache.ini b/dockerfiles/php/10-opcache.ini
new file mode 100644
index 0000000..d52cbce
--- /dev/null
+++ b/dockerfiles/php/10-opcache.ini
@@ -0,0 +1,9 @@
+; configuration for php opcache module
+; priority=10
+zend_extension=opcache.so
+opcache.jit=off
+opcache.preload=/var/www/wirhub/config/preload.php
+opcache.preload_user=www-data
+opcache.memory_consumption=256
+opcache.max_accelerated_files=20000
+opcache.validate_timestamps=0
\ No newline at end of file
diff --git a/dockerfiles/start.sh b/dockerfiles/start.sh
index 819e1b2..1e06943 100644
--- a/dockerfiles/start.sh
+++ b/dockerfiles/start.sh
@@ -46,6 +46,7 @@ chown -R www-data:www-data public/
chown -R www-data:www-data var/
chown -R www-data:www-data files/
chown -R www-data:www-data /opt/wirhub-secret/
+chown -R www-data:www-data /var/lib/php/sessions
if grep -q MAILER_URL=sendmail://default .env.local; then