Commit e36255ab authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

repaired xdebug after upgrade from 2 to 3

parent e6714dc0
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
"name": "PHP - Listen for XDebug", "name": "PHP - Listen for XDebug",
"type": "php", "type": "php",
"request": "launch", "request": "launch",
"port": 9000, "port": 9003,
"pathMappings": { "pathMappings": {
"/html": "${workspaceRoot}" "/html": "${workspaceRoot}"
} }
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
"name": "PHP - Launch currently open script", "name": "PHP - Launch currently open script",
"type": "php", "type": "php",
"request": "launch", "request": "launch",
"port": 9000, "port": 9003,
"program": "${file}", "program": "${file}",
"cwd": "${fileDirname}", "cwd": "${fileDirname}",
"pathMappings": { "pathMappings": {
......
...@@ -30,7 +30,7 @@ RUN apt update \ ...@@ -30,7 +30,7 @@ RUN apt update \
php7.4-redis \ php7.4-redis \
php7.4-gd \ php7.4-gd \
php7.4-json \ php7.4-json \
php7.4-opcache php7.4-xdebug
WORKDIR /html WORKDIR /html
...@@ -49,9 +49,9 @@ RUN mkdir -p /run/php && \ ...@@ -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/;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/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 && \ 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.mode = debug" >> /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.start_with_request = yes" >> /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.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 && \ echo "xdebug.idekey=VSCODE" >> /etc/php/7.4/fpm/conf.d/20-xdebug.ini && \
cp /usr/share/zoneinfo/Europe/Berlin /etc/localtime && \ cp /usr/share/zoneinfo/Europe/Berlin /etc/localtime && \
echo "Europe/Berlin" > /etc/timezone && \ echo "Europe/Berlin" > /etc/timezone && \
......
...@@ -73,12 +73,6 @@ class StartpageController extends Controller ...@@ -73,12 +73,6 @@ class StartpageController extends Controller
return view($subpage, ['title' => 'Datenschutz Richtlinien']); 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") public function loadPlugin(Request $request, $locale = "de")
{ {
$link = action('MetaGerSearch@search', []); $link = action('MetaGerSearch@search', []);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment