Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
EcomDev_PHPUnit
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Open
EcomDev_PHPUnit
Commits
ac76e595
Commit
ac76e595
authored
Aug 29, 2016
by
Fabian Schmengler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Integrate PHP 7 compatibility patch from Inchoo_PHP7 into EcomDev_PHPUnit_Model_Layout
parent
8276c465
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
1 deletion
+10
-1
app/code/community/EcomDev/PHPUnit/Model/Layout.php
app/code/community/EcomDev/PHPUnit/Model/Layout.php
+10
-1
No files found.
app/code/community/EcomDev/PHPUnit/Model/Layout.php
View file @
ac76e595
...
...
@@ -532,6 +532,15 @@ class EcomDev_PHPUnit_Model_Layout
public
function
getOutput
()
{
$this
->
record
(
self
::
ACTION_RENDER
,
'layout'
);
return
parent
::
getOutput
();
// parent::getOutput() with Inchoo_PHP7 fix:
$out
=
''
;
if
(
!
empty
(
$this
->
_output
))
{
foreach
(
$this
->
_output
as
$callback
)
{
$out
.=
$this
->
getBlock
(
$callback
[
0
])
->
{
$callback
[
1
]}();
}
}
return
$out
;
}
}
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