joomla / statistics-server

src/Commands/Database/MigrationStatusCommand.php

Indentation +66 added lines, -66 removed lines

@@ -20,81 +20,81 @@
  */
 class MigrationStatusCommand extends AbstractCommand
 {
-    /**
-     * The default command name
-     *
-     * @var  string|null
-     */
-    protected static $defaultName = 'database:migrations:status';
+	/**
+	 * The default command name
+	 *
+	 * @var  string|null
+	 */
+	protected static $defaultName = 'database:migrations:status';
 
-    /**
-     * Database migrations helper
-     *
-     * @var  Migrations
-     */
-    private $migrations;
+	/**
+	 * Database migrations helper
+	 *
+	 * @var  Migrations
+	 */
+	private $migrations;
 
-    /**
-     * Constructor.
-     *
-     * @param   Migrations  $migrations  Database migrations helper
-     */
-    public function __construct(Migrations $migrations)
-    {
-        $this->migrations = $migrations;
+	/**
+	 * Constructor.
+	 *
+	 * @param   Migrations  $migrations  Database migrations helper
+	 */
+	public function __construct(Migrations $migrations)
+	{
+		$this->migrations = $migrations;
 
-        parent::__construct();
-    }
+		parent::__construct();
+	}
 
-    /**
-     * Internal function to execute the command.
-     *
-     * @param   InputInterface   $input   The input to inject into the command.
-     * @param   OutputInterface  $output  The output to inject into the command.
-     *
-     * @return  integer  The command exit code
-     */
-    protected function doExecute(InputInterface $input, OutputInterface $output): int
-    {
-        $symfonyStyle = new SymfonyStyle($input, $output);
+	/**
+	 * Internal function to execute the command.
+	 *
+	 * @param   InputInterface   $input   The input to inject into the command.
+	 * @param   OutputInterface  $output  The output to inject into the command.
+	 *
+	 * @return  integer  The command exit code
+	 */
+	protected function doExecute(InputInterface $input, OutputInterface $output): int
+	{
+		$symfonyStyle = new SymfonyStyle($input, $output);
 
-        $symfonyStyle->title('Database Migrations: Check Status');
+		$symfonyStyle->title('Database Migrations: Check Status');
 
-        $status = $this->migrations->checkStatus();
+		$status = $this->migrations->checkStatus();
 
-        if (!$status->tableExists) {
-            $symfonyStyle->comment('The migrations table does not exist, run the "database:migrate" command to set up the database.');
-        } elseif ($status->latest) {
-            $symfonyStyle->success('Your database is up-to-date.');
-        } else {
-            $symfonyStyle->comment(sprintf('Your database is not up-to-date. You are missing %d migration(s).', $status->missingMigrations));
+		if (!$status->tableExists) {
+			$symfonyStyle->comment('The migrations table does not exist, run the "database:migrate" command to set up the database.');
+		} elseif ($status->latest) {
+			$symfonyStyle->success('Your database is up-to-date.');
+		} else {
+			$symfonyStyle->comment(sprintf('Your database is not up-to-date. You are missing %d migration(s).', $status->missingMigrations));
 
-            $symfonyStyle->table(
-                [
-                    'Current Version',
-                    'Latest Version',
-                ],
-                [
-                    [
-                        $status->currentVersion,
-                        $status->latestVersion,
-                    ],
-                ]
-            );
+			$symfonyStyle->table(
+				[
+					'Current Version',
+					'Latest Version',
+				],
+				[
+					[
+						$status->currentVersion,
+						$status->latestVersion,
+					],
+				]
+			);
 
-            $symfonyStyle->comment('To update, run the "database:migrate" command.');
-        }
+			$symfonyStyle->comment('To update, run the "database:migrate" command.');
+		}
 
-        return 0;
-    }
+		return 0;
+	}
 
-    /**
-     * Configures the current command.
-     *
-     * @return  void
-     */
-    protected function configure(): void
-    {
-        $this->setDescription('Check the database migration status.');
-    }
+	/**
+	 * Configures the current command.
+	 *
+	 * @return  void
+	 */
+	protected function configure(): void
+	{
+		$this->setDescription('Check the database migration status.');
+	}
 }

src/Commands/SnapshotCommand.php

Indentation +98 added lines, -98 removed lines

