From d4d32f385ad7986caba494a9bf75f4fcd317c62b Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Thu, 2 Jun 2022 13:10:59 -0400 Subject: [PATCH 01/14] adding docker for local development --- docker-compose.yml | 27 +++++++++++++--- docker/8.0/.bashrc | 75 +++++++++++++++++++++++++++++++++++++++++++ docker/8.0/Dockerfile | 35 ++++++++++++++++++++ docker/8.0/extra.ini | 3 ++ docker/8.1/.bashrc | 75 +++++++++++++++++++++++++++++++++++++++++++ docker/8.1/Dockerfile | 35 ++++++++++++++++++++ docker/8.1/extra.ini | 3 ++ 7 files changed, 248 insertions(+), 5 deletions(-) create mode 100644 docker/8.0/.bashrc create mode 100644 docker/8.0/Dockerfile create mode 100644 docker/8.0/extra.ini create mode 100644 docker/8.1/.bashrc create mode 100644 docker/8.1/Dockerfile create mode 100644 docker/8.1/extra.ini diff --git a/docker-compose.yml b/docker-compose.yml index ed549a2..1dd6ffc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,11 +1,28 @@ -version: '2.1' +# For local development only. +version: '3' services: + module-phalcon5-8.0: + container_name: module-phalcon5-8.0 + hostname: module-phalcon5-80 + build: docker/8.0 + working_dir: /srv + volumes: + - .:/srv + + module-phalcon5-8.1: + container_name: module-phalcon5-8.1 + hostname: module-phalcon5-81 + build: docker/8.1 + working_dir: /srv + volumes: + - .:/srv + mysql: - restart: always + container_name: module-phalcon5-mysql image: mysql:5.7 - ports: - - 3306:3306 environment: + - MYSQL_ROOT_PASSWORD=secret + - MYSQL_USER=phalcon - MYSQL_DATABASE=phalcon - - MYSQL_ROOT_PASSWORD=password + - MYSQL_PASSWORD=secret diff --git a/docker/8.0/.bashrc b/docker/8.0/.bashrc new file mode 100644 index 0000000..ddcecd5 --- /dev/null +++ b/docker/8.0/.bashrc @@ -0,0 +1,75 @@ +#!/bin/bash + +# Easier navigation: .., ..., ...., ....., ~ and - +alias ..="cd .." +alias ...="cd ../.." +alias ....="cd ../../.." +alias .....="cd ../../../.." +alias ~="cd ~" # `cd` is probably faster to type though +alias -- -="cd -" + +# Shortcuts +alias g="git" +alias h="history" + +# Detect which `ls` flavor is in use +if ls --color > /dev/null 2>&1; then # GNU `ls` + colorflag="--color" +else # OS X `ls` + colorflag="-G" +fi + +# List all files colorized in long format +# shellcheck disable=SC2139 +alias l="ls -lF ${colorflag}" + +# List all files colorized in long format, including dot files +# shellcheck disable=SC2139 +alias la="ls -laF ${colorflag}" + +# List only directories +# shellcheck disable=SC2139 +alias lsd="ls -lF ${colorflag} | grep --color=never '^d'" + +# See: https://superuser.com/a/656746/280737 +alias ll='LC_ALL="C.UTF-8" ls -alF' + +# Always use color output for `ls` +# shellcheck disable=SC2139 +alias ls="command ls ${colorflag}" +export LS_COLORS='no=00:fi=00:di=01;34:ln=01;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.gz=01;31:*.bz2=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.jpg=01;35:*.jpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.avi=01;35:*.fli=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.ogg=01;35:*.mp3=01;35:*.wav=01;35:' + +# Always enable colored `grep` output +alias grep='grep --color=auto ' + +# Enable aliases to be sudo’ed +alias sudo='sudo ' + +# Get week number +alias week='date +%V' + +# Stopwatch +alias timer='echo "Timer started. Stop with Ctrl-D." && date && time cat && date' + +# Canonical hex dump; some systems have this symlinked +command -v hd > /dev/null || alias hd="hexdump -C" + +# vhosts +alias hosts='sudo nano /etc/hosts' + +# copy working directory +alias cwd='pwd | tr -d "\r\n" | xclip -selection clipboard' + +# copy file interactive +alias cp='cp -i' + +# move file interactive +alias mv='mv -i' + +# untar +alias untar='tar xvf' + +# Zephir related +alias untar='tar xvf' + +PATH=$PATH:./vendor/bin \ No newline at end of file diff --git a/docker/8.0/Dockerfile b/docker/8.0/Dockerfile new file mode 100644 index 0000000..cf585ff --- /dev/null +++ b/docker/8.0/Dockerfile @@ -0,0 +1,35 @@ +FROM composer:latest as composer +FROM php:8.0-fpm + +ADD ./extra.ini /usr/local/etc/php/conf.d/ + +# User/Group globals +ENV PHP_VERSION="8.0" \ + PHALCON_VERSION="5.0.0RC1" + +# Update +RUN apt update -y && \ + apt install -y \ + apt-utils \ + git \ + nano \ + sudo \ + wget \ + zip + +# PECL Packages +RUN pecl install phalcon-${PHALCON_VERSION} + +RUN docker-php-ext-install \ + pdo_mysql + +# Install PHP extensions +RUN docker-php-ext-enable \ + phalcon + +# Composer +COPY --from=composer /usr/bin/composer /usr/local/bin/composer +# Bash script with helper aliases +COPY ./.bashrc /root/.bashrc + +CMD ["php-fpm"] diff --git a/docker/8.0/extra.ini b/docker/8.0/extra.ini new file mode 100644 index 0000000..24836db --- /dev/null +++ b/docker/8.0/extra.ini @@ -0,0 +1,3 @@ +memory_limit=512M +apc.enable_cli="On" +session.save_path="/tmp" diff --git a/docker/8.1/.bashrc b/docker/8.1/.bashrc new file mode 100644 index 0000000..ddcecd5 --- /dev/null +++ b/docker/8.1/.bashrc @@ -0,0 +1,75 @@ +#!/bin/bash + +# Easier navigation: .., ..., ...., ....., ~ and - +alias ..="cd .." +alias ...="cd ../.." +alias ....="cd ../../.." +alias .....="cd ../../../.." +alias ~="cd ~" # `cd` is probably faster to type though +alias -- -="cd -" + +# Shortcuts +alias g="git" +alias h="history" + +# Detect which `ls` flavor is in use +if ls --color > /dev/null 2>&1; then # GNU `ls` + colorflag="--color" +else # OS X `ls` + colorflag="-G" +fi + +# List all files colorized in long format +# shellcheck disable=SC2139 +alias l="ls -lF ${colorflag}" + +# List all files colorized in long format, including dot files +# shellcheck disable=SC2139 +alias la="ls -laF ${colorflag}" + +# List only directories +# shellcheck disable=SC2139 +alias lsd="ls -lF ${colorflag} | grep --color=never '^d'" + +# See: https://superuser.com/a/656746/280737 +alias ll='LC_ALL="C.UTF-8" ls -alF' + +# Always use color output for `ls` +# shellcheck disable=SC2139 +alias ls="command ls ${colorflag}" +export LS_COLORS='no=00:fi=00:di=01;34:ln=01;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.gz=01;31:*.bz2=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.jpg=01;35:*.jpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.avi=01;35:*.fli=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.ogg=01;35:*.mp3=01;35:*.wav=01;35:' + +# Always enable colored `grep` output +alias grep='grep --color=auto ' + +# Enable aliases to be sudo’ed +alias sudo='sudo ' + +# Get week number +alias week='date +%V' + +# Stopwatch +alias timer='echo "Timer started. Stop with Ctrl-D." && date && time cat && date' + +# Canonical hex dump; some systems have this symlinked +command -v hd > /dev/null || alias hd="hexdump -C" + +# vhosts +alias hosts='sudo nano /etc/hosts' + +# copy working directory +alias cwd='pwd | tr -d "\r\n" | xclip -selection clipboard' + +# copy file interactive +alias cp='cp -i' + +# move file interactive +alias mv='mv -i' + +# untar +alias untar='tar xvf' + +# Zephir related +alias untar='tar xvf' + +PATH=$PATH:./vendor/bin \ No newline at end of file diff --git a/docker/8.1/Dockerfile b/docker/8.1/Dockerfile new file mode 100644 index 0000000..d5843a5 --- /dev/null +++ b/docker/8.1/Dockerfile @@ -0,0 +1,35 @@ +FROM composer:latest as composer +FROM php:8.1-fpm + +ADD ./extra.ini /usr/local/etc/php/conf.d/ + +# User/Group globals +ENV PHP_VERSION="8.1" \ + PHALCON_VERSION="5.0.0RC1" + +# Update +RUN apt update -y && \ + apt install -y \ + apt-utils \ + git \ + nano \ + sudo \ + wget \ + zip + +# PECL Packages +RUN pecl install phalcon-${PHALCON_VERSION} + +RUN docker-php-ext-install \ + pdo_mysql + +# Install PHP extensions +RUN docker-php-ext-enable \ + phalcon + +# Composer +COPY --from=composer /usr/bin/composer /usr/local/bin/composer +# Bash script with helper aliases +COPY ./.bashrc /root/.bashrc + +CMD ["php-fpm"] diff --git a/docker/8.1/extra.ini b/docker/8.1/extra.ini new file mode 100644 index 0000000..24836db --- /dev/null +++ b/docker/8.1/extra.ini @@ -0,0 +1,3 @@ +memory_limit=512M +apc.enable_cli="On" +session.save_path="/tmp" From e6b1e420742d2f180f17299c092584786f290496 Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Thu, 2 Jun 2022 13:11:17 -0400 Subject: [PATCH 02/14] trying a different env file --- .env.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.example b/.env.example index fcae4d6..f9f12b9 100644 --- a/.env.example +++ b/.env.example @@ -3,4 +3,4 @@ DB_HOST=127.0.0.1 DB_NAME=phalcon DB_USERNAME=root DB_PASSWORD=password -DB_PORT=3306 \ No newline at end of file +DB_PORT=3306 From e292e5c96f48293cb78e636492351fb331273e2d Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Thu, 2 Jun 2022 13:11:27 -0400 Subject: [PATCH 03/14] corrections for PHP8 --- src/Codeception/Lib/Connector/Phalcon5.php | 2 +- .../Lib/Connector/Phalcon5/MemorySession.php | 16 ++--- src/Codeception/Module/Phalcon5.php | 68 +++++++++++++------ 3 files changed, 57 insertions(+), 29 deletions(-) diff --git a/src/Codeception/Lib/Connector/Phalcon5.php b/src/Codeception/Lib/Connector/Phalcon5.php index e7cdcbb..f38f2a7 100644 --- a/src/Codeception/Lib/Connector/Phalcon5.php +++ b/src/Codeception/Lib/Connector/Phalcon5.php @@ -6,7 +6,7 @@ use Closure; use Codeception\Lib\Connector\Shared\PhpSuperGlobalsConverter; -use Codeception\Util\Stub; +use Codeception\Stub; use Phalcon\Di\Di; use Phalcon\Http; use Phalcon\Mvc\Application; diff --git a/src/Codeception/Lib/Connector/Phalcon5/MemorySession.php b/src/Codeception/Lib/Connector/Phalcon5/MemorySession.php index 825c25d..144cf80 100644 --- a/src/Codeception/Lib/Connector/Phalcon5/MemorySession.php +++ b/src/Codeception/Lib/Connector/Phalcon5/MemorySession.php @@ -5,34 +5,34 @@ namespace Codeception\Lib\Connector\Phalcon5; use Phalcon\Session\Adapter\AbstractAdapter; -use Phalcon\Session\AdapterInterface; +use SessionHandlerInterface; class MemorySession extends AbstractAdapter { /** * @var string */ - protected $sessionId; + protected string $sessionId; /** * @var string */ - protected $name; + protected string $name; /** * @var bool */ - protected $started = false; + protected bool $started = false; /** * @var array */ - protected $memory = []; + protected array $memory = []; /** * @var array */ - protected $options = []; + protected array $options = []; public function __construct(array $options = null) { @@ -201,9 +201,9 @@ public function destroy($id): bool * * @param bool $deleteOldSession * - * @return AdapterInterface + * @return SessionHandlerInterface */ - public function regenerateId(bool $deleteOldSession = true): AdapterInterface + public function regenerateId(bool $deleteOldSession = true): SessionHandlerInterface { $this->sessionId = $this->generateId(); diff --git a/src/Codeception/Module/Phalcon5.php b/src/Codeception/Module/Phalcon5.php index 2b9687b..037935b 100644 --- a/src/Codeception/Module/Phalcon5.php +++ b/src/Codeception/Module/Phalcon5.php @@ -23,11 +23,13 @@ use Phalcon\Mvc\Application; use Phalcon\Mvc\Micro; use Phalcon\Mvc\Model as PhalconModel; -use Phalcon\Mvc\Model\MessageInterface; -use Phalcon\Mvc\ResultsetInterface; +use Phalcon\Messages\MessageInterface; +use Phalcon\Mvc\Model\ResultsetInterface; use Phalcon\Mvc\Router\RouteInterface; use Phalcon\Mvc\RouterInterface; use Phalcon\Mvc\Url; +use Phalcon\Session\Manager; +use Symfony\Component\BrowserKit\AbstractBrowser; /** * This module provides integration with [Phalcon framework](https://www.phalcon.io/) (4.x). @@ -96,7 +98,7 @@ class Phalcon5 extends Framework implements ActiveRecord, PartedModule /** * @var array */ - protected $config = [ + protected array $config = [ 'bootstrap' => 'app/config/bootstrap.php', 'cleanup' => true, 'savepoints' => true, @@ -106,21 +108,21 @@ class Phalcon5 extends Framework implements ActiveRecord, PartedModule /** * Phalcon bootstrap file path */ - protected $bootstrapFile = null; + protected ?string $bootstrapFile = null; /** * Dependency injection container * * @var DiInterface */ - public $di = null; + public ?DiInterface $di = null; /** * Phalcon Connector * * @var PhalconConnector */ - public $client; + public ?AbstractBrowser $client; /** * HOOK: used after configuration is loaded @@ -158,7 +160,10 @@ public function _before(TestInterface $test) /** @noinspection PhpIncludeInspection */ $application = require $this->bootstrapFile; if (!$application instanceof Injectable) { - throw new ModuleException(__CLASS__, 'Bootstrap must return \Phalcon\Di\Injectable object'); + throw new ModuleException( + __CLASS__, + 'Bootstrap must return \Phalcon\Di\Injectable object' + ); } $this->di = $application->getDI(); @@ -221,7 +226,7 @@ public function _after(TestInterface $test) $_SESSION = $_FILES = $_GET = $_POST = $_COOKIE = $_REQUEST = []; } - public function _parts() + public function _parts(): array { return ['orm', 'services']; } @@ -248,8 +253,12 @@ public function haveInSession(string $key, $val): void $this->di->get('session') ->set($key, $val) ; - $this->debugSection('Session', json_encode($this->di['session']->getAdapter() - ->toArray())); + $this->debugSection( + 'Session', + json_encode( + $this->di['session']->getAdapter()->toArray() + ) + ); } /** @@ -267,8 +276,12 @@ public function haveInSession(string $key, $val): void */ public function seeInSession(string $key, $value = null): void { - $this->debugSection('Session', json_encode($this->di['session']->getAdapter() - ->toArray())); + $this->debugSection( + 'Session', + json_encode( + $this->di['session']->getAdapter()->toArray() + ) + ); if (is_array($key)) { $this->seeSessionHasValues($key); @@ -351,7 +364,13 @@ public function haveRecord($model, $attributes = []) ); } - $this->fail(sprintf("Record %s was not saved. Messages: \n%s", $model, implode(PHP_EOL, $errors))); + $this->fail( + sprintf( + "Record %s was not saved. Messages: \n%s", + $model, + implode(PHP_EOL, $errors) + ) + ); return null; } @@ -374,7 +393,7 @@ public function haveRecord($model, $attributes = []) * * @part orm */ - public function seeRecord($model, $attributes = []) + public function seeRecord(string $model, array $attributes = []): void { $record = $this->findRecord($model, $attributes); if (!$record) { @@ -425,12 +444,14 @@ public function seeNumberOfRecords(string $model, int $number, array $attributes * * @part orm */ - public function dontSeeRecord($model, $attributes = []) + public function dontSeeRecord(string $model, array $attributes = []): void { $record = $this->findRecord($model, $attributes); $this->debugSection($model, json_encode($record)); if ($record) { - $this->fail("Unexpectedly managed to find $model with " . json_encode($attributes)); + $this->fail( + "Unexpectedly managed to find $model with " . json_encode($attributes) + ); } } @@ -625,12 +646,18 @@ protected function findRecords(string $model, array $attributes = []) protected function getModelRecord($model) { if (!class_exists($model)) { - throw new ModuleException(__CLASS__, "Model $model does not exist"); + throw new ModuleException( + __CLASS__, + "Model $model does not exist" + ); } $record = new $model(); if (!$record instanceof PhalconModel) { - throw new ModuleException(__CLASS__, "Model $model is not instance of \\Phalcon\\Mvc\\Model"); + throw new ModuleException( + __CLASS__, + "Model $model is not instance of \\Phalcon\\Mvc\\Model" + ); } return $record; @@ -662,7 +689,8 @@ protected function getModelIdentity(PhalconModel $model) case 1: $primaryKey = $primaryKeys[0]; - // if columnMap is used for model, map database column name to model property name + // if columnMap is used for model, map database column name to + // model property name $columnMap = $this->di->get('modelsMetadata') ->getColumnMap($model); if ($columnMap) { @@ -685,7 +713,7 @@ protected function getModelIdentity(PhalconModel $model) * * @return array */ - protected function getInternalDomains() + protected function getInternalDomains(): array { $internalDomains = [$this->getApplicationDomainRegex()]; From 41047257b73bd6851c13a51848f9f6659b3072ba Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Thu, 2 Jun 2022 13:11:38 -0400 Subject: [PATCH 04/14] adapter php8 packages --- composer.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 4a17e4d..e88d897 100644 --- a/composer.json +++ b/composer.json @@ -18,19 +18,19 @@ } ], "require": { - "php": ">=7.4.0", + "php": ">=8.0", "ext-json": "*", - "codeception/codeception": "^4.0", - "codeception/lib-innerbrowser": "^1.0", - "codeception/module-asserts": "^1.0", - "codeception/module-phpbrowser": "^1.0", - "codeception/module-db": "^1.0" + "codeception/codeception": "^5.0.0-RC1", + "codeception/module-asserts": "^3.0", + "codeception/module-phpbrowser": "^3.0", + "codeception/module-db": "^3.0" }, "require-dev": { "codeception/util-robohelpers": "dev-master", - "vlucas/phpdotenv": "^4.1", - "squizlabs/php_codesniffer": "^3.4", - "vimeo/psalm": "^3.6" + "phalcon/ide-stubs": "^5.0.0RC1", + "squizlabs/php_codesniffer": "^3.6", + "vimeo/psalm": "^4.23", + "vlucas/phpdotenv": "^5.4" }, "autoload": { "classmap": [ From 31ad56abda719575116e4c8e0b1d099c8eaeaae7 Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Thu, 2 Jun 2022 13:11:50 -0400 Subject: [PATCH 05/14] corrected class references --- tests/unit/Phalcon5ConnectorTest.php | 2 +- tests/unit/Phalcon5ModuleTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/unit/Phalcon5ConnectorTest.php b/tests/unit/Phalcon5ConnectorTest.php index 08676bb..bd359cf 100644 --- a/tests/unit/Phalcon5ConnectorTest.php +++ b/tests/unit/Phalcon5ConnectorTest.php @@ -5,7 +5,7 @@ use Codeception\Lib\Connector\Phalcon5 as PhalconConnector; use Codeception\Module\Phalcon5; use Codeception\Test\Unit; -use Codeception\Util\Stub; +use Codeception\Stub; use Symfony\Component\BrowserKit\Request; final class Phalcon5ConnectorTest extends Unit diff --git a/tests/unit/Phalcon5ModuleTest.php b/tests/unit/Phalcon5ModuleTest.php index 610aca9..89d9b5d 100644 --- a/tests/unit/Phalcon5ModuleTest.php +++ b/tests/unit/Phalcon5ModuleTest.php @@ -5,7 +5,7 @@ use Codeception\Exception\ModuleConfigException; use Codeception\Module\Phalcon5; use Codeception\Test\Unit; -use Codeception\Util\Stub; +use Codeception\Stub; final class Phalcon5ModuleTest extends Unit { From 88b8ffaa2828aa2623b154fcba215f2143833c52 Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Thu, 2 Jun 2022 13:12:04 -0400 Subject: [PATCH 06/14] changed mysql password --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c6b94dd..f27812a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,7 +10,7 @@ jobs: mysql: image: mysql:5.7 env: - MYSQL_ROOT_PASSWORD: password + MYSQL_ROOT_PASSWORD: secret MYSQL_DATABASE: phalcon ports: - 3306:3306 @@ -21,7 +21,7 @@ jobs: --health-retries 5 strategy: matrix: - php: [7.4, 8.0] + php: [8.0, 8.1] steps: - name: Checkout code @@ -31,7 +31,7 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php }} - extensions: phalcon-5.0.0beta1, pdo, mysql + extensions: phalcon-5.0.0RC1, pdo, mysql coverage: none - name: Validate composer.json and composer.lock From a649bc7617db479140ef7e3a286c120032035513 Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Thu, 2 Jun 2022 13:24:42 -0400 Subject: [PATCH 07/14] changing the actions mysql password --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f27812a..d6a84b7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,7 +10,7 @@ jobs: mysql: image: mysql:5.7 env: - MYSQL_ROOT_PASSWORD: secret + MYSQL_ROOT_PASSWORD: password MYSQL_DATABASE: phalcon ports: - 3306:3306 From cb62b57f2ccfef6c3236c9b6ce973476fed23590 Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Thu, 2 Jun 2022 15:53:48 -0400 Subject: [PATCH 08/14] corrected references --- src/Codeception/Module/Phalcon5.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Codeception/Module/Phalcon5.php b/src/Codeception/Module/Phalcon5.php index 037935b..273be52 100644 --- a/src/Codeception/Module/Phalcon5.php +++ b/src/Codeception/Module/Phalcon5.php @@ -32,12 +32,12 @@ use Symfony\Component\BrowserKit\AbstractBrowser; /** - * This module provides integration with [Phalcon framework](https://www.phalcon.io/) (4.x). + * This module provides integration with [Phalcon framework](https://www.phalcon.io/) (5.x). * Please try it and leave your feedback. * * ## Status * - * * Maintainer: **Ruud Boon** + * * Maintainer: **Nikolaos Dimopoulos** * * Stability: **stable** * * Contact: team@phalcon.io * @@ -59,7 +59,7 @@ * * ## Parts * - * By default all available methods are loaded, but you can specify parts to select only needed + * By default, all available methods are loaded, but you can specify parts to select only needed * actions and avoid conflicts. * * * `orm` - include only `haveRecord/grabRecord/seeRecord/dontSeeRecord` actions. From ca83f163a39d4be13bb4edc50dd5e79d48087351 Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Thu, 2 Jun 2022 15:54:02 -0400 Subject: [PATCH 09/14] adjusted the url scheme --- documentation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation.md b/documentation.md index a1ca9ae..cfaa834 100644 --- a/documentation.md +++ b/documentation.md @@ -1507,7 +1507,7 @@ Switch to iframe or frame on the page. Example: ``` html -