")[0]):(n="Copied to clipboard",g(".debug-noti").html(n).addClass("animate").closest(".debug-noti-wrap").show(),e)}})}}],Un=1,Vn.reverse(),1===document.getElementsByTagName("body")[0].childElementCount?qn(Vn):qn(Vn,!0),Wn=setInterval(function(){qn(Vn,10===Un),0===Vn.length?clearInterval(Wn):20===Un&&clearInterval(Wn),Un++},500),g.fn.debugEnhance=function(e,t,n){if("sidebar"===e)a=this,"add"===(i=t)?_e(a):"open"===i?ke(a):"close"===i&&Oe(a);else{if("buildChannelList"===e)return Te(t,n,arguments[3]);"collapse"===e?this.each(function(){Le(g(this),t)}):"expand"===e?this.each(function(){Se(g(this))}):"init"===e?function(e,t){var n=new Nn(zn.get(),"phpDebugConsole");e.data("config",n),n.set(e.eq(0).data("options")||{}),"object"==typeof t&&n.set(t);Ne(e),n.get("tooltip")&&function(e){Mn(e[0],{target:".fa-hashtag, [title]",delay:[200,null],allowHTML:!0,maxWidth:"none",appendTo:function(e){return g(e).closest(".group-body, .debug")[0]},content:Ln,onHide:Sn,onMount:Pn,onShow:Fn})}(e);(function(e){o=e.data("config").get(),s(e),u(e),e.on("click",".close[data-dismiss=alert]",function(){g(this).parent().remove()}),e.on("click",".show-more-container .show-less",O),e.on("click",".show-more-container .show-more",k),e.on("expand.debug.array",E),e.on("expand.debug.group",T),e.on("expand.debug.object",j),e.on("expanded.debug.next",".context",function(e){M(g(e.target).find("> td > .t_array"))}),e.on("expanded.debug.array expanded.debug.group expanded.debug.object",D)})(e),Me(e),function(){if($n)return;g("body").on("animationend",".debug-noti",function(){g(this).removeClass("animate").closest(".debug-noti-wrap").hide()}),g(".debug").on("mousedown",".debug a",function(){var e=window.onbeforeunload;window.onbeforeunload=null,window.setTimeout(function(){window.onbeforeunload=e},500)}),$n=!0}(),Ee(e),n.get("drawer")||e.debugEnhance()}(this,t):"setConfig"===e?function(e,t){if("object"!=typeof t)return;zn.set(t),e.find(".debug-log.enhanced").closest(".debug").trigger("config.debug.updated","linkFilesTemplate")}(this,t):this.each(function(){var e=g(this);if(e.hasClass("debug"))return e.find(".debug-menu-bar > nav, .tab-panes").show(),void e.find(".tab-pane.active").find(".m_alert, .debug-log-summary, .debug-log").debugEnhance();e.hasClass("filter-hidden")&&!1===e.hasClass("m_group")||(e.hasClass("group-body")?x(e):e.is("li, div")&&null!==e.prop("class").match(/\bm_/)?C(e):e.prop("class").match(/\bt_/)&&_(e.parents("li").filter(function(){return null!==g(this).prop("class").match(/\bm_/)}),e))})}var a,i;return this},g(function(){g(".debug").each(function(){g(this).debugEnhance("init")})})}(window.jQuery);
diff --git a/src/Debug/js_src/Tooltip.js b/src/Debug/js_src/Tooltip.js
index a5666631..e4e2a141 100644
--- a/src/Debug/js_src/Tooltip.js
+++ b/src/Debug/js_src/Tooltip.js
@@ -40,6 +40,8 @@ function tippyContent (reference) {
title = tippyContentOverrides($ref, title)
} else if (title === 'Open in editor') {
title = '
' + title
+ } else if (title === 'Throws') {
+ title = tippyContentThrows($ref, title)
} else if (title.match(/^\/.+: line \d+$/)) {
title = '
' + title
}
@@ -54,34 +56,44 @@ function tippyContentDeprecated ($ref, title) {
}
function tippyContentImplements ($ref, title) {
- var titleMore = $ref.parent().data('implements')
- titleMore = '
' +
- titleMore.replace(/^(.*\\)(.+)$/, '$1$2') +
- ''
- return 'Implements: ' + titleMore
+ var classname = $ref.parent().data('implements')
+ return title + ' ' + markupClassname(classname)
}
function tippyContentInherited ($ref, title) {
- var titleMore = $ref.parent().data('inheritedFrom')
- if (typeof titleMore === 'undefined') {
+ var classname = $ref.parent().data('classname')
+ if (typeof classname === 'undefined') {
return title
}
title = title === 'Inherited'
? 'Inherited from'
- : title + '
defined in'
- titleMore = '
' +
- titleMore.replace(/^(.*\\)(.+)$/, '$1$2') +
- ''
- return title + ' ' + titleMore
+ : title + '
defined in' // private ancestor
+ return title + ' ' + markupClassname(classname)
}
function tippyContentOverrides ($ref, title) {
- var titleMore = $ref.parent().data('declaredPrev')
- return titleMore
- ? 'Overrides ' + titleMore
+ var classname = $ref.parent().data('declaredPrev')
+ return classname
+ ? title + ' ' + markupClassname(classname)
: title
}
+function tippyContentThrows ($ref, title) {
+ var throws = $ref.parent().data('throws')
+ var i
+ var count
+ var info
+ var $dl = $('
')
+ for (i = 0, count = throws.length; i < count; i++) {
+ info = throws[i]
+ $dl.append($('
').html(markupClassname(info.type)))
+ if (info.desc) {
+ $dl.append($('
').text(info.desc))
+ }
+ }
+ return title + $dl[0].outerHTML
+}
+
function tippyOnHide (instance) {
var $ref = $(instance.reference)
var title = $ref.data('titleOrig')
diff --git a/src/Debug/js_src/main.js b/src/Debug/js_src/main.js
index a1dc0bdf..1cd662a7 100644
--- a/src/Debug/js_src/main.js
+++ b/src/Debug/js_src/main.js
@@ -49,6 +49,7 @@ var config = new Config({
'> .method > .parameter.isPromoted': '
',
'> .method > .parameter[data-attributes]': '
',
'> .method[data-implements]': '
',
+ '> .method[data-throws]': '
',
'> .property.debuginfo-value': '
',
'> .property.debuginfo-excluded': '
',
'> .property.isDynamic': '
',
diff --git a/src/Debug/scss/_arrayAndObject.scss b/src/Debug/scss/_arrayAndObject.scss
index a60075ed..83c5c2e8 100644
--- a/src/Debug/scss/_arrayAndObject.scss
+++ b/src/Debug/scss/_arrayAndObject.scss
@@ -218,6 +218,7 @@ li[class*=m_] > .t_array.array-file-tree > .array-inner {
}
}
+ i.fa-flag,
i.fa-warning {
color: $color-warning;
}
diff --git a/src/Debug/scss/_base.scss b/src/Debug/scss/_base.scss
index 3be66c30..a320a1fe 100644
--- a/src/Debug/scss/_base.scss
+++ b/src/Debug/scss/_base.scss
@@ -78,7 +78,19 @@ dl {
margin-top: 0;
margin-bottom: 0;
dt { font-weight: bold; }
- &:not(.dl-horizontal) dd {
+ &.dl-horizontal {
+ display: grid;
+ grid-template-columns: max-content auto;
+ > dt {
+ grid-column: 1;
+ text-align: right;
+ }
+ > dd {
+ grid-column: 2;
+ margin-left: 0.75em;
+ }
+ }
+ &:not(.dl-horizontal) > dd {
margin-left: 20px;
padding-left: 10px;
text-indent: -10px;
diff --git a/tests/Debug/Fixture/TestObj.php b/tests/Debug/Fixture/TestObj.php
index b7f3c401..678410ba 100644
--- a/tests/Debug/Fixture/TestObj.php
+++ b/tests/Debug/Fixture/TestObj.php
@@ -91,7 +91,7 @@ public function __debugInfo()
*
* @return string
*
- * @throws \Exception
+ * @throws \Exception when toStrThrow is `1`
*/
public function __toString()
{
diff --git a/tests/Debug/Type/ObjectTest.php b/tests/Debug/Type/ObjectTest.php
index e9a583e4..5fbc847e 100644
--- a/tests/Debug/Type/ObjectTest.php
+++ b/tests/Debug/Type/ObjectTest.php
@@ -224,7 +224,7 @@ static function ($foo, $bar) {
self::assertAbstractionType($objAbs);
self::assertSame(array(
array(
- 'desc' => null,
+ 'desc' => 'when toStrThrow is `1`',
'type' => 'Exception',
),
), $objAbs['methods']['__toString']['phpDoc']['throws']);
@@ -329,7 +329,7 @@ static function ($foo, $bar) {
'',
'Constructor description">__construct
(string $toString = abracadabra, int $toStrThrow = 0)',
'
public __debugInfo(): array',
- '
= 80000 ? ' data-implements="Stringable"' : '' ) . '>public = 80000 ? 'data-implements="Stringable" ' : '' ) . 'data-throws="[{"desc":"when toStrThrow is `1`","type":"Exception"}]">public __toString(): string',
'static variables
',