Skip to content

Commit

Permalink
Fix .env support when running from phar archive
Browse files Browse the repository at this point in the history
With this changes, the moodle-plugin-ci execution
will be able to find a .env file in the same directory
that the .phar file containing it.

That way install will be able to create that file and
the rest of commands will access to that information
via dotenv, avoiding to have to export any env variable
manually for phar-based executions.
  • Loading branch information
stronk7 committed Sep 11, 2023
1 parent bfa22ca commit dd24266
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 2 deletions.
11 changes: 10 additions & 1 deletion bin/moodle-plugin-ci
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,16 @@ if (file_exists(__DIR__ . '/../../../autoload.php')) {
define('MOODLE_PLUGIN_CI_VERSION', '4.1.3');

define('MOODLE_PLUGIN_CI_BOXED', '@is_boxed@');
define('ENV_FILE', dirname(__DIR__) . '/.env');

// If we are running moodle-plugin-ci within a PHAR, we need to set the
// path to the dotenv file differently.
if (\Phar::running() !== '') {
// The .env file is in the same directory than the phar.
define('ENV_FILE', dirname(\Phar::running(false)) . '/.env');
} else {
// The .env file is in the root directory of the moodle-plugin-ci project.
define('ENV_FILE', dirname(__DIR__) . '/.env');
}

if (file_exists(ENV_FILE)) {
// Use this file because PHP cannot write to the environment.
Expand Down
5 changes: 5 additions & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).
The format of this change log follows the advice given at [Keep a CHANGELOG](http://keepachangelog.com).

## [Unreleased]
### Fixed
- Fix the `.env` support when running from within the PHAR archive.
- Fix the `mustache` command to work from within the PHAR archive.
- Fix the `phpcs` and `phpcbf` commands to work from within the PHAR archive.

## [4.1.3] - 2023-09-08
### Changed
- Updated project dependencies to current [moodle-cs](https://github.com/moodlehq/moodle-cs), [moodle-local_moodlecheck](https://github.com/moodlehq/moodle-local_moodlecheck) and [moodle-local_ci](https://github.com/moodlehq/moodle-local_ci) versions. Also, to various internal / development tools.
Expand Down
2 changes: 1 addition & 1 deletion src/Command/AbstractPluginCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ protected function configure(): void

protected function initialize(InputInterface $input, OutputInterface $output): void
{
if (!isset($this->plugin)) {
if (!isset($this->plugin) && $input->getArgument('plugin') !== null) {
$validate = new Validate();
$pluginDir = realpath($validate->directory($input->getArgument('plugin')));
$this->plugin = new MoodlePlugin($pluginDir);
Expand Down

0 comments on commit dd24266

Please sign in to comment.