Skip to content

Commit

Permalink
Merge pull request #16164 from phalcon/5.0.x
Browse files Browse the repository at this point in the history
v5.0.4
  • Loading branch information
niden authored Oct 17, 2022
2 parents caedb80 + 72ac868 commit 81a6fcf
Show file tree
Hide file tree
Showing 85 changed files with 538 additions and 623 deletions.
2 changes: 1 addition & 1 deletion .ci/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ else
fi

# If a `*.gch' (or a `*.pch') file is not found then the normal header files
# will be used. For more see: http://en.wikipedia.org/wiki/Precompiled_header
# will be used. For more see: https://en.wikipedia.org/wiki/Precompiled_header
while IFS= read -r -d '' file
do
# shellcheck disable=SC2046
Expand Down
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# EditorConfig is awesome: http://EditorConfig.org
# EditorConfig is awesome: https://EditorConfig.org

# top-most EditorConfig file
root = true
Expand Down
3 changes: 2 additions & 1 deletion .github/actions/build-phalcon-mac/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ runs:
steps:
- name: Configure macOS Environment
shell: bash
# Xcode paths: https://github.com/actions/runner-images/blob/main/images/macos/macos-11-Readme.md#xcode
run: |
sudo xcode-select -s /Applications/Xcode_12.app
sudo xcode-select -s /Applications/Xcode_13.0.app
xcodebuild -version
- name: 'Build Phalcon for macOS'
Expand Down
18 changes: 9 additions & 9 deletions .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.0.3
PHALCON_VERSION: 5.0.4
ZEPHIR_PARSER_VERSION: 1.5.1
ZEPHIR_VERSION: 0.16.3

Expand Down Expand Up @@ -91,15 +91,15 @@ jobs:

name:
- ubuntu-gcc
# - macos-clang
- macos-clang

# matrix names should be in next format:
# {php}-{ts}-{os.name}-{compiler}-{arch}
include:
# Linux
- { name: ubuntu-gcc, os: ubuntu-18.04, compiler: gcc }
# # macOS
# - { name: macos-clang, os: macos-11, compiler: clang }
# macOS
- { name: macos-clang, os: macos-11, compiler: clang }
# Windows
- { php: '7.4', ts: 'ts', arch: 'x64', name: 'windows2019-vc15', os: 'windows-2019', compiler: 'vc15' }
- { php: '7.4', ts: 'nts', arch: 'x64', name: 'windows2019-vc15', os: 'windows-2019', compiler: 'vc15' }
Expand Down Expand Up @@ -142,11 +142,11 @@ jobs:
with:
pecl: ./phalcon-pecl/phalcon-pecl.tgz

# - name: Build Phalcon Extension (macOS)
# uses: ./.github/actions/build-phalcon-mac
# if: runner.os == 'macOS'
# with:
# pecl: ./phalcon-pecl/phalcon-pecl.tgz
- name: Build Phalcon Extension (macOS)
uses: ./.github/actions/build-phalcon-mac
if: runner.os == 'macOS'
with:
pecl: ./phalcon-pecl/phalcon-pecl.tgz

- name: Build Phalcon Extension (Windows)
uses: ./.github/actions/build-phalcon-win
Expand Down
6 changes: 3 additions & 3 deletions 3rdparty/licenses/LICENSE-PHP.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ are met:
6. Redistributions of any form whatsoever must retain the following
acknowledgment:
"This product includes PHP software, freely available from
<http://www.php.net/software/>".
<https://www.php.net/software/>".

THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND
ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
Expand All @@ -62,7 +62,7 @@ individuals on behalf of the PHP Group.
The PHP Group can be contacted via Email at [email protected].

For more information on the PHP Group and the PHP project,
please see <http://www.php.net>.
please see <https://www.php.net>.

PHP includes the Zend Engine, freely available at
<http://www.zend.com>.
<https://www.zend.com>.
4 changes: 2 additions & 2 deletions 3rdparty/licenses/LICENSE-ZEND.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ are met:
5. Redistributions of any form whatsoever must retain the following
acknowledgment:
"This product includes the Zend Engine, freely available at
http://www.zend.com"
https://www.zend.com"

6. All advertising materials mentioning features or use of this
software must display the following acknowledgment:
"The Zend Engine is freely available at http://www.zend.com"
"The Zend Engine is freely available at https://www.zend.com"

