joomla / statistics-server

src/Repositories/StatisticsRepository.php

Indentation +188 added lines, -188 removed lines

@@ -17,192 +17,192 @@
  */
 class StatisticsRepository
 {
-    /**
-     * Array containing the allowed sources
-     *
-     * @var  string[]
-     */
-    public const ALLOWED_SOURCES = ['php_version', 'db_type', 'db_version', 'cms_version', 'server_os', 'cms_php_version', 'db_type_version'];
-
-    /**
-     * The database driver.
-     *
-     * @var    DatabaseInterface
-     * @since  1.3.0
-     */
-    private $db;
-
-    /**
-     * Instantiate the repository.
-     *
-     * @param   DatabaseInterface  $db  The database driver.
-     */
-    public function __construct(DatabaseInterface $db)
-    {
-        $this->db = $db;
-    }
-
-    /**
-     * Loads the statistics data from the database.
-     *
-     * @param   string  $column  A single column to filter on
-     *
-     * @return  array  An array containing the response data
-     *
-     * @throws  \InvalidArgumentException
-     */
-    public function getItems(string $column = ''): array
-    {
-        // Validate the requested column is actually in the table
-        if ($column !== '') {
-            // The column should exist in the table and be part of the API
-            if (!\in_array($column, self::ALLOWED_SOURCES)) {
-                throw new \InvalidArgumentException('An invalid data source was requested.', 404);
-            }
-
-            return $this->db->setQuery(
-                $this->db->getQuery(true)
-                    ->select('*')
-                    ->from($this->db->quoteName('#__jstats_counter_' . $column))
-            )->loadAssocList();
-        }
-
-        $return = [];
-
-        foreach (self::ALLOWED_SOURCES as $column) {
-            $return[$column] = $this->db->setQuery(
-                $this->db->getQuery(true)
-                    ->select('*')
-                    ->from($this->db->quoteName('#__jstats_counter_' . $column))
-            )->loadAssocList();
-        }
-
-        return $return;
-    }
-
-    /**
-     * Loads the recently updated statistics data from the database.
-     *
-     * Recently updated is an arbitrary 90 days, submit a pull request for a different behavior.
-     *
-     * @return  array  An array containing the response data
-     */
-    public function getRecentlyUpdatedItems(): array
-    {
-        $return = [];
-        $db = $this->db;
-
-        foreach (self::ALLOWED_SOURCES as $column) {
-            if (($column !== 'cms_php_version') && ($column !== 'db_type_version')) {
-                $return[$column] = $this->db->setQuery(
-                    $this->db->getQuery(true)
-                        ->select($column)
-                        ->select('COUNT(' . $column . ') AS count')
-                        ->from($this->db->quoteName('#__jstats'))
-                        ->where('modified BETWEEN DATE_SUB(NOW(), INTERVAL 90 DAY) AND NOW()')
-                        ->group($column)
-                )->loadAssocList();
-                continue;
-            }
-
-            if ($column === 'cms_php_version') {
-                $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('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') . ')')
-                )->loadAssocList();
-                continue;
-            }
-
-            if ($column === 'db_type_version') {
-                $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('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') . ')')
-                )->loadAssocList();
-                continue;
-            }
-        }
-
-        return $return;
-    }
-
-    /**
-     * Loads the recently updated statistics data from the database.
-     *
-     * Updated within a timeframe, submit a pull request for a different behavior.
-     *
-     * @param   int     $timeframe   The timeframe in days to consider
-     * @param   string  $showColumn  The column to return
-     *
-     * @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'])) {
-                continue;
-            }
-
-            $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.
-     *
-     * @param   \stdClass  $data  Data object to save.
-     *
-     * @return  void
-     */
-    public function save(\stdClass $data): void
-    {
-        // Set the modified date of the record
-        $data->modified = (new \DateTime('now', new \DateTimeZone('UTC')))->format($this->db->getDateFormat());
-
-        // Check if a row exists for this unique ID and update the existing record if so
-        $recordExists = $this->db->setQuery(
-            $this->db->getQuery(true)
-                ->select('unique_id')
-                ->from('#__jstats')
-                ->where('unique_id = :unique_id')
-                ->bind(':unique_id', $data->unique_id, ParameterType::STRING)
-        )->loadResult();
-
-        if ($recordExists) {
-            $this->db->updateObject('#__jstats', $data, ['unique_id']);
-        } else {
-            $this->db->insertObject('#__jstats', $data, ['unique_id']);
-        }
-    }
+	/**
+	 * Array containing the allowed sources
+	 *
+	 * @var  string[]
+	 */
+	public const ALLOWED_SOURCES = ['php_version', 'db_type', 'db_version', 'cms_version', 'server_os', 'cms_php_version', 'db_type_version'];
+
+	/**
+	 * The database driver.
+	 *
+	 * @var    DatabaseInterface
+	 * @since  1.3.0
+	 */
+	private $db;
+
+	/**
+	 * Instantiate the repository.
+	 *
+	 * @param   DatabaseInterface  $db  The database driver.
+	 */
+	public function __construct(DatabaseInterface $db)
+	{
+		$this->db = $db;
+	}
+
+	/**
+	 * Loads the statistics data from the database.
+	 *
+	 * @param   string  $column  A single column to filter on
+	 *
+	 * @return  array  An array containing the response data
+	 *
+	 * @throws  \InvalidArgumentException
+	 */
+	public function getItems(string $column = ''): array
+	{
+		// Validate the requested column is actually in the table
+		if ($column !== '') {
+			// The column should exist in the table and be part of the API
+			if (!\in_array($column, self::ALLOWED_SOURCES)) {
+				throw new \InvalidArgumentException('An invalid data source was requested.', 404);
+			}
+
+			return $this->db->setQuery(
+				$this->db->getQuery(true)
+					->select('*')
+					->from($this->db->quoteName('#__jstats_counter_' . $column))
+			)->loadAssocList();
+		}
+
+		$return = [];
+
+		foreach (self::ALLOWED_SOURCES as $column) {
+			$return[$column] = $this->db->setQuery(
+				$this->db->getQuery(true)
+					->select('*')
+					->from($this->db->quoteName('#__jstats_counter_' . $column))
+			)->loadAssocList();
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Loads the recently updated statistics data from the database.
+	 *
+	 * Recently updated is an arbitrary 90 days, submit a pull request for a different behavior.
+	 *
+	 * @return  array  An array containing the response data
+	 */
+	public function getRecentlyUpdatedItems(): array
+	{
+		$return = [];
+		$db = $this->db;
+
+		foreach (self::ALLOWED_SOURCES as $column) {
+			if (($column !== 'cms_php_version') && ($column !== 'db_type_version')) {
+				$return[$column] = $this->db->setQuery(
+					$this->db->getQuery(true)
+						->select($column)
+						->select('COUNT(' . $column . ') AS count')
+						->from($this->db->quoteName('#__jstats'))
+						->where('modified BETWEEN DATE_SUB(NOW(), INTERVAL 90 DAY) AND NOW()')
+						->group($column)
+				)->loadAssocList();
+				continue;
+			}
+
+			if ($column === 'cms_php_version') {
+				$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('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') . ')')
+				)->loadAssocList();
+				continue;
+			}
+
+			if ($column === 'db_type_version') {
+				$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('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') . ')')
+				)->loadAssocList();
+				continue;
+			}
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Loads the recently updated statistics data from the database.
+	 *
+	 * Updated within a timeframe, submit a pull request for a different behavior.
+	 *
+	 * @param   int     $timeframe   The timeframe in days to consider
+	 * @param   string  $showColumn  The column to return
+	 *
+	 * @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'])) {
+				continue;
+			}
+
+			$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.
+	 *
+	 * @param   \stdClass  $data  Data object to save.
+	 *
+	 * @return  void
+	 */
+	public function save(\stdClass $data): void
+	{
+		// Set the modified date of the record
+		$data->modified = (new \DateTime('now', new \DateTimeZone('UTC')))->format($this->db->getDateFormat());
+
+		// Check if a row exists for this unique ID and update the existing record if so
+		$recordExists = $this->db->setQuery(
+			$this->db->getQuery(true)
+				->select('unique_id')
+				->from('#__jstats')
+				->where('unique_id = :unique_id')
+				->bind(':unique_id', $data->unique_id, ParameterType::STRING)
+		)->loadResult();
+
+		if ($recordExists) {
+			$this->db->updateObject('#__jstats', $data, ['unique_id']);
+		} else {
+			$this->db->insertObject('#__jstats', $data, ['unique_id']);
+		}
+	}
 }

