Skip to content

Commit

Permalink
Merge pull request #12083 from sergeyklay/3.0.x
Browse files Browse the repository at this point in the history
Updated test proxies
  • Loading branch information
sergeyklay authored Aug 3, 2016
2 parents 797f87f + 6b66102 commit ff5c4bb
Show file tree
Hide file tree
Showing 11 changed files with 26 additions and 18 deletions.
10 changes: 6 additions & 4 deletions tests/_proxies/Assets/Collection.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@

namespace Phalcon\Test\Proxy\Assets;

use Phalcon\Assets\Collection as PhCollection;
use Phalcon\Assets\Inline;
use Phalcon\Assets\FilterInterface;
use Phalcon\Assets\Resource as PhResource;
use Phalcon\Assets\Collection as PhCollection;

/**
* \Phalcon\Test\Proxy\Assets\Collection
Expand All @@ -24,12 +26,12 @@
*/
class Collection extends PhCollection
{
public function add(\Phalcon\Assets\Resource $resource)
public function add(PhResource $resource)
{
return parent::add($resource);
}

public function addInline(\Phalcon\Assets\Inline $code)
public function addInline(Inline $code)
{
return parent::addInline($code);
}
Expand Down Expand Up @@ -116,7 +118,7 @@ public function setAttributes(array $attributes)

public function setFilters(array $filters)
{
return parent::setFilter($filters);
return parent::setFilters($filters);
}

public function setTargetLocal($targetLocal)
Expand Down
14 changes: 8 additions & 6 deletions tests/_proxies/Assets/Manager.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
namespace Phalcon\Test\Proxy\Assets;

use Phalcon\Assets\Inline;
use Phalcon\Assets\Collection;
use Phalcon\Assets\Manager as PhManager;
use Phalcon\Assets\Resource as PhResource;

/**
* \Phalcon\Test\Proxy\Assets\Manager
Expand Down Expand Up @@ -59,17 +61,17 @@ public function addInlineJs($content, $filter = true, $attributes = null)
parent::addInlineJs($content, $filter, $attributes);
}

public function addResourceByType($type, \Phalcon\Assets\Resource $resource)
public function addResourceByType($type, PhResource $resource)
{
parent::addResourceByType($type, $resource);
}

public function addInlineCodeByType($type, \Phalcon\Assets\Inline $code)
public function addInlineCodeByType($type, Inline $code)
{
parent::addInlineCodeByType($type, $code);
}

public function addResource(\Phalcon\Assets\Resource $resource)
public function addResource(PhResource $resource)
{
parent::addResource($resource);
}
Expand All @@ -79,7 +81,7 @@ public function addInlineCode(Inline $code)
parent::addInlineCode($code);
}

public function set($id, \Phalcon\Assets\Collection $collection)
public function set($id, Collection $collection)
{
return parent::set($id, $collection);
}
Expand All @@ -104,12 +106,12 @@ public function collection($name)
return parent::collection($name);
}

public function output(\Phalcon\Assets\Collection $collection, $callback, $type)
public function output(Collection $collection, $callback, $type)
{
return parent::output($collection, $callback, $type);
}

public function outputInline(\Phalcon\Assets\Collection $collection, $type)
public function outputInline(Collection $collection, $type)
{
return parent::outputInline($collection, $type);
}
Expand Down
1 change: 0 additions & 1 deletion tests/_proxies/Cache/Backend/File.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ public function get($keyName, $lifetime = null)
return parent::get($keyName, $lifetime);
}


public function save($keyName = null, $content = null, $lifetime = null, $stopBuffer = true)
{
return parent::save($keyName, $content, $lifetime, $stopBuffer);
Expand Down
2 changes: 1 addition & 1 deletion tests/_proxies/Config.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
*/
class Config extends PhConfig
{
public function __construct($arrayConfig = null)
public function __construct(array $arrayConfig = null)
{
parent::__construct($arrayConfig);
}
Expand Down
2 changes: 1 addition & 1 deletion tests/_proxies/Flash.php
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public function setAutomaticHtml($automaticHtml)
return parent::setAutomaticHtml($automaticHtml);
}

public function setCssClasses($cssClasses)
public function setCssClasses(array $cssClasses)
{
return parent::setCssClasses($cssClasses);
}
Expand Down
5 changes: 5 additions & 0 deletions tests/_proxies/Loader.php
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,11 @@ public function registerFiles(array $files, $merge = false)
return parent::registerFiles($files, $merge);
}

protected function prepareNamespace(array $namespace)
{
return parent::prepareNamespace($namespace);
}

public function getFiles()
{
return parent::getFiles();
Expand Down
2 changes: 1 addition & 1 deletion tests/_proxies/Paginator/Adapter/NativeArray.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
*/
class NativeArray extends PhNativeArray
{
public function __construct($config)
public function __construct(array $config)
{
parent::__construct($config);
}
Expand Down
2 changes: 1 addition & 1 deletion tests/_proxies/Queue/Beanstalk.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
*/
class Beanstalk extends PhBeanstalk
{
public function __construct($options = null)
public function __construct(array $options = null)
{
parent::__construct($options);
}
Expand Down
2 changes: 1 addition & 1 deletion tests/_proxies/Session/Adapter/Libmemcached.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
*/
class Libmemcached extends PhLibmemcached
{
public function __construct($options = null)
public function __construct(array $options = null)
{
return parent::__construct($options);
}
Expand Down
2 changes: 1 addition & 1 deletion tests/_proxies/Session/Adapter/Memcache.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
*/
class Memcache extends PhMemcache
{
public function __construct($options = null)
public function __construct(array $options = null)
{
return parent::__construct($options);
}
Expand Down
2 changes: 1 addition & 1 deletion tests/_proxies/Session/Adapter/Redis.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
*/
class Redis extends PhRedis
{
public function __construct($options = null)
public function __construct(array $options = null)
{
return parent::__construct($options);
}
Expand Down

0 comments on commit ff5c4bb

Please sign in to comment.