Browse Source

reverted $isValid for events.

tags/2.0.0-beta
Mark 11 years ago
parent
commit
f267f4623f
  1. 13
      framework/yii/base/ActionEvent.php
  2. 7
      framework/yii/base/Event.php
  3. 8
      framework/yii/base/MailEvent.php
  4. 10
      framework/yii/base/ModelEvent.php
  5. 13
      framework/yii/base/ViewEvent.php

13
framework/yii/base/ActionEvent.php

@ -11,10 +11,7 @@ namespace yii\base;
* ActionEvent represents the event parameter used for an action event. * ActionEvent represents the event parameter used for an action event.
* *
* By setting the [[isValid]] property, one may control whether to continue running the action. * By setting the [[isValid]] property, one may control whether to continue running the action.
* @property boolean $isValid Event handlers of *
* [[Controller::EVENT_BEFORE_ACTION]] may set this property to decide whether
* to continue running the current action.
*
* @author Qiang Xue <qiang.xue@gmail.com> * @author Qiang Xue <qiang.xue@gmail.com>
* @since 2.0 * @since 2.0
*/ */
@ -28,6 +25,12 @@ class ActionEvent extends Event
* @var mixed the action result. Event handlers may modify this property to change the action result. * @var mixed the action result. Event handlers may modify this property to change the action result.
*/ */
public $result; public $result;
/**
* @var boolean whether to continue running the action. Event handlers of
* [[Controller::EVENT_BEFORE_ACTION]] may set this property to decide whether
* to continue running the current action.
*/
public $isValid = true;
/** /**
* Constructor. * Constructor.
@ -39,4 +42,4 @@ class ActionEvent extends Event
$this->action = $action; $this->action = $action;
parent::__construct($config); parent::__construct($config);
} }
} }

7
framework/yii/base/Event.php

@ -46,11 +46,6 @@ class Event extends Object
*/ */
public $data; public $data;
/**
* @var boolean whether to continue execution of process or not.
*/
public $isValid = true;
private static $_events = []; private static $_events = [];
/** /**
@ -185,4 +180,4 @@ class Event extends Object
} }
} while (($class = get_parent_class($class)) !== false); } while (($class = get_parent_class($class)) !== false);
} }
} }

8
framework/yii/base/MailEvent.php

@ -24,7 +24,13 @@ class MailEvent extends Event
*/ */
public $message; public $message;
/** /**
* * @var boolean if message send was successful
*/ */
public $isSuccessful; public $isSuccessful;
/**
* @var boolean whether to continue send. Event handlers of
* [[\yii\mail\BaseMailer::EVENT_BEFORE_SEND]] may set this property to decide whether
* to continue send or not.
*/
public $isValid = true;
} }

10
framework/yii/base/ModelEvent.php

@ -11,11 +11,15 @@ namespace yii\base;
* ModelEvent class. * ModelEvent class.
* *
* ModelEvent represents the parameter needed by model events. * ModelEvent represents the parameter needed by model events.
* @property boolean $isValid A model is in valid status if it passes validations or certain checks. *
*
* @author Qiang Xue <qiang.xue@gmail.com> * @author Qiang Xue <qiang.xue@gmail.com>
* @since 2.0 * @since 2.0
*/ */
class ModelEvent extends Event class ModelEvent extends Event
{ {
} /**
* @var boolean whether the model is in valid status. Defaults to true.
* A model is in valid status if it passes validations or certain checks.
*/
public $isValid = true;
}

13
framework/yii/base/ViewEvent.php

@ -10,11 +10,6 @@ namespace yii\base;
/** /**
* ViewEvent represents events triggered by the [[View]] component. * ViewEvent represents events triggered by the [[View]] component.
* *
* @property boolean $isValid whether to continue rendering the view file. Event handlers of
*[[View::EVENT_BEFORE_RENDER]] may set this property to decide whether
* to continue rendering the current view file.
*
*
* @author Qiang Xue <qiang.xue@gmail.com> * @author Qiang Xue <qiang.xue@gmail.com>
* @since 2.0 * @since 2.0
*/ */
@ -31,6 +26,12 @@ class ViewEvent extends Event
* @var string the view file path that is being rendered by [[View::renderFile()]]. * @var string the view file path that is being rendered by [[View::renderFile()]].
*/ */
public $viewFile; public $viewFile;
/**
* @var boolean whether to continue rendering the view file. Event handlers of
* [[View::EVENT_BEFORE_RENDER]] may set this property to decide whether
* to continue rendering the current view file.
*/
public $isValid = true;
/** /**
* Constructor. * Constructor.
@ -42,4 +43,4 @@ class ViewEvent extends Event
$this->viewFile = $viewFile; $this->viewFile = $viewFile;
parent::__construct($config); parent::__construct($config);
} }
} }
Loading…
Cancel
Save