Skip to content
Permalink
Browse files

Merge branch '4.0.x'

* 4.0.x: (116 commits)
  Regenerating ext again
  Updated changelog for PECL
  Updated optimized build files
  Generating ext folder
  Updated version for release
  [#14858] - PHPCS
  [#14858] - Corrected and added more tests
  [#14858] - Updated changelog
  [#14858] - Moved models to check outside the models folder to avoid collisions
  [#14858] - Fixed test
  [#14858] - Fixed dirFromFile to remove "." for Windows
  add backer (github)
  Update changelog [skip ci]
  Update tests schemas
  Add condition to add 'default NULL' with 'ON UPDATE'
  Fix query
  Add test case with 'default null on update'
  Remove Products model
  Move setDatabase() inside mvcModelCriteriaJoinManyToManyMultipleSchema() method
  Remove duplicate setDatabase() method
  ...
  • Loading branch information
niden committed Mar 7, 2020
2 parents b28b0a2 + 3791b07 commit d3e94630156a0c4441bf5f72e6ed071941c5908b
Showing 472 changed files with 5,336 additions and 4,351 deletions.
@@ -141,7 +141,6 @@ jobs:
- 5432
env:
POSTGRES_PASSWORD: secret
POSTGRES_USER: phalcon
POSTGRES_DB: phalcon
redis:
image: redis:5-alpine
@@ -228,26 +227,34 @@ jobs:
DATA_MEMCACHED_PORT: ${{ job.services.memcached.ports['11211'] }}
run: vendor/bin/codecept run --ext DotReporter integration

- name: Run database tests Common
env:
DATA_REDIS_PORT: ${{ job.services.redis.ports['6379'] }}
DATA_MEMCACHED_PORT: ${{ job.services.memcached.ports['11211'] }}
DATA_MYSQL_USER: root
run: vendor/bin/codecept run --ext DotReporter database -g common

- name: Run database tests MySQL
env:
DATA_MYSQL_PORT: ${{ job.services.mysql.ports['3306'] }}
DATA_REDIS_PORT: ${{ job.services.redis.ports['6379'] }}
DATA_MEMCACHED_PORT: ${{ job.services.memcached.ports['11211'] }}
run: vendor/bin/codecept run --ext DotReporter database --env mysql
DATA_MYSQL_USER: root
run: vendor/bin/codecept run --ext DotReporter database --env mysql -g mysql

- name: Run database tests Sqlite
env:
DATA_REDIS_PORT: ${{ job.services.redis.ports['6379'] }}
DATA_MEMCACHED_PORT: ${{ job.services.memcached.ports['11211'] }}
run: vendor/bin/codecept run --ext DotReporter database --env sqlite
run: vendor/bin/codecept run --ext DotReporter database --env sqlite -g sqlite

# # TODO Enable these one at a time and also for MacOS/Windows
# - name: Run database tests Postgres
# env:
# DATA_POSTGRES_PORT: ${{ job.services.postgres.ports['5432'] }}
# DATA_REDIS_PORT: ${{ job.services.redis.ports['6379'] }}
# DATA_MEMCACHED_PORT: ${{ job.services.memcached.ports['11211'] }}
# run: vendor/bin/codecept run --ext DotReporter database --env pgsql
- name: Run database tests Postgres
env:
DATA_POSTGRES_USER: postgres
DATA_POSTGRES_PORT: ${{ job.services.postgres.ports['5432'] }}
DATA_REDIS_PORT: ${{ job.services.redis.ports['6379'] }}
DATA_MEMCACHED_PORT: ${{ job.services.memcached.ports['11211'] }}
run: vendor/bin/codecept run --ext DotReporter database --env pgsql -g pgsql
# - name: Run integrations tests SQL Server
# env:
# DATA_REDIS_PORT: ${{ job.services.redis.ports['6379'] }}
@@ -166,12 +166,14 @@ jobs:
DATA_POSTGRES_PORT: ${{ job.services.postgres.ports['5432'] }}
DATA_REDIS_PORT: ${{ job.services.redis.ports['6379'] }}
DATA_MEMCACHED_PORT: ${{ job.services.memcached.ports['11211'] }}
DATA_MYSQL_USER: root
run: |
vendor/bin/codecept run --ext DotReporter cli
vendor/bin/codecept run --ext DotReporter unit
vendor/bin/codecept run --ext DotReporter integration
vendor/bin/codecept run --ext DotReporter database --env mysql
vendor/bin/codecept run --ext DotReporter database --env sqlite
vendor/bin/codecept run --ext DotReporter database -g common
vendor/bin/codecept run --ext DotReporter database -g mysql --env mysql
vendor/bin/codecept run --ext DotReporter database -g sqlite --env sqlite
- name: Upload codecoverage on 7.4
uses: codecov/codecov-action@v1
@@ -82,16 +82,19 @@ Thanks for the support

<a href="https://github.com/ninjapanzer"><img src="https://avatars1.githubusercontent.com/u/159591?s=460&v=4" title="Paul Scarrone" width="60" height="60"></a>
<a href="https://github.com/vlad-light"><img src="https://avatars1.githubusercontent.com/u/277235?s=460&v=4" title="Vladimir L" width="60" height="60"></a>
<a href="https://github.com/alrieckert"><img src="https://avatars1.githubusercontent.com/u/452786?s=460&v=4" title="Anton Rieckert" width="60" height="60"></a>
<a href="https://github.com/sinbadxiii"><img src="https://avatars2.githubusercontent.com/u/900273?s=460&v=4" title="Sergey Mukhin" width="60" height="60"></a>
<a href="https://github.com/niden"><img src="https://avatars2.githubusercontent.com/u/1073784?s=460&v=4" title="Nikolaos Dimopoulos" width="60" height="60"></a>
<a href="https://github.com/qmegas"><img src="https://avatars3.githubusercontent.com/u/2444896?s=460&v=4" title="qmegas" width="60" height="60"></a>
<a href="https://github.com/terolblade"><img src="https://avatars3.githubusercontent.com/u/3078649?s=460&v=4" title="Stanislav Sviridenko" width="60" height="60"></a>
<a href="https://github.com/Ruzgfpegk"><img src="https://avatars1.githubusercontent.com/u/3818364?s=460&v=4" title="Ruzgfpegk" width="60" height="60"></a>
<a href="https://github.com/zsilbi"><img src="https://avatars2.githubusercontent.com/u/3886658?s=460&v=4" title="Balázs Németh" width="60" height="60"></a>
<a href="https://github.com/olegatro"><img src="https://avatars3.githubusercontent.com/u/4980366?s=460&v=4" title="Oleg Scherbakov" width="60" height="60"></a>
<a href="https://github.com/ruudboon"><img src="https://avatars3.githubusercontent.com/u/7444246?s=460&v=4" title="Ruud Boon" width="60" height="60"></a>
<a href="https://github.com/sitchi"><img src="https://avatars0.githubusercontent.com/u/11546683?s=460&v=4" title="Nikoloz Sitchinava" width="60" height="60"></a>
<a href="https://github.com/Montana"><img src="https://avatars3.githubusercontent.com/u/20936398?s=460&v=4" title="Montana Mendy" width="60" height="60"></a>
<a href="https://github.com/ak1113"><img src="https://avatars0.githubusercontent.com/u/38716832?s=460&v=4" title="Akira Kato" width="60" height="60"></a>
<a href="https://github.com/mr-ginting"><img src="https://avatars2.githubusercontent.com/u/61111859?s=460&v=4" title="Herbet" width="60" height="60"></a>

[//]: github-sponsors

@@ -1,10 +1,14 @@
# [4.0.5](https://github.com/phalcon/cphalcon/releases/tag/v4.0.5) (2020-xx-xx)
# [4.0.5](https://github.com/phalcon/cphalcon/releases/tag/v4.0.5) (2020-03-07)
## Added

## Changed

## Fixed

- Fixed `Phalcon\Db::fetchAll` to correctly return data when `Enum::FETCH_COLUMN` is supplied. [#13321](https://github.com/phalcon/cphalcon/issues/13321)
- Fixed Postgres NULL values to not be required during model update. [#14862](https://github.com/phalcon/cphalcon/issues/14862)
- Fixed MySQL alter column when default value contains not only CURRENT_TIMESTAMP [#14880](https://github.com/phalcon/cphalcon/issues/14880)
- Fixed MySQL default value with ON UPDATE expression [#14887](https://github.com/phalcon/cphalcon/pull/14887)
- Fixed `Str::dirFromFile()` to replace `.` with `-` to avoid issues with Windows environments [#14858](https://github.com/phalcon/cphalcon/issues/14858)

# [4.0.4](https://github.com/phalcon/cphalcon/releases/tag/v4.0.4) (2020-02-15)
## Added
@@ -5,7 +5,7 @@
# For the full copyright and license information, please view
# the LICENSE.txt file that was distributed with this source code.

version: 4.0.4+{build}
version: 4.0.5+{build}

environment:
matrix:
@@ -86,7 +86,7 @@ install:
- ps: >-
InstallPeclExtension `
-Name psr `
-Version 0.7.0 `
-Version 1.0.0 `
-PhpVersion $Env:PHP_VERSION `
-BuildType $Env:BUILD_TYPE `
-VC $Env:VC_VERSION `

0 comments on commit d3e9463

Please sign in to comment.
You can’t perform that action at this time.