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
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,18 @@ Changelog

## develop

BC Break:

- [rpc] All handlers must now be registered with the "name" attribute.

Features:

- [config] Support loading config from JSON files

Improvements:

- [rpc] Handlers are lazy loaded, improving the RPC baseline latency

## 2018-11-26 0.10.0

BC Break:
Expand Down
4 changes: 0 additions & 4 deletions bin/phpactor
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@ if (version_compare(PHP_VERSION, $minVersion) < 0) {

require_once $autoloadFile;

if (class_exists(Debug::class)) {
Debug::enable();
}

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this actually causes a performance issue.

$application = new Application(realpath(dirname($autoloadFile)));
$output = new ConsoleOutput();

Expand Down
28 changes: 14 additions & 14 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions lib/Extension/ClassMover/ClassMoverExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,20 +56,20 @@ private function registerRpc(ContainerBuilder $container)
$container->get('application.method_references'),
$container->get(SourceCodeFilesystemExtension::SERVICE_REGISTRY)
);
}, [ RpcExtension::TAG_RPC_HANDLER => [] ]);
}, [ RpcExtension::TAG_RPC_HANDLER => ['name' => ReferencesHandler::NAME] ]);

$container->register('class_mover.handler.copy_class', function (Container $container) {
return new ClassCopyHandler(
$container->get('application.class_copy')
);
}, [ 'rpc.handler' => [] ]);
}, [ 'rpc.handler' => ['name' => ClassCopyHandler::NAME] ]);

$container->register('class_mover.handler.move_class', function (Container $container) {
return new ClassMoveHandler(
$container->get('application.class_mover'),
SourceCodeFilesystemExtension::FILESYSTEM_GIT
);
}, [ RpcExtension::TAG_RPC_HANDLER => [] ]);
}, [ RpcExtension::TAG_RPC_HANDLER => [ 'name' => ClassMoveHandler::NAME ] ]);
}

private function registerClassMover(ContainerBuilder $container)
Expand Down
3 changes: 2 additions & 1 deletion lib/Extension/ClassMover/Rpc/ClassMoveHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ class ClassMoveHandler extends AbstractHandler
const PARAM_SOURCE_PATH = 'source_path';
const PARAM_DEST_PATH = 'dest_path';
const PARAM_CONFIRMED = 'confirmed';
const NAME = 'move_class';

