Merge pull request #48 from PHPJasper/php7

geekcom · web-flow · commit a664b0706200 · 2017-05-26T15:20:58.000-03:00
v2
diff --git a/README.md b/README.md
@@ -19,10 +19,6 @@ This package is the solution to compile and process JasperReports (.jrxml & .jas
 Do not forget to grant the correct permissions for the directory 
 **/vendor/geekcom/phpjasper/bin/jasperstarter/bin** and the file binary **jasperstarter**
 
-**Do you need to generate Python reports?**
-
-Meet the **[pyreport](https://github.com/jadsonbr/pyreport)**
-
 ### Why PHPJasper?
 
 Did you ever had to create a good looking Invoice with a lot of fields for your great web app?
@@ -51,8 +47,8 @@ Package to generate reports with [JasperReports 6.3.1](http://community.jasperso
 
 ## Requirements
 
+* PHP 7.1 or above
 * Java JDK 1.8
-* PHP [exec()](http://php.net/manual/function.exec.php) function
 
 ## Optional
 
diff --git a/composer.json b/composer.json
@@ -14,17 +14,22 @@
       "role": "lead"
     }
   ],
-  "minimum-stability": "dev",
+  "minimum-stability": "stable",
   "require": {
-    "php": ">=5.4.0",
+    "php": ">=7.1",
     "symfony/console": "^3.2"
   },
   "require-dev": {
-    "phpunit/phpunit": "4.8.*"
+    "phpunit/phpunit": "^6.1"
   },
   "autoload": {
     "psr-4": {
-      "JasperPHP\\": "src/"
+      "PHPJasper\\": "src/"
+    }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "PHPJasper\\": "tests/"
     }
   }
-}
+}
diff --git a/docs/pt_BR/LEIA-ME_pt_BR.md b/docs/pt_BR/LEIA-ME_pt_BR.md
@@ -21,10 +21,6 @@ Este pacote é a solução perfeita para compilar e processar relatórios Jasper
 Não esqueça de fornecer as permissões devidas para o diretório
 **/vendor/geekcom/phpjasper/bin/jasperstarter/bin** e para o arquivo binário **jasperstarter**
 
