Skip to content

Commit

Permalink
Fixed segfault in PHP5.6 dispatching, prevented double dispatch
Browse files Browse the repository at this point in the history
exceptions, and improved documentation/test-suite for dispatcher
components [phalcon#12154](phalcon#12154),
[phalcon#11819](phalcon#11819)
  • Loading branch information
Mark Johnson committed Sep 9, 2016
1 parent 9bbab45 commit 9634e42
Show file tree
Hide file tree
Showing 32 changed files with 4,215 additions and 817 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
- Fixed `Phalcon\Cache\Frontend\Data::afterRetrieve`, `Phalcon\Cache\Frontend\Igbinary::afterRetrieve`, `Phalcon\Cache\Frontend\Msgpack::afterRetrieve` to unserialize only raw data [#12186](https://github.com/phalcon/cphalcon/issues/12186)
- Fixed `Phalcon\Mvc\Model::cloneResultMapHydrate` to correct create array/objects from data by column map with types [#12191](https://github.com/phalcon/cphalcon/issues/12191)
- Fixed `Phalcon\Validation\Validator\Confirmation::validate` to use `fieldWith` instead of `field` wehen looking up the value for labelWith.

- Fixed segfault in PHP5.6 dispatching, prevented double dispatch exceptions, and improved documentation/test-suite for dispatcher components [#12154](https://github.com/phalcon/cphalcon/issues/12154), [#11819](https://github.com/phalcon/cphalcon/issues/11819)

# [3.0.1](https://github.com/phalcon/cphalcon/releases/tag/v3.0.1) (2016-08-24)
- Fixed `Phalcon\Cache\Backend\Redis::flush` in order to flush cache correctly
Expand Down
8 changes: 4 additions & 4 deletions phalcon/cli/dispatcher.zep
Original file line number Diff line number Diff line change
Expand Up @@ -60,23 +60,23 @@ class Dispatcher extends \Phalcon\Dispatcher implements DispatcherInterface
/**
* Sets the default task suffix
*/
public function setTaskSuffix(string taskSuffix)
public function setTaskSuffix(string taskSuffix) -> void
{
let this->_handlerSuffix = taskSuffix;
}

/**
* Sets the default task name
*/
public function setDefaultTask(string taskName)
public function setDefaultTask(string taskName) -> void
{
let this->_defaultHandler = taskName;
}

/**
* Sets the task name to be dispatched
*/
public function setTaskName(string taskName)
public function setTaskName(string taskName) -> void
{
let this->_handlerName = taskName;
}
Expand Down Expand Up @@ -138,7 +138,7 @@ class Dispatcher extends \Phalcon\Dispatcher implements DispatcherInterface
/**
* Set the options to be dispatched
*/
public function setOptions(array options)
public function setOptions(array options) -> void
{
let this->_options = options;
}
Expand Down
8 changes: 4 additions & 4 deletions phalcon/cli/dispatcherinterface.zep
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
+------------------------------------------------------------------------+
| Phalcon Framework |
+------------------------------------------------------------------------+
| Copyright (c) 2011-2016 Phalcon Team (https://phalconphp.com) |
| Copyright (c) 2011-2016 Phalcon Team (https://phalconphp.com) |
+------------------------------------------------------------------------+
| This source file is subject to the New BSD License that is bundled |
| with this package in the file docs/LICENSE.txt. |
Expand Down Expand Up @@ -32,17 +32,17 @@ interface DispatcherInterface extends DispatcherInterfaceBase
/**
* Sets the default task suffix
*/
public function setTaskSuffix(string taskSuffix);
public function setTaskSuffix(string taskSuffix) -> void;

/**
* Sets the default task name
*/
public function setDefaultTask(string taskName);
public function setDefaultTask(string taskName) -> void;

/**
* Sets the task name to be dispatched
*/
public function setTaskName(string taskName);
public function setTaskName(string taskName) -> void;

/**
* Gets last dispatched task name
Expand Down
Loading

0 comments on commit 9634e42

Please sign in to comment.