/**
* @var ClassMover
Expand All @@ -37,7 +38,7 @@ public function __construct(ClassMover $classMove, string $defaultFilesystem)

public function name(): string
{
return 'move_class';
return self::NAME;
}

public function configure(Resolver $resolver)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public function load(ContainerBuilder $container)

$container->register('class_to_file_extra.rpc.handler.file_info', function (Container $container) {
return new FileInfoHandler($container->get('application.file_info'));
}, [ RpcExtension::TAG_RPC_HANDLER => [] ]);
}, [ RpcExtension::TAG_RPC_HANDLER => ['name' => FileInfoHandler::NAME] ]);
}

/**
Expand Down
24 changes: 12 additions & 12 deletions lib/Extension/CodeTransform/CodeTransformExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -321,75 +321,75 @@ private function registerRpc(ContainerBuilder $container)
return new ClassInflectHandler(
$container->get('application.class_inflect')
);
}, [ RpcExtension::TAG_RPC_HANDLER => [] ]);
}, [ RpcExtension::TAG_RPC_HANDLER => ['name' => ClassInflectHandler::NAME] ]);

$container->register('code_transform.rpc.handler.class_new', function (Container $container) {
return new ClassNewHandler(
$container->get('application.class_new')
);
}, [ RpcExtension::TAG_RPC_HANDLER => [] ]);
}, [ RpcExtension::TAG_RPC_HANDLER => ['name' => ClassNewHandler::NAME] ]);

$container->register('code_transform.rpc.handler.extract_constant', function (Container $container) {
return new ExtractConstantHandler(
$container->get('code_transform.refactor.extract_constant')
);
}, [ RpcExtension::TAG_RPC_HANDLER => [] ]);
}, [ RpcExtension::TAG_RPC_HANDLER => ['name' => ExtractConstantHandler::NAME] ]);

$container->register('code_transform.rpc.handler.extract_method', function (Container $container) {
return new ExtractMethodHandler(
$container->get('code_transform.refactor.extract_method')
);
}, [ RpcExtension::TAG_RPC_HANDLER => [] ]);
}, [ RpcExtension::TAG_RPC_HANDLER => ['name' => ExtractMethodHandler::NAME] ]);

$container->register('code_transform.rpc.handler.generate_accessor', function (Container $container) {
return new GenerateAccessorHandler(
$container->get('code_transform.refactor.generate_accessor')
);
}, [ RpcExtension::TAG_RPC_HANDLER => [] ]);
}, [ RpcExtension::TAG_RPC_HANDLER => ['name' => GenerateAccessorHandler::NAME] ]);

$container->register('code_transform.rpc.handler.generate_method', function (Container $container) {
return new GenerateMethodHandler(
$container->get('code_transform.refactor.generate_method')
);
}, [ RpcExtension::TAG_RPC_HANDLER => [] ]);
}, [ RpcExtension::TAG_RPC_HANDLER => ['name' => GenerateMethodHandler::NAME] ]);

$container->register('code_transform.rpc.handler.refactor.import_class', function (Container $container) {
return new ImportClassHandler(
$container->get('code_transform.refactor.class_import'),
$container->get('application.class_search'),
SourceCodeFilesystemExtension::FILESYSTEM_COMPOSER
);
}, [ RpcExtension::TAG_RPC_HANDLER => [] ]);
}, [ RpcExtension::TAG_RPC_HANDLER => ['name' => ImportClassHandler::NAME] ]);

$container->register('code_transform.rpc.handler.rename_variable', function (Container $container) {
return new RenameVariableHandler(
$container->get('code_transform.refactor.rename_variable')
);
}, [ RpcExtension::TAG_RPC_HANDLER => [] ]);
}, [ RpcExtension::TAG_RPC_HANDLER => ['name' => RenameVariableHandler::NAME] ]);

$container->register('code_transform.handler.change_visiblity', function (Container $container) {
return new ChangeVisiblityHandler(
$container->get('code_transform.refactor.change_visiblity')
);
}, [ RpcExtension::TAG_RPC_HANDLER => [] ]);
}, [ RpcExtension::TAG_RPC_HANDLER => ['name' => ChangeVisiblityHandler::NAME] ]);

$container->register('code_transform.rpc.handler.override_method', function (Container $container) {
return new OverrideMethodHandler(
$container->get(WorseReflectionExtension::SERVICE_REFLECTOR),
$container->get('code_transform.refactor.override_method')
);
}, [ RpcExtension::TAG_RPC_HANDLER => [] ]);
}, [ RpcExtension::TAG_RPC_HANDLER => ['name' => OverrideMethodHandler::NAME] ]);

$container->register('code_transform.rpc.handler.transform', function (Container $container) {
return new TransformHandler(
$container->get('code_transform.transform')
);
}, [ RpcExtension::TAG_RPC_HANDLER => [] ]);
}, [ RpcExtension::TAG_RPC_HANDLER => ['name' => TransformHandler::NAME] ]);

$container->register('code_transform.rpc.handler.extract_expression', function (Container $container) {
return new ExtractExpressionHandler(
$container->get('code_transform.refactor.extract_expression')
);
}, [ RpcExtension::TAG_RPC_HANDLER => [] ]);
}, [ RpcExtension::TAG_RPC_HANDLER => ['name' => ExtractExpressionHandler::NAME] ]);
}
}
3 changes: 2 additions & 1 deletion lib/Extension/CodeTransform/Rpc/ImportClassHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ class ImportClassHandler extends AbstractHandler
const PARAM_PATH = 'path';
const PARAM_ALIAS = 'alias';
const PARAM_QUALIFIED_NAME = 'qualified_name';
const NAME = 'import_class';

/**

Expand Down Expand Up @@ -53,7 +54,7 @@ public function __construct(

public function name(): string
{
return 'import_class';
return self::NAME;
}

public function configure(Resolver $resolver)
Expand Down
14 changes: 8 additions & 6 deletions lib/Extension/CodeTransform/Rpc/TransformHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

class TransformHandler implements Handler
{
const NAME = 'transform';

/**
* @var CodeTransform
*/
Expand All @@ -25,13 +27,13 @@ public function __construct(CodeTransform $codeTransform)

