Skip to content
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

Filters\{Css,Js}min should implement FilterInterface #1539

Merged
merged 4 commits into from Nov 8, 2013
Merged

Filters\{Css,Js}min should implement FilterInterface #1539

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
88e6af7
Initialization order matters
sjinks Oct 24, 2013
007e97d
Assets\Filters\Cssmin should implement Assets\FilterInterface
sjinks Oct 24, 2013
6a3e00f
Assets\Filters\Jsmin should implement Assets\FilterInterface
sjinks Oct 24, 2013
50ede68
Updated README.md (#1525)
sjinks Nov 8, 2013
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions ext/assets/filters/cssmin.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion ext/assets/filters/jsmin.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion ext/phalcon.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down