Updated cs-fixer rules

.php-cs-fixer.php

@@ -15,6 +15,7 @@
 	'concat_space' => ['spacing' => 'one'],
 	'constant_case' => true,
 	'dir_constant' => true,
+	'curly_braces_position' => true,
 	'elseif' => true,
 	'encoding' => true,
 	'full_opening_tag' => true,
@@ -83,6 +84,7 @@
 	'single_line_after_imports' => true,
 	'single_line_comment_style' => ['comment_types' => ['hash']],
 	'single_quote' => true,
+	'single_space_around_construct' => true,
 	'space_after_semicolon' => true,
 	'standardize_not_equals' => true,
 	'switch_case_semicolon_to_colon' => true,

src/Toolbar.php

@@ -41,8 +41,8 @@ public function __construct(
 		protected ViewFactory $view,
 		protected Humanizer $humanizer,
 		protected Application $application
-	)
-	{}
+	) {
+	}
 
 	/**
 	 * Add a panel to the toolbar.
@@ -71,19 +71,16 @@ protected function calculateExecutionTime(): array
 
 		$otherTime = 0;
 
-		foreach($this->timers as $timer)
-		{
+		foreach ($this->timers as $timer) {
 			$otherTime += $timer instanceof Closure ? $timer() : $timer;
 		}
 
 		$detailedTime = $totalTime - $otherTime;
 
 		$executionTime['details']['PHP'] = ['time' => $detailedTime, 'pct' => ($detailedTime / $totalTime * 100)];
 
-		foreach($this->timers as $timer => $time)
-		{
-			if($time instanceof Closure)
-			{
+		foreach ($this->timers as $timer => $time) {
+			if ($time instanceof Closure) {
 				$time = $time();
 			}
 
@@ -100,8 +97,7 @@ public function render(): string
 	{
 		$executionTime = $this->calculateExecutionTime();
 
-		$view = $this->view->create('mako-toolbar::toolbar',
-		[
+		$view = $this->view->create('mako-toolbar::toolbar', [
 			'humanizer'      => $this->humanizer,
 			'version'        => Mako::VERSION,
 			'memory'         => memory_get_peak_usage(),

src/ToolbarMiddleware.php

@@ -27,8 +27,8 @@ class ToolbarMiddleware implements MiddlewareInterface
 	 */
 	public function __construct(
 		protected Toolbar $toolbar
-	)
-	{}
+	) {
+	}
 
 	/**
 	 * {@inheritDoc}
@@ -39,8 +39,7 @@ public function execute(Request $request, Response $response, Closure $next): Re
 
 		$body = $response->getBody();
 
-		if($response->getType() === 'text/html' && (is_string($body) || (is_object($body) && method_exists($body, '__toString'))))
-		{
+		if ($response->getType() === 'text/html' && (is_string($body) || (is_object($body) && method_exists($body, '__toString')))) {
 			$response->setBody(str_replace('</body>', $this->toolbar->render() . '</body>', $body));
 		}
 

src/ToolbarPackage.php

@@ -50,22 +50,19 @@ protected function bootstrap(): void
 
 		// Add logger if monolog is in the container
 
-		if($this->container->has(LoggerInterface::class))
-		{
+		if ($this->container->has(LoggerInterface::class)) {
 			$monologHandler = new MonologHandler(MonoLogger::DEBUG, true);
 
 			$logger = $this->container->get(LoggerInterface::class)->getLogger();
 
-			if($logger instanceof MonoLogger)
-			{
+			if ($logger instanceof MonoLogger) {
 				$logger->pushHandler($monologHandler);
 			}
 		}
 
 		// Register the toolbar in the container
 
-		$this->container->registerSingleton([Toolbar::class, 'toolbar'], static function ($container) use ($monologHandler)
-		{
+		$this->container->registerSingleton([Toolbar::class, 'toolbar'], static function ($container) use ($monologHandler) {
 			$view = $container->get(ViewFactory::class);
 
 			$toolbar = new Toolbar($view, $container->get(Humanizer::class), $container->get(Application::class));
@@ -76,27 +73,23 @@ protected function bootstrap(): void
 
 			$toolbar->addPanel(new ConfigPanel($view, $container->get(Config::class), $container->get(Application::class)->getEnvironment()));
 
-			if($container->has(Session::class))
-			{
+			if ($container->has(Session::class)) {
 				$toolbar->addPanel(new SessionPanel($view, $container->get(Session::class)));
 			}
 
-			if($container->has(DatabaseConnectionManager::class))
-			{
+			if ($container->has(DatabaseConnectionManager::class)) {
 				$panel = new DatabasePanel($view, $container->get(DatabaseConnectionManager::class));
 
 				$toolbar->addPanel($panel);
 
 				$toolbar->addTimer('SQL', fn () => $panel->getTotalQueryTime());
 			}
 
-			if($monologHandler !== null)
-			{
+			if ($monologHandler !== null) {
 				$toolbar->addPanel(new MonologPanel($view, $monologHandler));
 			}
 
-			if(function_exists('opcache_get_status'))
-			{
+			if (function_exists('opcache_get_status')) {
 				$toolbar->addPanel(new OPcachePanel($view, $container->get(URLBuilder::class)));
 			}
 
@@ -105,8 +98,7 @@ protected function bootstrap(): void
 
 		// Register routes
 
-		if(function_exists('opcache_get_status'))
-		{
+		if (function_exists('opcache_get_status')) {
 			$this->container->get(Routes::class)->post('/mako.toolbar/opcache/reset', [OPcache::class, 'reset'], 'mako.toolbar.opcache.reset');
 		}
 	}

src/panels/ConfigPanel.php

@@ -31,8 +31,7 @@ public function __construct(
 		ViewFactory $view,
 		protected Config $config,
 		protected ?string $environment = null
-	)
-	{
+	) {
 		parent::__construct($view);
 	}
 
@@ -49,8 +48,7 @@ public function getTabLabel(): string
 	 */
 	protected function expandKey(array $config, string $key): array
 	{
-		if(strpos($key, '*') === false)
-		{
+		if (strpos($key, '*') === false) {
 			return [$key];
 		}
 
@@ -64,14 +62,10 @@ protected function maskValues(array $config): array
 	{
 		$mask = $this->config->get('mako-toolbar::config.config.mask');
 
-		if(!empty($mask) && is_array($mask))
-		{
-			foreach($mask as $key)
-			{
-				foreach($this->expandKey($config, $key) as $key)
-				{
-					if(($value = Arr::get($config, $key)) !== null)
-					{
+		if (!empty($mask) && is_array($mask)) {
+			foreach ($mask as $key) {
+				foreach ($this->expandKey($config, $key) as $key) {
+					if (($value = Arr::get($config, $key)) !== null) {
 						Arr::set($config, $key, is_string($value) ? Str::mask($value) : '******');
 					}
 				}
@@ -86,8 +80,7 @@ protected function maskValues(array $config): array
 	 */
 	public function render(): string
 	{
-		$view = $this->view->create('mako-toolbar::panels.config',
-		[
+		$view = $this->view->create('mako-toolbar::panels.config', [
 			'config'      => $this->maskValues($this->config->getLoadedConfiguration()),
 			'environment' => $this->environment,
 			'dump'        => $this->getDumper(),

src/panels/DatabasePanel.php

@@ -29,8 +29,7 @@ class DatabasePanel extends Panel implements PanelInterface
 	public function __construct(
 		ViewFactory $view,
 		protected ConnectionManager $database
-	)
-	{
+	) {
 		parent::__construct($view);
 	}
 
@@ -55,8 +54,7 @@ public function getTotalQueryTime(): float
 	 */
 	public function getTabLabel(): string
 	{
-		if(($totalQueries = $this->getTotalQueryCount()) === 0)
-		{
+		if (($totalQueries = $this->getTotalQueryCount()) === 0) {
 			return sprintf('%u database queries', $totalQueries);
 		}
 
@@ -70,19 +68,16 @@ protected function getFormattedLog(array $logs): array
 	{
 		// Configure the SQL highlighter
 
-		$highlighter = new HtmlHighlighter
-		([
+		$highlighter = new HtmlHighlighter([
 			HtmlHighlighter::HIGHLIGHT_PRE => 'style="color: inherit; background-color: transparent;"',
 		]);
 
 		// Add syntax highlighting to SQL queries
 
 		$formatter = new SqlFormatter($highlighter);
 
-		foreach($logs as &$log)
-		{
-			foreach($log as $key => $query)
-			{
+		foreach ($logs as &$log) {
+			foreach ($log as $key => $query) {
 				$log[$key]['query'] = $formatter->format($query['query']);
 			}
 		}
@@ -95,8 +90,7 @@ protected function getFormattedLog(array $logs): array
 	 */
 	public function render(): string
 	{
-		$view = $this->view->create('mako-toolbar::panels.database',
-		[
+		$view = $this->view->create('mako-toolbar::panels.database', [
 			'logs' => $this->getFormattedLog($this->database->getLogs()),
 		]);
 

src/panels/IncludedFilesPanel.php

@@ -30,8 +30,7 @@ class IncludedFilesPanel extends Panel implements PanelInterface
 	 */
 	protected function getIncludedFiles(): array
 	{
-		if(empty($this->files))
-		{
+		if (empty($this->files)) {
 			$this->files = get_included_files();
 		}
 
@@ -51,8 +50,7 @@ public function getTabLabel(): string
 	 */
 	public function render(): string
 	{
-		$view = $this->view->create('mako-toolbar::panels.included_files',
-		[
+		$view = $this->view->create('mako-toolbar::panels.included_files', [
 			'files' => $this->getIncludedFiles(),
 			'dump'  => $this->getDumper(),
 		]);

src/panels/MonologPanel.php

@@ -27,8 +27,7 @@ class MonologPanel extends Panel implements PanelInterface
 	public function __construct(
 		ViewFactory $view,
 		protected MonologHandler $monologHandler
-	)
-	{
+	) {
 		parent::__construct($view);
 	}
 
@@ -45,10 +44,8 @@ public function getTabLabel(): string
 	 */
 	protected function getLevelHelper(): Closure
 	{
-		return static function (int $level): string
-		{
-			return match($level)
-			{
+		return static function (int $level): string {
+			return match ($level) {
 				100     => 'debug',
 				200     => 'info',
 				250     => 'notice',
@@ -67,8 +64,7 @@ protected function getLevelHelper(): Closure
 	 */
 	public function render(): string
 	{
-		$view = $this->view->create('mako-toolbar::panels.monolog',
-		[
+		$view = $this->view->create('mako-toolbar::panels.monolog', [
 			'entries'      => $this->monologHandler->getEntries(),
 			'level_helper' => $this->getLevelHelper(),
 			'dump'         => $this->getDumper(),

src/panels/OPcachePanel.php

@@ -26,8 +26,7 @@ class OPcachePanel extends Panel implements PanelInterface
 	public function __construct(
 		ViewFactory $view,
 		protected URLBuilder $urlBuilder
-	)
-	{
+	) {
 		parent::__construct($view);
 	}
 
@@ -44,8 +43,7 @@ public function getTabLabel(): string
 	 */
 	public function render(): string
 	{
-		return $this->view->render('mako-toolbar::panels.opcache',
-		[
+		return $this->view->render('mako-toolbar::panels.opcache', [
 			'dump'   => $this->getDumper(),
 			'status' => opcache_get_status(),
 			'url'    => $this->urlBuilder,

src/panels/RequestPanel.php

@@ -24,8 +24,7 @@ class RequestPanel extends Panel implements PanelInterface
 	public function __construct(
 		ViewFactory $view,
 		protected Request $request
-	)
-	{
+	) {
 		parent::__construct($view);
 	}
 
@@ -42,12 +41,10 @@ public function getTabLabel(): string
 	 */
 	public function render(): string
 	{
-		$view = $this->view->create('mako-toolbar::panels.request',
-		[
+		$view = $this->view->create('mako-toolbar::panels.request', [
 			'request'      => $this->request,
 			'dump'         => $this->getDumper(),
-			'superglobals' =>
-			[
+			'superglobals' => [
 				'GET parameters'      => &$_GET,
 				'POST parameters'     => &$_POST,
 				'Cookies'             => &$_COOKIE,

src/panels/ResponsePanel.php

@@ -24,8 +24,7 @@ class ResponsePanel extends Panel implements PanelInterface
 	public function __construct(
 		ViewFactory $view,
 		protected Response $response
-	)
-	{
+	) {
 		parent::__construct($view);
 	}
 
@@ -46,8 +45,7 @@ public function render(): string
 		[
 			'response' => $this->response,
 			'dump'     => $this->getDumper(),
-			'data'     =>
-			[
+			'data'     => [
 				'Headers' => $this->response->getHeaders(),
 				'Cookies' => $this->response->getCookies(),
 			],

src/panels/SessionPanel.php

@@ -24,8 +24,7 @@ class SessionPanel extends Panel implements PanelInterface
 	public function __construct(
 		ViewFactory $view,
 		protected Session $session
-	)
-	{
+	) {
 		parent::__construct($view);
 	}
 
@@ -42,8 +41,7 @@ public function getTabLabel(): string
 	 */
 	public function render(): string
 	{
-		$view = $this->view->create('mako-toolbar::panels.session',
-		[
+		$view = $this->view->create('mako-toolbar::panels.session', [
 			'id'   => $this->session->getId(),
 			'data' => $this->session->getData(),
 			'dump' => $this->getDumper(),