Spacing +10 added lines, -10 removed lines

@@ -63,7 +63,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();
         }
 
@@ -73,7 +73,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();
         }
 
@@ -97,7 +97,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)
@@ -108,11 +108,11 @@ 
             if ($column === 'cms_php_version') {
                 $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;
             }
@@ -120,11 +120,11 @@ 
             if ($column === 'db_type_version') {
                 $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;
             }
@@ -165,9 +165,9 @@ 
             $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/Kernel/WebKernel.php

Indentation +24 added lines, -24 removed lines

@@ -21,28 +21,28 @@
  */
 class WebKernel extends Kernel
 {
-    /**
-     * Build the service container
-     *
-     * @return  Container
-     */
-    protected function buildContainer(): Container
-    {
-        $container = parent::buildContainer();
-
-        // Alias the web application to Joomla's base application class as this is the primary application for the environment
-        $container->alias(AbstractApplication::class, AbstractWebApplication::class);
-
-        // Alias the web application logger as the primary logger for the environment
-        $container->alias('monolog', 'monolog.logger.application')
-            ->alias('logger', 'monolog.logger.application')
-            ->alias(Logger::class, 'monolog.logger.application')
-            ->alias(LoggerInterface::class, 'monolog.logger.application');
-
-        // Set error reporting based on config
-        $errorReporting = (int) $container->get('config')->get('errorReporting', 0);
-        error_reporting($errorReporting);
-
-        return $container;
-    }
+	/**
+	 * Build the service container
+	 *
+	 * @return  Container
+	 */
+	protected function buildContainer(): Container
+	{
+		$container = parent::buildContainer();
+
+		// Alias the web application to Joomla's base application class as this is the primary application for the environment
+		$container->alias(AbstractApplication::class, AbstractWebApplication::class);
+
+		// Alias the web application logger as the primary logger for the environment
+		$container->alias('monolog', 'monolog.logger.application')
+			->alias('logger', 'monolog.logger.application')
+			->alias(Logger::class, 'monolog.logger.application')
+			->alias(LoggerInterface::class, 'monolog.logger.application');
+
+		// Set error reporting based on config
+		$errorReporting = (int) $container->get('config')->get('errorReporting', 0);
+		error_reporting($errorReporting);
+
+		return $container;
+	}
 }

