joomla / statistics-server

src/Views/Stats/StatsJsonView.php

Braces +1 added lines, -2 removed lines

@@ -102,8 +102,7 @@
 		if ($this->recent)
 		{
 			$items = $this->repository->getRecentlyUpdatedItems();
-		}
-		else
+		} else
 		{
 			$items = $this->repository->getItems($this->source);
 		}

Spacing +5 added lines, -5 removed lines

@@ -152,7 +152,7 @@ 
 							if ((isset($item['cms_version']) && $item['cms_version'] !== null)
 								&& (isset($item['php_version']) && $item['php_version'] !== null))
 							{
-								$index = $item['cms_version'] . ' - ' . $item['php_version'];
+								$index = $item['cms_version'].' - '.$item['php_version'];
 								$cms_php_version[$index] = $item['count'];
 
 								$this->totalItems += $item['count'];
@@ -164,7 +164,7 @@ 
 							if ((isset($item['db_type']) && $item['db_type'] !== null)
 								&& (isset($item['db_version']) && $item['db_version'] !== null))
 							{
-								$index = $item['db_type'] . ' - ' . $item['db_version'];
+								$index = $item['db_type'].' - '.$item['db_version'];
 								$db_type_version[$index] = $item['count'];
 
 								$this->totalItems += $item['count'];
@@ -281,12 +281,12 @@ 
 					break;
 
 				case 'cms_php_version':
-					$index = $item['cms_version'] . ' - ' . $item['php_version'];
+					$index = $item['cms_version'].' - '.$item['php_version'];
 					$data[$this->source][$index] = $item['count'];
 					break;
 
 				case 'db_type_version':
-					$index = $item['db_type'] . ' - ' . $item['db_version'];
+					$index = $item['db_type'].' - '.$item['db_version'];
 					$data[$this->source][$index] = $item['count'];
 					break;
 
@@ -329,7 +329,7 @@ 
 					foreach ($dataGroup as $row)
 					{
 						$exploded = explode('.', $row['name']);
-						$version  = $exploded[0] . '.' . ($exploded[1] ?? '0');
+						$version  = $exploded[0].'.'.($exploded[1] ?? '0');
 
 						// If the container does not exist, add it
 						if (!isset($counts[$version]))

src/EventListener/AnalyticsSubscriber.php

Braces +1 added lines, -2 removed lines

@@ -82,8 +82,7 @@
 		try
 		{
 			$this->analytics->sendPageview();
-		}
-		catch (\Exception $e)
+		} catch (\Exception $e)
 		{
 			// Log the error for reference
 			$this->logger->error(

src/Database/Migrations.php

Spacing +1 added lines, -1 removed lines

@@ -196,7 +196,7 @@
 	 */
 	private function doMigration(string $version): void
 	{
-		$sqlFile = $version . '.sql';
+		$sqlFile = $version.'.sql';
 
 		if (!$this->filesystem->has($sqlFile))
 		{

Braces +2 added lines, -4 removed lines

@@ -64,8 +64,7 @@ 
 					->select('version')
 					->from('#__migrations')
 			)->loadColumn();
-		}
-		catch (ExecutionFailureException | PrepareStatementFailureException $exception)
+		} catch (ExecutionFailureException | PrepareStatementFailureException $exception)
 		{
 			// On PDO we're checking "42S02, 1146, Table 'XXX.#__migrations' doesn't exist"
 			if (strpos($exception->getMessage(), "migrations' doesn't exist") === false)
@@ -132,8 +131,7 @@ 
 					->select('version')
 					->from('#__migrations')
 			)->loadColumn();
-		}
-		catch (ExecutionFailureException | PrepareStatementFailureException $exception)
+		} catch (ExecutionFailureException | PrepareStatementFailureException $exception)
 		{
 			// If the table does not exist, we can still try to run migrations
 			if (strpos($exception->getMessage(), "migrations' doesn't exist") === false)

src/Kernel.php

Spacing +3 added lines, -3 removed lines

@@ -121,11 +121,11 @@
 	private function loadConfiguration(): Registry
 	{
 		$registry = new Registry;
-		$registry->loadFile(APPROOT . '/etc/config.dist.json');
+		$registry->loadFile(APPROOT.'/etc/config.dist.json');
 
-		if (file_exists(APPROOT . '/etc/config.json'))
+		if (file_exists(APPROOT.'/etc/config.json'))
 		{
-			$registry->loadFile(APPROOT . '/etc/config.json');
+			$registry->loadFile(APPROOT.'/etc/config.json');
 		}
 
 		return $registry;

src/Repositories/StatisticsRepository.php

Braces +1 added lines, -2 removed lines

@@ -132,8 +132,7 @@
 		if ($recordExists)
 		{
 			$this->db->updateObject('#__jstats', $data, ['unique_id']);
-		}
-		else
+		} else
 		{
 			$this->db->insertObject('#__jstats', $data, ['unique_id']);
 		}

Indentation +39 added lines, -39 removed lines

@@ -140,45 +140,45 @@
 	}
 
 
-    /**
-     * Loads the recently updated statistics data from the database.
-     *
-     * Updated within a timeframe, submit a pull request for a different behavior.
-     *
-     * @return  array  An array containing the response data
-     */
-    public function getTimeframeUpdatedItems(int $timeframe = 0, string $showColumn = ''): array
-    {
-        $return  = [];
-        $columns = self::ALLOWED_SOURCES;
-        if ($showColumn !== '') {
-            // The column should exist in the table and be part of the API
-            if (!\in_array($showColumn, self::ALLOWED_SOURCES)) {
-                throw new \InvalidArgumentException('An invalid data source was requested.', 404);
-            }
-
-            $columns = [$showColumn];
-        }
-
-        foreach ($columns as $column) {
-            if (\in_array($column, ['cms_php_version', 'db_type_version'])) {
-                throw new \InvalidArgumentException('An invalid data source was requested.', 404);
-            }
-            $return[$column] = $this->db->setQuery(
-              $this->db->getQuery(true)
-                       ->select($column)
-                       ->select('COUNT(' . $column . ') AS count')
-                       ->from('(SELECT * FROM ' . $this->db->quoteName('#__jstats') . ' WHERE modified > DATE_SUB(NOW(), INTERVAL ' . $this->db->quote($timeframe) .' DAY)) AS tmptable')
-                       ->group($column)
-            )->loadAssocList();
-        }
-
-        if ($showColumn !== '') {
-            return $return[$showColumn];
-        }
-
-        return $return;
-    }
+	/**
+	 * Loads the recently updated statistics data from the database.
+	 *
+	 * Updated within a timeframe, submit a pull request for a different behavior.
+	 *
+	 * @return  array  An array containing the response data
+	 */
+	public function getTimeframeUpdatedItems(int $timeframe = 0, string $showColumn = ''): array
+	{
+		$return  = [];
+		$columns = self::ALLOWED_SOURCES;
+		if ($showColumn !== '') {
+			// The column should exist in the table and be part of the API
+			if (!\in_array($showColumn, self::ALLOWED_SOURCES)) {
+				throw new \InvalidArgumentException('An invalid data source was requested.', 404);
+			}
+
+			$columns = [$showColumn];
+		}
+
+		foreach ($columns as $column) {
+			if (\in_array($column, ['cms_php_version', 'db_type_version'])) {
+				throw new \InvalidArgumentException('An invalid data source was requested.', 404);
+			}
+			$return[$column] = $this->db->setQuery(
+			  $this->db->getQuery(true)
+					   ->select($column)
+					   ->select('COUNT(' . $column . ') AS count')
+					   ->from('(SELECT * FROM ' . $this->db->quoteName('#__jstats') . ' WHERE modified > DATE_SUB(NOW(), INTERVAL ' . $this->db->quote($timeframe) .' DAY)) AS tmptable')
+					   ->group($column)
+			)->loadAssocList();
+		}
+
+		if ($showColumn !== '') {
+			return $return[$showColumn];
+		}
+
+		return $return;
+	}
 	/**
 	 * Saves the given data.
 	 *

Spacing +9 added lines, -9 removed lines

@@ -64,7 +64,7 @@ 
 			return $this->db->setQuery(
 				$this->db->getQuery(true)
 					->select('*')
-					->from($this->db->quoteName('#__jstats_counter_' . $column))
+					->from($this->db->quoteName('#__jstats_counter_'.$column))
 			)->loadAssocList();
 		}
 
@@ -75,7 +75,7 @@ 
 			$return[$column] = $this->db->setQuery(
 				$this->db->getQuery(true)
 					->select('*')
-					->from($this->db->quoteName('#__jstats_counter_' . $column))
+					->from($this->db->quoteName('#__jstats_counter_'.$column))
 			)->loadAssocList();
 		}
 
@@ -101,7 +101,7 @@ 
 				$return[$column] = $this->db->setQuery(
 					$this->db->getQuery(true)
 						->select($column)
-						->select('COUNT(' . $column . ') AS count')
+						->select('COUNT('.$column.') AS count')
 						->from($this->db->quoteName('#__jstats'))
 						->where('modified BETWEEN DATE_SUB(NOW(), INTERVAL 90 DAY) AND NOW()')
 						->group($column)
@@ -113,11 +113,11 @@ 
 			{
 				$return['cms_php_version'] = $this->db->setQuery(
 					$this->db->getQuery(true)
-						->select('CONCAT(' . $db->qn('cms_version') . ', ' . $db->q(' - ') . ', ' . $db->qn('php_version') . ') AS cms_php_version')
+						->select('CONCAT('.$db->qn('cms_version').', '.$db->q(' - ').', '.$db->qn('php_version').') AS cms_php_version')
 						->select('COUNT(*) AS count')
 						->from($this->db->quoteName('#__jstats'))
 						->where('modified BETWEEN DATE_SUB(NOW(), INTERVAL 90 DAY) AND NOW()')
-						->group('CONCAT(' . $db->qn('cms_version') . ', ' . $db->q(' - ') . ', ' . $db->qn('php_version') . ')')
+						->group('CONCAT('.$db->qn('cms_version').', '.$db->q(' - ').', '.$db->qn('php_version').')')
 				)->loadAssocList();
 				continue;
 			}
@@ -126,11 +126,11 @@ 
 			{
 				$return['db_type_version'] = $this->db->setQuery(
 					$this->db->getQuery(true)
-						->select('CONCAT(' . $db->qn('db_type') . ', ' . $db->q(' - ') . ', ' . $db->qn('db_version') . ') AS db_type_version')
+						->select('CONCAT('.$db->qn('db_type').', '.$db->q(' - ').', '.$db->qn('db_version').') AS db_type_version')
 						->select('COUNT(*) AS count')
 						->from($this->db->quoteName('#__jstats'))
 						->where('modified BETWEEN DATE_SUB(NOW(), INTERVAL 90 DAY) AND NOW()')
-						->group('CONCAT(' . $db->qn('db_type') . ', ' . $db->q(' - ') . ', ' . $db->qn('db_version') . ')')
+						->group('CONCAT('.$db->qn('db_type').', '.$db->q(' - ').', '.$db->qn('db_version').')')
 				)->loadAssocList();
 				continue;
 			}
@@ -167,8 +167,8 @@ 
             $return[$column] = $this->db->setQuery(
               $this->db->getQuery(true)
                        ->select($column)
-                       ->select('COUNT(' . $column . ') AS count')
-                       ->from('(SELECT * FROM ' . $this->db->quoteName('#__jstats') . ' WHERE modified > DATE_SUB(NOW(), INTERVAL ' . $this->db->quote($timeframe) .' DAY)) AS tmptable')
+                       ->select('COUNT('.$column.') AS count')
+                       ->from('(SELECT * FROM '.$this->db->quoteName('#__jstats').' WHERE modified > DATE_SUB(NOW(), INTERVAL '.$this->db->quote($timeframe).' DAY)) AS tmptable')
                        ->group($column)
             )->loadAssocList();
         }

src/Providers/MonologServiceProvider.php

Spacing +2 added lines, -2 removed lines

@@ -89,7 +89,7 @@ 
 
 		$level = strtoupper($config->get('log.application', $config->get('log.level', 'error')));
 
-		return new StreamHandler(APPROOT . '/logs/stats.log', \constant('\\Monolog\\Logger::' . $level));
+		return new StreamHandler(APPROOT.'/logs/stats.log', \constant('\\Monolog\\Logger::'.$level));
 	}
 
 	/**
@@ -106,7 +106,7 @@ 
 
 		$level = strtoupper($config->get('log.database', $config->get('log.level', 'error')));
 
-		return new StreamHandler(APPROOT . '/logs/stats.log', \constant('\\Monolog\\Logger::' . $level));
+		return new StreamHandler(APPROOT.'/logs/stats.log', \constant('\\Monolog\\Logger::'.$level));
 	}
 
 	/**

src/Providers/WebApplicationServiceProvider.php

Spacing +1 added lines, -1 removed lines

@@ -135,7 +135,7 @@
 			'/:source',
 			DisplayStatisticsController::class,
 			[
-				'source' => '(' . implode('|', StatisticsRepository::ALLOWED_SOURCES) . ')',
+				'source' => '('.implode('|', StatisticsRepository::ALLOWED_SOURCES).')',
 			]
 		);
 

src/Providers/FlysystemServiceProvider.php

Spacing +3 added lines, -3 removed lines

@@ -41,7 +41,7 @@ 
 	 */
 	public function getMigrationsFilesystemService(Container $container): Filesystem
 	{
-		return new Filesystem(new Local(APPROOT . '/etc/migrations'));
+		return new Filesystem(new Local(APPROOT.'/etc/migrations'));
 	}
 
 	/**
@@ -53,7 +53,7 @@ 
 	 */
 	public function getSnapshotFilesystemService(Container $container): Filesystem
 	{
-		return new Filesystem(new Local(APPROOT . '/snapshots'));
+		return new Filesystem(new Local(APPROOT.'/snapshots'));
 	}
 
 	/**
@@ -65,6 +65,6 @@ 
 	 */
 	public function getVersionsFilesystemService(Container $container): Filesystem
 	{
-		return new Filesystem(new Local(APPROOT . '/versions'));
+		return new Filesystem(new Local(APPROOT.'/versions'));
 	}
 }

src/Controllers/SubmitDataController.php

Braces +2 added lines, -4 removed lines

@@ -188,8 +188,7 @@ 
 		try
 		{
 			$validVersions = json_decode($this->filesystem->read('joomla.json'), true);
-		}
-		catch (FileNotFoundException $exception)
+		} catch (FileNotFoundException $exception)
 		{
 			throw new \RuntimeException('Missing Joomla! release listing', 500, $exception);
 		}
@@ -248,8 +247,7 @@ 
 		try
 		{
 			$validVersions = json_decode($this->filesystem->read('php.json'), true);
-		}
-		catch (FileNotFoundException $exception)
+		} catch (FileNotFoundException $exception)
 		{
 			throw new \RuntimeException('Missing PHP release listing', 500, $exception);
 		}