Permalink
Browse files

Merge branch 'release-1.0'

  • Loading branch information...
corpsee committed Feb 9, 2019
2 parents 0252554 + 06408d5 commit 6d714a0a01beaeef74eb0ebfa7b083170d473093
@@ -16,7 +16,7 @@ Configuration
test:
behat:
executable: "path to behat binary"
features: "command line arguments"
features: "command line arguments"
```

### Additional Options
@@ -20,8 +20,8 @@ Configuration
build_settings:
campfire:
authToken: "campfire auth token"
roomId: "campfire room ID"
url: "campfire URL"
roomId: "campfire room ID"
url: "campfire URL"
success:
campfire:
@@ -37,9 +37,9 @@ processing on line 146.

```yaml
tests:
codeception:
config: "codeception.yml"
args: "--no-ansi --coverage-html"
codeception:
config: "codeception.yml"
args: "--no-ansi --coverage-html"
```

Or
@@ -19,6 +19,6 @@ branches matches the one being built (Default: true).
success:
deployer:
webhook_url: "https://deployer.example.com/deploy/QZaF1bMIUqbMFTmKDmgytUuykRN0cjCgW9SooTnwkIGETAYhDTTYoR8C431t"
reason: "PHP Censor Build #%BUILD% - %COMMIT_MESSAGE%"
reason: "PHP Censor Build #%BUILD% - %COMMIT_MESSAGE%"
update_only: true
```
@@ -30,12 +30,13 @@ Sample configuration
--------------------

```yaml
\Ket4yii\PHPCensor\Deployer\Plugin\Deployer:
development: # branch name
task: sample-task # optional, default task is deploy
stage: dev # required, name of stage or server
verbose: debug # optional, default is normal(no verbosity)
file: .deploy_config.php # optional, deployer takes the deploy.php file for default
master:
stage: prod #required, name of stage or server
deploy:
deployer_org:
development: # branch name
task: sample-task # optional, default task is deploy
stage: dev # required, name of stage or server
verbose: debug # optional, default is normal(no verbosity)
file: .deploy_config.php # optional, deployer takes the deploy.php file for default
master:
stage: prod #required, name of stage or server
```
@@ -10,10 +10,10 @@ Configuration

```yaml
complete:
git:
master: <-- branch
tag: <-- action
name: "" <-- Action options
git:
master: <-- branch
tag: <-- action
name: "" <-- Action options
```

@@ -16,12 +16,12 @@ Configuration
### Example

```yaml
test:
test:
grunt:
directory: "path to run grunt in"
grunt: "path to grunt executable"
gruntfile: "gruntfile.js"
task: "css"
directory: "path to run grunt in"
grunt: "path to grunt executable"
gruntfile: "gruntfile.js"
task: "css"
```

### Additional Options
@@ -15,12 +15,12 @@ Configuration

### Example

```yml
test:
```yaml
test:
gulp:
directory: "/path/to/run/gulp/from"
gulpfile: "gulpfile.js"
task: "css"
directory: "/path/to/run/gulp/from"
gulpfile: "gulpfile.js"
task: "css"
```

### Additional Options
@@ -28,10 +28,10 @@ Message can be formatted via HTML. Example:

```yaml
success:
hipchat_notify:
authToken: 123
room: 456
message: <b>%PROJECT_TITLE%</b> - build <a href="%BUILD_URI%">%BUILD%</a> failed!
color: red
notify: true
hipchat_notify:
authToken: 123
room: 456
message: '<b>%PROJECT_TITLE%</b> - build <a href="%BUILD_URI%">%BUILD%</a> failed!'
color: red
notify: true
```
@@ -1,21 +1,23 @@
Plugin Mage
===========

Triggers a deployment of the project to run via [Mage](https://github.com/andres-montanez/Magallanes)
Triggers a deployment of the project to run via [Mage](https://github.com/andres-montanez/Magallanes) (Magallanes).

Configuration
-------------

Mage must be installed locally in your project as it is not provided by PHP Censor.

### Options

* **env** [string, required] - The environment name.
* **bin** [string, optional] - The mage executable path
* **bin** [string, required] - The mage executable path

### Examples

```yaml
success:
deploy:
mage:
env: production
mage:
env: production
bin: bin/mage
```
@@ -1,22 +1,24 @@
Plugin Mage v3
==============

Triggers a deployment of the project to run via [Mage v3](https://github.com/andres-montanez/Magallanes)
Triggers a deployment of the project to run via [Mage v3](https://github.com/andres-montanez/Magallanes) (Magallanes).

Configuration
-------------

Mage must be installed locally in your project as it is not provided by PHP Censor.

### Options

* **env** [string, required] - The environment name.
* **bin** [string, optional] - The mage executable path
* **bin** [string, required] - The mage executable path
* **log_dir** [string, optional] - The mage logs path

### Examples

```yaml
success:
deploy:
mage3:
env: production
mage3:
env: production
bin: bin/mage
```
@@ -14,8 +14,8 @@ See additional options below.

```yaml
test:
pdepend:
directory: "src"
pdepend:
directory: "src"
```

### Additional Options
@@ -16,9 +16,10 @@ Configuration
### Examples

```yaml
phar:
directory: /path/to/directory
filename: foobar.phar
regexp: /\.(php|phtml)$/
stub: filestub.php
test:
phar:
directory: /path/to/directory
filename: foobar.phar
regexp: /\.(php|phtml)$/
stub: filestub.php
```
@@ -17,7 +17,7 @@ Configuration

```yaml
setup:
phing:
phing:
build_file: 'build.xml'
targets:
- "build:test"
@@ -41,7 +41,7 @@ For use with an existing project:
test:
php_code_sniffer:
standard: "/phpcs.xml" # The leading slash is needed to trigger an external ruleset.
# Without it, PHP Censor looks for a rule named "phpcs.xml"
# Without it, PHP Censor looks for a rule named "phpcs.xml"
allowed_errors: -1 # Even a single error will cause the build to fail. -1 = unlimited
allowed_warnings: -1
```
@@ -15,10 +15,10 @@ Configuration

```yaml
test:
php_cpd:
directory: "app"
ignore:
- "app/my/path"
php_cpd:
directory: "app"
ignore:
- "app/my/path"
```

### Additional Options
@@ -30,10 +30,10 @@ test:
```yaml
test:
php_cs_fixer:
directory: "%BUILD_PATH%/my/dir/path"
verbose: true
diff: true
rules: "@PSR2"
directory: "%BUILD_PATH%/my/dir/path"
verbose: true
diff: true
rules: "@PSR2"
```

```yaml
@@ -22,18 +22,18 @@ details on the rules. (default: ['codesize', 'unusedcode', 'naming']).
```yaml
test:
php_mess_detector:
directory: 'app'
ignore:
- 'vendor'
allowed_warnings: -1
rules:
- "cleancode"
- "controversial"
- "codesize"
- "design"
- "naming"
- "unusedcode"
- "somedir/customruleset.xml"
directory: 'app'
ignore:
- 'vendor'
allowed_warnings: -1
rules:
- "cleancode"
- "controversial"
- "codesize"
- "design"
- "naming"
- "unusedcode"
- "somedir/customruleset.xml"
```