src/Kernel/ConsoleKernel.php

Indentation +24 added lines, -24 removed lines

@@ -21,28 +21,28 @@
  */
 class ConsoleKernel extends Kernel
 {
-    /**
-     * Build the service container
-     *
-     * @return  Container
-     */
-    protected function buildContainer(): Container
-    {
-        $container = parent::buildContainer();
-
-        // Alias the web application to Joomla's base application class as this is the primary application for the environment
-        $container->alias(AbstractApplication::class, Application::class);
-
-        // Alias the web application logger as the primary logger for the environment
-        $container->alias('monolog', 'monolog.logger.cli')
-            ->alias('logger', 'monolog.logger.cli')
-            ->alias(Logger::class, 'monolog.logger.cli')
-            ->alias(LoggerInterface::class, 'monolog.logger.cli');
-
-        // Set error reporting based on config
-        $errorReporting = (int) $container->get('config')->get('errorReporting', 0);
-        error_reporting($errorReporting);
-
-        return $container;
-    }
+	/**
+	 * Build the service container
+	 *
+	 * @return  Container
+	 */
+	protected function buildContainer(): Container
+	{
+		$container = parent::buildContainer();
+
+		// Alias the web application to Joomla's base application class as this is the primary application for the environment
+		$container->alias(AbstractApplication::class, Application::class);
+
+		// Alias the web application logger as the primary logger for the environment
+		$container->alias('monolog', 'monolog.logger.cli')
+			->alias('logger', 'monolog.logger.cli')
+			->alias(Logger::class, 'monolog.logger.cli')
+			->alias(LoggerInterface::class, 'monolog.logger.cli');
+
+		// Set error reporting based on config
+		$errorReporting = (int) $container->get('config')->get('errorReporting', 0);
+		error_reporting($errorReporting);
+
+		return $container;
+	}
 }

