4.0.2

.ci/github_set_env.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+#
+# This file is part of the Phalcon Framework.
+#
+# (c) Phalcon Team <[email protected]>
+#
+# For the full copyright and license information, please view the
+# LICENSE.txt file that was distributed with this source code.
+
+set -e
+
+sed -i "s/MYSQL_DB_PORT=3306/MYSQL_DB_PORT=$MYSQL_DB_PORT/g" .env
+sed -i "s/MYSQL_DB_PASSWORD=''/MYSQL_DB_PASSWORD='$MYSQL_DB_PASSWORD'/g" .env
+sed -i "s/POSTGRES_DB_PORT=5432/POSTGRES_DB_PORT=$POSTGRES_DB_PORT/g" .env

.ci/link_devtools.sh

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+#
+# This file is part of the Phalcon Framework.
+#
+# (c) Phalcon Team <[email protected]>
+#
+# For the full copyright and license information, please view the
+# LICENSE.txt file that was distributed with this source code.
+
+mkdir "$GITHUB_WORKSPACE"/bin
+ln -s "$GITHUB_WORKSPACE"/phalcon "$GITHUB_WORKSPACE"/bin/phalcon
+echo "::add-path::$GITHUB_WORKSPACE/bin"
+chmod +x "$GITHUB_WORKSPACE"/phalcon

.ci/serve-webtools.sh

@@ -9,12 +9,15 @@
 
 set -e
 
-WEB_TOOLS_PROJECT=${HOME}/webtools
+#WEB_TOOLS_PROJECT=${HOME}/webtools
 
-rm -rf ${WEB_TOOLS_PROJECT}
-phalcon project --directory=$HOME --name=webtools
-sed -i "s/'dbname'      => 'test',/'dbname'      => 'devtools',/g" ${WEB_TOOLS_PROJECT}/app/config/config.php
-cd ${WEB_TOOLS_PROJECT}
+rm -rf webtools
+phalcon project --name=webtools
+#phalcon project --directory=$HOME --name=webtools
+#sed -i "s/'dbname'      => 'test',/'dbname'      => 'devtools',/g" ${WEB_TOOLS_PROJECT}/app/config/config.php
+sed -i "s/database->charset/database->charset,\n\t\t'port'     => \$config->database->port/g" webtools/app/config/services.php
+#cd ${WEB_TOOLS_PROJECT}
+cd webtools
 
 phalcon webtools enable
 phalcon serve &

.github/workflows/tests.yml

