Skip to content

Commit

Permalink
[phalcon#16604] - Merge branch 'refs/heads/5.0.x' into T16604-catch-e…
Browse files Browse the repository at this point in the history
…xception-rollback-and-re-throw

# Conflicts:
#	composer.json
#	tests/cli/Cli/Console/HandleCest.php
  • Loading branch information
noone-silent committed Jun 10, 2024
2 parents f8af0bc + fbb8318 commit 498e6fb
Show file tree
Hide file tree
Showing 32 changed files with 2,737 additions and 225 deletions.
4 changes: 2 additions & 2 deletions .github/actions/build-phalcon-win/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,15 @@ runs:
cache_dir: ${{ env.CACHE_DIR }}

- name: Configure Developer Command Prompt for MSVC compiler
uses: ilammy/msvc-dev-cmd@v1.12.1
uses: ilammy/msvc-dev-cmd@v1
with:
arch: ${{ inputs.arch }}

# Workaround for
# PHP Warning: PHP Startup: Can't load module 'C:\tools\php\ext\php_zephir_parser.dll'
# as it's linked with 14.29, but the core is linked with 14.16 in Unknown on line 0
- name: Configure Developer Command Prompt for MSVC compiler
uses: ilammy/msvc-dev-cmd@v1.12.1
uses: ilammy/msvc-dev-cmd@v1
if: ${{ inputs.php_version }} == '7.4'
with:
arch: ${{ inputs.arch }}
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,10 @@ autom4te.cache/
.zephir/
.temp/

# JetBrains IDE
*.iml
.idea/

# Zephir compiler
zephir.phar
zephir-*.phar
Expand Down
15 changes: 15 additions & 0 deletions CHANGELOG-5.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,23 @@

- Changed `Phalcon\Mvc\Model`, `Phalcon\Support\Collection` and `Phalcon\Support\Registry` to correctly implement `\Serializable` interface. [#16591](https://github.com/phalcon/cphalcon/issues/16591)
- Changed the `Phalcon\Mvc\Router\Group::getHostname()` to return `null` also. [#16601](https://github.com/phalcon/cphalcon/issues/16601)
- Changed `Phalcon\Mvc\View\Engine\Volt\Compiler::compileSource` to also return `array` [#16608](https://github.com/phalcon/cphalcon/issues/16608)

### Added

- Added events and `Phalcon\Events\Manager` for `Phalcon\Storage\Adapter\Apcu`,
`Phalcon\Storage\Adapter\Redis`,
`Phalcon\Storage\Adapter\Memory`,
`Phalcon\Storage\Adapter\Libmemcached`,
`Phalcon\Storage\Adapter\Stream`,
`Phalcon\Storage\Adapter\Weak`,
`Phalcon\Cache\Adapter\Apcu`,
`Phalcon\Cache\Adapter\Redis`,
`Phalcon\Cache\Adapter\Memory`,
`Phalcon\Cache\Adapter\Libmemcached`,
`Phalcon\Cache\Adapter\Stream`,
`Phalcon\Cache\Adapter\Weak`
`Phalcon\Cache\AbstractCache`. [#16606](https://github.com/phalcon/cphalcon/issues/16606)

### Fixed

Expand Down
21 changes: 18 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,23 @@
"test-db-mysql": "php -d extension=ext/modules/phalcon.so ./vendor/bin/codecept run --ext DotReporter database --env mysql -g mysql",
"test-db-pgsql": "php -d extension=ext/modules/phalcon.so ./vendor/bin/codecept run --ext DotReporter database --env pgsql -g pgsql",
"test-db-sqlite": "php -d extension=ext/modules/phalcon.so ./vendor/bin/codecept run --ext DotReporter database --env sqlite -g sqlite",
"test-db": "composer test-db-common && composer test-db-mysql && composer test-db-sqlite",
"test-all": "composer test-unit && composer test-cli && composer test-integration && composer test-db",
"analyze": "php -d extension=ext/modules/phalcon.so ./vendor/bin/psalm --no-cache"
"test-db": [
"@test-db-common",
"@test-db-mysql",
"@test-db-sqlite"
],
"test-all": [
"@test-unit",
"@test-cli",
"@test-integration",
"@test-db"
],
"analyze": "php -d extension=ext/modules/phalcon.so ./vendor/bin/psalm --no-cache",
"clean-build-stubs": [
"./vendor/bin/zephir fullclean",
"Composer\\Config::disableProcessTimeout",
"./vendor/bin/zephir build",
"./vendor/bin/zephir stubs"
]
}
}
Loading

0 comments on commit 498e6fb

Please sign in to comment.