src/Repositories/InfluxdbRepository.php

Spacing +3 added lines, -3 removed lines

@@ -68,7 +68,7 @@ 
             $point->addField('php_version', $data->php_version);
             if (!empty($phpVersion)) {
                 $point->addField('php_major', $phpVersion[1])
-                    ->addField('php_minor', $phpVersion[1] . '.' . $phpVersion[2]);
+                    ->addField('php_minor', $phpVersion[1].'.'.$phpVersion[2]);
             }
         }
 
@@ -80,7 +80,7 @@ 
             if (!empty($cmsVersions)) {
                 $point
                     ->addField('cms_major', $cmsVersions[1])
-                    ->addField('cms_minor', $cmsVersions[1] . '.' . $cmsVersions[2]);
+                    ->addField('cms_minor', $cmsVersions[1].'.'.$cmsVersions[2]);
             }
         }
 
@@ -91,7 +91,7 @@ 
             $point->addField('db_version', $data->db_version);
             if (!empty($dbVersions)) {
                 $point->addField('db_major', $dbVersions[1])
-                    ->addField('db_minor', $dbVersions[1] . '.' . $dbVersions[2]);
+                    ->addField('db_minor', $dbVersions[1].'.'.$dbVersions[2]);
             }
         }
 

Indentation +109 added lines, -109 removed lines

