diff --git a/.vscode/launch.json b/.vscode/launch.json index 7987693b275ab4e9e2834defffbf52c763a061ef..eddd6068e8fa0bb943b3ccf2336eba7bb1609510 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -8,7 +8,7 @@ "name": "PHP - Listen for XDebug", "type": "php", "request": "launch", - "port": 9000, + "port": 9003, "pathMappings": { "/html": "${workspaceRoot}" } @@ -17,7 +17,7 @@ "name": "PHP - Launch currently open script", "type": "php", "request": "launch", - "port": 9000, + "port": 9003, "program": "${file}", "cwd": "${fileDirname}", "pathMappings": { diff --git a/DockerfileDev b/DockerfileDev index 3292dee2337ff59c332da3a50f341a4dcc6f72ab..8d680fb30c45c86a2eefc164f5ac34d93362c5f5 100644 --- a/DockerfileDev +++ b/DockerfileDev @@ -30,7 +30,7 @@ RUN apt update \ php7.4-redis \ php7.4-gd \ php7.4-json \ - php7.4-opcache + php7.4-xdebug WORKDIR /html @@ -49,9 +49,9 @@ RUN mkdir -p /run/php && \ sed -i 's/;cgi.fix_pathinfo=1/cgi.fix_pathinfo=0/g' /etc/php/7.4/fpm/php.ini && \ sed -i 's/upload_max_filesize = 2M/upload_max_filesize = 30M/g' /etc/php/7.4/fpm/php.ini && \ sed -i 's/post_max_size = 8M/post_max_size = 30M/g' /etc/php/7.4/fpm/php.ini && \ - echo "xdebug.remote_enable = 1" >> /etc/php/7.4/fpm/conf.d/20-xdebug.ini && \ - echo "xdebug.remote_autostart = 1" >> /etc/php/7.4/fpm/conf.d/20-xdebug.ini && \ - echo "xdebug.remote_connect_back = 1" >> /etc/php/7.4/fpm/conf.d/20-xdebug.ini && \ + echo "xdebug.mode = debug" >> /etc/php/7.4/fpm/conf.d/20-xdebug.ini && \ + echo "xdebug.start_with_request = yes" >> /etc/php/7.4/fpm/conf.d/20-xdebug.ini && \ + echo "xdebug.discover_client_host = true" >> /etc/php/7.4/fpm/conf.d/20-xdebug.ini && \ echo "xdebug.idekey=VSCODE" >> /etc/php/7.4/fpm/conf.d/20-xdebug.ini && \ cp /usr/share/zoneinfo/Europe/Berlin /etc/localtime && \ echo "Europe/Berlin" > /etc/timezone && \ diff --git a/app/Http/Controllers/StartpageController.php b/app/Http/Controllers/StartpageController.php index 6369c87ad882aa7f61020387c8d9bbb880e55407..edae97096f9be10c8f6aeb10b73e9a49c6c1a18b 100644 --- a/app/Http/Controllers/StartpageController.php +++ b/app/Http/Controllers/StartpageController.php @@ -73,12 +73,6 @@ class StartpageController extends Controller return view($subpage, ['title' => 'Datenschutz Richtlinien']); } - public function loadLocalPage($locale = "de", $subpage = "datenschutz") - { - \App::setLocale($locale); - return loadPage($subpage); - } - public function loadPlugin(Request $request, $locale = "de") { $link = action('MetaGerSearch@search', []);