Skip to content

Commit

Permalink
Merge pull request #16479 from niden/5.0.x
Browse files Browse the repository at this point in the history
5.5.0 Prep
  • Loading branch information
niden authored Dec 25, 2023
2 parents b4d4d7e + ac7e6a4 commit 394b14c
Show file tree
Hide file tree
Showing 17 changed files with 182 additions and 165 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ on:

env:
# All versions should be declared here
PHALCON_VERSION: 5.4.0
PHALCON_VERSION: 5.5.0
ZEPHIR_PARSER_VERSION: 1.6.0

# For tests
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG-5.0.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Changelog

## [5.5.0](https://github.com/phalcon/cphalcon/releases/tag/v5.5.0) (xxxx-xx-xx)
## [5.5.0](https://github.com/phalcon/cphalcon/releases/tag/v5.5.0) (2023-12-25)

### Changed

Expand Down
14 changes: 14 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,5 +89,19 @@
"source": "https://github.com/phalcon/cphalcon",
"docs": "https://phalcon.io/docs/",
"rss": "https://blog.phalcon.io/rss"
},
"scripts": {
"cs": "php -d extension=ext/modules/phalcon.so ./vendor/bin/phpcs --standard=phpcs.xml",
"cs-fix": "php -d extension=ext/modules/phalcon.so ./vendor/bin/phpcbf --standard=phpcs.xml",
"test-unit": "php -d extension=ext/modules/phalcon.so ./vendor/bin/codecept run --ext DotReporter unit",
"test-cli": "php -d extension=ext/modules/phalcon.so ./vendor/bin/codecept run --ext DotReporter cli",
"test-integration": "php -d extension=ext/modules/phalcon.so ./vendor/bin/codecept run --ext DotReporter integration",
"test-db-common": "php -d extension=ext/modules/phalcon.so ./vendor/bin/codecept run --ext DotReporter database -g common",
"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"
}
}
13 changes: 6 additions & 7 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion config.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "phalcon",
"description": "Phalcon is a full stack PHP framework, delivered as a PHP extension, offering lower resource consumption and high performance.",
"author": "Phalcon Team and contributors",
"version": "5.4.0",
"version": "5.5.0",
"verbose": false,
"stubs": {
"path": "ide\/%version%\/%namespace%\/",
Expand Down
13 changes: 0 additions & 13 deletions docker/8.0/.bashrc
Original file line number Diff line number Diff line change
Expand Up @@ -81,16 +81,3 @@ alias zg='./vendor/bin/zephir generate'
alias zs='./vendor/bin/zephir stubs'
alias cpl='zf && zg && cd ext/ && ./install && ..'
alias codecept='php -d extension=ext/modules/phalcon.so ./vendor/bin/codecept '
alias phpcs='php -d extension=ext/modules/phalcon.so ./vendor/bin/phpcs '
alias phpcbf='php -d extension=ext/modules/phalcon.so ./vendor/bin/phpcbf '
alias psalm='php ./vendor/bin/psalm '

alias test-unit='php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter unit'
alias test-cli='php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter cli'
alias test-integration='php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter integration'
alias test-db-common='php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter database -g common'
alias test-db-mysql='php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter database --env mysql -g mysql'
alias test-db-pgsql='php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter database --env pgsql -g pgsql'
alias test-db-sqlite='php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter database --env sqlite -g sqlite'
alias test-db='test-db-common && test-db-mysql && test-db-pgsql && test-db-sqlite'
alias test-all='test-unit && test-cli && test-integration && test-db'
13 changes: 0 additions & 13 deletions docker/8.1/.bashrc
Original file line number Diff line number Diff line change
Expand Up @@ -81,16 +81,3 @@ alias zg='./vendor/bin/zephir generate'
alias zs='./vendor/bin/zephir stubs'
alias cpl='zf && zg && cd ext/ && ./install && ..'
alias codecept='php -d extension=ext/modules/phalcon.so ./vendor/bin/codecept '
alias phpcs='php -d extension=ext/modules/phalcon.so ./vendor/bin/phpcs '
alias phpcbf='php -d extension=ext/modules/phalcon.so ./vendor/bin/phpcbf '
alias psalm='php ./vendor/bin/psalm '

alias test-unit='php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter unit'
alias test-cli='php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter cli'
alias test-integration='php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter integration'
alias test-db-common='php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter database -g common'
alias test-db-mysql='php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter database --env mysql -g mysql'
alias test-db-pgsql='php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter database --env pgsql -g pgsql'
alias test-db-sqlite='php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter database --env sqlite -g sqlite'
alias test-db='test-db-common && test-db-mysql && test-db-pgsql && test-db-sqlite'
alias test-all='test-unit && test-cli && test-integration && test-db'
13 changes: 0 additions & 13 deletions docker/8.2/.bashrc
Original file line number Diff line number Diff line change
Expand Up @@ -81,16 +81,3 @@ alias zg='./vendor/bin/zephir generate'
alias zs='./vendor/bin/zephir stubs'
alias cpl='zf && zg && cd ext/ && ./install && ..'
alias codecept='php -d extension=ext/modules/phalcon.so ./vendor/bin/codecept '
alias phpcs='php -d extension=ext/modules/phalcon.so ./vendor/bin/phpcs '
alias phpcbf='php -d extension=ext/modules/phalcon.so ./vendor/bin/phpcbf '
alias psalm='php ./vendor/bin/psalm '

alias test-unit='php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter unit'
alias test-cli='php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter cli'
alias test-integration='php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter integration'
alias test-db-common='php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter database -g common'
alias test-db-mysql='php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter database --env mysql -g mysql'
alias test-db-pgsql='php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter database --env pgsql -g pgsql'
alias test-db-sqlite='php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter database --env sqlite -g sqlite'
alias test-db='test-db-common && test-db-mysql && test-db-pgsql && test-db-sqlite'
alias test-all='test-unit && test-cli && test-integration && test-db'
Loading

0 comments on commit 394b14c

Please sign in to comment.