@@ -20,113 +20,113 @@
  */
 class InfluxdbRepository
 {
-    /**
-     * The database driver.
-     *
-     * @var    Client
-     * @since  1.3.0
-     */
-    private $db;
-
-    /**
-     * Instantiate the repository.
-     *
-     * @param Client $db The database driver.
-     */
-    public function __construct(Client $db)
-    {
-        $this->db = $db;
-    }
-
-    /**
-     * Saves the given data.
-     *
-     * @param \stdClass $data Data object to save.
-     *
-     * @return  void
-     */
-    public function save(\stdClass $data): void
-    {
-        $writeApi = $this->db->createWriteApi();
-
-        // Set the modified date of the record
-        $timestamp = (new \DateTime('now', new \DateTimeZone('UTC')))->getTimestamp();
-
-        $point = Point::measurement('joomla')
-            ->addTag('unique_id', $data->unique_id)
-            ->time($timestamp);
-
-        // Extract major and minor version
-        if (!empty($data->php_version)) {
-            preg_match('/^(\d+)\.(\d+)\./', $data->php_version, $phpVersion);
-            $point->addField('php_version', $data->php_version);
-            if (!empty($phpVersion)) {
-                $point->addField('php_major', $phpVersion[1])
-                    ->addField('php_minor', $phpVersion[1] . '.' . $phpVersion[2]);
-            }
-        }
-
-        // Prepare CMS version
-        if (!empty($data->cms_version)) {
-            preg_match('/^(\d+)\.(\d+)\./', $data->cms_version, $cmsVersions);
-
-            $point->addField('cms_version', $data->cms_version);
-            if (!empty($cmsVersions)) {
-                $point
-                    ->addField('cms_major', $cmsVersions[1])
-                    ->addField('cms_minor', $cmsVersions[1] . '.' . $cmsVersions[2]);
-            }
-        }
-
-        // Prepare Database versions
-        if (!empty($data->db_version)) {
-            preg_match('/^(\d+)\.(\d+)\./', $data->db_version, $dbVersions);
-
-            $point->addField('db_version', $data->db_version);
-            if (!empty($dbVersions)) {
-                $point->addField('db_major', $dbVersions[1])
-                    ->addField('db_minor', $dbVersions[1] . '.' . $dbVersions[2]);
-            }
-        }
-
-        // Prepare Database Driver
-        if (!empty($data->db_type)) {
-            $dbServer = null;
-            if ($data->db_type === 'postgresql') {
-                $dbServer = 'PostgreSQL';
-            } elseif (str_contains($data->db_type, 'mysql')) {
-                $dbServer = 'MySQL';
-                if (!empty($data->db_version)) {
-                    if (
-                        version_compare($data->db_version, '10.0.0', '>=')
-                        // We know this is not 100% correct but more accurate than expecting MySQL with this version string
-                        || version_compare($data->db_version, '5.5.5', '=')
-                    ) {
-                        $dbServer = 'MariaDB';
-                    }
-                }
-            } elseif (str_contains($data->db_type, 'mariadb')) {
-                $dbServer = 'MariaDB';
-            } elseif (str_contains($data->db_type, 'sqlsrv')) {
-                $dbServer = 'MSSQL';
-            }
-
-            $point->addField('db_driver', $data->db_type);
-            if (!empty($dbServer)) {
-                $point->addField('db_server', $dbServer);
-            }
-        }
-
-        // Prepare Operating System
-        if (!empty($data->server_os)) {
-            $os = explode(' ', $data->server_os, 2);
-
-            $point->addField('server_string', $data->server_os);
-            if (!empty($os[0])) {
-                $point->addField('server_os', $os[0]);
-            }
-        }
-
-        $writeApi->write($point, \InfluxDB2\Model\WritePrecision::S, 'cms');
-    }
+	/**
+	 * The database driver.
+	 *
+	 * @var    Client
+	 * @since  1.3.0
+	 */
+	private $db;
+
+	/**
+	 * Instantiate the repository.
+	 *
+	 * @param Client $db The database driver.
+	 */
+	public function __construct(Client $db)
+	{
+		$this->db = $db;
+	}
+
+	/**
+	 * Saves the given data.
+	 *
+	 * @param \stdClass $data Data object to save.
+	 *
+	 * @return  void
+	 */
+	public function save(\stdClass $data): void
+	{
+		$writeApi = $this->db->createWriteApi();
+
+		// Set the modified date of the record
+		$timestamp = (new \DateTime('now', new \DateTimeZone('UTC')))->getTimestamp();
+
+		$point = Point::measurement('joomla')
+			->addTag('unique_id', $data->unique_id)
+			->time($timestamp);
+
+		// Extract major and minor version
+		if (!empty($data->php_version)) {
+			preg_match('/^(\d+)\.(\d+)\./', $data->php_version, $phpVersion);
+			$point->addField('php_version', $data->php_version);
+			if (!empty($phpVersion)) {
+				$point->addField('php_major', $phpVersion[1])
+					->addField('php_minor', $phpVersion[1] . '.' . $phpVersion[2]);
+			}
+		}
+
+		// Prepare CMS version
+		if (!empty($data->cms_version)) {
+			preg_match('/^(\d+)\.(\d+)\./', $data->cms_version, $cmsVersions);
+
+			$point->addField('cms_version', $data->cms_version);
+			if (!empty($cmsVersions)) {
+				$point
+					->addField('cms_major', $cmsVersions[1])
+					->addField('cms_minor', $cmsVersions[1] . '.' . $cmsVersions[2]);
+			}
+		}
+
+		// Prepare Database versions
+		if (!empty($data->db_version)) {
+			preg_match('/^(\d+)\.(\d+)\./', $data->db_version, $dbVersions);
+
+			$point->addField('db_version', $data->db_version);
+			if (!empty($dbVersions)) {
+				$point->addField('db_major', $dbVersions[1])
+					->addField('db_minor', $dbVersions[1] . '.' . $dbVersions[2]);
+			}
+		}
+
+		// Prepare Database Driver
+		if (!empty($data->db_type)) {
+			$dbServer = null;
+			if ($data->db_type === 'postgresql') {
+				$dbServer = 'PostgreSQL';
+			} elseif (str_contains($data->db_type, 'mysql')) {
+				$dbServer = 'MySQL';
+				if (!empty($data->db_version)) {
+					if (
+						version_compare($data->db_version, '10.0.0', '>=')
+						// We know this is not 100% correct but more accurate than expecting MySQL with this version string
+						|| version_compare($data->db_version, '5.5.5', '=')
+					) {
+						$dbServer = 'MariaDB';
+					}
+				}
+			} elseif (str_contains($data->db_type, 'mariadb')) {
+				$dbServer = 'MariaDB';
+			} elseif (str_contains($data->db_type, 'sqlsrv')) {
+				$dbServer = 'MSSQL';
+			}
+
+			$point->addField('db_driver', $data->db_type);
+			if (!empty($dbServer)) {
+				$point->addField('db_server', $dbServer);
+			}
+		}
+
+		// Prepare Operating System
+		if (!empty($data->server_os)) {
+			$os = explode(' ', $data->server_os, 2);
+
+			$point->addField('server_string', $data->server_os);
+			if (!empty($os[0])) {
+				$point->addField('server_os', $os[0]);
+			}
+		}
+
+		$writeApi->write($point, \InfluxDB2\Model\WritePrecision::S, 'cms');
+	}
 }

