phalcon v5.8 adjustments

Author: someson

.docker/nginx/templates/vhost.conf.template

@@ -5,7 +5,8 @@ server {
 }
 
 server {
-    listen 443 ssl http2;
+    listen 443 ssl;
+    http2 on;
     server_name ${VHOST_NAME};
     root /var/www/public;
     index index.php index.html index.htm;

.docker/php/Dockerfile

@@ -1,18 +1,22 @@
-FROM php:8.1-fpm
+FROM php:8.2-fpm-bullseye
 
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    libzip-dev \
-    zip \
-    unzip \
-    libssl-dev \
-    git \
-    libicu-dev \
-    && rm -rf /var/lib/apt/lists/*
+RUN apt-get update  \
+    && apt-get install -y --no-install-recommends \
+        apt-transport-https \
+        git curl \
+        libtool libicu-dev libonig-dev libpng-dev libxml2-dev libxslt1-dev libzip-dev libyaml-dev libssl-dev \
+        zip unzip
+
+ADD https://raw.githubusercontent.com/mlocati/docker-php-extension-installer/master/install-php-extensions /usr/local/bin/
+RUN chmod uga+x /usr/local/bin/install-php-extensions && sync && install-php-extensions yaml
 
 ENV APCU_VERSION=5.1.22
+ENV PHALCON_VERSION=5.8.0
+
 RUN set -xe \
-    && pecl install apcu-${APCU_VERSION} xdebug \
-    && docker-php-ext-enable xdebug apcu \
+    && pecl channel-update pecl.php.net \
+    && pecl install apcu-${APCU_VERSION} xdebug-3.3.1 phalcon-${PHALCON_VERSION} \
+    && docker-php-ext-enable xdebug apcu phalcon \
     && docker-php-ext-install -j$(nproc) \
         zip \
         calendar \
@@ -21,22 +25,7 @@ RUN set -xe \
         opcache \
     && pecl clear-cache
 
-ENV PHALCON_VERSION=5.1.3 \
-    PSR_VERSION=1.1.0
-RUN set -xe \
-    && curl -LO https://github.com/jbboehr/php-psr/archive/refs/tags/v${PSR_VERSION}.tar.gz \
-    && tar xzf ${PWD}/v${PSR_VERSION}.tar.gz \
-    && curl -LO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz \
-    && tar xzf ${PWD}/v${PHALCON_VERSION}.tar.gz \
-    && docker-php-ext-install -j $(getconf _NPROCESSORS_ONLN) \
-        ${PWD}/php-psr-${PSR_VERSION} \
-        ${PWD}/cphalcon-${PHALCON_VERSION}/build/phalcon \
-    && rm -r \
-        ${PWD}/v${PSR_VERSION}.tar.gz \
-        ${PWD}/php-psr-${PSR_VERSION} \
-        ${PWD}/v${PHALCON_VERSION}.tar.gz \
-        ${PWD}/cphalcon-${PHALCON_VERSION} \
-    && php -m
+RUN apt-get clean && rm -rf /var/lib/apt/lists/*
 
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 

.docker/php/cert/cacert.pem

@@ -1,5 +1,5 @@
 APPLICATION_ENV=development
 VHOST_NAME=phalcon5.test
-VHOST_FASTCGI_PASS=app-service
+VHOST_FASTCGI_PASS=p5-app
 VHOST_FASTCGI_PORT=9000
 NGINX_ENVSUBST_OUTPUT_DIR=/etc/nginx/sites-enabled

.nginx.env

@@ -1,4 +1,4 @@
-[![MIT License](https://img.shields.io/apm/l/atomic-design-ui.svg?)](https://choosealicense.com/licenses/mit/)
+![GitHub License](https://img.shields.io/github/license/someson/phalcon5-docker)
 [![Made in Ukraine](https://img.shields.io/badge/made_in-ukraine-ffd700.svg?labelColor=0057b7)](https://supportukrainenow.org/)
 [![Russian Warship Go Fuck Yourself](https://raw.githubusercontent.com/vshymanskyy/StandWithUkraine/main/badges/RussianWarship.svg)](https://stand-with-ukraine.pp.ua)
 
@@ -16,7 +16,7 @@ $ docker-compose up -d --build
 ```
 
 ```sh
-$ docker-compose exec app-service composer install
+$ docker-compose exec p5-app composer install
 ```
 
 # CLI
@@ -32,7 +32,7 @@ $ docker-compose exec [service-name] php ./scripts/cli.php [handler] [action] [p
 ```
 Example:
 ```bash
-$ docker-compose exec app-service php ./scripts/cli.php main main -v -r -s
+$ docker-compose exec p5-app php ./scripts/cli.php main main -v -r -s
 ```
 - ```-s``` = single instance allowed
 - ```-v``` = verbose info
@@ -51,12 +51,20 @@ where docker host for Windows or Linux:
 Result:
 
 ```bash
-$ docker-compose exec app-service php -dxdebug.mode=debug -dxdebug.client_host=host.docker.internal -dxdebug.client_port=9003 -dxdebug.start_with_request=yes ./scripts/cli.php main main -v -s -r
+$ docker-compose exec p5-app php -dxdebug.mode=debug -dxdebug.client_host=host.docker.internal -dxdebug.client_port=9003 -dxdebug.start_with_request=yes ./scripts/cli.php main main -v -s -r
 ```
 with started listenings for PHP debug connections, certainly.
 
 # Tests
 
 ```bash
-$ docker-compose exec app-service vendor/bin/codecept run
+$ docker-compose exec p5-app vendor/bin/codecept run
+```
+
+# Troubleshooting
+
+## Docker
+if `... did not complete successfully: exit code: 100`
+```bash
+$ docker image prune -f
 ```

README.md

@@ -1,12 +1,11 @@
-version: "3.8"
 services:
 
     # nginx
-    nginx-service:
+    p5-web:
         build:
             context: .docker/nginx
             dockerfile: Dockerfile
-        container_name: p5-webserver
+        container_name: p5-web
         ports:
             - "80:80"
             - "443:443"
@@ -23,13 +22,13 @@ services:
         env_file:
             - .nginx.env
         depends_on:
-            - app-service
-            - mariadb-service
+            - p5-app
+            - p5-db
         networks:
             - backend
 
     # php
-    app-service:
+    p5-app:
         build:
             context: .docker
             dockerfile: php/Dockerfile
@@ -43,19 +42,22 @@ services:
         volumes:
             - ./src:/var/www
             - ~/composer:/root/.composer
+        depends_on:
+            - p5-db
         networks:
             - backend
 
     # database (mariadb)
-    mariadb-service:
+    p5-db:
         image: mariadb:latest
-        container_name: p5-mariadb
+        container_name: p5-db
         ports:
             - "3307:3306"
         volumes:
             - ./.docker/mysql/cnf:/etc/mysql/conf.d
             - ./.docker/mysql/database:/var/lib/mysql
             - ./.docker/mysql/dump.sql:/docker-entrypoint-initdb.d/dump.sql
+        command: --default-authentication-plugin=mysql_native_password --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
         restart: always
         env_file:
             - .sql.env

docker-compose.yml

@@ -6,15 +6,15 @@ APP_DEBUG=1
 CONFIG_ADAPTER=php
 CONFIG_MAIN=Main.php
 
-MYSQL_HOST=mariadb-service
+MYSQL_HOST=p5-db
 MYSQL_USERNAME=phalcon5
 MYSQL_PASSWORD=secret
 MYSQL_DATABASE=phalcon5
 MYSQL_CHARSET=utf8
 MYSQL_PORT=3306
 MYSQL_LOG=
 
-CLI_MYSQL_HOST=mariadb-service
+CLI_MYSQL_HOST=p5-db
 CLI_MYSQL_USERNAME=root
 CLI_MYSQL_PASSWORD=root
 CLI_MYSQL_DATABASE=phalcon5_cli

src/.env.example

@@ -44,14 +44,14 @@ public function getProviders(): array
 
     public function handle(?array $arguments = null): void
     {
-        /** @var Manager $eventaManager */
-        $eventaManager = $this->getDI()->getShared('eventsManager');
+        /** @var Manager $eventManager */
+        $eventManager = $this->getDI()->getShared('eventsManager');
 
         /** @var Config $config */
         $config = $this->getDI()->getShared('config');
 
-        $eventaManager->attach('console', new TaskListener($config->path('cli')));
-        $this->setEventsManager($eventaManager);
+        $eventManager->attach('console', new TaskListener($config->path('cli')));
+        $this->setEventsManager($eventManager);
 
         parent::handle($arguments);
     }

