From 88e6af78a15ca9bc6a78c021b51a503ae69cd2d8 Mon Sep 17 00:00:00 2001 From: Vladimir Kolesnikov Date: Thu, 24 Oct 2013 07:22:58 +0300 Subject: [PATCH 1/4] Initialization order matters (cherry picked from commit 265616c4ac6103d9b091bc06590ffcb9cc0f337e) --- ext/phalcon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/phalcon.c b/ext/phalcon.c index 033744cee8b..dc33837e802 100644 --- a/ext/phalcon.c +++ b/ext/phalcon.c @@ -718,11 +718,11 @@ static PHP_MINIT_FUNCTION(phalcon){ PHALCON_INIT(Phalcon_Assets_Resource_Js); PHALCON_INIT(Phalcon_Assets_Collection); PHALCON_INIT(Phalcon_Assets_Exception); + PHALCON_INIT(Phalcon_Assets_FilterInterface); PHALCON_INIT(Phalcon_Assets_Filters_None); PHALCON_INIT(Phalcon_Assets_Filters_Cssmin); PHALCON_INIT(Phalcon_Assets_Filters_Jsmin); PHALCON_INIT(Phalcon_Assets_Resource_Css); - PHALCON_INIT(Phalcon_Assets_FilterInterface); PHALCON_INIT(Phalcon_Http_Request); PHALCON_INIT(Phalcon_Http_Cookie); PHALCON_INIT(Phalcon_Http_Response); From 007e97d3f9223deade5c559b724dfdd7b7cc9475 Mon Sep 17 00:00:00 2001 From: Vladimir Kolesnikov Date: Thu, 24 Oct 2013 07:05:16 +0300 Subject: [PATCH 2/4] Assets\Filters\Cssmin should implement Assets\FilterInterface (cherry picked from commit bd0e085bc6dd637ba1e639d2be37e73224ae22d4) Conflicts: ext/assets/filters/cssmin.c --- ext/assets/filters/cssmin.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ext/assets/filters/cssmin.c b/ext/assets/filters/cssmin.c index be4a6e3f613..80bac3833bf 100644 --- a/ext/assets/filters/cssmin.c +++ b/ext/assets/filters/cssmin.c @@ -51,6 +51,7 @@ PHALCON_INIT_CLASS(Phalcon_Assets_Filters_Cssmin){ PHALCON_REGISTER_CLASS(Phalcon\\Assets\\Filters, Cssmin, assets_filters_cssmin, phalcon_assets_filters_cssmin_method_entry, 0); + zend_class_implements(phalcon_assets_filters_cssmin_ce TSRMLS_CC, 1, phalcon_assets_filterinterface_ce); return SUCCESS; } From 6a3e00f70e80eab7331551042c485b8305226e43 Mon Sep 17 00:00:00 2001 From: Vladimir Kolesnikov Date: Thu, 24 Oct 2013 07:05:27 +0300 Subject: [PATCH 3/4] Assets\Filters\Jsmin should implement Assets\FilterInterface (cherry picked from commit 30461a5f495da880643455a8a11d9c53ece6ee73) Conflicts: ext/assets/filters/jsmin.c --- ext/assets/filters/jsmin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/assets/filters/jsmin.c b/ext/assets/filters/jsmin.c index 5ed68d979ab..ae8e281b4cb 100644 --- a/ext/assets/filters/jsmin.c +++ b/ext/assets/filters/jsmin.c @@ -25,7 +25,6 @@ #include "php_phalcon.h" #include "phalcon.h" -#include "Zend/zend_operators.h" #include "Zend/zend_exceptions.h" #include "Zend/zend_interfaces.h" @@ -51,6 +50,7 @@ PHALCON_INIT_CLASS(Phalcon_Assets_Filters_Jsmin){ PHALCON_REGISTER_CLASS(Phalcon\\Assets\\Filters, Jsmin, assets_filters_jsmin, phalcon_assets_filters_jsmin_method_entry, 0); + zend_class_implements(phalcon_assets_filters_jsmin_ce TSRMLS_CC, 1, phalcon_assets_filterinterface_ce); return SUCCESS; } From 50ede6828d5bf9ed8311a59b3cd6f8144d53322f Mon Sep 17 00:00:00 2001 From: Vladimir Kolesnikov Date: Fri, 8 Nov 2013 16:12:40 +0200 Subject: [PATCH 4/4] Updated README.md (#1525) (cherry picked from commit 69986d6b8e4c70ceddd28c62094d1247a637eb03) Conflicts: README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e34c2377a8c..ea0b1032085 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Phalcon is written in C with platform independence in mind. As a result, Phalcon ### Windows -For use phalcon on windows you only should to download a DLL library (http://phalconphp.com/download). Edit your php.ini file and then add: +To use Phalcon on windows you should download a DLL library (http://phalconphp.com/en/download/windows). Edit your php.ini file and then add: ```bash extension=php_phalcon.dll