| @@ -1,7 +1,7 @@ | |||||
| name: phpmyadmin | name: phpmyadmin | ||||
| repository: ddev/ddev-phpmyadmin | repository: ddev/ddev-phpmyadmin | ||||
| version: v0.3.2 | |||||
| install_date: "2023-12-06T15:28:03+01:00" | |||||
| version: v0.3.3 | |||||
| install_date: "2024-01-23T13:35:25+01:00" | |||||
| project_files: | project_files: | ||||
| - docker-compose.phpmyadmin.yaml | - docker-compose.phpmyadmin.yaml | ||||
| - docker-compose.phpmyadmin-norouter.yaml | - docker-compose.phpmyadmin-norouter.yaml | ||||
| @@ -5,6 +5,11 @@ | |||||
| ## Usage: phpmyadmin | ## Usage: phpmyadmin | ||||
| ## Example: "ddev phpmyadmin" | ## Example: "ddev phpmyadmin" | ||||
| if [ "${DDEV_PROJECT_STATUS-running}" != "running" ]; then | |||||
| echo "Project ${DDEV_PROJECT} is not running, starting it" | |||||
| ddev start | |||||
| fi | |||||
| DDEV_PHPMYADMIN_PORT=8036 | DDEV_PHPMYADMIN_PORT=8036 | ||||
| DDEV_PHPMYADMIN_HTTPS_PORT=8037 | DDEV_PHPMYADMIN_HTTPS_PORT=8037 | ||||
| @@ -0,0 +1,3 @@ | |||||
| ARG BASE_IMAGE | |||||
| FROM $BASE_IMAGE | |||||
| RUN enable_xdebug | |||||
| @@ -39,13 +39,12 @@ MESSENGER_TRANSPORT_DSN=doctrine://default?auto_setup=0 | |||||
| ###> symfony/mailer ### | ###> symfony/mailer ### | ||||
| # MAILER_DSN=null://null | # MAILER_DSN=null://null | ||||
| ###< symfony/mailer ### | ###< symfony/mailer ### | ||||
| ###> nelmio/cors-bundle ### | |||||
| CORS_ALLOW_ORIGIN='^https?://(localhost|127\.0\.0\.1)(:[0-9]+)?$' | |||||
| ###< nelmio/cors-bundle ### | |||||
| ###> lexik/jwt-authentication-bundle ### | ###> lexik/jwt-authentication-bundle ### | ||||
| JWT_SECRET_KEY=%kernel.project_dir%/config/jwt/private.pem | JWT_SECRET_KEY=%kernel.project_dir%/config/jwt/private.pem | ||||
| JWT_PUBLIC_KEY=%kernel.project_dir%/config/jwt/public.pem | JWT_PUBLIC_KEY=%kernel.project_dir%/config/jwt/public.pem | ||||
| JWT_PASSPHRASE=dd92770a0c99773cc99cf1bdc4bd425986dacbcde1bc753e9934614aa6f364b6 | JWT_PASSPHRASE=dd92770a0c99773cc99cf1bdc4bd425986dacbcde1bc753e9934614aa6f364b6 | ||||
| ###< lexik/jwt-authentication-bundle ### | ###< lexik/jwt-authentication-bundle ### | ||||
| ###> nelmio/cors-bundle ### | |||||
| CORS_ALLOW_ORIGIN='^https?://(localhost|127\.0\.0\.1)(:[0-9]+)?$' | |||||
| ###< nelmio/cors-bundle ### | |||||
| @@ -32,7 +32,8 @@ class AuthenticationSuccessListener | |||||
| return; | return; | ||||
| } | } | ||||
| $data['id'] = $this->iriConverter->getIriFromResource($user); | |||||
| $data['id'] = $user->getId(); | |||||
| //$data['id'] = $this->iriConverter->getIriFromResource($user); | |||||
| $data['email'] = $user->getEmail(); | $data['email'] = $user->getEmail(); | ||||
| $data['firstName'] = $user->getFirstName(); | $data['firstName'] = $user->getFirstName(); | ||||
| $data['lastName'] = $user->getLastName(); | $data['lastName'] = $user->getLastName(); | ||||