Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yii2
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
PSDI Army
yii2
Commits
595f55c5
Commit
595f55c5
authored
Mar 08, 2014
by
Carsten Brandt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
api doc improvements
parent
c815d0ce
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
12 deletions
+17
-12
ApiMarkdown.php
extensions/apidoc/helpers/ApiMarkdown.php
+1
-1
style.css
extensions/apidoc/templates/bootstrap/assets/css/style.css
+6
-2
ApiRenderer.php
extensions/apidoc/templates/html/ApiRenderer.php
+5
-4
methodDetails.php
extensions/apidoc/templates/html/views/methodDetails.php
+4
-4
Widget.php
framework/base/Widget.php
+1
-1
No files found.
extensions/apidoc/helpers/ApiMarkdown.php
View file @
595f55c5
...
...
@@ -93,7 +93,7 @@ class ApiMarkdown extends GithubMarkdown
}
}
p
rotected
function
highlight
(
$code
,
$language
)
p
ublic
static
function
highlight
(
$code
,
$language
)
{
if
(
$language
!==
'php'
)
{
return
htmlspecialchars
(
$code
,
ENT_NOQUOTES
,
'UTF-8'
);
...
...
extensions/apidoc/templates/bootstrap/assets/css/style.css
View file @
595f55c5
...
...
@@ -57,4 +57,9 @@ blockquote {
td
p
{
margin
:
0
;
}
\ No newline at end of file
}
table
.detailTable
.paramNameCol
{
width
:
15%
;
min-width
:
100px
;
}
table
.detailTable
.paramTypeCol
{
width
:
15%
;
min-width
:
150px
;
}
table
.detailTable
.paramDescCol
{
width
:
70%
;
}
extensions/apidoc/templates/html/ApiRenderer.php
View file @
595f55c5
...
...
@@ -7,6 +7,7 @@
namespace
yii\apidoc\templates\html
;
use
yii\apidoc\helpers\ApiMarkdown
;
use
yii\apidoc\models\MethodDoc
;
use
yii\apidoc\models\PropertyDoc
;
use
yii\apidoc\models\ClassDoc
;
...
...
@@ -225,7 +226,8 @@ class ApiRenderer extends BaseApiRenderer implements ViewContextInterface
}
return
implode
(
'<br />'
,
$sig
);
}
return
$this
->
createTypeLink
(
$property
->
types
)
.
' '
.
$property
->
name
.
' = '
.
(
$property
->
defaultValue
===
null
?
'null'
:
$property
->
defaultValue
);
return
$this
->
createTypeLink
(
$property
->
types
)
.
' '
.
$this
->
createSubjectLink
(
$property
,
$property
->
name
)
.
' '
.
ApiMarkdown
::
highlight
(
'= '
.
(
$property
->
defaultValue
===
null
?
'null'
:
$property
->
defaultValue
),
'php'
);
}
/**
...
...
@@ -244,9 +246,8 @@ class ApiRenderer extends BaseApiRenderer implements ViewContextInterface
return
(
$method
->
isReturnByReference
?
'<b>&</b>'
:
''
)
.
(
$method
->
returnType
===
null
?
'void'
:
$this
->
createTypeLink
(
$method
->
returnTypes
))
.
' '
.
$this
->
createSubjectLink
(
$method
,
$method
->
name
)
.
'( '
.
implode
(
', '
,
$params
)
.
' )'
;
.
' '
.
$this
->
createSubjectLink
(
$method
,
$method
->
name
)
.
ApiMarkdown
::
highlight
(
'( '
.
implode
(
', '
,
$params
)
.
' )'
,
'php'
);
}
public
function
generateApiUrl
(
$typeName
)
...
...
extensions/apidoc/templates/html/views/methodDetails.php
View file @
595f55c5
...
...
@@ -34,28 +34,28 @@ ArrayHelper::multisort($methods, 'name');
</span>
</div>
<table
class=
"
summary
Table table table-striped table-bordered table-hover"
>
<table
class=
"
detail
Table table table-striped table-bordered table-hover"
>
<tr><td
colspan=
"3"
>
<div
class=
"signature2"
>
<?=
$renderer
->
renderMethodSignature
(
$method
)
?>
</div>
</td></tr>
<?php
if
(
!
empty
(
$method
->
params
)
||
!
empty
(
$method
->
return
)
||
!
empty
(
$method
->
exceptions
))
:
?>
<?php
foreach
(
$method
->
params
as
$param
)
:
?>
<tr>
<td
class=
"paramNameCol"
>
<?=
$param
->
name
?>
</td>
<td
class=
"paramNameCol"
>
<?=
ApiMarkdown
::
highlight
(
$param
->
name
,
'php'
)
?>
</td>
<td
class=
"paramTypeCol"
>
<?=
$renderer
->
createTypeLink
(
$param
->
types
)
?>
</td>
<td
class=
"paramDescCol"
>
<?=
ApiMarkdown
::
process
(
$param
->
description
,
$type
)
?>
</td>
</tr>
<?php
endforeach
;
?>
<?php
if
(
!
empty
(
$method
->
return
))
:
?>
<tr>
<t
d
class=
"paramNameCol"
>
<?=
'return'
;
?>
</td
>
<t
h
class=
"paramNameCol"
>
<?=
'return'
;
?>
</th
>
<td
class=
"paramTypeCol"
>
<?=
$renderer
->
createTypeLink
(
$method
->
returnTypes
);
?>
</td>
<td
class=
"paramDescCol"
>
<?=
ApiMarkdown
::
process
(
$method
->
return
,
$type
);
?>
</td>
</tr>
<?php
endif
;
?>
<?php
foreach
(
$method
->
exceptions
as
$exception
=>
$description
)
:
?>
<tr>
<t
d
class=
"paramNameCol"
>
<?=
'throws'
?>
</td
>
<t
h
class=
"paramNameCol"
>
<?=
'throws'
?>
</th
>
<td
class=
"paramTypeCol"
>
<?=
$renderer
->
createTypeLink
(
$exception
)
?>
</td>
<td
class=
"paramDescCol"
>
<?=
ApiMarkdown
::
process
(
$description
,
$type
)
?>
</td>
</tr>
...
...
framework/base/Widget.php
View file @
595f55c5
...
...
@@ -31,7 +31,7 @@ class Widget extends Component implements ViewContextInterface
public
static
$counter
=
0
;
/**
* @var string the prefix to the automatically generated widget IDs.
* @see
[[getId()]]
* @see
getId()
*/
public
static
$autoIdPrefix
=
'w'
;
...
...
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