Skip to content

Commit

Permalink
Merge pull request #2461 from alkana/2.0.0
Browse files Browse the repository at this point in the history
2.0.0 - Starting to fix assets test-unit
  • Loading branch information
Phalcon committed May 26, 2014
2 parents ba72e81 + 3b280f5 commit d6dbd72
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
9 changes: 5 additions & 4 deletions phalcon/assets/collection.zep
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class Collection implements \Countable, \Iterator
* @param array attributes
* @return Phalcon\Assets\Collection
*/
public function addCss(string path, var local, boolean filter, attributes=null) -> <\Phalcon\Assets\Collection>
public function addCss(string! path, boolean local = false, boolean filter = false, attributes = null) -> <\Phalcon\Assets\Collection>
{
var collectionLocal, collectionAttributes;

Expand All @@ -90,7 +90,8 @@ class Collection implements \Countable, \Iterator
let collectionAttributes = this->_attributes;
}

let this->_resources[] = new \Phalcon\Assets\Resource\Css(collectionLocal, filter, collectionAttributes);
let this->_resources[] = new \Phalcon\Assets\Resource\Css(path, collectionLocal, filter, collectionAttributes);

return this;
}

Expand All @@ -103,7 +104,7 @@ class Collection implements \Countable, \Iterator
* @param array attributes
* @return Phalcon\Assets\Collection
*/
public function addJs(string! path, var local, boolean filter, attributes=null) -> <\Phalcon\Assets\Collection>
public function addJs(string! path, boolean local = false, boolean filter = false, attributes = null) -> <\Phalcon\Assets\Collection>
{
var collectionLocal, collectionAttributes;

Expand All @@ -123,7 +124,7 @@ class Collection implements \Countable, \Iterator
let collectionAttributes = this->_attributes;
}

let this->_resources[] = new \Phalcon\Assets\Resource\Js(collectionLocal, filter, collectionAttributes);
let this->_resources[] = new \Phalcon\Assets\Resource\Js(path, collectionLocal, filter, collectionAttributes);

return this;
}
Expand Down
2 changes: 1 addition & 1 deletion phalcon/assets/filters/cssmin.zep
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ namespace Phalcon\Assets\Filters;
* removes newlines and line feeds keeping
* removes last semicolon from last property
*/
class Cssmin
class Cssmin implements \Phalcon\Assets\FilterInterface
{

/**
Expand Down
2 changes: 1 addition & 1 deletion phalcon/assets/filters/jsmin.zep
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ namespace Phalcon\Assets\Filters;
* replaced with spaces. Carriage returns will be replaced with linefeeds.
* Most spaces and linefeeds will be removed.
*/
class Jsmin
class Jsmin implements \Phalcon\Assets\FilterInterface
{

/**
Expand Down
2 changes: 1 addition & 1 deletion phalcon/assets/filters/none.zep
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ namespace Phalcon\Assets\Filters;
*
* Returns the content without make any modification to the original source
*/
class None
class None implements \Phalcon\Assets\FilterInterface
{

/**
Expand Down

0 comments on commit d6dbd72

Please sign in to comment.