Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
use Phpactor\Extension\CodeTransform\CodeTransformExtension;
use Phpactor\Extension\Core\CoreExtension;
use Phpactor\Extension\Logger\LoggingExtension;
use Phpactor\Extension\Php\Model\PhpVersionResolver;
use Phpactor\Extension\Rpc\RpcExtension;
use Phpactor\Extension\Console\ConsoleExtension;
use Phpactor\Extension\SourceCodeFilesystem\SourceCodeFilesystemExtension;
Expand Down Expand Up @@ -194,7 +195,7 @@ private function registerRenderer(ContainerBuilder $container)
return $resolver->resolve($path);
}, $templatePaths);

$phpVersion = $container->getParameter(CoreExtension::PARAM_PHP_VERSION);
$phpVersion = $container->get(PhpVersionResolver::class)->resolve();
$paths = (new PhpVersionPathResolver($phpVersion))->resolve($resolvedTemplatePaths);

foreach ($paths as $path) {
Expand Down
9 changes: 9 additions & 0 deletions lib/Extension/Core/Application/Status.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace Phpactor\Extension\Core\Application;

use Phpactor\ConfigLoader\Core\PathCandidates;
use Phpactor\Extension\Php\Model\PhpVersionResolver;
use Phpactor\Extension\SourceCodeFilesystem\SourceCodeFilesystemExtension;
use Phpactor\Filesystem\Domain\FilesystemRegistry;
use Symfony\Component\Process\ExecutableFinder;
Expand Down Expand Up @@ -30,16 +31,23 @@ class Status
*/
private $workingDirectory;

/**
* @var PhpVersionResolver
*/
private $phpVersionResolver;

public function __construct(
FilesystemRegistry $registry,
PathCandidates $paths,
string $workingDirectory,
PhpVersionResolver $phpVersionResolver,
ExecutableFinder $executableFinder = null
) {
$this->registry = $registry;
$this->executableFinder = $executableFinder ?: new ExecutableFinder();
$this->paths = $paths;
$this->workingDirectory = $workingDirectory;
$this->phpVersionResolver = $phpVersionResolver;
}

public function check(): array
Expand All @@ -48,6 +56,7 @@ public function check(): array
$diagnostics = [
'filesystems' => $filesystems,
'cwd' => $this->workingDirectory,
'php_version' => $this->phpVersionResolver->resolve(),
'config_files' => [],
'good' => [],
'bad' => [],
Expand Down
6 changes: 3 additions & 3 deletions lib/Extension/Core/CoreExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
use Phpactor\Extension\Core\Rpc\CacheClearHandler;
use Phpactor\Extension\Core\Rpc\ConfigHandler;
use Phpactor\Extension\Core\Rpc\StatusHandler;
use Phpactor\Extension\Php\Model\PhpVersionResolver;
use Phpactor\Extension\Rpc\RpcExtension;
use Phpactor\FilePathResolverExtension\FilePathResolverExtension;
use Phpactor\Extension\Core\Console\Dumper\DumperRegistry;
Expand Down Expand Up @@ -34,15 +35,13 @@ class CoreExtension implements Extension
const PARAM_DUMPER = 'console_dumper_default';
const PARAM_XDEBUG_DISABLE = 'xdebug_disable';
const PARAM_COMMAND = 'command';
const PARAM_PHP_VERSION = 'core.php_version';

public function configure(Resolver $schema)
{
$schema->setDefaults([
self::PARAM_DUMPER => 'indented',
self::PARAM_XDEBUG_DISABLE => true,
self::PARAM_COMMAND => null,
self::PARAM_PHP_VERSION => phpversion(),
]);
}

Expand Down Expand Up @@ -123,7 +122,8 @@ private function registerApplicationServices(Container $container)
return new Status(
$container->get('source_code_filesystem.registry'),
$container->get('config_loader.candidates'),
$container->get(FilePathResolverExtension::SERVICE_FILE_PATH_RESOLVER)->resolve('%project_root%')
$container->get(FilePathResolverExtension::SERVICE_FILE_PATH_RESOLVER)->resolve('%project_root%'),
$container->get(PhpVersionResolver::class)
);
});
}
Expand Down
2 changes: 2 additions & 0 deletions lib/Extension/Core/Rpc/StatusHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ public function handle(array $arguments)
'Info',
'----',
'Version: ' . $diagnostics['phpactor_version'],
'PHP: ' . sprintf('%s (supporting %s)', phpversion(), $diagnostics['php_version']),
'Phpactor dir: ' . realpath(__DIR__ . '/../../../../'),
'Work dir: ' . $diagnostics['cwd'] . PHP_EOL,
'Diagnostics',
'-----------',
Expand Down
37 changes: 37 additions & 0 deletions lib/Extension/Php/Model/ChainResolver.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?php

