8000 Fixes the problem with macros returning Renderable implementations by kirkbushell · Pull Request #7980 · laravel/framework · GitHub
[go: up one dir, main page]
Skip to content

Fixes the problem with macros returning Renderable implementations #7980

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed

Fixes the problem with macros returning Renderable implementations #7980

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cc85bc6
View exception handling update
kirkbushell Mar 11, 2015
a41713a
View test update for handling exceptions
kirkbushell Mar 11, 2015
01568e2
Additional support for renderable macros.
kirkbushell Mar 12, 2015
e0d7547
Merge branch '5.0' of github.com:kirkbushell/framework into 5.0
kirkbushell Mar 12, 2015
16a62d3
Merge branch '5.0' of github.com:laravel/framework into 5.0
kirkbushell Mar 12, 2015
bed15c5
Removed view exception handling from previous PR
kirkbushell Mar 12, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Removed view exception handling from previous PR
  • Loading branch information
@kirkbushell
kirkbushell committed Mar 12, 2015
commit bed15c5d5c5082554232f55ae2a57341ad5443b8
6 changes: 1 addition & 5 deletions src/Illuminate/View/View.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,11 +397,7 @@ public function __call($method, $parameters)
*/
public function __toString()
{
try {
return $this->render();
} catch (\Exception $e) {
return $e->getMessage();
}
return $this->render();
}

}
8 changes: 0 additions & 8 deletions tests/View/ViewTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,14 +203,6 @@ public function testWithErrors()
}


public function testViewExceptionHandling()
{
$view = $this->getView();

$this->assertEquals('Method Mockery_0_Illuminate_View_Factory::incrementRender() does not exist on this mock object', (string) $view);
}


protected function getView()
{
return new View(
Expand Down
0