From fc0db15ebce101602fb1cbfa8f6a5cc0f8b58be4 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Mon, 6 Jan 2014 22:41:46 +0100 Subject: Happy 2014! (cherry picked from commit 7915cde127eba2a5143fd45c6b32e81ad91bdfae) Conflicts: framework/Data/Common/Mssql/TMssqlMetaData.php framework/Data/Common/Mysql/TMysqlMetaData.php framework/Data/Common/Oracle/TOracleMetaData.php framework/Data/Common/Pgsql/TPgsqlMetaData.php framework/Data/Common/Sqlite/TSqliteMetaData.php framework/Data/Common/TDbMetaData.php framework/Web/UI/ActiveControls/TCallbackClientScript.php framework/Web/UI/JuiControls/TJuiAutoComplete.php framework/Web/UI/JuiControls/TJuiControlAdapter.php framework/Web/UI/JuiControls/TJuiDraggable.php framework/Web/UI/JuiControls/TJuiDroppable.php framework/Web/UI/JuiControls/TJuiResizable.php framework/Web/UI/JuiControls/TJuiSelectable.php framework/Web/UI/JuiControls/TJuiSortable.php framework/Wsat/TWsatARGenerator.php framework/Wsat/TWsatService.php framework/Wsat/pages/TWsatGenerateAR.php framework/Wsat/pages/TWsatHome.php framework/Wsat/pages/TWsatLogin.php framework/Wsat/pages/TWsatScaffolding.php --- framework/Util/TCallChain.php | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'framework/Util/TCallChain.php') diff --git a/framework/Util/TCallChain.php b/framework/Util/TCallChain.php index 9d6144b3..6e2c9944 100644 --- a/framework/Util/TCallChain.php +++ b/framework/Util/TCallChain.php @@ -4,14 +4,14 @@ * * @author Brad Anderson * @link http://www.pradosoft.com/ - * @copyright Copyright © 2008-2013 Pradosoft + * @copyright Copyright © 2008-2014 Pradosoft * @license http://www.pradosoft.com/license/ */ /** * TCallChain is a recursive event calling mechanism. This class implements * the {@link IDynamicMethods} class so that any 'dy' event calls can be caught - * and patched through to the intended recipient + * and patched through to the intended recipient * @author Brad Anderson * @version $Id: TCallChain.php 564 2009-01-21 22:07:10Z javalizard $ * @package System.Util @@ -23,12 +23,12 @@ class TCallChain extends TList implements IDynamicMethods * @var {@link TListIterator} for moving through the chained method calls */ private $_iterator=null; - + /** * @var string the method name of the call chain */ private $_method=null; - + /** * This initializes the list and the name of the method to be called * @param string the name of the function call @@ -37,11 +37,11 @@ class TCallChain extends TList implements IDynamicMethods $this->_method=$method; parent::__construct(); } - - + + /** * This initializes the list and the name of the method to be called - * @param string|array this is a callable function as a string or array with + * @param string|array this is a callable function as a string or array with * the object and method name as string * @param array The array of arguments to the function call chain */ @@ -49,12 +49,12 @@ class TCallChain extends TList implements IDynamicMethods { $this->add(array($method,$args)); } - + /** * This method calls the next Callable in the list. All of the method arguments - * coming into this method are substituted into the original method argument of + * coming into this method are substituted into the original method argument of * call in the chain. - * + * * If the original method call has these parameters * * $originalobject->dyExampleMethod('param1', 'param2', 'param3') @@ -71,7 +71,7 @@ class TCallChain extends TList implements IDynamicMethods * list in 'dy' event calls is always the object containing the behavior. This modifies * the parameter replacement mechanism slightly to leave the object containing the behavior * alone and only replacing the other parameters in the argument list. As per {@link __call}, - * any calls to a 'dy' event do not need the object containing the behavior as the addition of + * any calls to a 'dy' event do not need the object containing the behavior as the addition of * the object to the argument list as the first element is automatic for IClassBehaviors. * * The last parameter of the method parameter list for any callable in the call chain @@ -87,14 +87,14 @@ class TCallChain extends TList implements IDynamicMethods * * When there are no handlers or no handlers left, it returns the first parameter of the * argument list. - * + * */ public function call() { $args=func_get_args(); if($this->getCount()===0) return isset($args[0])?$args[0]:null; - + if(!$this->_iterator) { $chain_array=array_reverse($this->toArray()); @@ -115,12 +115,12 @@ class TCallChain extends TList implements IDynamicMethods $result = $args[0]; return $result; } - - + + /** * This catches all the unpatched dynamic events. When the method call matches the - * call chain method, it passes the arguments to the original __call (of the dynamic - * event being unspecified in TCallChain) and funnels into the method {@link call}, + * call chain method, it passes the arguments to the original __call (of the dynamic + * event being unspecified in TCallChain) and funnels into the method {@link call}, * so the next dynamic event handler can be called. * If the original method call has these parameters * -- cgit v1.2.3