THIS SOFTWARE IS PROVIDED BY ZEND TECHNOLOGIES LTD. ``AS IS'' AND
ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
Expand Down
2 changes: 2 additions & 0 deletions BACKERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,9 @@ Thanks for the support
<a href="https://github.com/emagus"><img src="https://avatars.githubusercontent.com/u/5857789?v=4" title="maGus Informática" width="60" height="60"></a>
<a href="https://github.com/tztztztz"><img src="https://avatars.githubusercontent.com/u/7032308?v=4" title="Tomasz Zadora" 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/kgrammer"><img src="https://avatars.githubusercontent.com/u/8472433?v=4" title="Ken Grammer" width="60" height="60"></a>
<a href="https://github.com/sitchi"><img src="https://avatars.githubusercontent.com/u/11546683?v=4" title="Nikoloz Sitchinava" width="60" height="60"></a>
<a href="https://github.com/6trading"><img src="https://avatars.githubusercontent.com/u/12135941?v=4" title="Chris" 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/fvromera"><img src="https://avatars.githubusercontent.com/u/32909196?s=460&u=a4a6d765c836be52ab247354399d0ed1a49224fa&v=4" title="fvromera" 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>
Expand Down
14 changes: 12 additions & 2 deletions CHANGELOG-5.0.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
# [5.0.4](https://github.com/phalcon/cphalcon/releases/tag/v5.0.4) (2022-10-17)

## Fixed
- Fixed `Phalcon\Encryption\Security` to take into account the `workFactor` in the cost calculation [#16153](https://github.com/phalcon/cphalcon/issues/16153)
- Removed double unserializing during Model caching [#16035](https://github.com/phalcon/cphalcon/issues/16035), [#16131](https://github.com/phalcon/cphalcon/issues/16131)
- Fixed `Phalcon\Db\Adapter\Pdo\Mysql::describeIndexes` to assign an empty string in the index type of `null` and remove warnings [#16157](https://github.com/phalcon/cphalcon/issues/16157)
- Fixed `Phalcon\Db\Adapter\Pdo\Sqlite::describeIndexes` to assign an empty string in the index type of `null` and remove warnings [#16157](https://github.com/phalcon/cphalcon/issues/16157)
- Fixed `Phalcon\Mvc\Model\Manager::notifyEvent` to return `true` instead of `null` on success [#16161](https://github.com/phalcon/cphalcon/issues/16161)
- Fixed `Phalcon\Encryption\Security\JWT\Validator::validateExpiration` to correctly validate the `exp` claim [#16166](https://github.com/phalcon/cphalcon/issues/16166)

# [5.0.3](https://github.com/phalcon/cphalcon/releases/tag/v5.0.3) (2022-10-06)

## Changed
Expand Down Expand Up @@ -203,8 +213,8 @@
- Changes to `Phalcon\Autoload\Loader`:
- Renamed `registerClasses()` to `setClasses()`
- Renamed `registerDirectories()` to `setDirectories()`
- Renamed `registertExtensions()` to `setExtensions()`
- Renamed `registertFiles()` to `setFiles()`
- Renamed `registerExtensions()` to `setExtensions()`
- Renamed `registerFiles()` to `setFiles()`
- Renamed `registerNamespaces()` to `setNamespaces()` [#15797](https://github.com/phalcon/cphalcon/issues/15797)
- Moved `Phalcon\Di` to `Phalcon\Di\Di` [#15799](https://github.com/phalcon/cphalcon/issues/15799)
- Removed references to `Phalcon\Tag` from the framework in favor of `Phalcon\Html\TagFactory` [#15801](https://github.com/phalcon/cphalcon/issues/15801)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[![Codecov master][codecov-master-badge]](https://codecov.io/gh/phalcon/cphalcon)
[![Codecov 5.0x][codecov-5x-badge]](https://codecov.io/gh/phalcon/cphalcon)

[![Discord][discord-badge]](http://phalcon.io/discord)
[![Discord][discord-badge]](https://phalcon.io/discord)
[![Contributors][contributors-badge]](https://github.com/phalcon/cphalcon/graphs/contributors)
[![Phalcon Backers][backers-badge]](https://github.com/phalcon/cphalcon/blob/master/BACKERS.md)
[![OpenCollective][oc-backers-badge]](#backers)
Expand Down
4 changes: 2 additions & 2 deletions build/gcccpuopt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# License: LGPLv2
# Author:
# http://www.pixelbeat.org/
# https://www.pixelbeat.org/
# Notes:
# This script currently supports Linux,FreeBSD,Cygwin
# This script is x86 (32 bit) specific
Expand Down Expand Up @@ -58,7 +58,7 @@
# V0.99.4, 24 Oct 2009, Following a report from Maxime de Roucy, add support
# for AMD family 17 (griffin).
# V0.99.11, 04 Jul 2013
# http://github.com/pixelb/scripts/commits/master/scripts/gcccpuopt
# https://github.com/pixelb/scripts/commits/master/scripts/gcccpuopt

if [ "$1" = "--version" ]; then
echo "0.99.11" && exit
Expand Down
Loading

0 comments on commit 81a6fcf

Please sign in to comment.