### Additional Options
@@ -20,7 +20,7 @@ Configuration
test:
sensiolabs_insight:
allow_failures: true
user_uuid: 'xxx-xxx-xxx-xxx-xxx'
api_token: 'xxxx'
project_uuid: 'xxx-xxx-xxx-xxx-xxx'
user_uuid: 'xxx-xxx-xxx-xxx-xxx'
api_token: 'xxxx'
project_uuid: 'xxx-xxx-xxx-xxx-xxx'
```
@@ -28,10 +28,10 @@ Send a message if the build fails:
failure:
slack_notify:
webhook_url: "https://hooks.slack.com/services/R212T827A/G983UY31U/aIp0yuW9u0iTqwAMOEwTg"
room: "#php-censor"
username: "PHP Censor"
icon: ":ghost:"
message: "%PROJECT_TITLE% - build %BUILD% failed! :angry:"
room: "#php-censor"
username: "PHP Censor"
icon: ":ghost:"
message: "%PROJECT_TITLE% - build %BUILD% failed! :angry:"
show_status: false
```

@@ -41,10 +41,10 @@ Send a message if the build is successful:
success:
slack_notify:
webhook_url: "https://hooks.slack.com/services/R212T827A/G983UY31U/aIp0yuW9u0iTqwAMOEwTg"
room: "#php-censor"
username: "PHP Censor"
icon: ":ghost:"
message: "%PROJECT_TITLE% - build %BUILD% succeeded! :smiley:"
room: "#php-censor"
username: "PHP Censor"
icon: ":ghost:"
message: "%PROJECT_TITLE% - build %BUILD% succeeded! :smiley:"
show_status: false
```

@@ -54,9 +54,9 @@ Send a message every time the build runs:
complete:
slack_notify:
webhook_url: "https://hooks.slack.com/services/R212T827A/G983UY31U/aIp0yuW9u0iTqwAMOEwTg"
room: "#php-censor"
username: "PHP Censor"
icon: ":ghost:"
message: "%PROJECT_TITLE% - build %BUILD% completed"
room: "#php-censor"
username: "PHP Censor"
icon: ":ghost:"
message: "%PROJECT_TITLE% - build %BUILD% completed"
show_status: true
```
@@ -14,7 +14,7 @@ complete:
api_key: "<YOUR_BOT_TOKEN_HERE>"
message: "[%ICON_BUILD%] [%PROJECT_TITLE%](%PROJECT_URI%) - [Build #%BUILD%](%BUILD_URI%) has finished for commit [%SHORT_COMMIT% (%COMMIT_EMAIL%)](%COMMIT_URI%) on branch [%BRANCH%](%BRANCH_URI%)"
recipients:
- <user id>
- "<user id>"
- "-<group id>"
- "@<channel id>"
send_log: true
@@ -36,8 +36,8 @@ complete:
- "recipient1@jabber.org"
- "recipient2@jabber.org"
server: "gtalk.google.com"
tls: 1
alias: "PHP Censor Notification"
tls: 1
alias: "PHP Censor Notification"
date_format: "%d/%m/%Y"
```

@@ -2,6 +2,7 @@
namespace PHPCensor\Controller;
use PHPCensor\Config;
use PHPCensor\Form\Element\Csrf;
use PHPCensor\Helper\Email;
use PHPCensor\Helper\Lang;
@@ -199,7 +200,10 @@ public function logout()
/**
* Allows the user to request a password reset email.
*
* @return string
*
* @throws \PHPCensor\Exception\HttpException
*/
public function forgotPassword()
{
@@ -215,7 +219,7 @@ public function forgotPassword()
$key = md5(date('Y-m-d') . $user->getHash());
$message = Lang::get('reset_email_body', $user->getName(), APP_URL, $user->getId(), $key);
$email = new Email();
$email = new Email(Config::getInstance());
$email->setEmailTo($user->getEmail(), $user->getName());
$email->setSubject(Lang::get('reset_email_title', $user->getName()));
$email->setBody($message);
Oops, something went wrong.

0 comments on commit 6d714a0

Please sign in to comment.