diff --git a/share/tools/generate_docs.php b/share/tools/generate_docs.php index f983157..abb535c 100644 --- a/share/tools/generate_docs.php +++ b/share/tools/generate_docs.php @@ -55,7 +55,8 @@ exec($cmd, $output, $rc); if ($rc == 0) { # update dokumentation - $cmd = $vzDir . '/phpdoc/phpdoc -c ' . $vzDir . '/github/share/tools/phpdoc.ini'; + //$cmd = $vzDir . '/phpdoc/phpdoc -c ' . $vzDir . '/github/share/tools/phpdoc.ini'; + $cmd = 'php5 ' . $vzDir . '/phpdoctor/phpdoc.php ' . $vzDir . '/github/share/tools/phpdoctor.ini'; $output[] = PHP_EOL . $cmd . PHP_EOL; exec($cmd, $output, $rc); } diff --git a/share/tools/phpdoc.ini b/share/tools/phpdoc.ini index 8bd134d..1c5a0b3 100644 --- a/share/tools/phpdoc.ini +++ b/share/tools/phpdoc.ini @@ -24,7 +24,7 @@ hidden = true ;; show elements marked @access private in documentation by setting this to on ;; legal values: on, off -parseprivate = off +parseprivate = on ;; parse with javadoc-like description (first sentence is always the short description) ;; legal values: on, off @@ -32,6 +32,7 @@ javadocdesc = off ;; add any custom @tags separated by commas here ;; legal values: any legal tagname separated by commas. +;; added doctrine Annotations customtags = Column,ChangeTrackingPolicy,DiscriminatorColumn,DiscriminatorMap,Entity,GeneratedValue,HasLifecycleCallbacks,Index,Id,InheritanceType,JoinColumn,JoinTable,ManyToOne,ManyToMany,MappedSuperclass,OneToOne,OneToMany,OrderBy,PostLoad,PostPersist,PostRemove,PostUpdate,PrePersist,PreRemove,PreUpdate,SequenceGenerator,Table,UniqueConstraint,Version ;; This is only used by the XML:DocBook/peardoc2 converter