Nosial/ncc
2
0
Fork 0
Code Issues 1 Pull requests Projects Releases 11 Packages Wiki Activity Actions

Improved PhpRunner.php

Browse source 
https://git.n64.cc/nosial/ncc/-/issues/32
This commit is contained in:
Netkas 2022-12-07 20:59:06 -05:00
parent a60981380f
commit 2842e63637
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/ncc/Classes/PhpExtension/PhpRunner.php
View file

@ -2,6 +2,7 @@
namespace ncc\Classes\PhpExtension; namespace ncc\Classes\PhpExtension;
use ncc\Abstracts\Runners;
use ncc\Exceptions\AccessDeniedException; use ncc\Exceptions\AccessDeniedException;
use ncc\Exceptions\FileNotFoundException; use ncc\Exceptions\FileNotFoundException;
use ncc\Exceptions\IOException; use ncc\Exceptions\IOException;
@ -10,10 +11,10 @@
use ncc\Objects\ExecutionPointers\ExecutionPointer; use ncc\Objects\ExecutionPointers\ExecutionPointer;
use ncc\Objects\Package\ExecutionUnit; use ncc\Objects\Package\ExecutionUnit;
use ncc\Objects\ProjectConfiguration\ExecutionPolicy; use ncc\Objects\ProjectConfiguration\ExecutionPolicy;
use ncc\ThirdParty\Symfony\Process\ExecutableFinder;
use ncc\ThirdParty\Symfony\Process\Process; use ncc\ThirdParty\Symfony\Process\Process;
use ncc\Utilities\Base64; use ncc\Utilities\Base64;
use ncc\Utilities\IO; use ncc\Utilities\IO;
use ncc\Utilities\PathFinder;
class PhpRunner implements RunnerInterface class PhpRunner implements RunnerInterface
{ {
@ -28,12 +29,11 @@
public static function processUnit(string $path, ExecutionPolicy $policy): ExecutionUnit public static function processUnit(string $path, ExecutionPolicy $policy): ExecutionUnit
{ {
$execution_unit = new ExecutionUnit(); $execution_unit = new ExecutionUnit();
$target_file = $path; if(!file_exists($path) && !is_file($path))
if(!file_exists($target_file) && !is_file($target_file)) throw new FileNotFoundException($path);
throw new FileNotFoundException($target_file);
$policy->Execute->Target = null; $policy->Execute->Target = null;
$execution_unit->ExecutionPolicy = $policy; $execution_unit->ExecutionPolicy = $policy;
$execution_unit->Data = Base64::encode(IO::fread($target_file)); $execution_unit->Data = Base64::encode(IO::fread($path));
return $execution_unit; return $execution_unit;
} }
@ -55,10 +55,7 @@
*/ */
public static function prepareProcess(ExecutionPointer $pointer): Process public static function prepareProcess(ExecutionPointer $pointer): Process
{ {
$php_bin = new ExecutableFinder(); $php_bin = PathFinder::findRunner(Runners::php);
$php_bin = $php_bin->find('php');
if($php_bin == null)
throw new RunnerExecutionException('Cannot locate PHP executable');
if($pointer->ExecutionPolicy->Execute->Options !== null && count($pointer->ExecutionPolicy->Execute->Options) > 0) if($pointer->ExecutionPolicy->Execute->Options !== null && count($pointer->ExecutionPolicy->Execute->Options) > 0)
return new Process(array_merge([$php_bin, $pointer->FilePointer], $pointer->ExecutionPolicy->Execute->Options)); return new Process(array_merge([$php_bin, $pointer->FilePointer], $pointer->ExecutionPolicy->Execute->Options));