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
ab003354
Commit
ab003354
authored
Dec 17, 2014
by
Alexander Makarov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes #6247: Logger and error handler are now using slightly less memory
parent
3b9dd7f4
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
2 deletions
+3
-2
CHANGELOG.md
framework/CHANGELOG.md
+1
-0
ErrorHandler.php
framework/base/ErrorHandler.php
+1
-1
Logger.php
framework/log/Logger.php
+1
-1
No files found.
framework/CHANGELOG.md
View file @
ab003354
...
@@ -5,6 +5,7 @@ Yii Framework 2 Change Log
...
@@ -5,6 +5,7 @@ Yii Framework 2 Change Log
-----------------------
-----------------------
-
Bug #6404: advanced application template
`Alert`
widget was generating duplicate IDs in case of multiple flashes (SDKiller)
-
Bug #6404: advanced application template
`Alert`
widget was generating duplicate IDs in case of multiple flashes (SDKiller)
-
Enh #6247: Logger and error handler are now using slightly less memory (stepanselyuk, samdark)
-
Enh #6434: Added
`yii\behaviors\SluggableBehavior::immutable`
to support keeping the generated slug unchanged (trntv)
-
Enh #6434: Added
`yii\behaviors\SluggableBehavior::immutable`
to support keeping the generated slug unchanged (trntv)
-
Enh #6467:
`ActiveForm`
will scroll to the nearest visible element when the first error input is hidden (newartix)
-
Enh #6467:
`ActiveForm`
will scroll to the nearest visible element when the first error input is hidden (newartix)
...
...
framework/base/ErrorHandler.php
View file @
ab003354
...
@@ -140,7 +140,7 @@ abstract class ErrorHandler extends Component
...
@@ -140,7 +140,7 @@ abstract class ErrorHandler extends Component
$exception
=
new
ErrorException
(
$message
,
$code
,
$code
,
$file
,
$line
);
$exception
=
new
ErrorException
(
$message
,
$code
,
$code
,
$file
,
$line
);
// in case error appeared in __toString method we can't throw any exception
// in case error appeared in __toString method we can't throw any exception
$trace
=
debug_backtrace
(
0
);
$trace
=
debug_backtrace
(
DEBUG_BACKTRACE_IGNORE_ARGS
);
array_shift
(
$trace
);
array_shift
(
$trace
);
foreach
(
$trace
as
$frame
)
{
foreach
(
$trace
as
$frame
)
{
if
(
$frame
[
'function'
]
==
'__toString'
)
{
if
(
$frame
[
'function'
]
==
'__toString'
)
{
...
...
framework/log/Logger.php
View file @
ab003354
...
@@ -138,7 +138,7 @@ class Logger extends Component
...
@@ -138,7 +138,7 @@ class Logger extends Component
$traces
=
[];
$traces
=
[];
if
(
$this
->
traceLevel
>
0
)
{
if
(
$this
->
traceLevel
>
0
)
{
$count
=
0
;
$count
=
0
;
$ts
=
debug_backtrace
();
$ts
=
debug_backtrace
(
DEBUG_BACKTRACE_IGNORE_ARGS
);
array_pop
(
$ts
);
// remove the last trace since it would be the entry script, not very useful
array_pop
(
$ts
);
// remove the last trace since it would be the entry script, not very useful
foreach
(
$ts
as
$trace
)
{
foreach
(
$ts
as
$trace
)
{
if
(
isset
(
$trace
[
'file'
],
$trace
[
'line'
])
&&
strpos
(
$trace
[
'file'
],
YII2_PATH
)
!==
0
)
{
if
(
isset
(
$trace
[
'file'
],
$trace
[
'line'
])
&&
strpos
(
$trace
[
'file'
],
YII2_PATH
)
!==
0
)
{
...
...
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