src/app/CliApplication.php

@@ -1,30 +1,44 @@
 <?php
 
+use App\Shared\ExceptionDto;
+use App\Shared\Micro;
+use App\Shared\Simple;
+use App\Shared\Volt;
+use Phalcon\Config\Adapter\Php;
+use Phalcon\Config\Config;
+use Phalcon\Config\Exception as ConfigException;
+use Phalcon\Di\FactoryDefault;
+use Phalcon\Http\Message\ResponseStatusCodeInterface;
+
 try {
-    $di = new \Phalcon\Di\FactoryDefault();
-    $app = new \Phalcon\Mvc\Micro($di);
+    $di = new FactoryDefault();
+    $app = new Micro($di);
 
     defined('CURRENT_APP') || define('CURRENT_APP', $_SERVER['SERVER_NAME'] ?? env('APP_DOMAIN'));
 
     $file = sprintf('%s/Config/Main.php', APP_DIR);
     if (! file_exists($file)) {
-        throw new \Phalcon\Config\Exception('Configuration not defined');
+        throw new ConfigException('Configuration not defined');
     }
-
-    $defaultConfig = new \Phalcon\Config\Adapter\Php($file);
+    $defaultConfig = new Php($file);
     $site = $defaultConfig->get('app', []);
-    $config = new \Phalcon\Config\Config([
+    $config = new Config([
         'debug' => $defaultConfig->get('debug', true),
         'viewsDir' => SHARED_DIR . '/Views/',
         'cacheDir' => CACHE_DIR . '/volt/',
     ]);
 
+    $voltCacheDir = $config->get('cacheDir');
+    if (! is_writable($voltCacheDir) && ! mkdir($voltCacheDir, 0777, true) && ! is_dir($voltCacheDir)) {
+        throw new \RuntimeException(sprintf('Directory [%s] was not created', $voltCacheDir));
+    }
+
     $di->setShared('view', function() use ($config, $site) {
-        $view = new Phalcon\Mvc\View\Simple();
+        $view = new Simple();
         $view->setViewsDir($config->get('viewsDir'));
         $view->registerEngines([
             '.volt' => function($view) use ($config) {
-                $volt = new \Phalcon\Mvc\View\Engine\Volt($view, $this);
+                $volt = new Volt($view, $this);
                 $volt->setOptions([
                     'path' => $config->get('cacheDir'),
                     'separator' => '_',
@@ -37,28 +51,43 @@
         return $view;
     });
 
-    $output = static function(\Phalcon\Mvc\Micro $app, $e) {
-        $code = \Phalcon\Http\Message\ResponseStatusCodeInterface::STATUS_INTERNAL_SERVER_ERROR;
-        if ($e instanceof \DomainException) {
-            $code = \Phalcon\Http\Message\ResponseStatusCodeInterface::STATUS_FORBIDDEN;
+    /**
+     * @param Micro $app
+     * @param array<int, \Throwable> $exceptions
+     * @return string
+     */
+    $output = static function(Micro $app, array $exceptions) {
+        $code = ResponseStatusCodeInterface::STATUS_INTERNAL_SERVER_ERROR;
+        if ($exceptions[0] instanceof \DomainException) {
+            $code = ResponseStatusCodeInterface::STATUS_FORBIDDEN;
         }
         $message = $app->response->getReasonPhrase();
         $app->response->setStatusCode($code, $message)->sendHeaders();
 
-        /** @var \Phalcon\Mvc\View\Simple $view */
+        $storage = new \SplObjectStorage();
+        foreach ($exceptions as $exception) {
+            $storage->attach(new ExceptionDto($exception::class, $exception->getMessage()));
+        }
+        /** @var Simple $view */
         $view = $app->view;
         return $view->render('error', [
             'errCode' => $code,
-            'exceptionData' => new \Phalcon\Support\Collection([
-                'class' => $e::class,
-                'message' => $e->getMessage(),
-            ]),
+            'exceptionData' => $storage,
         ]);
     };
 
-    $app->error(function() use ($output, $app, $e) { echo $output($app, $e); });
-    $app->notFound(function() use ($output, $app, $e) { echo $output($app, $e); });
-    $app->handle($_SERVER['REQUEST_URI']);
+    /** @var \Throwable $e from the catch block where this file is included */
+    $app->error(function(\Throwable $appException) use ($output, $app, $e) {
+        $exceptions = $appException->getMessage() === $e->getMessage() ? [$e] : [$appException, $e];
+        echo $output($app, $exceptions);
+    });
+    $app->notFound(function() use ($output, $app, $e) { echo $output($app, [$e]); });
+
+    try {
+        $app->handle($_SERVER['REQUEST_URI']);
+    } catch(\Throwable) {
+        // nothing to do
+    }
 
 } catch (\Throwable $e) {
     echo $e->getMessage(), PHP_EOL;

src/app/Micro.php

@@ -2,21 +2,23 @@
 
 namespace App\Modules\Cli\Listeners;
 
+use App\Shared\ExceptionDto;
 use Library\Cli\Dispatcher;
 use Phalcon\Cli\Task;
 use Phalcon\Cli\Dispatcher\Exception as DispatchException;
 use Phalcon\Dispatcher\Exception as BaseException;
 use Phalcon\Events\Event;
-use Phalcon\Support\Collection;
 
 class ErrorListener
 {
+    /**
+     * @throws BaseException
+     */
     public function beforeException(Event $event, Dispatcher $dispatcher, \Throwable $exception): bool
     {
-        $dispatcher->getUserOptions()->set('exceptionData', new Collection([
-            'class' => \get_class($exception),
-            'message' => $exception->getMessage(),
-        ]));
+        $e = new \SplObjectStorage();
+        $e->attach(new ExceptionDto(\get_class($exception), $exception->getMessage()));
+        $dispatcher->getUserOptions()->set('exceptionData', $e);
 
         if ($exception instanceof DispatchException) {
             $action = match ($exception->getCode()) {