Merge pull request #173 from PHPJasper/master

master into develop

Author: geekcom

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,29 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.gitignore

@@ -1,5 +1,6 @@
 /vendor
 tests/*.jasper
+tests/fixture
 tests/codeCoverage
 
 # IDE
@@ -8,4 +9,4 @@ tests/codeCoverage
 .project
 .settings
 ## PHPStorm
-.idea/
+.idea/

docs/pt_BR/LEIA-ME_pt_BR.md

@@ -33,7 +33,7 @@ Apresento para vocês **JasperReports** a melhor solução open source que exist
 
 **Texto extraido do site JasperSoft:**
 
-> A biblioteca JasperReports é o mecanismo de geração de relatórios de código aberto mais popular do mundo. É inteiramente escrito em Java e é capaz de usar dados provenientes de qualquer tipo de fonte de dados e gerar documentos perfeitos que podem ser visualizado, impressom ou exportadom em uma variedade de formatos de documentos, incluindo HTML, PDF, Excel, OpenOffice e Word .
+> A biblioteca JasperReports é o mecanismo de geração de relatórios de código aberto mais popular do mundo. É inteiramente escrito em Java e é capaz de usar dados provenientes de qualquer tipo de fonte de dados e gerar documentos perfeitos que podem ser visualizado, impresso ou exportado em uma variedade de formatos de documentos, incluindo HTML, PDF, Excel, OpenOffice e Word .
 
 *Exemplos do que você pode fazer:*
 
@@ -339,4 +339,4 @@ MIT
 
 ## [Contribuição](https://github.com/PHPJasper/phpjasper/blob/master/CONTRIBUTING.md)
 
-Contribua com a comunidade PHP, faça um fork !!
+Contribua com a comunidade PHP, faça um fork !!

tests/PHPJasperTest.php

@@ -45,7 +45,7 @@ public function testCompile()
 
         $expected = '.*jasperstarter compile ".*hello_world.jrxml" -o "{output_file}"';
 
-        $this->assertRegExp('/'.$expected.'/', $result->output());
+        $this->expectOutputRegex('/'.$expected.'/', $result->output());
     }
 
     public function testProcess()
@@ -54,15 +54,42 @@ public function testProcess()
 
         $expected = '.*jasperstarter process ".*hello_world.jrxml" -o "{output_file}"';
 
-        $this->assertRegExp('/'.$expected.'/', $result->output());
+        $this->expectOutputRegex('/'.$expected.'/', $result->output());
+    }
 
+    public function testProcessWithOptions()
+    {
+        $options = [
+            'locale' => 'en_US',
+            'params' => [
+                'param_1' => 'value_1',
+                'param_2' => 'value_2',
+            ],
+            'db_connection' => [
+                'driver' => 'driver',
+                'username' => 'user',
+                'password' => '12345678',
+                'database' => 'db'
+            ],
+            'resources' => 'foo',
+        ];
+
+        $result = $this->instance->process('examples/hello_world.jrxml', '{output_file}', $options);
+
+        $expected = '.*jasperstarter --locale en_US process ".*hello_world.jrxml" -o "{output_file}" ';
+        $expected .= '-f pdf -P  param_1="value_1"   param_2="value_2"   -t driver -u user -p 12345678 -n db -r foo';
+
+        $this->expectOutputRegex(
+            '/'.$expected.'/',
+            $result->output()
+        );
     }
 
     public function testListParameters()
     {
         $result = $this->instance->listParameters('examples/hello_world.jrxml');
 
-        $this->assertRegExp(
+        $this->expectOutputRegex(
             '/.*jasperstarter list_parameters ".*hello_world.jrxml"/',
             $result->output()
         );
@@ -79,7 +106,18 @@ public function testCompileHelloWorld()
     {
         $result = $this->instance->compile('examples/hello_world.jrxml');
 
-        $this->assertRegExp('/.*jasperstarter compile ".*hello_world.jrxml"/', $result->output());
+        $this->expectOutputRegex('/.*jasperstarter compile ".*hello_world.jrxml"/', $result->output());
+    }
+
+    public function testOutputWithUserOnExecute()
+    {
+        $this->expectException(Exception\ErrorCommandExecutable::class);
+
+        $this->instance->compile(__DIR__ . '/test.jrxml', __DIR__ . '/test')->execute('phpjasper');
+
+        $expected = 'su -u 1000 -c "./jasperstarter compile "/var/www/app/tests/test.jrxml" -o "/var/www/app/tests/test""';
+
+        $this->expectOutputRegex('/' . $expected . '/', $this->instance->output());
     }
 
     public function testExecuteWithoutCompile()
@@ -103,6 +141,25 @@ public function testExecute()
         $this->assertInternalType('array', $actual);
     }
 
+    public function testExecuteWithOutput()
+    {
+        $actual = $this->instance->compile(__DIR__ . '/test.jrxml', __DIR__ . '/test')->execute();
+
+        $this->assertInternalType('array', $actual);
+    }
+
+    public function testExecuteThrowsInvalidResourceDirectory()
+    {
+        $reflectionObject = new \ReflectionObject($this->instance);
+        $reflectionProperty = $reflectionObject->getProperty('pathExecutable');
+        $reflectionProperty->setAccessible(true);
+        $reflectionProperty->setValue($this->instance, '');
+
+        $this->expectException(Exception\InvalidResourceDirectory::class);
+
+        $this->instance->compile(__DIR__ . '/test.jrxml', __DIR__ . '/test')->execute();
+    }
+
     public function testListParametersWithWrongInput()
     {
         $this->expectException(Exception\InvalidInputFile::class);