Skip to content

Commit 6cee996

Browse files
authored
Merge pull request #100 from PHPJasper/develop
improvement in resource parameter
2 parents 3062cd7 + 8bd311b commit 6cee996

File tree

5 files changed

+15
-7
lines changed

5 files changed

+15
-7
lines changed

.gitignore

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
.idea/
21
/vendor
32
tests/PHPJasper/*.jasper
43

54
# IDE
65
## Eclipse
76
.buildpath
87
.project
9-
.settings
8+
.settings
9+
## PHPStorm
10+
.idea/

CHANGES

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
Release Notes - PHPJasper - Version 2.7
2+
========================================================
3+
** Improvement https://github.com/PHPJasper/phpjasper/issues/99
4+
* improvement in resource '-r' parameter,
5+
it's no longer necessary to be connected in database
6+
to use resources
7+
________________________________________________________
18
Release Notes - PHPJasper - Version 2.6
29
========================================================
310
** Update

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ Or in your file'composer.json' add:
9292
```json
9393
{
9494
"require": {
95-
"geekcom/phpjasper": "^2.4"
95+
"geekcom/phpjasper": "^2.7"
9696
}
9797
}
9898
```

docs/pt_BR/LEIA-ME_pt_BR.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ Ou crie um arquivo 'composer.json' e adicione o trecho:
9191
```json
9292
{
9393
"require": {
94-
"geekcom/phpjasper": "^2.1"
94+
"geekcom/phpjasper": "^2.7"
9595
}
9696
}
9797
```

src/PHPJasper.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -138,10 +138,10 @@ public function process(string $input, string $output, array $options = [])
138138
foreach ($options['db_connection'] as $key => $value) {
139139
$this->command .= " {$mapDbParams[$key]} {$value}";
140140
}
141+
}
141142

142-
if ($options['resources']) {
143-
$this->command .= " -r {$options['resources']}";
144-
}
143+
if ($options['resources']) {
144+
$this->command .= " -r {$options['resources']}";
145145
}
146146

147147
return $this;

0 commit comments

Comments
 (0)