Migrate SqlFormatter usage from jdorn/sql-formatter to doctrine/sql-formatter

The jdorn package was removed but its global SqlFormatter class was still
used in two templates. Move formatting to controllers using Doctrine's
SqlFormatter with NullHighlighter, matching the existing pattern in
CakeExamplesController.

Author: dereuromark

plugins/Sandbox/src/Controller/GeoExamplesController.php

@@ -5,6 +5,8 @@
 use Cake\Core\Configure;
 use Cake\Database\Driver\Mysql;
 use Cake\Utility\Text;
+use Doctrine\SqlFormatter\NullHighlighter;
+use Doctrine\SqlFormatter\SqlFormatter;
 use Exception;
 use Geo\Exception\InconclusiveException;
 use Geo\Geocoder\Geocoder;
@@ -227,6 +229,7 @@ public function filter() {
 
 		$sandboxCities = [];
 		$sqlQuery = null;
+		$sqlQueryFormatted = null;
 		$queryTime = null;
 		$explainResult = null;
 		if ($this->request->getData('city_id')) {
@@ -244,6 +247,7 @@ public function filter() {
 				->contain(['Countries'])
 				->limit(10);
 			$sqlQuery = (string)$query;
+			$sqlQueryFormatted = (new SqlFormatter(new NullHighlighter()))->format($sqlQuery);
 
 			// Get EXPLAIN output for the query
 			if ($spatialAvailable && $this->request->getQuery('spatial')) {
@@ -255,7 +259,7 @@ public function filter() {
 			$queryTime = (microtime(true) - $startTime) * 1000; // in milliseconds
 		}
 
-		$this->set(compact('cities', 'sandboxCities', 'sqlQuery', 'spatialAvailable', 'spatialInfo', 'queryTime', 'explainResult'));
+		$this->set(compact('cities', 'sandboxCities', 'sqlQuery', 'sqlQueryFormatted', 'spatialAvailable', 'spatialInfo', 'queryTime', 'explainResult'));
 	}
 
 	/**

plugins/Sandbox/src/Controller/ToolsExamplesController.php

@@ -3,6 +3,8 @@
 namespace Sandbox\Controller;
 
 use Cake\Event\EventInterface;
+use Doctrine\SqlFormatter\NullHighlighter;
+use Doctrine\SqlFormatter\SqlFormatter;
 use RuntimeException;
 use Sandbox\Model\Entity\BitmaskedRecord;
 use Sandbox\Model\Enum\Flag;
@@ -194,6 +196,7 @@ public function bitmaskSearch() {
 
 		$query = $bitmaskedRecordsTable->find('search', search: $this->request->getQuery());
 		$sql = (string)$query;
+		$sqlFormatted = (new SqlFormatter(new NullHighlighter()))->format($sql);
 
 		$bitmaskedRecords = $this->paginate($query);
 
@@ -206,7 +209,7 @@ public function bitmaskSearch() {
 		if ($type !== 'multiOr' && $type !== 'multiAnd') {
 			$flags[0] = ' - n/a (no flags) - ';
 		}
-		$this->set(compact('bitmaskedRecords', 'flags', 'type', 'sql'));
+		$this->set(compact('bitmaskedRecords', 'flags', 'type', 'sql', 'sqlFormatted'));
 	}
 
 	/**

plugins/Sandbox/templates/GeoExamples/filter.php

@@ -147,7 +147,7 @@
 
 		<details>
 			<summary>SQL Query</summary>
-			<?php echo SqlFormatter::format($sqlQuery); ?>
+			<?php echo $sqlQueryFormatted; ?>
 		</details>
 
 	<?php } ?>

plugins/Sandbox/templates/ToolsExamples/bitmask_search.php

@@ -66,6 +66,6 @@
 <h3>SQL query</h3>
 For example/demo purposes here the query it runs as per your filter selection above:
 <div>
-	<?php echo SqlFormatter::format($sql); ?>
+	<?php echo $sqlFormatted; ?>
 </div>