From 03213ffa258d95c4a17bc2ffd741ca4d1ecf9a27 Mon Sep 17 00:00:00 2001
From: sHa <sha@shadoll.dev>
Date: Tue, 5 Apr 2022 12:49:23 +0300
Subject: [PATCH] update for xdebug

---
 .vscode/launch.json       |  5 ++++-
 app/info.php              |  3 +++
 docker-compose.yml        |  4 ++--
 docker/nginx/default.conf | 43 ++++++++++++---------------------------
 docker/php/xdebug.ini     | 24 ++++++++++++++++------
 5 files changed, 40 insertions(+), 39 deletions(-)
 create mode 100644 app/info.php

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 9dc6b4d..b87bc51 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -8,7 +8,10 @@
             "name": "Listen for Xdebug",
             "type": "php",
             "request": "launch",
-            "port": 9003
+            "port": 9003,
+            "pathMappings": {
+                "/var/www/html": "${workspaceRoot}/app"
+            }
         },
         {
             "name": "Launch currently open script",
diff --git a/app/info.php b/app/info.php
new file mode 100644
index 0000000..83f1549
--- /dev/null
+++ b/app/info.php
@@ -0,0 +1,3 @@
+<?php
+
+phpinfo();
diff --git a/docker-compose.yml b/docker-compose.yml
index 486cf32..2cfaa8e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,7 +12,7 @@ services:
   composer:
       image: composer
       volumes:
-          - .:/app
+          - ./app:/app
 
   nginx:
     image: nginx
@@ -20,7 +20,7 @@ services:
         - ./docker/nginx/default.conf:/etc/nginx/conf.d/default.conf
         - ./app:/var/www/html
     ports:
-        - 80:80
+        - 8080:80
     restart: always
     depends_on:
         - php
diff --git a/docker/nginx/default.conf b/docker/nginx/default.conf
index 941f50b..5b2e9be 100644
--- a/docker/nginx/default.conf
+++ b/docker/nginx/default.conf
@@ -3,41 +3,24 @@ server {
     listen [::]:80 default_server;
     server_name localhost;
 
-    root /var/www/html/public;
+    root /var/www/html;
+    index index.php;
 
     location / {
-        try_files $uri /index.php$is_args$args;
+        client_max_body_size 25M;
+        try_files $uri $uri/ /index.php?$query_string;
     }
 
-    location ~ ^/index\.php(/|$) {
-        fastcgi_pass php:9000;
-        fastcgi_split_path_info ^(.+\.php)(/.*)$;
-        include fastcgi_params;
-
-        # optionally set the value of the environment variables used in the application
-        # fastcgi_param APP_ENV prod;
-        # fastcgi_param APP_SECRET <app-secret-id>;
-        # fastcgi_param DATABASE_URL "mysql://db_user:db_pass@host:3306/db_name";
-
-        # When you are using symlinks to link the document root to the
-        # current version of your application, you should pass the real
-        # application path instead of the path to the symlink to PHP
-        # FPM.
-        # Otherwise, PHP's OPcache may not properly detect changes to
-        # your PHP files (see https://github.com/zendtech/ZendOptimizerPlus/issues/126
-        # for more information).
-        fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
-        fastcgi_param DOCUMENT_ROOT $realpath_root;
-        # Prevents URIs that include the front controller. This will 404:
-        # http://domain.tld/index.php/some-path
-        # Remove the internal directive to allow URIs like this
-        internal;
-    }
-
-    # return 404 for all other php files not matching the front controller
-    # this prevents access to other php files you don't want to be accessible.
     location ~ \.php$ {
-        return 404;
+        client_max_body_size 25M;
+        try_files $uri =404;
+        fastcgi_split_path_info ^(.+\.php)(/.+)$;
+        fastcgi_pass php:9000;
+        fastcgi_index index.php;
+        include fastcgi_params;
+        fastcgi_read_timeout 600;
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        fastcgi_param PATH_INFO $fastcgi_path_info;
     }
 
     error_log /var/log/nginx/project_error.log;
diff --git a/docker/php/xdebug.ini b/docker/php/xdebug.ini
index 91df087..aa545c3 100644
--- a/docker/php/xdebug.ini
+++ b/docker/php/xdebug.ini
@@ -1,6 +1,18 @@
-xdebug.remote_enable = 1
-xdebug.remote_autostart = 1
-xdebug.remote_connect_back = 1
-xdebug.remote_idekey = VSCODE
-xdebug.remote_host=docker.for.mac.localhost
-xdebug.remote_port=9003
+zend_extension = xdebug.so
+;old xdebug.remote_enable = 1
+xdebug.mode = develop,coverage,debug,profile
+;old xdebug.remote_connect_back = 0
+xdebug.discover_client_host = true
+;old xdebug.remote_autostart = 1
+xdebug.start_with_request = yes
+;old xdebug.remote_idekey = docker
+xdebug.idekey = docker
+;old xdebug.remote_host = 10.254.254.254
+; xdebug.client_host = host.docker.internal
+; xdebug.client_host = docker.for.mac.localhost
+xdebug.client_host = 10.254.254.254
+;old xdebug.remote_port = 9003
+xdebug.client_port = 9003
+
+xdebug.log=/dev/stdout
+xdebug.log_level=0