Skip to content

Commit

Permalink
Merge pull request #100 from PHPJasper/develop
Browse files Browse the repository at this point in the history
improvement in resource parameter
  • Loading branch information
geekcom committed Apr 25, 2018
2 parents 3062cd7 + 8bd311b commit 6cee996
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 7 deletions.
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
.idea/
/vendor
tests/PHPJasper/*.jasper

# IDE
## Eclipse
.buildpath
.project
.settings
.settings
## PHPStorm
.idea/
7 changes: 7 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
Release Notes - PHPJasper - Version 2.7
========================================================
** Improvement https://github.com/PHPJasper/phpjasper/issues/99
* improvement in resource '-r' parameter,
it's no longer necessary to be connected in database
to use resources
________________________________________________________
Release Notes - PHPJasper - Version 2.6
========================================================
** Update
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ Or in your file'composer.json' add:
```json
{
"require": {
"geekcom/phpjasper": "^2.4"
"geekcom/phpjasper": "^2.7"
}
}
```
Expand Down
2 changes: 1 addition & 1 deletion docs/pt_BR/LEIA-ME_pt_BR.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ Ou crie um arquivo 'composer.json' e adicione o trecho:
```json
{
"require": {
"geekcom/phpjasper": "^2.1"
"geekcom/phpjasper": "^2.7"
}
}
```
Expand Down
6 changes: 3 additions & 3 deletions src/PHPJasper.php
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,10 @@ public function process(string $input, string $output, array $options = [])
foreach ($options['db_connection'] as $key => $value) {
$this->command .= " {$mapDbParams[$key]} {$value}";
}
}

if ($options['resources']) {
$this->command .= " -r {$options['resources']}";
}
if ($options['resources']) {
$this->command .= " -r {$options['resources']}";
}

return $this;
Expand Down

0 comments on commit 6cee996

Please sign in to comment.