Php 8.x constructor style

Add note about securing bin arguments
rapsys · Feb 29, 2024 · c16e5e7 · c16e5e7
1 parent 3f19569
commit c16e5e7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 50 deletions.
diff --git a/Filter/CPackFilter.php b/Filter/CPackFilter.php
@@ -18,40 +18,17 @@
  * {@inheritdoc}
  */
 class CPackFilter implements FilterInterface {
-	//Default bin
-	private $bin;
-
-	//Default compress type
-	private $compress;
-
-	//Twig template filename
-	private $fileName;
-
-	//Twig template line
-	private $line;
-
 	/**
 	 * Setup cpack filter
 	 *
 	 * @xxx compress can be minify or pretty
 	 */
-	public function __construct(Source $fileName, int $line, string $bin = 'cpack', string $compress = 'minify') {
-		//Set fileName
-		$this->fileName = $fileName;
-
-		//Set line
-		$this->line = $line;
-
-		//Set bin
-		$this->bin = $bin;
-
-		//Set compress
-		$this->compress = $compress;
-
+	public function __construct(protected Source $fileName, protected int $line, protected string $bin = 'cpack', protected string $compress = 'minify') {
 		//Deal with compress
 		if (!empty($this->compress)) {
 			//Append minify parameter
 			if ($this->compress == 'minify') {
+				//TODO: protect binary call by converting bin to array ?
 				$this->bin .= ' --minify';
 			//Unknown compress type
 			//XXX: default compression is pretty

diff --git a/Filter/JPackFilter.php b/Filter/JPackFilter.php
@@ -18,46 +18,25 @@
  * {@inheritdoc}
  */
 class JPackFilter implements FilterInterface {
-	//Default bin
-	private $bin;
-
-	//Default compress type
-	private $compress;
-
-	//Twig template filename
-	private $fileName;
-
-	//Twig template line
-	private $line;
-
 	/**
 	 * Setup jpack filter
 	 *
 	 * @xxx compress can be clean, shrink, obfuscate or best
 	 */
-	public function __construct(Source $fileName, int $line, string $bin = 'jpack', string $compress = 'best') {
-		//Set fileName
-		$this->fileName = $fileName;
-
-		//Set line
-		$this->line = $line;
-
-		//Set bin
-		$this->bin = $bin;
-
-		//Set compress
-		$this->compress = $compress;
-
+	public function __construct(protected Source $fileName, protected int $line, protected string $bin = 'jpack', protected string $compress = 'best') {
 		//Deal with compress
 		if (!empty($this->compress)) {
 			//Append clean parameter
 			if ($this->compress == 'clean') {
+				//TODO: protect binary call by converting bin to array ?
 				$this->bin .= ' --clean';
 			//Append shrink parameter
 			} elseif ($this->compress == 'shrink') {
+				//TODO: protect binary call by converting bin to array ?
 				$this->bin .= ' --shrink';
 			//Append obfuscate parameter
 			} elseif ($this->compress == 'obfuscate') {
+				//TODO: protect binary call by converting bin to array ?
 				$this->bin .= ' --obfuscate';
 			//Unknown compress type
 			//XXX: default compression is best