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: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -386,11 +386,11 @@ Also returns JSON with `--format=json`
Packages
--------

- [phpactor/class-to-file](https://github.com/phpactor/class-to-file): Convert files to class names and vice-versa.
- [phpactor/class-mover](https://github.com/phpactor/class-mover): Find and update class references.
- [phpactor/source-code-filesystem](https://github.com/phpactor/source-code-filesystem): Find and manage source code files.
- [phpactor/type-inference](https://github.com/phpactor/type-inference): Determine type of thing at a given offset.
- [phpactor/class-to-file](https://github.com/phpactor/class-to-file): Convert files to class names and vice-versa.
- [phpactor/code-builder](https://github.com/phpactor/code-builder): Library for creating and idempotently updating source code.
- [phpactor/code-transform](https://github.com/phpactor/code-transform): Transform code.
- [phpactor/source-code-filesystem](https://github.com/phpactor/source-code-filesystem): Find and manage source code files.
- [phpactor/worse-reflection](https://github.com/phpactor/worse-reflection): Lightweight class reflection API

About this project
Expand All @@ -402,7 +402,7 @@ IDEs such as PHPStorm.
One of the interesting things about Phpactor is that it does not require any
indexing before it is used. It leverages the Composer to determine class
locations and to determine class FQNs from file locations. Introspection is
done in realtime (using the excellent [Tolerant PHP
done in realtime using [Worse Reflection](https://github.com/phpactor/worse-reflection) (which is based on the excellent [Tolerant PHP
Parser](https://github.com/Microsoft/tolerant-php-parser).

Using Composer we can locate a file using a fully qualified class name, when
Expand Down
8 changes: 0 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,13 @@
"type": "vcs",
"url": "git@github.com:phpactor/code-builder"
},
{
"type": "vcs",
"url": "git@github.com:phpactor/class-to-file"
},
{
"type": "vcs",
"url": "git@github.com:phpactor/source-code-filesystem"
},
{
"type": "vcs",
"url": "git@github.com:phpactor/worse-reflection"
},
{
"type": "vcs",
"url": "git@github.com:phpactor/type-inference"
}
],
"require": {
Expand Down
74 changes: 34 additions & 40 deletions composer.lock

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

14 changes: 7 additions & 7 deletions lib/Application/ClassReflector.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
namespace Phpactor\Application;

use Phpactor\Application\Helper\ClassFileNormalizer;
use Phpactor\WorseReflection\ClassName;
use Phpactor\WorseReflection\Core\ClassName;
use Phpactor\WorseReflection\Reflector;
use Phpactor\WorseReflection\Type;
use Phpactor\WorseReflection\Reflection\ReflectionClass;
use Phpactor\WorseReflection\Reflection\ReflectionMethod;
use Phpactor\WorseReflection\Reflection\ReflectionProperty;
use Phpactor\WorseReflection\Reflection\ReflectionConstant;
use Phpactor\WorseReflection\Reflection\ReflectionParameter;
use Phpactor\WorseReflection\Core\Type;
use Phpactor\WorseReflection\Core\Reflection\ReflectionClass;
use Phpactor\WorseReflection\Core\Reflection\ReflectionMethod;
use Phpactor\WorseReflection\Core\Reflection\ReflectionProperty;
use Phpactor\WorseReflection\Core\Reflection\ReflectionConstant;
use Phpactor\WorseReflection\Core\Reflection\ReflectionParameter;

class ClassReflector
{
Expand Down
14 changes: 7 additions & 7 deletions lib/Application/Complete.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
namespace Phpactor\Application;

use Phpactor\WorseReflection\Reflector;
use Phpactor\WorseReflection\SourceCode;
use Phpactor\WorseReflection\Offset;
use Phpactor\WorseReflection\Core\SourceCode;
use Phpactor\WorseReflection\Core\Offset;
use Phpactor\Application\Helper\FilesystemHelper;
use Phpactor\WorseReflection\ClassName;
use Phpactor\WorseReflection\Reflection\ReflectionClass;
use Phpactor\WorseReflection\Reflection\ReflectionMethod;
use Phpactor\WorseReflection\Reflection\ReflectionParameter;
use Phpactor\WorseReflection\Reflection\ReflectionProperty;
use Phpactor\WorseReflection\Core\ClassName;
use Phpactor\WorseReflection\Core\Reflection\ReflectionClass;
use Phpactor\WorseReflection\Core\Reflection\ReflectionMethod;
use Phpactor\WorseReflection\Core\Reflection\ReflectionParameter;
use Phpactor\WorseReflection\Core\Reflection\ReflectionProperty;

class Complete
{
Expand Down
8 changes: 4 additions & 4 deletions lib/Application/FileInfoAtOffset.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
namespace Phpactor\Application;

use Phpactor\ClassFileConverter\Domain\ClassName;
use Phpactor\TypeInference\Domain\InferredType;
use Phpactor\ClassFileConverter\Domain\ClassToFileFileToClass;
use Phpactor\WorseReflection\Reflector;
use Phpactor\WorseReflection\SourceCode;
use Phpactor\WorseReflection\Offset;
use Phpactor\WorseReflection\Core\SourceCode;
use Phpactor\WorseReflection\Core\Offset;
use Phpactor\WorseReflection\Core\Type;

final class FileInfoAtOffset
{
Expand Down Expand Up @@ -69,7 +69,7 @@ public function infoForOffset(string $sourcePath, int $offset, $showFrame = fals
$return['frame'] = $frame;
}

if (InferredType::unknown() == $result->value()->type()) {
if (Type::unknown() === $result->value()->type()) {
return $return;
}

Expand Down
9 changes: 0 additions & 9 deletions lib/Container/CoreExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
use Phpactor\Filesystem\Domain\ChainFileListProvider;
use Phpactor\Filesystem\Domain\Cwd;
use Phpactor\Filesystem\Domain\FilePath;
use Phpactor\TypeInference\Adapter\ClassToFile\ClassToFileSourceCodeLoader;
use Phpactor\UserInterface\Console\Command\ClassCopyCommand;
use Phpactor\UserInterface\Console\Command\ClassMoveCommand;
use Phpactor\UserInterface\Console\Command\ClassReflectorCommand;
Expand Down Expand Up @@ -67,7 +66,6 @@ public function load(Container $container)
$this->registerComposer($container);
$this->registerClassToFile($container);
$this->registerClassMover($container);
$this->registerTypeInference($container);
$this->registerSourceCodeFilesystem($container);
$this->registerApplicationServices($container);
}
Expand Down Expand Up @@ -262,13 +260,6 @@ private function registerSourceCodeFilesystem(Container $container)
});
}

private function registerTypeInference(Container $container)
{
$container->register('type_inference.source_code_loader', function (Container $container) {
return new ClassToFileSourceCodeLoader($container->get('class_to_file.converter'));
});
}

private function registerApplicationServices(Container $container)
{
$container->register('application.class_mover', function (Container $container) {
Expand Down
Loading