Rector upgrade PHP 8.5

Author: Jonas De Keukelaere

rector.php

@@ -10,10 +10,7 @@
         __DIR__ . '/spoon',
     ])
     // uncomment to reach your current PHP version
-    ->withPhpSets(php84: true)
-    ->withRules([
-        ExplicitNullableParamTypeRector::class,
-    ])
+    ->withPhpSets(php85: true)
     ->withTypeCoverageLevel(0)
     ->withDeadCodeLevel(0)
     ->withCodeQualityLevel(0);

spoon/database/database.php

@@ -248,7 +248,7 @@ public function delete($table, $where = null, $parameters = [])
 	 */
 	public function drop($tables)
 	{
-		$this->execute('DROP TABLE ' . implode(', ', array_map([$this, 'quoteName'], (array) $tables)));
+		$this->execute('DROP TABLE ' . implode(', ', array_map($this->quoteName(...), (array) $tables)));
 	}
 
 
@@ -825,7 +825,7 @@ public function insert($table, array $values)
 			$subKeys = array_keys($actualValues[0]);
 
 			// prefix with table name
-			array_walk($subKeys, [$this, 'prefixTableNames'], $table);
+			array_walk($subKeys, $this->prefixTableNames(...), $table);
 
 			// build query
 			$query .= implode(', ', $subKeys) . ') VALUES ';
@@ -882,7 +882,7 @@ public function insert($table, array $values)
 			$numFields = count($actualValues);
 
 			// prefix with table name
-			array_walk($keys, [$this, 'prefixTableNames'], $table);
+			array_walk($keys, $this->prefixTableNames(...), $table);
 
 			// build query
 			$query .= implode(', ', $keys) . ') VALUES (';
@@ -955,7 +955,7 @@ public function optimize($tables)
 		$tables = (func_num_args() == 1) ? (array) $tables : func_get_args();
 
 		// build & execute query
-		return $this->getRecords('OPTIMIZE TABLE ' . implode(', ', array_map([$this, 'quoteName'], $tables)));
+		return $this->getRecords('OPTIMIZE TABLE ' . implode(', ', array_map($this->quoteName(...), $tables)));
 	}
 
 
@@ -1145,7 +1145,7 @@ public function update($table, array $values, $where = null, $parameters = [])
 			foreach($parameters as $key => $value)
 			{
 				// key such as ':id' starting
-				if(str_starts_with($key, ':'))
+				if(str_starts_with((string) $key, ':'))
 				{
 					$namedParameters = true;
 					break;

spoon/exception/exception.php

@@ -84,7 +84,7 @@ public function getObfuscate()
 
 // Redefine the exception handler if we are not running in the command line.
 if (!Spoon::inCli()) {
-    set_exception_handler('exceptionHandler');
+    set_exception_handler(exceptionHandler(...));
 }
 
 /**

spoon/file/csv.php

@@ -216,7 +216,7 @@ public static function fileToArray($path, array $columns = [], ?array $excludeCo
 		$handle = @fopen($path, 'r');
 
 		// loop lines and store the rows
-		while(($row = @fgetcsv($handle, 0, (($delimiter == '') ? ',' : $delimiter), (($enclosure == '') ? '"' : $enclosure))) !== false) $rows[] = $row;
+		while(($row = @fgetcsv($handle, 0, (($delimiter == '') ? ',' : $delimiter), (($enclosure == '') ? '"' : $enclosure), escape: '\\')) !== false) $rows[] = $row;
 
 		// close file
 		@fclose($handle);

spoon/filter/filter.php

@@ -156,16 +156,16 @@ public static function disableMagicQuotes()
 				 */
 				function fixMagicQuotes($value)
 				{
-					$value = is_array($value) ? array_map('fixMagicQuotes', $value) : stripslashes((string) $value);
+					$value = is_array($value) ? array_map(fixMagicQuotes(...), $value) : stripslashes((string) $value);
 					return $value;
 				}
 			}
 
 			// fix the thing with magic dust!
-			$_POST = array_map('fixMagicQuotes', $_POST);
-			$_GET = array_map('fixMagicQuotes', $_GET);
-			$_COOKIE = array_map('fixMagicQuotes', $_COOKIE);
-			$_REQUEST = array_map('fixMagicQuotes', $_REQUEST);
+			$_POST = array_map(fixMagicQuotes(...), $_POST);
+			$_GET = array_map(fixMagicQuotes(...), $_GET);
+			$_COOKIE = array_map(fixMagicQuotes(...), $_COOKIE);
+			$_REQUEST = array_map(fixMagicQuotes(...), $_REQUEST);
 		}
 	}
 

spoon/form/dropdown.php

@@ -712,7 +712,7 @@ public function setSingle($single = true)
 	 */
 	private function setValues(?array $values = null)
 	{
-		$values = $values ?? [];
+		$values ??= [];
 
 		// has no items
 		if(count($values) == 0) $this->setDefaultElement('');

spoon/template/compiler.php

@@ -1111,7 +1111,7 @@ protected function prepareIterations($content)
 		while(1)
 		{
 			// replace iteration names to ensure that they're unique
-			$content = preg_replace_callback($pattern, [$this, 'prepareIterationsCallback'], (string) $content, -1, $count);
+			$content = preg_replace_callback($pattern, $this->prepareIterationsCallback(...), (string) $content, -1, $count);
 
 			// break the loop, no matches were found
 			if(!$count) break;

spoon/thumbnail/thumbnail.php

@@ -599,9 +599,6 @@ private function resizeImageWithoutForceAspectRatio($currentWidth, $currentHeigh
 		// resize
 		$success = @imagecopyresampled($tempImage, $currentImage, 0, 0, 0, 0, $tempWidth, $tempHeight, $currentWidth, $currentHeight);
 
-		// destroy original image
-		imagedestroy($currentImage);
-
 		// image creation fail
 		if(!$success)
 		{