From 009c7416868b13851324a114f71da5aea413b1d1 Mon Sep 17 00:00:00 2001 From: Bastian Feder Date: Wed, 16 Feb 2011 21:59:00 +0100 Subject: [PATCH 1/6] corrections to locations of the mandatory packages on local system --- phpdox.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpdox.php b/phpdox.php index 9c046f9f..bdc40ae8 100755 --- a/phpdox.php +++ b/phpdox.php @@ -43,9 +43,9 @@ */ require __DIR__ . '/../DirectoryScanner/autoload.php'; -require __DIR__ . '/../fDomDocument/autoload.php'; +require __DIR__ . '/../fDOMDocument/autoload.php'; require __DIR__ . '/../fXSL/autoload.php'; -require __DIR__ . '/../ezc/current/Base/src/base.php'; +require 'ezc/Base/base.php'; require __DIR__ . '/../staticReflection/src/main/php/pdepend/reflection/Autoloader.php'; require __DIR__ . '/../docblock/DocBlock.php'; require __DIR__ . '/autoload.php'; From 06bcdf401faca27d4c8cc20093c05acc7c8ae913 Mon Sep 17 00:00:00 2001 From: Bastian Feder Date: Fri, 18 Feb 2011 09:57:55 +0100 Subject: [PATCH 2/6] first draft of the class xslt --- src/backend/htmlBuilder/class.xsl | 190 +++++++++++++++++++++++++++--- 1 file changed, 176 insertions(+), 14 deletions(-) diff --git a/src/backend/htmlBuilder/class.xsl b/src/backend/htmlBuilder/class.xsl index 1bb2669d..48445313 100644 --- a/src/backend/htmlBuilder/class.xsl +++ b/src/backend/htmlBuilder/class.xsl @@ -1,18 +1,180 @@ - - - + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns="http://www.w3.org/1999/xhtml" + xmlns:file="http://phpdox.de/xml#" + exclude-result-prefixes="#default file" + > + + + - - - - - - - - - + + + + + + + + + + + + +
+

+
+ + + +

+ +

+ +
+

Members

+
    + +
+
+
+

Methods

+
    + + +
