Merge pull request #52 from PHPJasper/php7

refactoring to improvements Release Notes - PHPJasper - Version 2.1 ======================================================== ** Refactoring * strict types activate * add type declarations ________________________________________________________
PHPJasper · Jun 1, 2017 · 42ce4e7 · 42ce4e7
2 parents b5ab85e + 3e34d96
commit 42ce4e7
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 29 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,9 @@
+Release Notes - PHPJasper - Version 2.1
+========================================================
+** Refactoring
+    * strict types activate
+    * add type declarations
+________________________________________________________
 Release Notes - PHPJasper - Version 2.0
 ========================================================
 ** Improvement

diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
 [![License](https://poser.pugx.org/geekcom/phpjasper/license)](https://packagist.org/packages/geekcom/phpjasper) 
 
 ### Docs
-[![Language-pt_BR](https://img.shields.io/badge/pt__BR-100%25-green.svg)](https://github.com/PHPJasper/phpjasper/blob/master/docs/pt_BR/LEIA-ME_pt_BR.md)
+[![Language-pt_BR](https://img.shields.io/badge/pt__BR-100%25-green.svg)](https://github.com/PHPJasper/phpjasper/blob/2.0/docs/pt_BR/LEIA-ME_pt_BR.md)
 
 ### About
 This package is the solution to compile and process JasperReports (.jrxml & .jasper files) just using PHP.

diff --git a/src/PHPJasper.php b/src/PHPJasper.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace PHPJasper;
 
 /**
@@ -22,7 +24,7 @@ class PHPJasper
     /**
      * @var string
      */
-    protected $path_executable;
+    protected $pathExecutable;
 
     /**
      * @var bool
@@ -40,46 +42,46 @@ class PHPJasper
     public function __construct()
     {
         $this->executable = 'jasperstarter';
-        $this->path_executable = __DIR__ . '/../bin/jasperstarter/bin';
+        $this->pathExecutable = __DIR__ . '/../bin/jasperstarter/bin';
         $this->windows = strtoupper(substr(PHP_OS, 0, 3)) === 'WIN' ? true : false;
     }
 
     /**
-     * @param $input_file
-     * @param bool $output_file
+     * @param string $input
+     * @param string $output optional
      * @return $this
      * @throws Exception\InvalidInputFile
      */
-    public function compile($input_file, $output_file = false)
+    public function compile(string $input, string $output = '')
     {
-        if (!$input_file) {
+        if (!$input) {
             throw new \PHPJasper\Exception\InvalidInputFile();
         }
 
         $this->command = $this->windows ? $this->executable : './' . $this->executable;
         $this->command .= ' compile ';
-        $this->command .= "\"$input_file\"";
+        $this->command .= "\"$input\"";
 
-        if ($output_file !== false) {
-            $this->command .= ' -o ' . "\"$output_file\"";
+        if (!empty($output)) {
+            $this->command .= ' -o ' . "\"$output\"";
         }
 
         return $this;
     }
 
 
     /**
-     * @param $input_file
-     * @param bool $output_file
+     * @param string $input
+     * @param string $output
      * @param array $options
      * @return $this
      * @throws Exception\InvalidInputFile
      * @throws Exception\InvalidFormat
      */
-    public function process($input_file, $output_file = false, $options = [])
+    public function process(string $input, string $output, array $options = [])
     {
         $options = $this->parseProcessOptions($options);
-        if (!$input_file) {
+        if (!$input) {
             throw new \PHPJasper\Exception\InvalidInputFile();
         }
         $this->validateFormat($options['format']);
@@ -90,10 +92,8 @@ public function process($input_file, $output_file = false, $options = [])
         }
 
         $this->command .= ' process ';
-        $this->command .= "\"$input_file\"";
-        if ($output_file !== false) {
-            $this->command .= ' -o ' . "\"$output_file\"";
-        }
+        $this->command .= "\"$input\"";
+        $this->command .= ' -o ' . "\"$output\"";
 
         $this->command .= ' -f ' . join(' ', $options['format']);
         if ($options['params']) {
@@ -130,10 +130,10 @@ public function process($input_file, $output_file = false, $options = [])
 
     /**
      *
-     * @param $options
+     * @param array $options
      * @return array
      */
-    protected function parseProcessOptions($options)
+    protected function parseProcessOptions(array $options)
     {
         $defaultOptions = [
             'format' => ['pdf'],
@@ -162,19 +162,19 @@ protected function validateFormat($format)
     }
 
     /**
-     * @param $input_file
+     * @param string $input
      * @return $this
      * @throws \Exception
      */
-    public function listParameters($input_file)
+    public function listParameters(string $input)
     {
-        if (!$input_file) {
+        if (!$input) {
             throw new \PHPJasper\Exception\InvalidInputFile();
         }
 
         $this->command = $this->windows ? $this->executable : './' . $this->executable;
         $this->command .= ' list_parameters ';
-        $this->command .= "\"$input_file\"";
+        $this->command .= "\"$input\"";
 
         return $this;
     }
@@ -192,11 +192,11 @@ public function execute($user = false)
         $this->addUserToCommand($user);
 
         $output = [];
-        $return_var = 0;
+        $returnVar = 0;
 
-        chdir($this->path_executable);
-        exec($this->command, $output, $return_var);
-        if ($return_var !== 0) {
+        chdir($this->pathExecutable);
+        exec($this->command, $output, $returnVar);
+        if ($returnVar !== 0) {
             throw new \PHPJasper\Exception\ErrorCommandExecutable();
         }
 
@@ -230,7 +230,7 @@ protected function validateExecute()
         if (!$this->command) {
             throw new \PHPJasper\Exception\InvalidCommandExecutable();
         }
-        if (!is_dir($this->path_executable)) {
+        if (!is_dir($this->pathExecutable)) {
             throw new \PHPJasper\Exception\InvalidResourceDirectory();
         }