@@ -0,0 +1,141 @@
+name: "Tests"
+
+on: [push, pull_request]
+
+jobs:
+    run-tests:
+        name: PHP ${{ matrix.php-versions }}
+        runs-on: ubuntu-latest
+        env:
+            extensions: mbstring, intl, json, phalcon-4.0.5, mysql, pgsql, xdebug
+            key: cache-v2.0~19.03.2020
+        services:
+            mysql:
+                image: mysql:5.7
+                env:
+                    MYSQL_DATABASE: devtools
+                    MYSQL_ROOT_PASSWORD: root
+                ports:
+                    - 3306/tcp
+                options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+            postgres:
+                image: postgres:10.8
+                ports:
+                    - 5432/tcp
+                env:
+                    POSTGRES_DB: devtools
+                options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+        strategy:
+            fail-fast: false
+            matrix:
+                php-versions: ['7.2', '7.3']
+        steps:
+            - uses: actions/checkout@v1
+
+            - name: Setup cache environment
+              id: cache-env
+              uses: shivammathur/cache-extensions@v1
+              with:
+                  php-version: ${{ matrix.php-versions }}
+                  extensions: ${{ env.extensions }}
+                  key: ${{ env.key }}
+
+            - name: Cache extensions
+              uses: actions/cache@v1
+              with:
+                  path: ${{ steps.cache-env.outputs.dir }}
+                  key: ${{ steps.cache-env.outputs.key }}
+                  restore-keys: ${{ steps.cache-env.outputs.key }}
+
+            - name: Setup PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: ${{ matrix.php-versions }}
+                  extensions: ${{ env.extensions }}
+                  tools: pecl
+
+            - name: Get Composer Cache Directory
+              id: composer-cache
+              run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+            - name: Cache composer dependencies
+              uses: actions/cache@v1
+              with:
+                  path: ${{ steps.composer-cache.outputs.dir }}
+                  key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+                  restore-keys: ${{ runner.os }}-composer-
+
+            - name: Install Composer dependencies
+              run: |
+                composer install --prefer-dist --no-suggest
+                composer require --dev phpstan/phpstan
+
+            - name: Initialise DataBase
+              env:
+                  MYSQL_DB_PASSWORD: 'root'
+                  MYSQL_DB_PORT: ${{ job.services.mysql.ports['3306'] }}
+                  POSTGRES_DB_PORT: ${{ job.services.postgres.ports['5432'] }}
+              run: bash tests/_ci/setup_dbs_github.sh
+
+            - name: Symbolic link Phalcon devtools
+              run: bash ./.ci/link_devtools.sh
+
+            - name: Init Webtools and add ports in database setup
+              env:
+                  MYSQL_DB_PASSWORD: 'root'
+                  MYSQL_DB_PORT: ${{ job.services.mysql.ports['3306'] }}
+                  POSTGRES_DB_PORT: ${{ job.services.postgres.ports['5432'] }}
+              run: bash ./.ci/serve-webtools.sh
+
+            - name: Setup tests
+              run: |
+                cp tests/.env.test .env
+                bash ./.ci/github_set_env.sh
+                mkdir .phalcon
+                vendor/bin/codecept build
+                vendor/bin/phpcs
+
+            - name: Run test suites
+              env:
+                  MYSQL_DB_PASSWORD: 'root'
+                  MYSQL_DB_PORT: ${{ job.services.mysql.ports['3306'] }}
+                  POSTGRES_DB_PORT: ${{ job.services.postgres.ports['5432'] }}
+              if: success()
+              run: |
+                vendor/bin/codecept run --ext DotReporter acceptance -g mysql --env mysql
+                vendor/bin/codecept run --ext DotReporter acceptance -g pgsql --env pgsql
+                vendor/bin/codecept run --ext DotReporter acceptance -g common --coverage-xml=coverage-common-${{ matrix.php-versions }}.xml
+                vendor/bin/codecept run --ext DotReporter unit --coverage-xml=coverage-unit-${{ matrix.php-versions }}.xml
+                vendor/bin/codecept run --ext DotReporter functional --coverage-xml=coverage-functional-${{ matrix.php-versions }}.xml
+                vendor/bin/codecept run --ext DotReporter console --coverage-xml=coverage-console-${{ matrix.php-versions }}.xml
+
+            - name: If fail - Check Config file
+              env:
+                  MYSQL_DB_PORT: ${{ job.services.mysql.ports['3306'] }}
+                  POSTGRES_DB_PORT: ${{ job.services.postgres.ports['5432'] }}
+              if: failure()
+              run: |
+                  cat webtools/app/config/config.php
+                  cat webtools/app/config/services.php
+                  echo "<?php print_r(include('webtools/app/config/config.php')) ?>" > content_config.php
+                  php content_config.php
+                  php tests/debug.php
+
+            - uses: actions/upload-artifact@v1
+              if: failure()
+              with:
+                  name: Codeception Logs
+                  path: tests/_output
+
+            - name: Check psalm
+              run: vendor/bin/psalm --show-info=false
+
+            - name: Check phpstan
+              run: vendor/bin/phpstan analyse -l 5 -c phpstan.neon src -v
+
+            - name: Upload coverage to Codecov
+              if: success()
+              uses: codecov/codecov-action@v1
+              with:
+                  token: ${{secrets.CODECOV_TOKEN}}
+                  file: ./tests/_output/coverage-*.xml

.travis.yml

@@ -37,8 +37,6 @@ env:
     - PHALCON_VERSION=v4.0.0
 
 before_install:
-  - source $TRAVIS_BUILD_DIR/tests/_ci/environment
-  - export $(cut -d= -f1 $TRAVIS_BUILD_DIR/tests/_ci/environment)
   - if [ -n "$GITHUB_TOKEN" ]; then composer config github-oauth.github.com $GITHUB_TOKEN; fi;
   - bash tests/_ci/setup_dbs.sh
 