public function name(): string
{
return 'transform';
return self::NAME;
}

public function configure(Resolver $resolver)
{
$resolver->setDefaults([
'transform' => null,
self::NAME => null,
]);
$resolver->setRequired([
'path',
Expand All @@ -41,14 +43,14 @@ public function configure(Resolver $resolver)

public function handle(array $arguments)
{
if (null === $arguments['transform']) {
if (null === $arguments[self::NAME]) {
return $this->transformerChoiceAction($arguments['path'], $arguments['source']);
}

$code = SourceCode::fromStringAndPath($arguments['source'], $arguments['path']);

$transformedCode = $this->codeTransform->transform($code, [
$arguments['transform']
$arguments[self::NAME]
]);

return UpdateFileSourceResponse::fromPathOldAndNewSource(
Expand All @@ -67,14 +69,14 @@ private function transformerChoiceAction(string $path, string $source)
Request::fromNameAndParameters(
$this->name(),
[
'transform' => null,
self::NAME => null,
'path' => $path,
'source' => $source,
]
),
[
ChoiceInput::fromNameLabelChoicesAndDefault(
'transform',
self::NAME,
'Transform: ',
array_combine($transformers, $transformers)
)
Expand Down
2 changes: 1 addition & 1 deletion lib/Extension/CompletionExtra/CompletionExtraExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ private function registerRpc(ContainerBuilder $container)
$container->get(WorseReflectionExtension::SERVICE_REFLECTOR),
$container->get(CompletionExtension::SERVICE_FORMATTER)
);
}, [ RpcExtension::TAG_RPC_HANDLER => [] ]);
}, [ RpcExtension::TAG_RPC_HANDLER => ['name' => HoverHandler::NAME] ]);
}

private function registerCommands(ContainerBuilder $container)
Expand Down
3 changes: 2 additions & 1 deletion lib/Extension/ContextMenu/ContextMenuExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
use Phpactor\Container\Extension;
use Phpactor\Container\ContainerBuilder;
use Phpactor\Container\Container;
use Phpactor\Extension\Rpc\RpcExtension;
use Phpactor\Extension\WorseReflection\WorseReflectionExtension;
use Phpactor\MapResolver\Resolver;

Expand All @@ -25,7 +26,7 @@ public function load(ContainerBuilder $container)
json_decode(file_get_contents(__DIR__ . '/menu.json'), true),
$container
);
}, [ 'rpc.handler' => [] ]);
}, [ RpcExtension::TAG_RPC_HANDLER => ['name' => ContextMenuHandler::NAME] ]);
}

/**
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 @@ -129,15 +129,15 @@ private function registerRpc(ContainerBuilder $container)
{
$container->register('core.rpc.handler.cache_clear', function (Container $container) {
return new CacheClearHandler($container->get('application.cache_clear'));
}, [ RpcExtension::TAG_RPC_HANDLER => [] ]);
}, [ RpcExtension::TAG_RPC_HANDLER => ['name' => CacheClearHandler::NAME] ]);

$container->register('core.rpc.handler.status', function (Container $container) {
return new StatusHandler($container->get('application.status'), $container->get('config_loader.candidates'));
}, [ RpcExtension::TAG_RPC_HANDLER => [] ]);
}, [ RpcExtension::TAG_RPC_HANDLER => ['name' => StatusHandler::NAME] ]);

$container->register('core.rpc.handler.config', function (Container $container) {
return new ConfigHandler($container->getParameters());
}, [ RpcExtension::TAG_RPC_HANDLER => [] ]);
}, [ RpcExtension::TAG_RPC_HANDLER => ['name' => ConfigHandler::CONFIG] ]);
}

private function registerFilePathExpanders(ContainerBuilder $container)
Expand Down
4 changes: 2 additions & 2 deletions lib/Extension/Core/Rpc/CacheClearHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

class CacheClearHandler implements Handler
{
const CACHE_CLEAR = 'cache_clear';
const NAME = 'cache_clear';

/**
* @var CacheClear
Expand All @@ -23,7 +23,7 @@ public function __construct(CacheClear $cacheClear)

public function name(): string
{
return self::CACHE_CLEAR;
return self::NAME;
}

public function configure(Resolver $resolver)
Expand Down
Loading