+
+ + + + +
+ +
+ + +
+ +
+ +
+ + + + + + + + +
+ + + +
  • +

    + + + +

    + Constructor + +
    • +     + + +
  • +

    + + +

    + +
    • +     + + +
  • +

    + + + + +

    +

    + +

    + +
    • +     + + +
  • + + + + +
    • +     + + + +
    +
      + + +
    +
    +     + + + + + + + + + + + = + + + + + + + & + + + + + + final + + + + + + + + + + + + static + + + + + + + abstract + + + +     From f76a8d97c5f88a446d9ad0e584c70e7ecf2785dd Mon Sep 17 00:00:00 2001 From: Bastian Feder Date: Fri, 18 Feb 2011 10:01:13 +0100 Subject: [PATCH 3/6] added output dirs to ignore list --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 81e93668..ff6d1f09 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ .project .settings /output - +docs/ +xml/ From c68944242a3dab28cc0e3982c4ef00a129eb232d Mon Sep 17 00:00:00 2001 From: Bastian Feder Date: Fri, 18 Feb 2011 16:41:53 +0100 Subject: [PATCH 4/6] 2nd draft of the class XSLT --- src/backend/htmlBuilder/class.xsl | 128 +++++++++++++++++++----------- 1 file changed, 81 insertions(+), 47 deletions(-) diff --git a/src/backend/htmlBuilder/class.xsl b/src/backend/htmlBuilder/class.xsl index 48445313..e245f189 100644 --- a/src/backend/htmlBuilder/class.xsl +++ b/src/backend/htmlBuilder/class.xsl @@ -5,7 +5,6 @@ xmlns:file="http://phpdox.de/xml#" exclude-result-prefixes="#default file" > - @@ -27,45 +26,62 @@ -

    +

    + -
    +
    +

    Constants

    +
      + +
    +
    +

    Members

    -
      +
    -
    +

    Methods

    -
      +
    + +
    + extending + +
    +     + + +
  • + + = + +
    • +     + - -
    - -
    -     - -
    - -
    -     -
    - - - - - - - - +
    + +
    + +
    +     + +
    + +
    +     + + +
    @@ -82,49 +98,70 @@ -
  • +

  • + + = + +
    • -
  • +

  • -

    +

    - + + + +
    • -
  • +
  • +
    • - + + + +
    + +
    + +
    +     + +
    + +
    +     +
    +     + -
    -
      - - -
    -
    +
    +
      + +
    +
    @@ -135,12 +172,13 @@ --> + - = + = @@ -153,8 +191,7 @@ - final - + final @@ -165,16 +202,13 @@ - static - + static - abstract - + abstract - From 44981414407b3b06e4fc1dd3e19852a0b636e62b Mon Sep 17 00:00:00 2001 From: Bastian Feder Date: Fri, 18 Feb 2011 16:46:42 +0100 Subject: [PATCH 5/6] added phpdox.php to ignore list --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index ff6d1f09..26fc326b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /output docs/ xml/ +phpdox.php From ceedcf147c97ceccd7696585ac8bfa1c7100f3c8 Mon Sep 17 00:00:00 2001 From: Bastian Feder Date: Fri, 18 Feb 2011 19:48:23 +0100 Subject: [PATCH 6/6] 1st draft of css rules --- docs/style/media.css | 138 ++++++++++++++++++++++++++++++ src/backend/htmlBuilder/class.xsl | 89 ++++++++++++------- 2 files changed, 194 insertions(+), 33 deletions(-) create mode 100644 docs/style/media.css diff --git a/docs/style/media.css b/docs/style/media.css new file mode 100644 index 00000000..14e4857e --- /dev/null +++ b/docs/style/media.css @@ -0,0 +1,138 @@ +@CHARSET "UTF-8"; + +html { + font-family: Helvetica; +} + +h1, h2, h3 { + border-bottom: 1px solid black; +} + +.classNamespace { + +} + +.classNamespaceName:before{ + content: "namespace " +} + +.classNamespaceName{ + +} + +.className{ + +} + +.classConstants{ + +} + +.classConstantList{ + list-style-type: none; +} + + +.classConstantItem:before { + content: "const "; + font-weight: bold; + font-family: monospace; +} + +.classConstantItem{ + +} + +.classMembers{ + +} + +.classMemberList{ + list-style-type: none; +} + +.classMemberItem{ + +} + +.classMethods{ + +} + +.classMethod{ + +} + +.classMethodName{ + display:inline; +} + +.classMethodList{ + list-style-type: none; +} + +.classMethodItem{ + margin-bottom: 25px; + margin-top: 20px; +} + +.classMethodParameters{ + +} + +.classMethodParameter{ + +} + +.classMethodParameterList{ + list-style-type: none; +} + +.classDocBlock{ + margin-left: 25px; +} + +.prefixes{ + display:inline; + font-family: monospace; +} + +.author:before{ + content: "by "; +} + +.author{ + margin-top: 5px; + +} + +.copyright:before{ + content: "Ⓒ "; +} + +.copyright{ + +} + +.description{ + background-color: #EEEEEE; + margin-top: 15px; + padding: 10px; +} + +.shortDescription{ + margin-bottom: 25px; +} + +.longDescription{ + +} + +.inheritance { + margin-top:-20px; +} + +.typeHint{ + display:inline; + font-family: monospace; +} \ No newline at end of file diff --git a/src/backend/htmlBuilder/class.xsl b/src/backend/htmlBuilder/class.xsl index e245f189..3dc611eb 100644 --- a/src/backend/htmlBuilder/class.xsl +++ b/src/backend/htmlBuilder/class.xsl @@ -10,7 +10,7 @@ - + @@ -21,42 +21,26 @@
    -

    +

    -

    +

    -
    -

    Constants

    -
      - -
    -
    -
    -

    Members

    -
      - -
    -
    -
    -

    Methods

    -
      - - -
    -
    + + +
    - extending +

    extending

    -
    +
    @@ -80,7 +64,7 @@
    - +
    @@ -112,7 +96,7 @@ -
  • +

  • @@ -140,7 +124,41 @@ + + + +

    +

    Constants

    +
      + +
    +
    + + + + + +
    +

    Members

    +
      + +
    +
    +     +     + + +
    +

    Methods

    +
      + + +
    +
    +     +     +
    @@ -165,13 +183,18 @@ - - - + +

    + +

    + +     + +

    array

    + +     + +

    mixed