namespace Phpactor\Extension\Php\Model;

use RuntimeException;

class ChainResolver implements PhpVersionResolver
{
/**
* @var PhpVersionResolver[]
*/
private $versionResolvers;

public function __construct(PhpVersionResolver ...$versionResolvers)
{
$this->versionResolvers = $versionResolvers;
}

/**
* {@inheritDoc}
*/
public function resolve(): ?string
{
foreach ($this->versionResolvers as $versionResolver) {
if (!$version = $versionResolver->resolve()) {
continue;
}

return $version;
}

throw new RuntimeException(sprintf(
'%s resolvers could not resolve PHP version',
count($this->versionResolvers)
));
}
}
44 changes: 44 additions & 0 deletions lib/Extension/Php/Model/ComposerPhpVersionResolver.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?php

namespace Phpactor\Extension\Php\Model;

class ComposerPhpVersionResolver implements PhpVersionResolver
{
/**
* @var string
*/
private $composerJsonPath;

public function __construct(string $composerJsonPath)
{
$this->composerJsonPath = $composerJsonPath;
}

/**
* {@inheritDoc}
*/
public function resolve(): ?string
{
if (!file_exists($this->composerJsonPath)) {
return null;
}

if (!$contents = file_get_contents($this->composerJsonPath)) {
return null;
}

if (!$json = json_decode($contents, true)) {
return null;
}

if (isset($json['config']['platform']['php'])) {
return $json['config']['platform']['php'];
}

if (isset($json['require']['php'])) {
return preg_replace('/[^0-9.]/', '', $json['require']['php']);
}

return null;
}
}
24 changes: 24 additions & 0 deletions lib/Extension/Php/Model/ConstantPhpVersionResolver.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?php

namespace Phpactor\Extension\Php\Model;

class ConstantPhpVersionResolver implements PhpVersionResolver
{
/**
* @var string|null
*/
private $version;

public function __construct(?string $version)
{
$this->version = $version;
}

/**
* {@inheritDoc}
*/
public function resolve(): ?string
{
return $this->version;
}
}
11 changes: 11 additions & 0 deletions lib/Extension/Php/Model/PhpVersionResolver.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?php

namespace Phpactor\Extension\Php\Model;

interface PhpVersionResolver
{
/**
* @return string
*/
public function resolve(): ?string;
}
16 changes: 16 additions & 0 deletions lib/Extension/Php/Model/RuntimePhpVersionResolver.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?php

namespace Phpactor\Extension\Php\Model;

use Phpactor\Extension\Php\Model\PhpVersionResolver;

class RuntimePhpVersionResolver implements PhpVersionResolver
{
/**
* {@inheritDoc}
*/
public function resolve(): ?string
{
return phpversion();
}
}
46 changes: 46 additions & 0 deletions lib/Extension/Php/PhpExtension.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<?php

namespace Phpactor\Extension\Php;

use Phpactor\Container\Container;
use Phpactor\Container\ContainerBuilder;
use Phpactor\Container\Extension;
use Phpactor\Extension\Php\Model\ChainResolver;
use Phpactor\Extension\Php\Model\ComposerPhpVersionResolver;
use Phpactor\Extension\Php\Model\ConstantPhpVersionResolver;
use Phpactor\Extension\Php\Model\PhpVersionResolver;
use Phpactor\Extension\Php\Model\RuntimePhpVersionResolver;
use Phpactor\FilePathResolverExtension\FilePathResolverExtension;
use Phpactor\MapResolver\Resolver;