src/Providers/RepositoryServiceProvider.php

Indentation +38 added lines, -38 removed lines

@@ -21,44 +21,44 @@
  */
 class RepositoryServiceProvider implements ServiceProviderInterface
 {
-    /**
-     * Registers the service provider with a DI container.
-     *
-     * @param   Container  $container  The DI container.
-     *
-     * @return  void
-     */
-    public function register(Container $container): void
-    {
-        $container->share(StatisticsRepository::class, [$this, 'getStatisticsRepositoryService']);
-        $container->share(InfluxdbRepository::class, [$this, 'getInfluxdbRepositoryService']);
-    }
+	/**
+	 * Registers the service provider with a DI container.
+	 *
+	 * @param   Container  $container  The DI container.
+	 *
+	 * @return  void
+	 */
+	public function register(Container $container): void
+	{
+		$container->share(StatisticsRepository::class, [$this, 'getStatisticsRepositoryService']);
+		$container->share(InfluxdbRepository::class, [$this, 'getInfluxdbRepositoryService']);
+	}
 
-    /**
-     * Get the StatisticsRepository service
-     *
-     * @param   Container  $container  The DI container.
-     *
-     * @return  StatisticsRepository
-     */
-    public function getStatisticsRepositoryService(Container $container): StatisticsRepository
-    {
-        return new StatisticsRepository(
-            $container->get(DatabaseInterface::class)
-        );
-    }
+	/**
+	 * Get the StatisticsRepository service
+	 *
+	 * @param   Container  $container  The DI container.
+	 *
+	 * @return  StatisticsRepository
+	 */
+	public function getStatisticsRepositoryService(Container $container): StatisticsRepository
+	{
+		return new StatisticsRepository(
+			$container->get(DatabaseInterface::class)
+		);
+	}
 
-    /**
-     * Get the StatisticsRepository service
-     *
-     * @param   Container  $container  The DI container.
-     *
-     * @return  StatisticsRepository
-     */
-    public function getInfluxdbRepositoryService(Container $container): InfluxdbRepository
-    {
-        return new InfluxdbRepository(
-            $container->get(Client::class)
-        );
-    }
+	/**
+	 * Get the StatisticsRepository service
+	 *
+	 * @param   Container  $container  The DI container.
+	 *
+	 * @return  StatisticsRepository
+	 */
+	public function getInfluxdbRepositoryService(Container $container): InfluxdbRepository
+	{
+		return new InfluxdbRepository(
+			$container->get(Client::class)
+		);
+	}
 }