-**Precisa gerar relatórios em Python?**
-
-Conheça a biblioteca **[pyreport](https://github.com/jadsonbr/pyreport)**
-
 ### Por quê preciso do PHPJasper?
 
 Alguma vez você precisou de um relatório simples ou complexo em PHP para seu sistema web?
@@ -48,8 +44,8 @@ Apresento para vocês **JasperReports** a melhor solução open source que exist
 
 ## Requisitos
 
+* PHP 7.1 em diante
 * Java JDK 1.8
-* PHP [exec()](http://php.net/manual/function.exec.php) function
 
 ## Opcional
 
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
+<phpunit bootstrap="./vendor/autoload.php"
+         backupGlobals="false"
          backupStaticAttributes="false"
          colors="true"
          convertErrorsToExceptions="true"
@@ -11,7 +12,7 @@
 
     <filter>
         <whitelist>
-            <directory>src/JasperPHP</directory>
+            <directory>src/PHPJasper</directory>
             <directory>src/JasperStarter</directory>
         </whitelist>
     </filter>
diff --git a/src/Command/PHPJasperCommand.php b/src/Command/PHPJasperCommand.php
@@ -1,11 +1,11 @@
 <?php
-namespace JasperPHP;
+namespace PHPJasper;
 
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class JasperPHPCommand extends Command
+class PHPJasperCommand extends Command
 {
     /**
      *
diff --git a/src/Exception/ErrorCommandExecutable.php b/src/Exception/ErrorCommandExecutable.php
@@ -1,8 +1,8 @@
 <?php
-namespace JasperPHP\Exception;
+namespace PHPJasper\Exception;
 /**
  * Class ErrorCommandExecutable
- * @package JasperPHP\Exception
+ * @package PHPJasper\Exception
  */
 class ErrorCommandExecutable extends \Exception
 {
diff --git a/src/Exception/InvalidCommandExecutable.php b/src/Exception/InvalidCommandExecutable.php
@@ -1,8 +1,8 @@
 <?php
-namespace JasperPHP\Exception;
+namespace PHPJasper\Exception;
 /**
  * Class InvalidCommandExecutable
- * @package JasperPHP\Exception
+ * @package PHPJasper\Exception
  */
 class InvalidCommandExecutable extends \Exception
 {
diff --git a/src/Exception/InvalidFormat.php b/src/Exception/InvalidFormat.php
@@ -1,8 +1,8 @@
 <?php
-namespace JasperPHP\Exception;
+namespace PHPJasper\Exception;
 /**
  * Class InvalidFormat
- * @package JasperPHP\Exception
+ * @package PHPJasper\Exception
  */
 class InvalidFormat extends \Exception
 {
diff --git a/src/Exception/InvalidInputFile.php b/src/Exception/InvalidInputFile.php
@@ -1,8 +1,8 @@
 <?php
-namespace JasperPHP\Exception;
+namespace PHPJasper\Exception;
 /**
  * Class InvalidInputFile
- * @package JasperPHP\Exception
+ * @package PHPJasper\Exception
  */
 class InvalidInputFile extends \Exception
 {
diff --git a/src/Exception/InvalidResourceDirectory.php b/src/Exception/InvalidResourceDirectory.php
@@ -1,8 +1,8 @@
 <?php
-namespace JasperPHP\Exception;
+namespace PHPJasper\Exception;
 /**
  * Class InvalidResourceDirectory
- * @package JasperPHP\Exception
+ * @package PHPJasper\Exception
  */
 class InvalidResourceDirectory extends \Exception
 {
diff --git a/src/PHPJasper.php b/src/PHPJasper.php
@@ -1,10 +1,12 @@
 <?php
-namespace JasperPHP;
+
+namespace PHPJasper;
+
 /**
- * Class JasperPHP
- * @package JasperPHP
+ * Class PHPJasper
+ * @package PHPJasper
  */
-class JasperPHP
+class PHPJasper
 {
 
     /**
@@ -33,7 +35,7 @@ class JasperPHP
     protected $formats = ['pdf', 'rtf', 'xls', 'xlsx', 'docx', 'odt', 'ods', 'pptx', 'csv', 'html', 'xhtml', 'xml', 'jrprint'];
 
     /**
-     * JasperPHP constructor
+     * PHPJasper constructor
      */
     public function __construct()
     {
@@ -51,7 +53,7 @@ public function __construct()
     public function compile($input_file, $output_file = false)
     {
         if (!$input_file) {
-            throw new \JasperPHP\Exception\InvalidInputFile();
+            throw new \PHPJasper\Exception\InvalidInputFile();
         }
 
         $this->command = $this->windows ? $this->executable : './' . $this->executable;
@@ -78,7 +80,7 @@ public function process($input_file, $output_file = false, $options = [])
     {
         $options = $this->parseProcessOptions($options);
         if (!$input_file) {
-            throw new \JasperPHP\Exception\InvalidInputFile();
+            throw new \PHPJasper\Exception\InvalidInputFile();
         }
         $this->validateFormat($options['format']);
 
@@ -154,7 +156,7 @@ protected function validateFormat($format)
         }
         foreach ($format as $value) {
             if (!in_array($value, $this->formats)) {
-                throw new \JasperPHP\Exception\InvalidFormat();
+                throw new \PHPJasper\Exception\InvalidFormat();
             }
         }
     }
@@ -167,7 +169,7 @@ protected function validateFormat($format)
     public function listParameters($input_file)
     {
         if (!$input_file) {
-            throw new \JasperPHP\Exception\InvalidInputFile();
+            throw new \PHPJasper\Exception\InvalidInputFile();
         }
 
         $this->command = $this->windows ? $this->executable : './' . $this->executable;
@@ -195,7 +197,7 @@ public function execute($user = false)
         chdir($this->path_executable);
         exec($this->command, $output, $return_var);
         if ($return_var !== 0) {
-            throw new \JasperPHP\Exception\ErrorCommandExecutable();
+            throw new \PHPJasper\Exception\ErrorCommandExecutable();
         }
 
         return $output;
@@ -226,10 +228,10 @@ protected function addUserToCommand($user)
     protected function validateExecute()
     {
         if (!$this->command) {
-            throw new \JasperPHP\Exception\InvalidCommandExecutable();
+            throw new \PHPJasper\Exception\InvalidCommandExecutable();
         }
         if (!is_dir($this->path_executable)) {
-            throw new \JasperPHP\Exception\InvalidResourceDirectory();
+            throw new \PHPJasper\Exception\InvalidResourceDirectory();
         }
 
     }
diff --git a/tests/JasperPHP/JasperPHPCommandTest.php b/tests/JasperPHP/JasperPHPCommandTest.php
diff --git a/tests/JasperPHP/JasperPHPTest.php b/tests/JasperPHP/JasperPHPTest.php
diff --git a/tests/PHPJasper/PHPJasperCommandTest.php b/tests/PHPJasper/PHPJasperCommandTest.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace PHPJasper\Test;
+
+use PHPUnit\Framework\TestCase;
+
+class PHPJasperCommandTest extends TestCase
+{
+    public function testBasic()
+    {
+        $this->assertNull(null);
+    }
+}
diff --git a/tests/PHPJasper/PHPJasperTest.php b/tests/PHPJasper/PHPJasperTest.php

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`<?php`
`2`		`-namespace JasperPHP;`
	`2`	`+namespace PHPJasper;`
`3`	`3`
`4`	`4`	`use Symfony\Component\Console\Command\Command;`
`5`	`5`	`use Symfony\Component\Console\Input\InputInterface;`
`6`	`6`	`use Symfony\Component\Console\Output\OutputInterface;`
`7`	`7`
`8`		`-class JasperPHPCommand extends Command`
	`8`	`+class PHPJasperCommand extends Command`
`9`	`9`	`{`
`10`	`10`	`/**`
`11`	`11`	`*`