geckon01/whoops
1
0
Fork 0
mirror of https://github.com/filp/whoops.git synced 2026-09-13 11:16:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #474 from sergeyklay/editor-improvements

Browse Source 
Improved PrettyPageHandler::getEditor
This commit is contained in:
Denis Sokolov
2017-01-25 10:19:54 +02:00
committed by GitHub
parent bfd3413465 2d523f5d72
commit 4df0f6ec67
1 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Whoops/Handler/PrettyPageHandler.php
+22 -20
View File
@@ -390,7 +390,7 @@ class PrettyPageHandler extends Handler
{
$editor = $this->getEditor($filePath, $line);
if (!$editor) {
if (empty($editor)) {
return false;
}
@@ -436,42 +436,44 @@ class PrettyPageHandler extends Handler
* act as an Ajax request. The editor must be a
* valid callable function/closure
*
* @throws UnexpectedValueException If editor resolver does not return a boolean
* @param string $filePath
* @param int $line
* @return mixed
* @param string $filePath
* @param int $line
* @return array
*/
protected function getEditor($filePath, $line)
{
if ($this->editor === null && !is_string($this->editor) && !is_callable($this->editor))
{
return false;
if (!$this->editor || (!is_string($this->editor) && !is_callable($this->editor))) {
return [];
}
else if(is_string($this->editor) && isset($this->editors[$this->editor]) && !is_callable($this->editors[$this->editor]))
{
if (is_string($this->editor) && isset($this->editors[$this->editor]) && !is_callable($this->editors[$this->editor])) {
return [
'ajax' => false,
'url' => $this->editors[$this->editor],
];
}
else if(is_callable($this->editor) || (isset($this->editors[$this->editor]) && is_callable($this->editors[$this->editor])))
{
if(is_callable($this->editor))
{
if (is_callable($this->editor) || (isset($this->editors[$this->editor]) && is_callable($this->editors[$this->editor]))) {
if (is_callable($this->editor)) {
$callback = call_user_func($this->editor, $filePath, $line);
}
else
{
} else {
$callback = call_user_func($this->editors[$this->editor], $filePath, $line);
}
if (is_string($callback)) {
return [
'ajax' => false,
'url' => $callback,
];
}
return [
'ajax' => isset($callback['ajax']) ? $callback['ajax'] : false,
'url' => (is_array($callback) ? $callback['url'] : $callback),
'url' => isset($callback['url']) ? $callback['url'] : $callback,
];
}
return false;
return [];
}
/**
@@ -495,7 +497,7 @@ class PrettyPageHandler extends Handler
* Adds a path to the list of paths to be searched for
* resources.
*
* @throws InvalidArgumnetException If $path is not a valid directory
* @throws InvalidArgumentException If $path is not a valid directory
*
* @param string $path
* @return void