github-mirror/framework
github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-04-25 22:24:04 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

chore(package-manager): config composer to use web php version

Browse Source 
Signed-off-by: Sami Mazouz <sychocouldy@gmail.com>
This commit is contained in:
Sami Mazouz 2022-09-15 11:07:08 +01:00
parent f6761843b2
commit fd196454a5
No known key found for this signature in database
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
extensions/package-manager/src/Composer/ComposerAdapter.php
View File

@ -9,6 +9,7 @@
namespace Flarum\PackageManager\Composer;
use Composer\Config;
use Composer\Console\Application;
use Flarum\Foundation\Paths;
use Flarum\PackageManager\OutputLogger;
@ -70,4 +71,9 @@ class ComposerAdapter
return new ComposerOutput($exitCode, $output);
}
public static function setPhpVersion(string $phpVersion)
{
Config::$defaultConfig['platform']['php'] = $phpVersion;
}
}

12
extensions/package-manager/src/Job/ComposerCommandJob.php
View File

@ -11,6 +11,7 @@ namespace Flarum\PackageManager\Job;
use Flarum\Bus\Dispatcher;
use Flarum\PackageManager\Command\BusinessCommandInterface;
use Flarum\PackageManager\Composer\ComposerAdapter;
use Flarum\Queue\AbstractJob;
use Illuminate\Queue\Middleware\WithoutOverlapping;
use Throwable;
@ -23,11 +24,11 @@ class ComposerCommandJob extends AbstractJob
protected $command;
/**
* @var int[]
* @var string
*/
protected $phpVersion;
public function __construct(BusinessCommandInterface $command, array $phpVersion)
public function __construct(BusinessCommandInterface $command, string $phpVersion)
{
$this->command = $command;
$this->phpVersion = $phpVersion;
@ -36,12 +37,7 @@ class ComposerCommandJob extends AbstractJob
public function handle(Dispatcher $bus)
{
try {
if ([PHP_MAJOR_VERSION, PHP_MINOR_VERSION] !== [$this->phpVersion[0], $this->phpVersion[1]]) {
$webPhpVersion = implode('.', $this->phpVersion);
$sshPhpVersion = implode('.', [PHP_MAJOR_VERSION, PHP_MINOR_VERSION]);
throw new \Exception("PHP version mismatch. SSH PHP version must match web server PHP version. Found SSH (PHP $sshPhpVersion) and Web Server (PHP $webPhpVersion).");
}
ComposerAdapter::setPhpVersion($this->phpVersion);
$this->command->task->start();

2
extensions/package-manager/src/Job/Dispatcher.php
View File

@ -73,7 +73,7 @@ class Dispatcher
$command->task = $task;
$this->queue->push(
new ComposerCommandJob($command, [PHP_MAJOR_VERSION, PHP_MINOR_VERSION])
new ComposerCommandJob($command, PHP_VERSION)
);
} else {
$data = $this->bus->dispatch($command);