From: Raphaël Gertz <git@rapsys.eu>
Date: Tue, 26 Nov 2019 16:13:18 +0000 (+0100)
Subject: Switch to normal twig error
X-Git-Tag: 0.1.3~5
X-Git-Url: https://git.rapsys.eu/packbundle/commitdiff_plain/99adeca653bc521be9bbabf53cdee250b9a113fa?ds=sidebyside

Switch to normal twig error
---

diff --git a/Twig/Filter/CPackFilter.php b/Twig/Filter/CPackFilter.php
index 2edb1c4..ca38c3b 100644
--- a/Twig/Filter/CPackFilter.php
+++ b/Twig/Filter/CPackFilter.php
@@ -1,9 +1,9 @@
 <?php
 
-// src/Rapsys/PackBundle/Twig/Filter/CPackFilter.php
 namespace Rapsys\PackBundle\Twig\Filter;
 
 use Rapsys\PackBundle\Twig\Filter\FilterInterface;
+use Twig\Error\Error;
 
 class CPackFilter implements FilterInterface {
 	//Default bin
@@ -39,10 +39,10 @@ class CPackFilter implements FilterInterface {
 			if ($this->compress == 'minify') {
 				$this->bin .= ' --minify';
 			//Unknown compress type
-			#XXX: default compression is pretty
+			//XXX: default compression is pretty
 			} elseif ($this->compress !== 'pretty') {
 				//Throw an error on unknown compress
-				throw new \Twig_Error(sprintf('Got unexpected compress for %s: %s', $this->bin, $this->compress), $this->line, $this->fileName);
+				throw new Error(sprintf('Got unexpected compress for %s: %s', $this->bin, $this->compress), $this->line, $this->fileName);
 			}
 		}
 	}
@@ -76,7 +76,7 @@ class CPackFilter implements FilterInterface {
 
 			//Read content from stderr
 			if (($stderr = stream_get_contents($pipes[2]))) {
-				throw new \Twig_Error(sprintf('Got unexpected strerr for %s: %s', $this->bin, $stderr), $this->line, $this->fileName);
+				throw new Error(sprintf('Got unexpected strerr for %s: %s', $this->bin, $stderr), $this->line, $this->fileName);
 			}
 
 			//Close stderr
@@ -84,7 +84,7 @@ class CPackFilter implements FilterInterface {
 
 			//Close process
 			if (($ret = proc_close($proc))) {
-				throw new \Twig_Error(sprintf('Got unexpected non zero return code %s: %d', $this->bin, $ret), $this->line, $this->fileName);
+				throw new Error(sprintf('Got unexpected non zero return code %s: %d', $this->bin, $ret), $this->line, $this->fileName);
 			}
 		}
 
diff --git a/Twig/Filter/JPackFilter.php b/Twig/Filter/JPackFilter.php
index 199d980..ca4555d 100644
--- a/Twig/Filter/JPackFilter.php
+++ b/Twig/Filter/JPackFilter.php
@@ -1,9 +1,9 @@
 <?php
 
-// src/Rapsys/PackBundle/Twig/Filter/JPackFilter.php
 namespace Rapsys\PackBundle\Twig\Filter;
 
 use Rapsys\PackBundle\Twig\Filter\FilterInterface;
+use Twig\Error\Error;
 
 class JPackFilter implements FilterInterface {
 	//Default bin
@@ -45,10 +45,10 @@ class JPackFilter implements FilterInterface {
 			} elseif ($this->compress == 'obfuscate') {
 				$this->bin .= ' --obfuscate';
 			//Unknown compress type
-			#XXX: default compression is best
+			//XXX: default compression is best
 			} elseif ($this->compress !== 'best') {
 				//Throw an error on unknown compress
-				throw new \Twig_Error(sprintf('Got unexpected compress for %s: %s', $this->bin, $this->compress), $this->line, $this->fileName);
+				throw new Error(sprintf('Got unexpected compress for %s: %s', $this->bin, $this->compress), $this->line, $this->fileName);
 			}
 		}
 	}
@@ -82,7 +82,7 @@ class JPackFilter implements FilterInterface {
 
 			//Read content from stderr
 			if (($stderr = stream_get_contents($pipes[2]))) {
-				throw new \Twig_Error(sprintf('Got unexpected strerr for %s: %s', $this->bin, $stderr), $this->line, $this->fileName);
+				throw new Error(sprintf('Got unexpected strerr for %s: %s', $this->bin, $stderr), $this->line, $this->fileName);
 			}
 
 			//Close stderr
@@ -90,7 +90,7 @@ class JPackFilter implements FilterInterface {
 
 			//Close process
 			if (($ret = proc_close($proc))) {
-				throw new \Twig_Error(sprintf('Got unexpected non zero return code %s: %d', $this->bin, $ret), $this->line, $this->fileName);
+				throw new Error(sprintf('Got unexpected non zero return code %s: %d', $this->bin, $ret), $this->line, $this->fileName);
 			}
 		}