From 70acb45dffe697e748677b484bcd2ac985cea0c9 Mon Sep 17 00:00:00 2001 From: Serghei Iakovlev Date: Sat, 8 Apr 2017 01:41:44 +0300 Subject: [PATCH 01/12] Improved RPM-spec by by removing hardcoded virtual provides specific things --- CHANGELOG.md | 2 ++ rpm/php-phalcon.spec | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 52c1b1b..d1e2ba5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] +### Changed +- Improved RPM-spec by by removing hardcoded virtual provides specific things ## [1.2.0] - 2017-04-06 ### Added diff --git a/rpm/php-phalcon.spec b/rpm/php-phalcon.spec index bfbc735..4df8cd5 100644 --- a/rpm/php-phalcon.spec +++ b/rpm/php-phalcon.spec @@ -59,8 +59,8 @@ BuildRequires: pcre-devel%{?_isa} >= 8.20 BuildRequires: re2c%{?_isa} Requires: %{php_base}-pdo%{?_isa} Requires: %{php_base}-common%{?_isa} -Requires: %{php_base}(zend-abi) = %{zend_apiver} -Requires: %{php_base}(api) = %{php_apiver} +Requires: php(zend-abi) = %{php_zend_api} +Requires: php(api) = %{php_core_api} %description High performance PHP framework. From 50238f3082dd18f61e653d93fbaf53d9e0e2a46d Mon Sep 17 00:00:00 2001 From: Serghei Iakovlev Date: Sat, 8 Apr 2017 01:44:08 +0300 Subject: [PATCH 02/12] Fixed CHANGELOG.md [ci skip] --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d1e2ba5..1b0af46 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] ### Changed -- Improved RPM-spec by by removing hardcoded virtual provides specific things +- Improved RPM-spec by removing hardcoded virtual provides specific things ## [1.2.0] - 2017-04-06 ### Added From e2e3bd58ae122247536b599453d8baf3e2224ea8 Mon Sep 17 00:00:00 2001 From: Serghei Iakovlev Date: Sat, 8 Apr 2017 13:17:51 +0300 Subject: [PATCH 03/12] Cleaned .travis.yml --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a9e692a..60afc50 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,8 +39,6 @@ cache: env: global: - - ZEND_DONT_UNLOAD_MODULES=1 - - CC="ccache gcc" - PATH="$HOME/bin:$PATH" - PRODUCT=php-phalcon - PACKAGECLOUD_USER=phalcon From 47281bc5eb5d7e3b7fcdcaa1869be919f978bee1 Mon Sep 17 00:00:00 2001 From: Serghei Iakovlev Date: Fri, 14 Apr 2017 12:53:39 +0300 Subject: [PATCH 04/12] Use stable Zephor Parser --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 60afc50..ea309a6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,7 +46,7 @@ env: - DOCKER_REPO=phalconphp/build - SOURCEDIR=$TRAVIS_BUILD_DIR/cphalcon - ZEPHIR_VERSION=0.9.7 - - ZEPHIR_PARSER_VERSION=v1.0.1 + - ZEPHIR_PARSER_VERSION=v1.0.2 # This should be a branch name or a tag - STABLE_BRANCH=v3.1.2 - NIGHTLY_BRANCH=3.2.x From 981d0352053b2fe60e8faabf771e97c577d912e0 Mon Sep 17 00:00:00 2001 From: Serghei Iakovlev Date: Sat, 15 Apr 2017 11:33:03 +0300 Subject: [PATCH 05/12] Update phalcon.ini --- debian/phalcon.ini | 1 + rpm/php-phalcon.spec | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/phalcon.ini b/debian/phalcon.ini index 9fbbcc4..172bf3b 100644 --- a/debian/phalcon.ini +++ b/debian/phalcon.ini @@ -32,3 +32,4 @@ extension = phalcon.so ; phalcon.orm.enable_implicit_joins = On ; phalcon.orm.cast_on_hydrate = Off ; phalcon.orm.ignore_unknown_columns = Off +; phalcon.orm.update_snapshot_on_save = On diff --git a/rpm/php-phalcon.spec b/rpm/php-phalcon.spec index 4df8cd5..00e9780 100644 --- a/rpm/php-phalcon.spec +++ b/rpm/php-phalcon.spec @@ -82,7 +82,7 @@ Documentation: https://docs.phalconphp.com ; Copyright (c) 2011-2017 Phalcon Team (https://www.phalconphp.com) ; ; This source file is subject to the New BSD License that is bundled -; with this package in the file https://license.phalconphp.com +; with this package in the file LICENSE.txt. ; ; If you did not receive a copy of the license and are unable to ; obtain it through the world-wide-web, please send an email @@ -109,6 +109,7 @@ extension = %{ext_name}.so ; %{ext_name}.orm.enable_implicit_joins = On ; %{ext_name}.orm.cast_on_hydrate = Off ; %{ext_name}.orm.ignore_unknown_columns = Off +; %{ext_name}.orm.update_snapshot_on_save = On EOF From 3e11312595af5fe0c5632e50cabee3966aeaf327 Mon Sep 17 00:00:00 2001 From: Serghei Iakovlev Date: Tue, 20 Jun 2017 07:11:22 +0300 Subject: [PATCH 06/12] Regenerated the build --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index ea309a6..6de6ec2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,13 +45,13 @@ env: - PACKAGECLOUD_REPO=stable - DOCKER_REPO=phalconphp/build - SOURCEDIR=$TRAVIS_BUILD_DIR/cphalcon - - ZEPHIR_VERSION=0.9.7 - - ZEPHIR_PARSER_VERSION=v1.0.2 + - ZEPHIR_VERSION=0.9.8 + - ZEPHIR_PARSER_VERSION=v1.0.3 # This should be a branch name or a tag - - STABLE_BRANCH=v3.1.2 + - STABLE_BRANCH=v3.2.0 - NIGHTLY_BRANCH=3.2.x # This should be increased to reb-build and push package - - STABLE_BUILD_VERSION=2 + - STABLE_BUILD_VERSION=1 - NIGHTLY_BUILD_VERSION=$TRAVIS_BUILD_NUMBER - TARGET=package From 6ee9b19f5cd72ec0469b46e7187e8c950056b82e Mon Sep 17 00:00:00 2001 From: Serghei Iakovlev Date: Wed, 21 Jun 2017 22:14:11 +0300 Subject: [PATCH 07/12] Updated license path --- rpm/php-phalcon.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm/php-phalcon.spec b/rpm/php-phalcon.spec index 00e9780..22ccbb3 100644 --- a/rpm/php-phalcon.spec +++ b/rpm/php-phalcon.spec @@ -216,7 +216,7 @@ extclean zts-phpize %files %defattr(-,root,root,-) %{!?_licensedir:%global license %%doc} -%license docs/LICENSE.txt +%license LICENSE.txt %doc BACKERS.md %doc CHANGELOG.md %doc CONTRIBUTING.md From 01b0e03b658ba1f3fc16cdca2695f5c4c94df407 Mon Sep 17 00:00:00 2001 From: Serghei Iakovlev Date: Wed, 21 Jun 2017 22:46:05 +0300 Subject: [PATCH 08/12] Patching zend_error_noreturn usage Thanks to @remicollet See: * https://github.com/phalcon/cphalcon/issues/12909 * https://github.com/phalcon/zephir/pull/1550 --- .travis.mk | 2 +- builder/patching.mk | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/.travis.mk b/.travis.mk index 509f7e9..8eab49c 100644 --- a/.travis.mk +++ b/.travis.mk @@ -21,7 +21,7 @@ D_TARGETS=report prepare-build .EXPORT_ALL_VARIABLES: ; # send all vars to shell -.PHONY: source package prepare-deb-spec prepare-rpm-spec $(D_TARGETS) +.PHONY: source package prepare-deb-spec prepare-rpm-spec patching-sources $(D_TARGETS) include $(SCRIPTDIR)/builder/config.mk include $(SCRIPTDIR)/builder/check.mk diff --git a/builder/patching.mk b/builder/patching.mk index 44218ad..1e4cedd 100644 --- a/builder/patching.mk +++ b/builder/patching.mk @@ -33,6 +33,8 @@ else RPM_PHP_BASE:=php endif +PHALCON_SOURCE=$(shell grep -r -l "zend_error_noreturn" $(SOURCEDIR)/build/php5 | grep phalcon.zep.c) + define patching_rpmspec cp $(1) rpmspec.tmp sed \ @@ -48,6 +50,27 @@ define patching_rpmspec mv -f rpmspec.tmp $(SOURCEDIR)/rpm/php-phalcon.spec endef +define patching_zend_error_noreturn + echo "-------------------------------------------------------------------" + echo "Patching $(1)" + echo "-------------------------------------------------------------------" + cp $(1) $@.tmp + sed \ + -e 's/zend_error_noreturn/zend_error/' \ + -i $@.tmp + grep -F "zend_error" $@.tmp || \ + (echo "Failed to patch $(1)" && exit 1) + mv -f $@.tmp $(1) + echo +endef + +patching-sources: $(PHALCON_SOURCE) + $(info -------------------------------------------------------------------) + $(info Scan for $(PHALCON_SOURCE)) + $(info -------------------------------------------------------------------) + $(foreach file,$(PHALCON_SOURCE),$(call patching_zend_error_noreturn,$(file));) + $(info ) + prepare-build: prepare-$(PACKAGE)-spec $(info -------------------------------------------------------------------) $(info Prepare .build.mk) From 0f7cfe56eaf9840702e2a2c6d124269e2494e839 Mon Sep 17 00:00:00 2001 From: Serghei Iakovlev Date: Wed, 21 Jun 2017 22:50:28 +0300 Subject: [PATCH 09/12] Updated phalcon.ini --- .travis.mk | 4 ++-- ci/phalcon.ini | 2 ++ debian/phalcon.ini | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.mk b/.travis.mk index 8eab49c..872dc88 100644 --- a/.travis.mk +++ b/.travis.mk @@ -27,12 +27,12 @@ include $(SCRIPTDIR)/builder/config.mk include $(SCRIPTDIR)/builder/check.mk include $(SCRIPTDIR)/builder/patching.mk -source: $(D_TARGETS) +source: $(D_TARGETS) patching-sources $(info Create tarball...) git clone -q --depth=1 $(PACK_REPO) -b $(PACK_BRANCH) $(SCRIPTDIR)/packpack TARBALL_COMPRESSOR=gz $(SCRIPTDIR)/packpack/packpack tarball -package: $(D_TARGETS) +package: $(D_TARGETS) patching-sources $(info Build package...) git clone -q --depth=1 $(PACK_REPO) -b $(PACK_BRANCH) $(SCRIPTDIR)/packpack $(SCRIPTDIR)/packpack/packpack diff --git a/ci/phalcon.ini b/ci/phalcon.ini index 2667787..5676431 100644 --- a/ci/phalcon.ini +++ b/ci/phalcon.ini @@ -30,3 +30,5 @@ extension = phalcon.so ; phalcon.orm.enable_implicit_joins = On ; phalcon.orm.cast_on_hydrate = Off ; phalcon.orm.ignore_unknown_columns = Off +; phalcon.orm.update_snapshot_on_save = On +; phalcon.orm.disable_assign_setters = Off diff --git a/debian/phalcon.ini b/debian/phalcon.ini index 172bf3b..e4f68c6 100644 --- a/debian/phalcon.ini +++ b/debian/phalcon.ini @@ -33,3 +33,4 @@ extension = phalcon.so ; phalcon.orm.cast_on_hydrate = Off ; phalcon.orm.ignore_unknown_columns = Off ; phalcon.orm.update_snapshot_on_save = On +; phalcon.orm.disable_assign_setters = Off From ff725f9fadeeca910632f08d45e88c614f64b328 Mon Sep 17 00:00:00 2001 From: Serghei Iakovlev Date: Wed, 21 Jun 2017 23:28:13 +0300 Subject: [PATCH 10/12] Updated README.md --- README.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index e882d21..3f3b5bd 100644 --- a/README.md +++ b/README.md @@ -18,27 +18,27 @@ Installation/configuration details for each version and operating system [can be | Codename | OS Release | Phalcon Releases | Supported PHP versions | | --------- | ---------- | ----------------- | ---------------------- | -| `trusty` | 14.04 LTS | `3.0.0` - `3.1.2` | `5.5.x`, `7.0.x` | -| `trusty` | 14.04 LTS | `3.1.2` | `7.1.x` | -| `wily` | 15.10 | `3.0.0` - `3.1.2` | `5.6.x` | -| `xenial` | 16.04 LTS | `3.0.0` - `3.1.2` | `7.0.x` | -| `xenial` | 16.04 LTS | `3.1.2` | `7.1.x` | +| `trusty` | 14.04 LTS | `3.0.0` - `3.2.0` | `5.5.x`, `7.0.x` | +| `trusty` | 14.04 LTS | `3.1.2` - `3.2.0` | `7.1.x` | +| `wily` | 15.10 | `3.0.0` - `3.2.0` | `5.6.x` | +| `xenial` | 16.04 LTS | `3.0.0` - `3.2.0` | `7.0.x` | +| `xenial` | 16.04 LTS | `3.1.2` - `3.2.0` | `7.1.x` | ### Debian | Codename | OS Release | Phalcon Releases | Supported PHP versions | | --------- | ---------- | ----------------- | ---------------------- | -| `jessie` | 8.5 LTS | `3.0.0` - `3.1.2` | `5.6.x`, `7.0.x` | -| `jessie` | 8.5 LTS | `3.1.2` | `7.1.x` | -| `stretch` | 9 | `3.0.0` - `3.1.2` | `7.0.x` | -| `stretch` | 9 | `3.1.2` | `7.1.x` | +| `jessie` | 8.5 LTS | `3.0.0` - `3.2.0` | `5.6.x`, `7.0.x` | +| `jessie` | 8.5 LTS | `3.1.2` - `3.2.0` | `7.1.x` | +| `stretch` | 9 | `3.0.0` - `3.2.0` | `7.0.x` | +| `stretch` | 9 | `3.1.2` - `3.2.0` | `7.1.x` | ### CentOS (RHEL) | Codename | OS Release | Phalcon Releases | Supported PHP versions | RPM repo | | --------- | ---------- | ----------------- | ---------------------------- | -------------- | -| `Core` | 7.2 LTS | `3.0.0` - `3.1.2` | `php55u`, `php56u`, `php70u` | [`IUS`][:ius:] | -| `Core` | 7.2 LTS | `3.1.2` | `php71u` | [`IUS`][:ius:] | +| `Core` | 7.2 LTS | `3.0.0` - `3.2.0` | `php55u`, `php56u`, `php70u` | [`IUS`][:ius:] | +| `Core` | 7.2 LTS | `3.1.2` - `3.2.0` | `php71u` | [`IUS`][:ius:] | _Support of other RPM repos is coming soon_ From d9120a64b8707d30f6e31387a51911a3ce177da7 Mon Sep 17 00:00:00 2001 From: Serghei Iakovlev Date: Wed, 21 Jun 2017 23:28:35 +0300 Subject: [PATCH 11/12] Updated CHANGELOG.md --- CHANGELOG.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1b0af46..2e1ceee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,8 +5,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] + +## [1.2.1] - 2017-06-21 ### Changed - Improved RPM-spec by removing hardcoded virtual provides specific things +- Use stable Zephir Parser +- Updated license path +- Patching `zend_error_noreturn` usage [phalcon/cphalcon#12909](https://github.com/phalcon/cphalcon/issues/12909) ## [1.2.0] - 2017-04-06 ### Added @@ -27,8 +32,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/). - Removed patching headers target - Renamed debug symbols for Debain/Ubuntu -## [1.0.0] - 2017-03-14 +## 1.0.0 - 2017-03-14 ### Added - Initial stable release. Added ability to build packages for Ubuntu 14.04-16.04, Debian 8.5-9 and CentOS 7.2 by using [Packpack](https://github.com/packpack/packpack). + +[1.2.1]: https://github.com/phalcongelist/packagecloud/compare/v1.2.0...v1.2.1 +[1.2.0]: https://github.com/phalcongelist/packagecloud/compare/v1.1.0...v1.2.0 +[1.1.0]: https://github.com/phalcongelist/packagecloud/compare/v1.0.0...v1.1.0 From 083e5262bc78b124a5eea1a4fec1fb93da1dd090 Mon Sep 17 00:00:00 2001 From: Serghei Iakovlev Date: Wed, 21 Jun 2017 23:28:52 +0300 Subject: [PATCH 12/12] Used latest stable Zephir --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6de6ec2..7c71b61 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,7 +45,7 @@ env: - PACKAGECLOUD_REPO=stable - DOCKER_REPO=phalconphp/build - SOURCEDIR=$TRAVIS_BUILD_DIR/cphalcon - - ZEPHIR_VERSION=0.9.8 + - ZEPHIR_VERSION=0.9.9 - ZEPHIR_PARSER_VERSION=v1.0.3 # This should be a branch name or a tag - STABLE_BRANCH=v3.2.0