@@ -59,12 +57,19 @@ before_script:
   - composer require --dev phpstan/phpstan
   - ln -s $PWD/phalcon ~/bin/phalcon
   - .ci/serve-webtools.sh
+  - sed -i "s/getenv('POSTGRES_DB_PORT')/5432/g" tests/_data/acceptance/pgsql/config.php
+  - cp tests/.env.test .env
 
 script:
   - mkdir .phalcon
   - vendor/bin/phpcs
   - vendor/bin/codecept build
-  - vendor/bin/codecept run --coverage-xml
+  - vendor/bin/codecept run --ext DotReporter acceptance -g mysql --env mysql
+  - vendor/bin/codecept run --ext DotReporter acceptance -g pgsql --env pgsql
+  - vendor/bin/codecept run --ext DotReporter acceptance -g common --coverage-xml=coverage-common-$PHAR_PHP_VERSION.xml
+  - vendor/bin/codecept run --ext DotReporter unit --coverage-xml=coverage-unit-$PHAR_PHP_VERSION.xml
+  - vendor/bin/codecept run --ext DotReporter functional --coverage-xml=coverage-functional-$PHAR_PHP_VERSION.xml
+  - vendor/bin/codecept run --ext DotReporter console --coverage-xml=coverage-console-$PHAR_PHP_VERSION.xml
   - vendor/bin/psalm --show-info=false
   - vendor/bin/phpstan analyse -l 5 -c phpstan.neon src -v
 

CHANGELOG.md

@@ -0,0 +1,10 @@
+# [4.0.2](https://github.com/phalcon/cphalcon/releases/tag/v4.0.2) (2020-04-11)
+## Added
+- Added launcher.bat to run cli with Windows and used DIRECTORY_SEPARATOR to find the file. [#1440](https://github.com/phalcon/phalcon-devtools/issues/1440) [@jenovateurs](https://github.com/jenovateurs)
+## Changed
+
+## Fixed
+- Fixed include order of files in created project [#1417](https://github.com/phalcon/phalcon-devtools/issues/1417)
+- Fixed Scaffold templates errors and phpstan errors. [#1429](https://github.com/phalcon/phalcon-devtools/issues/1429) [@jenovateurs](https://github.com/jenovateurs)
+- Fixed duplicate camelCase properties [#1433](https://github.com/phalcon/phalcon-devtools/pull/1433)
+- Fixed webtools not enabled by default when creating a new project [#1410](https://github.com/phalcon/phalcon-devtools/issues/1410) [@jenovateurs](https://github.com/jenovateurs)

phpstan.neon

@@ -4,10 +4,14 @@ parameters:
     excludes_analyse:
         - %rootDir%/../../../src/Generator/*
         - %rootDir%/../../../src/Commands/DotPhalconMissingException.php
+        - %rootDir%/../../../src/Mvc/Dispatcher/ErrorHandler.php
     ignoreErrors:
         - '#Strict comparison using === between#'
         - '#Result of && is always true#'
-        - '#Result of || is always true#'
+        - '#Result of \|\| is always true#'
         - '#Parameter \#1 \$adapter of class Phalcon\\Cache constructor expects#'
         - '#Parameter \#1 \$eventsManager of method Phalcon#'
+        - '#Parameter \#1 \$exception_handler of function set_exception_handler expects#'
+        - '#Parameter \#1 \$function of function register_shutdown_function expects callable()#'
+        - '#Call to an undefined method [a-zA-Z0-9\\_]+::getShared\(\)#'
     reportUnmatchedIgnoredErrors: false

src/Access/Manager.php

@@ -15,7 +15,11 @@
 use Phalcon\Di\Injectable;
 use Phalcon\Events\Event;
 use Phalcon\Mvc\Dispatcher;
+use Phalcon\Events\ManagerInterface;
 
+/**
+ * @property ManagerInterface $eventsManager
+ */
 class Manager extends Injectable
 {
     const EXCEPTION_ACTION_DISALLOWED = 10;

src/Builder/Component/AllModels.php

@@ -159,7 +159,7 @@ public function build(): void
             }
         } else {
             foreach ($db->listTables($schema) as $name) {
-                if ($defineRelations) {
+                if (true === $defineRelations) {
                     $hasMany[$name] = [];
                     $belongsTo[$name] = [];
                     $foreignKeys[$name] = [];