Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yii2
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
PSDI Army
yii2
Commits
f267f462
Commit
f267f462
authored
Dec 30, 2013
by
Mark
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
reverted $isValid for events.
parent
59535d38
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
34 additions
and
21 deletions
+34
-21
ActionEvent.php
framework/yii/base/ActionEvent.php
+9
-5
Event.php
framework/yii/base/Event.php
+2
-6
MailEvent.php
framework/yii/base/MailEvent.php
+7
-1
ModelEvent.php
framework/yii/base/ModelEvent.php
+8
-3
ViewEvent.php
framework/yii/base/ViewEvent.php
+8
-6
No files found.
framework/yii/base/ActionEvent.php
View file @
f267f462
...
@@ -11,10 +11,7 @@ namespace yii\base;
...
@@ -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
...
@@ -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
...
@@ -39,4 +42,4 @@ class ActionEvent extends Event
$this
->
action
=
$action
;
$this
->
action
=
$action
;
parent
::
__construct
(
$config
);
parent
::
__construct
(
$config
);
}
}
}
}
\ No newline at end of file
framework/yii/base/Event.php
View file @
f267f462
...
@@ -46,11 +46,6 @@ class Event extends Object
...
@@ -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
...
@@ -185,4 +180,4 @@ class Event extends Object
}
}
}
while
((
$class
=
get_parent_class
(
$class
))
!==
false
);
}
while
((
$class
=
get_parent_class
(
$class
))
!==
false
);
}
}
}
}
\ No newline at end of file
framework/yii/base/MailEvent.php
View file @
f267f462
...
@@ -24,7 +24,13 @@ class MailEvent extends Event
...
@@ -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
;
}
}
framework/yii/base/ModelEvent.php
View file @
f267f462
...
@@ -11,11 +11,15 @@ namespace yii\base;
...
@@ -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
;
}
\ No newline at end of file
framework/yii/base/ViewEvent.php
View file @
f267f462
...
@@ -10,11 +10,6 @@ namespace yii\base;
...
@@ -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
...
@@ -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
...
@@ -42,4 +43,4 @@ class ViewEvent extends Event
$this
->
viewFile
=
$viewFile
;
$this
->
viewFile
=
$viewFile
;
parent
::
__construct
(
$config
);
parent
::
__construct
(
$config
);
}
}
}
}
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment