Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Yii Framework 2 apidoc extension Change Log
3.0.9 under development
-----------------------

- Bug #338: Fix deprecation error `Using null as an array offset is deprecated, use an empty string instead` (mspirkov)
- Enh #337: Log invalid tags (mspirkov)


Expand Down
6 changes: 1 addition & 5 deletions models/Context.php
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,8 @@ public function updateReferences()
{
// update all subclass references
foreach ($this->classes as $class) {
if ($class->parentClass === null) {
continue;
}

$className = $class->name;
while (isset($this->classes[$class->parentClass])) {
while ($class->parentClass !== null && isset($this->classes[$class->parentClass])) {
$class = $this->classes[$class->parentClass];
$class->subclasses[] = $className;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,10 @@
<a class="list-group-item" href="./yiiunit-apidoc-data-api-animal-cat.html">Cat</a>
<a class="list-group-item" href="./yiiunit-apidoc-data-api-animal-dog.html">Dog</a>
</div>
<a class="list-group-item" data-toggle="collapse" data-parent="#navigation">yiiunit\apidoc\data\api\base <b class="caret"></b></a><div class="submenu panel-collapse collapse"><a class="list-group-item" href="./yiiunit-apidoc-data-api-base-component.html">Component</a></div>
<a class="list-group-item" data-toggle="collapse" data-parent="#navigation">yiiunit\apidoc\data\api\base <b class="caret"></b></a><div class="submenu panel-collapse collapse">
<a class="list-group-item" href="./yiiunit-apidoc-data-api-base-component.html">Component</a>
<a class="list-group-item" href="./yiiunit-apidoc-data-api-base-controller.html">Controller</a>
</div>
</div> </div>
<div class="col-md-9 api-content" role="main">
<h1>Abstract Class yiiunit\apidoc\data\api\animal\Animal</h1>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,10 @@
<a class="list-group-item active" href="./yiiunit-apidoc-data-api-animal-cat.html">Cat</a>
<a class="list-group-item" href="./yiiunit-apidoc-data-api-animal-dog.html">Dog</a>
</div>
<a class="list-group-item" data-toggle="collapse" data-parent="#navigation">yiiunit\apidoc\data\api\base <b class="caret"></b></a><div class="submenu panel-collapse collapse"><a class="list-group-item" href="./yiiunit-apidoc-data-api-base-component.html">Component</a></div>
<a class="list-group-item" data-toggle="collapse" data-parent="#navigation">yiiunit\apidoc\data\api\base <b class="caret"></b></a><div class="submenu panel-collapse collapse">
<a class="list-group-item" href="./yiiunit-apidoc-data-api-base-component.html">Component</a>
<a class="list-group-item" href="./yiiunit-apidoc-data-api-base-controller.html">Controller</a>
</div>
</div> </div>
<div class="col-md-9 api-content" role="main">
<h1>Class yiiunit\apidoc\data\api\animal\Cat</h1>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,10 @@
<a class="list-group-item" href="./yiiunit-apidoc-data-api-animal-cat.html">Cat</a>
<a class="list-group-item active" href="./yiiunit-apidoc-data-api-animal-dog.html">Dog</a>
</div>
<a class="list-group-item" data-toggle="collapse" data-parent="#navigation">yiiunit\apidoc\data\api\base <b class="caret"></b></a><div class="submenu panel-collapse collapse"><a class="list-group-item" href="./yiiunit-apidoc-data-api-base-component.html">Component</a></div>
<a class="list-group-item" data-toggle="collapse" data-parent="#navigation">yiiunit\apidoc\data\api\base <b class="caret"></b></a><div class="submenu panel-collapse collapse">
<a class="list-group-item" href="./yiiunit-apidoc-data-api-base-component.html">Component</a>
<a class="list-group-item" href="./yiiunit-apidoc-data-api-base-controller.html">Controller</a>
</div>
</div> </div>
<div class="col-md-9 api-content" role="main">
<h1>Class yiiunit\apidoc\data\api\animal\Dog</h1>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,10 @@
<a class="list-group-item" href="./yiiunit-apidoc-data-api-animal-cat.html">Cat</a>
<a class="list-group-item" href="./yiiunit-apidoc-data-api-animal-dog.html">Dog</a>
</div>
<a class="list-group-item active" data-toggle="collapse" data-parent="#navigation">yiiunit\apidoc\data\api\base <b class="caret"></b></a><div class="submenu panel-collapse collapse in"><a class="list-group-item active" href="./yiiunit-apidoc-data-api-base-component.html">Component</a></div>
<a class="list-group-item active" data-toggle="collapse" data-parent="#navigation">yiiunit\apidoc\data\api\base <b class="caret"></b></a><div class="submenu panel-collapse collapse in">
<a class="list-group-item active" href="./yiiunit-apidoc-data-api-base-component.html">Component</a>
<a class="list-group-item" href="./yiiunit-apidoc-data-api-base-controller.html">Controller</a>
</div>
</div> </div>
<div class="col-md-9 api-content" role="main">
<h1>Class yiiunit\apidoc\data\api\base\Component</h1>
Expand All @@ -60,7 +63,11 @@ <h1>Class yiiunit\apidoc\data\api\base\Component</h1>
<th>Inheritance</th>
<td><a href="yiiunit-apidoc-data-api-base-component.html">yiiunit\apidoc\data\api\base\Component</a></td>
</tr>
</table>
<tr>
<th>Subclasses</th>
<td><a href="yiiunit-apidoc-data-api-base-controller.html">yiiunit\apidoc\data\api\base\Controller</a></td>
</tr>
</table>

<div class="class-description">
<p><strong></strong></p>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,197 @@
<!DOCTYPE html>
<html lang="en-US">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="language" content="en">






<title>Controller, yiiunit\apidoc\data\api\base\Controller - Yii Framework 2.0 API Documentation</title>
</head>
<body>

<div class="wrap">
<nav class="navbar-inverse navbar-fixed-top navbar"><div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse"><span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span></button><a class="navbar-brand" href="./index.html">Yii Framework 2.0 API Documentation</a>
</div>
<div class="collapse navbar-collapse">
<ul class="navbar-nav nav"><li><a href="./index.html">Class reference</a></li></ul>
<div class="navbar-form navbar-left" role="search">
<div class="form-group">
<input type="text" class="form-control" placeholder="Search">
</div>
</div>
</div></nav>
<div style="display: none;" class="modal-content">
<ul>
</ul>
</div>


<div class="row">
<div class="col-md-3">
<div class="list-group">
<a class="list-group-item" data-toggle="collapse" data-parent="#navigation">yiiunit\apidoc\data\api\animal <b class="caret"></b></a><div class="submenu panel-collapse collapse">
<a class="list-group-item" href="./yiiunit-apidoc-data-api-animal-animal.html">Animal</a>
<a class="list-group-item" href="./yiiunit-apidoc-data-api-animal-cat.html">Cat</a>
<a class="list-group-item" href="./yiiunit-apidoc-data-api-animal-dog.html">Dog</a>
</div>
<a class="list-group-item active" data-toggle="collapse" data-parent="#navigation">yiiunit\apidoc\data\api\base <b class="caret"></b></a><div class="submenu panel-collapse collapse in">
<a class="list-group-item" href="./yiiunit-apidoc-data-api-base-component.html">Component</a>
<a class="list-group-item active" href="./yiiunit-apidoc-data-api-base-controller.html">Controller</a>
</div>
</div> </div>
<div class="col-md-9 api-content" role="main">
<h1>Class yiiunit\apidoc\data\api\base\Controller</h1>
<div class="top-nav">
<a href="index">All Classes</a>
</div>

<table class="summaryTable docClass table table-bordered">
<colgroup>
<col class="col-name">
<col class="col-value">
</colgroup>
<tr>
<th>Inheritance</th>
<td>
<a href="yiiunit-apidoc-data-api-base-controller.html">yiiunit\apidoc\data\api\base\Controller</a> &raquo;
<a href="yiiunit-apidoc-data-api-base-component.html">yiiunit\apidoc\data\api\base\Component</a>
</td>
</tr>
</table>

<div class="class-description">
<p><strong>Controller is the base class for classes containing controller logic.</strong></p>

</div>



<a></a>

<a></a>

<a></a>

<a></a>

</div>
</div>

<script type="text/javascript">
/*<![CDATA[*/
$('a.toggle').on('click', function () {
var $this = $(this);
if ($this.hasClass('properties-hidden')) {
$this.text($this.text().replace(/Show/,'Hide'));
$this.parents('.toggle-target-container').find('.inherited').show();
$this.removeClass('properties-hidden');
} else {
$this.text($this.text().replace(/Hide/,'Show'));
$this.parents('.toggle-target-container').find('.inherited').hide();
$this.addClass('properties-hidden');
}

return false;
});
/*]]>*/
</script>


</div>

<footer class="footer">

Powered by <a href="https://www.yiiframework.com/" rel="external">Yii Framework</a></footer>

<script>jQuery(function ($) {
var shiftWindow = function () { scrollBy(0, -50) };
if (location.hash) setTimeout(shiftWindow, 1);
window.addEventListener("hashchange", shiftWindow);
var element = document.createElement("script");
element.src = "./jssearch.index.js";
document.body.appendChild(element);

var searchBox = $('#searchbox');

// search when typing in search field
searchBox.on("keyup", function(event) {
var query = $(this).val();

if (query == '' || event.which == 27) {
$('#search-resultbox').hide();
return;
} else if (event.which == 13) {
var selectedLink = $('#search-resultbox a.selected');
if (selectedLink.length != 0) {
document.location = selectedLink.attr('href');
return;
}
} else if (event.which == 38 || event.which == 40) {
$('#search-resultbox').show();

var selected = $('#search-resultbox a.selected');
if (selected.length == 0) {
$('#search-results').find('a').first().addClass('selected');
} else {
var next;
if (event.which == 40) {
next = selected.parent().next().find('a').first();
} else {
next = selected.parent().prev().find('a').first();
}
if (next.length != 0) {
var resultbox = $('#search-results');
var position = next.position();

// TODO scrolling is buggy and jumps around
// resultbox.scrollTop(Math.floor(position.top));
// console.log(position.top);

selected.removeClass('selected');
next.addClass('selected');
}
}

return;
}
$('#search-resultbox').show();
$('#search-results').html('<li><span class="no-results">No results');

var result = jssearch.search(query);

if (result.length > 0) {
var i = 0;
var resHtml = '';

for (var key in result) {
if (i++ > 20) {
break;
}
resHtml = resHtml +
'<li><a href="' + result[key].file.u.substr(3) +'"><span class="title">' + result[key].file.t + '' +
'<span class="description">' + result[key].file.d + '';
}
$('#search-results').html(resHtml);
}
});

// hide the search results on ESC
$(document).on("keyup", function(event) { if (event.which == 27) { $('#search-resultbox').hide(); } });
// hide search results on click to document
$(document).bind('click', function (e) { $('#search-resultbox').hide(); });
// except the following:
searchBox.bind('click', function(e) { e.stopPropagation(); });
$('#search-resultbox').bind('click', function(e) { e.stopPropagation(); });

});</script>
</body>
</html>
16 changes: 16 additions & 0 deletions tests/data/api/base/Controller.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?php

/**
* @link https://www.yiiframework.com/
* @copyright Copyright (c) 2008 Yii Software LLC
* @license https://www.yiiframework.com/license/
*/

namespace yiiunit\apidoc\data\api\base;

/**
* Controller is the base class for classes containing controller logic.
*/
class Controller extends Component
{
}
Loading