@@ -24,102 +24,102 @@
  */
 class SnapshotCommand extends AbstractCommand
 {
-    /**
-     * The default command name
-     *
-     * @var  string|null
-     */
-    protected static $defaultName = 'snapshot';
-
-    /**
-     * JSON view for displaying the statistics.
-     *
-     * @var  StatsJsonView
-     */
-    private $view;
-
-    /**
-     * Filesystem adapter for the snapshots space.
-     *
-     * @var  Filesystem
-     */
-    private $filesystem;
-
-    /**
-     * Constructor.
-     *
-     * @param   StatsJsonView  $view        JSON view for displaying the statistics.
-     * @param   Filesystem     $filesystem  Filesystem adapter for the snapshots space.
-     */
-    public function __construct(StatsJsonView $view, Filesystem $filesystem)
-    {
-        $this->view       = $view;
-        $this->filesystem = $filesystem;
-
-        parent::__construct();
-    }
-
-    /**
-     * Internal function to execute the command.
-     *
-     * @param   InputInterface   $input   The input to inject into the command.
-     * @param   OutputInterface  $output  The output to inject into the command.
-     *
-     * @return  integer  The command exit code
-     */
-    protected function doExecute(InputInterface $input, OutputInterface $output): int
-    {
-        $symfonyStyle = new SymfonyStyle($input, $output);
-
-        $symfonyStyle->title('Creating Statistics Snapshot');
-
-        // We want the full raw data set for our snapshot
-        $this->view->isAuthorizedRaw(true);
-
-        $source = $input->getOption('source');
-
-        $filename = date('YmdHis');
-
-        if ($source) {
-            if (!\in_array($source, StatisticsRepository::ALLOWED_SOURCES)) {
-                throw new InvalidOptionException(
-                    \sprintf(
-                        'Invalid source "%s" given, valid options are: %s',
-                        $source,
-                        implode(', ', StatisticsRepository::ALLOWED_SOURCES)
-                    )
-                );
-            }
-
-            $this->view->setSource($source);
-
-            $filename .= '_' . $source;
-        }
-
-        if (!$this->filesystem->write($filename, $this->view->render())) {
-            $symfonyStyle->error('Failed writing snapshot to the filesystem.');
-
-            return 1;
-        }
-
-        $symfonyStyle->success('Snapshot recorded.');
-
-        return 0;
-    }
-
-    /**
-     * Configures the current command.
-     *
-     * @return  void
-     */
-    protected function configure(): void
-    {
-        $this->setDescription('Takes a snapshot of the statistics data.');
-        $this->addOption(
-            'source',
-            null,
-            InputOption::VALUE_OPTIONAL,
-            'If given, filters the snapshot to a single source.'
-        );
-    }
+	/**
+	 * The default command name
+	 *
+	 * @var  string|null
+	 */
+	protected static $defaultName = 'snapshot';
+
+	/**
+	 * JSON view for displaying the statistics.
+	 *
+	 * @var  StatsJsonView
+	 */
+	private $view;
+
+	/**
+	 * Filesystem adapter for the snapshots space.
+	 *
+	 * @var  Filesystem
+	 */
+	private $filesystem;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   StatsJsonView  $view        JSON view for displaying the statistics.
+	 * @param   Filesystem     $filesystem  Filesystem adapter for the snapshots space.
+	 */
+	public function __construct(StatsJsonView $view, Filesystem $filesystem)
+	{
+		$this->view       = $view;
+		$this->filesystem = $filesystem;
+
+		parent::__construct();
+	}
+
+	/**
+	 * Internal function to execute the command.
+	 *
+	 * @param   InputInterface   $input   The input to inject into the command.
+	 * @param   OutputInterface  $output  The output to inject into the command.
+	 *
+	 * @return  integer  The command exit code
+	 */
+	protected function doExecute(InputInterface $input, OutputInterface $output): int
+	{
+		$symfonyStyle = new SymfonyStyle($input, $output);
+
+		$symfonyStyle->title('Creating Statistics Snapshot');
+
+		// We want the full raw data set for our snapshot
+		$this->view->isAuthorizedRaw(true);
+
+		$source = $input->getOption('source');
+
+		$filename = date('YmdHis');
+
+		if ($source) {
+			if (!\in_array($source, StatisticsRepository::ALLOWED_SOURCES)) {
+				throw new InvalidOptionException(
+					\sprintf(
+						'Invalid source "%s" given, valid options are: %s',
+						$source,
+						implode(', ', StatisticsRepository::ALLOWED_SOURCES)
+					)
+				);
+			}
+
+			$this->view->setSource($source);
+
+			$filename .= '_' . $source;
+		}
+
+		if (!$this->filesystem->write($filename, $this->view->render())) {
+			$symfonyStyle->error('Failed writing snapshot to the filesystem.');
+
+			return 1;
+		}
+
+		$symfonyStyle->success('Snapshot recorded.');
+
+		return 0;
+	}
+
+	/**
+	 * Configures the current command.
+	 *
+	 * @return  void
+	 */
+	protected function configure(): void
+	{
+		$this->setDescription('Takes a snapshot of the statistics data.');
+		$this->addOption(
+			'source',
+			null,
+			InputOption::VALUE_OPTIONAL,
+			'If given, filters the snapshot to a single source.'
+		);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -93,7 +93,7 @@
 
             $this->view->setSource($source);
 
-            $filename .= '_' . $source;
+            $filename .= '_'.$source;
         }
 
         if (!$this->filesystem->write($filename, $this->view->render())) {

src/Commands/SnapshotRecentlyUpdatedCommand.php

Indentation +99 added lines, -99 removed lines

@@ -24,103 +24,103 @@
  */
 class SnapshotRecentlyUpdatedCommand extends AbstractCommand
 {
-    /**
-     * The default command name
-     *
-     * @var  string|null
-     */
-    protected static $defaultName = 'snapshot:recently-updated';
-
-    /**
-     * JSON view for displaying the statistics.
-     *
-     * @var  StatsJsonView
-     */
-    private $view;
-
-    /**
-     * Filesystem adapter for the snapshots space.
-     *
-     * @var  Filesystem
-     */
-    private $filesystem;
-
-    /**
-     * Constructor.
-     *
-     * @param   StatsJsonView  $view        JSON view for displaying the statistics.
-     * @param   Filesystem     $filesystem  Filesystem adapter for the snapshots space.
-     */
-    public function __construct(StatsJsonView $view, Filesystem $filesystem)
-    {
-        $this->view       = $view;
-        $this->filesystem = $filesystem;
-
-        parent::__construct();
-    }
-
-    /**
-     * Internal function to execute the command.
-     *
-     * @param   InputInterface   $input   The input to inject into the command.
-     * @param   OutputInterface  $output  The output to inject into the command.
-     *
-     * @return  integer  The command exit code
-     */
-    protected function doExecute(InputInterface $input, OutputInterface $output): int
-    {
-        $symfonyStyle = new SymfonyStyle($input, $output);
-
-        $symfonyStyle->title('Creating Statistics Snapshot');
-
-        // We want the full raw data set for our snapshot
-        $this->view->isAuthorizedRaw(true);
-        $this->view->isRecent(true);
-
-        $source = $input->getOption('source');
-
-        $filename = date('YmdHis') . '_recent';
-
-        if ($source) {
-            if (!\in_array($source, StatisticsRepository::ALLOWED_SOURCES)) {
-                throw new InvalidOptionException(
-                    \sprintf(
-                        'Invalid source "%s" given, valid options are: %s',
-                        $source,
-                        implode(', ', StatisticsRepository::ALLOWED_SOURCES)
-                    )
-                );
-            }
-
-            $this->view->setSource($source);
-
-            $filename .= '_' . $source;
-        }
-
-        if (!$this->filesystem->write($filename, $this->view->render())) {
-            $symfonyStyle->error('Failed writing snapshot to the filesystem.');
-
-            return 1;
-        }
-
-        $symfonyStyle->success('Snapshot recorded.');
-
-        return 0;
-    }
-
-    /**
-     * Configures the current command.
-     *
-     * @return  void
-     */
-    protected function configure(): void
-    {
-        $this->setDescription('Takes a snapshot of the recently updated statistics data.');
-        $this->addOption(
-            'source',
-            null,
-            InputOption::VALUE_OPTIONAL,
-            'If given, filters the snapshot to a single source.'
-        );
-    }
+	/**
+	 * The default command name
+	 *
+	 * @var  string|null
+	 */
+	protected static $defaultName = 'snapshot:recently-updated';
+
+	/**
+	 * JSON view for displaying the statistics.
+	 *
+	 * @var  StatsJsonView
+	 */
+	private $view;
+
+	/**
+	 * Filesystem adapter for the snapshots space.
+	 *
+	 * @var  Filesystem
+	 */
+	private $filesystem;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   StatsJsonView  $view        JSON view for displaying the statistics.
+	 * @param   Filesystem     $filesystem  Filesystem adapter for the snapshots space.
+	 */
+	public function __construct(StatsJsonView $view, Filesystem $filesystem)
+	{
+		$this->view       = $view;
+		$this->filesystem = $filesystem;
+
+		parent::__construct();
+	}
+
+	/**
+	 * Internal function to execute the command.
+	 *
+	 * @param   InputInterface   $input   The input to inject into the command.
+	 * @param   OutputInterface  $output  The output to inject into the command.
+	 *
+	 * @return  integer  The command exit code
+	 */
+	protected function doExecute(InputInterface $input, OutputInterface $output): int
+	{
+		$symfonyStyle = new SymfonyStyle($input, $output);
+
+		$symfonyStyle->title('Creating Statistics Snapshot');
+
+		// We want the full raw data set for our snapshot
+		$this->view->isAuthorizedRaw(true);
+		$this->view->isRecent(true);
+
+		$source = $input->getOption('source');
+
+		$filename = date('YmdHis') . '_recent';
+
+		if ($source) {
+			if (!\in_array($source, StatisticsRepository::ALLOWED_SOURCES)) {
+				throw new InvalidOptionException(
+					\sprintf(
+						'Invalid source "%s" given, valid options are: %s',
+						$source,
+						implode(', ', StatisticsRepository::ALLOWED_SOURCES)
+					)
+				);
+			}
+
+			$this->view->setSource($source);
+
+			$filename .= '_' . $source;
+		}
+
+		if (!$this->filesystem->write($filename, $this->view->render())) {
+			$symfonyStyle->error('Failed writing snapshot to the filesystem.');
+
+			return 1;
+		}
+
+		$symfonyStyle->success('Snapshot recorded.');
+
+		return 0;
+	}
+
+	/**
+	 * Configures the current command.
+	 *
+	 * @return  void
+	 */
+	protected function configure(): void
+	{
+		$this->setDescription('Takes a snapshot of the recently updated statistics data.');
+		$this->addOption(
+			'source',
+			null,
+			InputOption::VALUE_OPTIONAL,
+			'If given, filters the snapshot to a single source.'
+		);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -79,7 +79,7 @@ 
 
         $source = $input->getOption('source');
 
-        $filename = date('YmdHis') . '_recent';
+        $filename = date('YmdHis').'_recent';
 
         if ($source) {
             if (!\in_array($source, StatisticsRepository::ALLOWED_SOURCES)) {
@@ -94,7 +94,7 @@ 
 
             $this->view->setSource($source);
 
-            $filename .= '_' . $source;
+            $filename .= '_'.$source;
         }
 
         if (!$this->filesystem->write($filename, $this->view->render())) {

src/GitHub/GitHub.php

Indentation +20 added lines, -20 removed lines

@@ -18,27 +18,27 @@
  */
 class GitHub extends JGitHub
 {
-    /**
-     * Magic method to lazily create API objects
-     *
-     * @param   string  $name  Name of property to retrieve
-     *
-     * @return  \Joomla\Github\AbstractGithubObject  GitHub API object (gists, issues, pulls, etc).
-     *
-     * @throws  \InvalidArgumentException If $name is not a valid sub class.
-     */
-    public function __get($name)
-    {
-        $class = __NAMESPACE__ . '\\Package\\' . ucfirst($name);
+	/**
+	 * Magic method to lazily create API objects
+	 *
+	 * @param   string  $name  Name of property to retrieve
+	 *
+	 * @return  \Joomla\Github\AbstractGithubObject  GitHub API object (gists, issues, pulls, etc).
+	 *
+	 * @throws  \InvalidArgumentException If $name is not a valid sub class.
+	 */
+	public function __get($name)
+	{
+		$class = __NAMESPACE__ . '\\Package\\' . ucfirst($name);
 
-        if (class_exists($class)) {
-            if (!isset($this->$name)) {
-                $this->$name = new $class($this->options, $this->client);
-            }
+		if (class_exists($class)) {
+			if (!isset($this->$name)) {
+				$this->$name = new $class($this->options, $this->client);
+			}
 
-            return $this->$name;
-        }
+			return $this->$name;
+		}
 
-        return parent::__get($name);
-    }
+		return parent::__get($name);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
      */
     public function __get($name)
     {
-        $class = __NAMESPACE__ . '\\Package\\' . ucfirst($name);
+        $class = __NAMESPACE__.'\\Package\\'.ucfirst($name);
 
         if (class_exists($class)) {
             if (!isset($this->$name)) {

src/GitHub/Package.php

Indentation +20 added lines, -20 removed lines

@@ -16,27 +16,27 @@
  */
 abstract class Package extends BasePackage
 {
-    /**
-     * Magic method to lazily create API objects
-     *
-     * @param   string  $name  Name of property to retrieve
-     *
-     * @return  Package  GitHub API package object.
-     *
-     * @throws  \InvalidArgumentException
-     */
-    public function __get($name)
-    {
-        $class = __NAMESPACE__ . '\\' . $this->package . '\\' . ucfirst($name);
+	/**
+	 * Magic method to lazily create API objects
+	 *
+	 * @param   string  $name  Name of property to retrieve
+	 *
+	 * @return  Package  GitHub API package object.
+	 *
+	 * @throws  \InvalidArgumentException
+	 */
+	public function __get($name)
+	{
+		$class = __NAMESPACE__ . '\\' . $this->package . '\\' . ucfirst($name);
 
-        if (class_exists($class)) {
-            if (!isset($this->$name)) {
-                $this->$name = new $class($this->options, $this->client);
-            }
+		if (class_exists($class)) {
+			if (!isset($this->$name)) {
+				$this->$name = new $class($this->options, $this->client);
+			}
 
-            return $this->$name;
-        }
+			return $this->$name;
+		}
 
-        return parent::__get($name);
-    }
+		return parent::__get($name);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
      */
     public function __get($name)
     {
-        $class = __NAMESPACE__ . '\\' . $this->package . '\\' . ucfirst($name);
+        $class = __NAMESPACE__.'\\'.$this->package.'\\'.ucfirst($name);
 
         if (class_exists($class)) {
             if (!isset($this->$name)) {

src/GitHub/Package/Repositories.php

Indentation +39 added lines, -39 removed lines

@@ -17,43 +17,43 @@
  */
 class Repositories extends BaseRepositories
 {
-    /**
-     * API Response object
-     *
-     * @var  Response
-     */
-    private $apiResponse;
-
-    /**
-     * Get the last API response if one is set
-     *
-     * @return  Response|null
-     */
-    public function getApiResponse()
-    {
-        return $this->apiResponse;
-    }
-
-    /**
-     * Get a list of tags on a repository.
-     *
-     * Note: This is different from the parent `getListTags` method as it adds support for the API's pagination. This extended method can be removed
-     * if the upstream class gains this support.
-     *
-     * @param   string   $owner  Repository owner.
-     * @param   string   $repo   Repository name.
-     * @param   integer  $page   The page number from which to get items.
-     *
-     * @return  object
-     */
-    public function getTags($owner, $repo, $page = 0)
-    {
-        // Build the request path.
-        $path = '/repos/' . $owner . '/' . $repo . '/tags';
-
-        // Send the request.
-        $this->apiResponse = $this->client->get($this->fetchUrl($path, $page));
-
-        return $this->processResponse($this->apiResponse);
-    }
+	/**
+	 * API Response object
+	 *
+	 * @var  Response
+	 */
+	private $apiResponse;
+
+	/**
+	 * Get the last API response if one is set
+	 *
+	 * @return  Response|null
+	 */
+	public function getApiResponse()
+	{
+		return $this->apiResponse;
+	}
+
+	/**
+	 * Get a list of tags on a repository.
+	 *
+	 * Note: This is different from the parent `getListTags` method as it adds support for the API's pagination. This extended method can be removed
+	 * if the upstream class gains this support.
+	 *
+	 * @param   string   $owner  Repository owner.
+	 * @param   string   $repo   Repository name.
+	 * @param   integer  $page   The page number from which to get items.
+	 *
+	 * @return  object
+	 */
+	public function getTags($owner, $repo, $page = 0)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/tags';
+
+		// Send the request.
+		$this->apiResponse = $this->client->get($this->fetchUrl($path, $page));
+
+		return $this->processResponse($this->apiResponse);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
     public function getTags($owner, $repo, $page = 0)
     {
         // Build the request path.
-        $path = '/repos/' . $owner . '/' . $repo . '/tags';
+        $path = '/repos/'.$owner.'/'.$repo.'/tags';
 
         // Send the request.
         $this->apiResponse = $this->client->get($this->fetchUrl($path, $page));

src/Database/Migrations.php

Indentation +192 added lines, -192 removed lines

@@ -22,196 +22,196 @@
  */
 class Migrations
 {
-    /**
-     * Database connector
-     *
-     * @var  DatabaseDriver
-     */
-    private $database;
-
-    /**
-     * Filesystem adapter
-     *
-     * @var  Filesystem
-     */
-    private $filesystem;
-
-    /**
-     * Constructor
-     *
-     * @param   DatabaseDriver  $database    Database connector
-     * @param   Filesystem      $filesystem  Filesystem adapter
-     */
-    public function __construct(DatabaseDriver $database, Filesystem $filesystem)
-    {
-        $this->database   = $database;
-        $this->filesystem = $filesystem;
-    }
-
-    /**
-     * Checks the migration status of the current installation
-     *
-     * @return  MigrationsStatus
-     */
-    public function checkStatus(): MigrationsStatus
-    {
-        $response = new MigrationsStatus();
-
-        try {
-            // First get the list of applied migrations
-            $appliedMigrations = $this->database->setQuery(
-                $this->database->getQuery(true)
-                    ->select('version')
-                    ->from('#__migrations')
-            )->loadColumn();
-        } 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) {
-                throw $exception;
-            }
-
-            $response->tableExists = false;
-
-            return $response;
-        }
-
-        // Now get the list of all known migrations
-        $knownMigrations = [];
-
-        foreach ($this->filesystem->listContents() as $migrationFiles) {
-            $knownMigrations[] = $migrationFiles['filename'];
-        }
-
-        // Don't rely on file system ordering.
-        sort($knownMigrations);
-
-        // Validate all migrations are applied; the count and latest versions should match
-        if (\count($appliedMigrations) === \count($knownMigrations)) {
-            $appliedValues = array_values($appliedMigrations);
-            $knownValues   = array_values($knownMigrations);
-
-            $latestApplied = (int) end($appliedValues);
-            $latestKnown   = (int) end($knownValues);
-
-            // Versions match, good to go
-            if ($latestApplied === $latestKnown) {
-                $response->latest = true;
-
-                return $response;
-            }
-        }
-
-        // The system is not on the latest version, get the relevant data
-        $response->missingMigrations = \count($knownMigrations) - \count($appliedMigrations);
-        $response->currentVersion    = array_pop($appliedMigrations);
-        $response->latestVersion     = array_pop($knownMigrations);
-
-        return $response;
-    }
-
-    /**
-     * Migrate the database
-     *
-     * @param   string|null  $version  Optional migration version to run
-     *
-     * @return  void
-     */
-    public function migrateDatabase(?string $version = null): void
-    {
-        try {
-            // Determine the migrations to apply
-            $appliedMigrations = $this->database->setQuery(
-                $this->database->getQuery(true)
-                    ->select('version')
-                    ->from('#__migrations')
-            )->loadColumn();
-        } 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) {
-                throw $exception;
-            }
-
-            // If given a version, we can only execute it if it is the first migration, otherwise we've got other problems
-            if ($version !== null && $version !== '') {
-                $firstMigration = $this->filesystem->listContents()[0];
-
-                if ($firstMigration['filename'] !== $version) {
-                    throw new CannotInitializeMigrationsException(
-                        'The migrations have not yet been initialized and the first migration has not been given as the version to run.'
-                    );
-                }
-            }
-
-            $appliedMigrations = [];
-        }
-
-        // If a version is specified, check if that migration is already applied and if not, run that one only
-        if ($version !== null && $version !== '') {
-            // If it's already applied, there's nothing to do here
-            if (\in_array($version, $appliedMigrations)) {
-                return;
-            }
-
-            $this->doMigration($version);
-
-            return;
-        }
-
-        // We need to check the known migrations and filter out the applied ones to know what to do
-        $knownMigrations = [];
-
-        foreach ($this->filesystem->listContents() as $migrationFiles) {
-            $knownMigrations[] = $migrationFiles['filename'];
-        }
-
-        foreach (array_diff($knownMigrations, $appliedMigrations) as $version) {
-            $this->doMigration($version);
-        }
-    }
-
-    /**
-     * Perform the database migration for the specified version
-     *
-     * @param   string  $version  Migration version to run
-     *
-     * @return  void
-     *
-     * @throws  UnknownMigrationException
-     * @throws  UnreadableFileException
-     */
-    private function doMigration(string $version): void
-    {
-        $sqlFile = $version . '.sql';
-
-        if (!$this->filesystem->has($sqlFile)) {
-            throw new UnknownMigrationException($sqlFile);
-        }
-
-        $queries = $this->filesystem->read($sqlFile);
-
-        if ($queries === false) {
-            throw new UnreadableFileException(
-                sprintf(
-                    'Could not read data from the %s SQL file, please update the database manually.',
-                    $sqlFile
-                )
-            );
-        }
-
-        foreach (DatabaseDriver::splitSql($queries) as $query) {
-            $query = trim($query);
-
-            if (!empty($query)) {
-                $this->database->setQuery($query)->execute();
-            }
-        }
-
-        // Log the migration into the database
-        $this->database->setQuery(
-            $this->database->getQuery(true)
-                ->insert('#__migrations')
-                ->columns('version')
-                ->values($version)
-        )->execute();
-    }
+	/**
+	 * Database connector
+	 *
+	 * @var  DatabaseDriver
+	 */
+	private $database;
+
+	/**
+	 * Filesystem adapter
+	 *
+	 * @var  Filesystem
+	 */
+	private $filesystem;
+
+	/**
+	 * Constructor
+	 *
+	 * @param   DatabaseDriver  $database    Database connector
+	 * @param   Filesystem      $filesystem  Filesystem adapter
+	 */
+	public function __construct(DatabaseDriver $database, Filesystem $filesystem)
+	{
+		$this->database   = $database;
+		$this->filesystem = $filesystem;
+	}
+
+	/**
+	 * Checks the migration status of the current installation
+	 *
+	 * @return  MigrationsStatus
+	 */
+	public function checkStatus(): MigrationsStatus
+	{
+		$response = new MigrationsStatus();
+
+		try {
+			// First get the list of applied migrations
+			$appliedMigrations = $this->database->setQuery(
+				$this->database->getQuery(true)
+					->select('version')
+					->from('#__migrations')
+			)->loadColumn();
+		} 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) {
+				throw $exception;
+			}
+
+			$response->tableExists = false;
+
+			return $response;
+		}
+
+		// Now get the list of all known migrations
+		$knownMigrations = [];
+
+		foreach ($this->filesystem->listContents() as $migrationFiles) {
+			$knownMigrations[] = $migrationFiles['filename'];
+		}
+
+		// Don't rely on file system ordering.
+		sort($knownMigrations);
+
+		// Validate all migrations are applied; the count and latest versions should match
+		if (\count($appliedMigrations) === \count($knownMigrations)) {
+			$appliedValues = array_values($appliedMigrations);
+			$knownValues   = array_values($knownMigrations);
+
+			$latestApplied = (int) end($appliedValues);
+			$latestKnown   = (int) end($knownValues);
+
+			// Versions match, good to go
+			if ($latestApplied === $latestKnown) {
+				$response->latest = true;
+
+				return $response;
+			}
+		}
+
+		// The system is not on the latest version, get the relevant data
+		$response->missingMigrations = \count($knownMigrations) - \count($appliedMigrations);
+		$response->currentVersion    = array_pop($appliedMigrations);
+		$response->latestVersion     = array_pop($knownMigrations);
+
+		return $response;
+	}
+
+	/**
+	 * Migrate the database
+	 *
+	 * @param   string|null  $version  Optional migration version to run
+	 *
+	 * @return  void
+	 */
+	public function migrateDatabase(?string $version = null): void
+	{
+		try {
+			// Determine the migrations to apply
+			$appliedMigrations = $this->database->setQuery(
+				$this->database->getQuery(true)
+					->select('version')
+					->from('#__migrations')
+			)->loadColumn();
+		} 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) {
+				throw $exception;
+			}
+
+			// If given a version, we can only execute it if it is the first migration, otherwise we've got other problems
+			if ($version !== null && $version !== '') {
+				$firstMigration = $this->filesystem->listContents()[0];
+
+				if ($firstMigration['filename'] !== $version) {
+					throw new CannotInitializeMigrationsException(
+						'The migrations have not yet been initialized and the first migration has not been given as the version to run.'
+					);
+				}
+			}
+
+			$appliedMigrations = [];
+		}
+
+		// If a version is specified, check if that migration is already applied and if not, run that one only
+		if ($version !== null && $version !== '') {
+			// If it's already applied, there's nothing to do here
+			if (\in_array($version, $appliedMigrations)) {
+				return;
+			}
+
+			$this->doMigration($version);
+
+			return;
+		}
+
+		// We need to check the known migrations and filter out the applied ones to know what to do
+		$knownMigrations = [];
+
+		foreach ($this->filesystem->listContents() as $migrationFiles) {
+			$knownMigrations[] = $migrationFiles['filename'];
+		}
+
+		foreach (array_diff($knownMigrations, $appliedMigrations) as $version) {
+			$this->doMigration($version);
+		}
+	}
+
+	/**
+	 * Perform the database migration for the specified version
+	 *
+	 * @param   string  $version  Migration version to run
+	 *
+	 * @return  void
+	 *
+	 * @throws  UnknownMigrationException
+	 * @throws  UnreadableFileException
+	 */
+	private function doMigration(string $version): void
+	{
+		$sqlFile = $version . '.sql';
+
+		if (!$this->filesystem->has($sqlFile)) {
+			throw new UnknownMigrationException($sqlFile);
+		}
+
+		$queries = $this->filesystem->read($sqlFile);
+
+		if ($queries === false) {
+			throw new UnreadableFileException(
+				sprintf(
+					'Could not read data from the %s SQL file, please update the database manually.',
+					$sqlFile
+				)
+			);
+		}
+
+		foreach (DatabaseDriver::splitSql($queries) as $query) {
+			$query = trim($query);
+
+			if (!empty($query)) {
+				$this->database->setQuery($query)->execute();
+			}
+		}
+
+		// Log the migration into the database
+		$this->database->setQuery(
+			$this->database->getQuery(true)
+				->insert('#__migrations')
+				->columns('version')
+				->values($version)
+		)->execute();
+	}
 }

Spacing +1 added lines, -1 removed lines

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

src/Database/MigrationsStatus.php

Indentation +30 added lines, -30 removed lines

@@ -14,38 +14,38 @@
  */
 class MigrationsStatus
 {
-    /**
-     * The currently applied migration version
-     *
-     * @var  string|null
-     */
-    public $currentVersion;
+	/**
+	 * The currently applied migration version
+	 *
+	 * @var  string|null
+	 */
+	public $currentVersion;
 
-    /**
-     * Is the database at the latest version?
-     *
-     * @var  boolean
-     */
-    public $latest = false;
+	/**
+	 * Is the database at the latest version?
+	 *
+	 * @var  boolean
+	 */
+	public $latest = false;
 
-    /**
-     * The newest available migration version
-     *
-     * @var  string|null
-     */
-    public $latestVersion;
+	/**
+	 * The newest available migration version
+	 *
+	 * @var  string|null
+	 */
+	public $latestVersion;
 
-    /**
-     * Count of the number of missing migrations
-     *
-     * @var  integer
-     */
-    public $missingMigrations = 0;
+	/**
+	 * Count of the number of missing migrations
+	 *
+	 * @var  integer
+	 */
+	public $missingMigrations = 0;
 
-    /**
-     * Does the migrations table even exist?
-     *
-     * @var  boolean
-     */
-    public $tableExists = true;
+	/**
+	 * Does the migrations table even exist?
+	 *
+	 * @var  boolean
+	 */
+	public $tableExists = true;
 }

src/WebApplication.php

Indentation +59 added lines, -59 removed lines

@@ -24,69 +24,69 @@
  */
 class WebApplication extends AbstractWebApplication
 {
-    /**
-     * The application's controller resolver.
-     *
-     * @var    ControllerResolverInterface
-     * @since  __DEPLOY_VERSION__
-     */
-    protected $controllerResolver;
+	/**
+	 * The application's controller resolver.
+	 *
+	 * @var    ControllerResolverInterface
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $controllerResolver;
 
-    /**
-     * The application's router.
-     *
-     * @var    Router
-     * @since  __DEPLOY_VERSION__
-     */
-    protected $router;
+	/**
+	 * The application's router.
+	 *
+	 * @var    Router
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $router;
 
-    /**
-     * Class constructor.
-     *
-     * @param   ControllerResolverInterface  $controllerResolver  The application's controller resolver
-     * @param   Router                       $router              The application's router
-     * @param   Input                        $input               An optional argument to provide dependency injection for the application's
-     *                                                            input object.
-     * @param   Registry                     $config              An optional argument to provide dependency injection for the application's
-     *                                                            config object.
-     * @param   WebClient                    $client              An optional argument to provide dependency injection for the application's
-     *                                                            client object.
-     * @param   ResponseInterface            $response            An optional argument to provide dependency injection for the application's
-     *                                                            response object.
-     *
-     * @since   __DEPLOY_VERSION__
-     */
-    public function __construct(
-        ControllerResolverInterface $controllerResolver,
-        Router $router,
-        Input $input = null,
-        Registry $config = null,
-        WebClient $client = null,
-        ResponseInterface $response = null
-    ) {
-        $this->controllerResolver = $controllerResolver;
-        $this->router             = $router;
+	/**
+	 * Class constructor.
+	 *
+	 * @param   ControllerResolverInterface  $controllerResolver  The application's controller resolver
+	 * @param   Router                       $router              The application's router
+	 * @param   Input                        $input               An optional argument to provide dependency injection for the application's
+	 *                                                            input object.
+	 * @param   Registry                     $config              An optional argument to provide dependency injection for the application's
+	 *                                                            config object.
+	 * @param   WebClient                    $client              An optional argument to provide dependency injection for the application's
+	 *                                                            client object.
+	 * @param   ResponseInterface            $response            An optional argument to provide dependency injection for the application's
+	 *                                                            response object.
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function __construct(
+		ControllerResolverInterface $controllerResolver,
+		Router $router,
+		Input $input = null,
+		Registry $config = null,
+		WebClient $client = null,
+		ResponseInterface $response = null
+	) {
+		$this->controllerResolver = $controllerResolver;
+		$this->router             = $router;
 
-        // Call the constructor as late as possible (it runs `initialise`).
-        parent::__construct($input, $config, $client, $response);
-    }
+		// Call the constructor as late as possible (it runs `initialise`).
+		parent::__construct($input, $config, $client, $response);
+	}
 
-    /**
-     * Method to run the application routines.
-     *
-     * @return  void
-     *
-     * @since   __DEPLOY_VERSION__
-     */
-    protected function doExecute(): void
-    {
-        $route = $this->router->parseRoute($this->get('uri.route'), $this->input->getMethod());
+	/**
+	 * Method to run the application routines.
+	 *
+	 * @return  void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected function doExecute(): void
+	{
+		$route = $this->router->parseRoute($this->get('uri.route'), $this->input->getMethod());
 
-        // Add variables to the input if not already set
-        foreach ($route->getRouteVariables() as $key => $value) {
-            $this->input->def($key, $value);
-        }
+		// Add variables to the input if not already set
+		foreach ($route->getRouteVariables() as $key => $value) {
+			$this->input->def($key, $value);
+		}
 
-        \call_user_func($this->controllerResolver->resolve($route));
-    }
+		\call_user_func($this->controllerResolver->resolve($route));
+	}
 }