class PhpExtension implements Extension
{
const PARAM_VERSION = 'php.version';

/**
* {@inheritDoc}
*/
public function load(ContainerBuilder $container)
{
$container->register(PhpVersionResolver::class, function (Container $container) {
$pathResolver = $container->get(FilePathResolverExtension::SERVICE_FILE_PATH_RESOLVER);
$composerPath = $pathResolver->resolve('%project_root%/composer.json');

return new ChainResolver(
new ConstantPhpVersionResolver($container->getParameter(self::PARAM_VERSION)),
new ComposerPhpVersionResolver($composerPath),
new RuntimePhpVersionResolver()
);
});
}

/**
* {@inheritDoc}
*/
public function configure(Resolver $schema)
{
$schema->setDefaults([
self::PARAM_VERSION => null
]);
}
}
2 changes: 2 additions & 0 deletions lib/Phpactor.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
use Phpactor\Extension\Console\ConsoleExtension;
use Phpactor\Extension\ClassToFile\ClassToFileExtension;
use Phpactor\Extension\Logger\LoggingExtension;
use Phpactor\Extension\Php\PhpExtension;
use Phpactor\Extension\ComposerAutoloader\ComposerAutoloaderExtension;
use Phpactor\MapResolver\Resolver;
use Phpactor\Container\Extension;
Expand Down Expand Up @@ -94,6 +95,7 @@ public static function boot(InputInterface $input, string $vendorDir): PhpactorC
WorseReferenceFinderExtension::class,
ReferenceFinderRpcExtension::class,
ReferenceFinderExtension::class,
PhpExtension::class,
];

if (file_exists($config[ExtensionManagerExtension::PARAM_INSTALLED_EXTENSIONS_FILE])) {
Expand Down
15 changes: 14 additions & 1 deletion tests/Unit/Extension/Core/Application/StatusTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use PHPUnit\Framework\TestCase;
use Phpactor\ConfigLoader\Core\PathCandidates;
use Phpactor\Extension\Php\Model\PhpVersionResolver;
use Phpactor\Extension\SourceCodeFilesystem\SourceCodeFilesystemExtension;
use Phpactor\Filesystem\Domain\FilesystemRegistry;
use Phpactor\Extension\Core\Application\Status;
Expand All @@ -15,11 +16,23 @@ class StatusTest extends TestCase
*/
private $registry;

/**
* @var ObjectProphecy
*/
private $resolver;

/**
* @var PathCandidates
*/
private $paths;


public function setUp()
{
$this->registry = $this->prophesize(FilesystemRegistry::class);
$this->resolver = $this->prophesize(PhpVersionResolver::class);
$this->paths = new PathCandidates([]);
$this->status = new Status($this->registry->reveal(), $this->paths, '/path/to/here');
$this->status = new Status($this->registry->reveal(), $this->paths, '/path/to/here', $this->resolver->reveal());
}

public function testStatusNoComposerOrGit()
Expand Down
1 change: 1 addition & 0 deletions tests/Unit/Extension/Core/Rpc/StatusHandlerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ public function createHandler(): Handler
public function testStatus()
{
$this->status->check()->willReturn([
'php_version' => '7.1',
'phpactor_version' => 'version one',
'cwd' => '/path/to/here',
'good' => [ 'i am good' ],
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?php

namespace Phpactor\Tests\Unit\Extension\PhpVersionResolver\Model;

use PHPUnit\Framework\TestCase;
use Phpactor\Extension\Php\Model\ChainResolver;
use Phpactor\Extension\Php\Model\PhpVersionResolver;
use RuntimeException;

class ChainResolverTest extends TestCase
{
public function testThrowsExceptionIfNoVeresionCanBeResolved()
{
$this->expectException(RuntimeException::class);
(new ChainResolver())->resolve();
}

public function testResolvesVersion()
{
$resolver = $this->prophesize(PhpVersionResolver::class);
$resolver->resolve()->willReturn('7.1');
self::assertEquals('7.1', (new ChainResolver($resolver->reveal()))->resolve());
}
}
Loading