Skip to content

Commit 9e6c78f

Browse files
committed
phpdoctor wants {} around inheritDoc - but the feature is broken anyways: peej/phpdoctor#46 peej/phpdoctor#35
1 parent d92b3a6 commit 9e6c78f

File tree

4 files changed

+158
-2
lines changed

4 files changed

+158
-2
lines changed

doc/config/README

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
=============
2+
Documentation
3+
=============
4+
5+
The documentation of this project follows the semantics and paradigms of
6+
phpdoctor[1] and PHPDocumentor[1].
7+
8+
If you want to /use/ the PHPCR API, you should look at the documentation of
9+
PHPCR, and not at the Jackalope implementation doc, as you should not rely on
10+
implementation specifics.
11+
The PHPCR documentation is online at http://phpcr.github.com/doc/html/index.html
12+
13+
Since the documentation is updated constantly and easy to generate, it is not
14+
included in the project. Please see the phpcr README file in phpcr doc/config/
15+
for how to generate the current doc.
16+

doc/config/phpdoctor.dist.ini

+140
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
; Configuration file for PHPDoctor
2+
3+
; PHPDoctor settings
4+
; -----------------------------------------------------------------------------
5+
6+
; Names of files to parse. This can be a single filename, or a comma separated
7+
; list of filenames. Wildcards are allowed.
8+
9+
files = "*.php"
10+
11+
; Names of files or directories to ignore. This can be a single filename, or a
12+
; comma separated list of filenames. Wildcards are NOT allowed.
13+
14+
ignore = "CVS, .svn, .git, _compiled"
15+
16+
; The directory to look for files in, if not used the PHPDoctor will look in
17+
; the current directory (the directory it is run from).
18+
19+
source_path = "/path/to/jackalope/src"
20+
21+
; If you do not want PHPDoctor to look in each sub directory for files
22+
; uncomment this line.
23+
24+
;subdirs = off
25+
26+
; Set how loud PHPDoctor is as it runs. Quiet mode suppresses all output other
27+
; than warnings and errors. Verbose mode outputs additional messages during
28+
; execution.
29+
30+
;quiet = on
31+
;verbose = on
32+
33+
; Select the doclet to use for generating output.
34+
35+
doclet = standard
36+
;doclet = debug
37+
38+
; The directory to find the doclet in. Doclets control the HTML output of
39+
; phpDoctor and can be modified to suit your needs. They are expected to be
40+
; in a directory named after themselves at the location given.
41+
42+
;doclet_path = ./doclets
43+
44+
; Select the formatter to use for generating output.
45+
46+
;formatter = htmlStandardFormatter
47+
48+
; The directory to find the formatter in. Formatters convert textual markup
49+
; for use by the doclet.
50+
51+
;formatter_path = ./formatters
52+
53+
; The directory to find taglets in. Taglets allow you to make PHPDoctor handle
54+
; new tags and to alter the behavour of existing tags and their output.
55+
56+
;taglet_path = ./taglets
57+
58+
; If the code you are parsing does not use package tags or not all elements
59+
; have package tags, use this setting to place unbound elements into a
60+
; particular package.
61+
62+
default_package = "Jackalope"
63+
64+
use_class_path_as_package = on
65+
66+
ignore_package_tags = on
67+
68+
; Specifies the name of a HTML file containing text for the overview
69+
; documentation to be placed on the overview page. The path is relative to
70+
; "source_path" unless an absolute path is given.
71+
72+
overview = overview.html
73+
74+
; Package comments will be looked for in a file named package.html in the same
75+
; directory as the first source file parsed in that package or in the directory
76+
; given below. If package comments are placed in the directory given below then
77+
; they should be named "<packageName>.html".
78+
79+
package_comment_dir = ./
80+
81+
; Parse out global variables and/or global constants?
82+
83+
;globals = off
84+
;constants = off
85+
86+
; Generate documentation for all class members
87+
88+
;private = on
89+
90+
; Generate documentation for public and protected class members
91+
92+
;protected = on
93+
94+
; Generate documentation for only public class members
95+
96+
public = on
97+
98+
; Use the PEAR compatible handling of the docblock first sentence
99+
100+
;pear_compat = on
101+
102+
; Standard doclet settings
103+
; -----------------------------------------------------------------------------
104+
105+
; The directory to place generated documentation in. If the given path is
106+
; relative to it will be relative to "source_path".
107+
108+
d = "/path/to/doc/html"
109+
110+
; Specifies the title to be placed in the HTML <title> tag.
111+
112+
windowtitle = "Jackalope PHPCR implementation"
113+
114+
; Specifies the title to be placed near the top of the overview summary file.
115+
116+
doctitle = "Jackalope PHPCR implementation documentation"
117+
118+
; Specifies the header text to be placed at the top of each output file. The
119+
; header will be placed to the right of the upper navigation bar.
120+
121+
header = "Jackalope"
122+
123+
; Specifies the footer text to be placed at the bottom of each output file. The
124+
; footer will be placed to the right of the lower navigation bar.
125+
126+
footer = "Jackalope"
127+
128+
; Specifies the text to be placed at the bottom of each output file. The text
129+
; will be placed at the bottom of the page, below the lower navigation bar.
130+
131+
;bottom = "This document was generated by <a href="http://peej.github.com/phpdoctor/">PHPDoctor: The PHP Documentation Creator</a>"
132+
133+
; Create a class tree?
134+
135+
;tree = off
136+
137+
; Use GeSHi to include formatted source files in the documentation. PHPDoctor will look in the current doclet directory for a /geshi subdirectory. Unpack the GeSHi archive from http://qbnz.com/highlighter to get this directory - it will contain a php script and a subdirectory with formatting files.
138+
139+
;include_source = off
140+

src/Jackalope/Item.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
namespace Jackalope;
33

44
/**
5-
* @inheritDoc
5+
* {@inheritDoc}
66
*
77
* TODO: we should have a state concept: NEW, MODIFIED, DIRTY, DELETED.
88
* modified needs to be saved

src/Jackalope/Property.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public function __construct($factory, array $data, $path, Session $session, Obje
8181
}
8282

8383
/**
84-
* @inheritDoc
84+
* {@inheritDoc}
8585
*/
8686
public function setValue($value, $type = null)
8787
{

0 commit comments

Comments
 (0)