Skip to content

Adjusting for up to PHP 7.4 and Phalcon 4 #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Adjusting for up to PHP 7.4 and Phalcon 4 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9f6fd99
allowing for more modern versions of zephir
Idrinth Aug 12, 2020
d94cd9a
updating gitignore
Idrinth Aug 12, 2020
5425559
updating version constraints
Idrinth Aug 12, 2020
ef7a21a
cleaning parsers doesn't seem an option in newer versions
Idrinth Aug 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/.project
/.settings
/vendor
/.project
/.settings
/vendor
/nbproject/
/composer.lock
9 changes: 4 additions & 5 deletions bin/install-phalcon.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,15 +145,14 @@ if [[ $PHP_VER == 7* ]]; then
# Therefore, since Zephir uses global PHP, ensure we set globally.
phpenv global ${PHP_VER}

# Clean parsers
cd ${CI_APP_DIR}/vendor/phalcon/zephir/parser
phpize --clean
# Clean parsers in older versions
(cd ${CI_APP_DIR}/vendor/phalcon/zephir/parser && phpize --clean) || true

# Compile
cd ${PHALCON_DIR}

${CI_APP_DIR}/vendor/phalcon/zephir/bin/zephir compile --backend=ZendEngine3
${CI_APP_DIR}/vendor/bin/zephir compile --backend=ZendEngine3

# Install
cd ${PHALCON_DIR}/ext
# Using debug flags (Production flags: "-O2 -fvisibility=hidden -Wparentheses -DZEPHIR_RELEASE=1")
Expand Down
6 changes: 3 additions & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
"Codeship"
],
"require": {
"php": "^5.4|^5.5|^5.6|^7.0",
"phalcon/zephir": "^0.9.6"
"php": "^5.4|^7.0",
"phalcon/zephir": ">=0.9.6 <1"
},
"require-dev": {
"phpunit/phpunit": "~3.7"
"phpunit/phpunit": "^3.7|^4|^5|^6|^7|^8"
},
"bin": [
"bin/install-phalcon.sh"
Expand Down
Loading