Skip to content

Commit

Permalink
Simplify phpdocs generation
Browse files Browse the repository at this point in the history
  • Loading branch information
Synchro committed May 1, 2016
1 parent da739aa commit 9b784d2
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
docs/phpdoc/
docs/
!docs/README.md
test/message.txt
test/testbootstrap.php
*.pem
.idea
build/
vendor/
2 changes: 1 addition & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# PHPMailer Documentation

Pre-built PHPMailer API documentation is not provided with the PHP classes, but you can generate API documentation by running the `generatedocs.sh` shell script in this folder. You will need to have [phpDocumentor](https://www.phpdoc.org) installed. This documentation is also [available online](http://phpmailer.github.io/PHPMailer/), though it may not be quite up to date or match your version.
Pre-built PHPMailer API documentation is not provided with the PHP classes, but you can generate API documentation by running `phpdoc` in the top-level folder of this project, and documentation will be generated in this folder. You will need to have [phpDocumentor](https://www.phpdoc.org) installed. This documentation is also [available online](http://phpmailer.github.io/PHPMailer/), though it may not be quite up to date or match your version exactly. The configuration for phpdoc is in the [phpdoc.dist.xml file](https://github.com/PHPMailer/PHPMailer/blob/master/phpdoc.dist.xml).

Further help and information is available in [the PHPMailer README](https://github.com/PHPMailer/PHPMailer/blob/master/README.md), [the examples folder](https://github.com/PHPMailer/PHPMailer/tree/master/examples), and in [the GitHub wiki](https://github.com/PHPMailer/PHPMailer/wiki).

Expand Down
8 changes: 0 additions & 8 deletions docs/generatedocs.sh

This file was deleted.

20 changes: 20 additions & 0 deletions phpdoc.dist.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8" ?>
<phpdoc>
<title>PHPMailer</title>
<parser>
<target>docs</target>
<encoding>utf8</encoding>
<markers>
<item>TODO</item>
</markers>
</parser>
<transformer>
<target>docs</target>
</transformer>
<transformations>
<template name="clean"/>
</transformations>
<files>
<directory>src</directory>
</files>
</phpdoc>
3 changes: 1 addition & 2 deletions src/PHPMailer.php
Original file line number Diff line number Diff line change
Expand Up @@ -3800,8 +3800,7 @@ public function getAllRecipientAddresses()
protected function doCallback($isSent, $to, $cc, $bcc, $subject, $body, $from)
{
if (!empty($this->action_function) and is_callable($this->action_function)) {
$params = [$isSent, $to, $cc, $bcc, $subject, $body, $from];
call_user_func_array($this->action_function, $params);
call_user_func_array($this->action_function, [$isSent, $to, $cc, $bcc, $subject, $body, $from]);
}
}

Expand Down

0 comments on commit 9b784d2

Please sign in to comment.