Skip to content

test importing stuff #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
come-nc wants to merge 2 commits into from
Closed

test importing stuff #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1aec0c9
test importing stuff
come-nc Sep 18, 2024
fc45183
fix: WIP
come-nc Sep 18, 2024
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
3 changes: 2 additions & 1 deletion config/nextcloud-26/nextcloud-26-deprecations.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
declare(strict_types=1);

use ChristophWurst\Nextcloud\Rector\Rector\RenameUserIdRector;
use OCP\AppFramework\Http\Attribute\UseSession;
use Rector\Config\RectorConfig;
use Rector\Php80\Rector\Class_\AnnotationToAttributeRector;
use Rector\Php80\ValueObject\AnnotationToAttribute;
Expand All @@ -11,7 +12,7 @@
$rectorConfig->ruleWithConfiguration(
AnnotationToAttributeRector::class,
[
new AnnotationToAttribute('UseSession', 'OCP\AppFramework\Http\Attribute\UseSession'),
new AnnotationToAttribute('UseSession', UseSession::class),
],
);
$rectorConfig->rule(RenameUserIdRector::class);
Expand Down
43 changes: 42 additions & 1 deletion src/Rector/OcServerToOcpServerRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,27 @@
use PhpParser\Node\Expr\StaticCall;
use PhpParser\Node\Expr\StaticPropertyFetch;
use PhpParser\Node\Name\FullyQualified;
use Rector\Application\Provider\CurrentFileProvider;
use Rector\CodingStyle\Application\UseImportsAdder;
use Rector\CodingStyle\ClassNameImport\ClassNameImportSkipper;
use Rector\PostRector\Collector\UseNodesToAddCollector;
use Rector\Rector\AbstractRector;
use Rector\StaticTypeMapper\PhpParser\FullyQualifiedNodeMapper;
use Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;

class OcServerToOcpServerRector extends AbstractRector
{
public function __construct(
private UseImportsAdder $useImportsAdder,
private UseNodesToAddCollector $useNodesToAddCollector,
private FullyQualifiedNodeMapper $fullyQualifiedNodeMapper,
private ClassNameImportSkipper $classNameImportSkipper,
private CurrentFileProvider $currentFileProvider,
) {
}

/**
* @return array<class-string<Node>>
*/
Expand Down Expand Up @@ -52,8 +67,34 @@ public function refactor(Node $node): ?Node
return null;
}

$class = $node->args[0]->value->class;
$serverClass = new FullyQualifiedObjectType('OCP\Server');
$serverClassNode = new FullyQualified('OCP\Server');
$file = $this->currentFileProvider->getFile();
if ($class !== null) {
$staticType = $this->fullyQualifiedNodeMapper->mapToPHPStan($class);
if (!$staticType instanceof FullyQualifiedObjectType) {
return null;
}
if (!$this->classNameImportSkipper->shouldSkipNameForFullyQualifiedObjectType($file, $class, $staticType)) {
$this->useNodesToAddCollector->addUseImport($staticType);
$node->args[0]->value->class = $staticType->getShortNameNode();
}
}
if (
!$this->classNameImportSkipper->shouldSkipNameForFullyQualifiedObjectType(
$file,
$serverClassNode,
$serverClass,
)
) {
$this->useNodesToAddCollector->addUseImport($serverClass);
$serverClassNode = $serverClass->getShortNameNode();
}
$this->useNodesToAddCollector->addUseImport($serverClass);

return new StaticCall(
new FullyQualified('OCP\Server'),
$serverClassNode,
'get',
$node->args,
);
Expand Down
9 changes: 5 additions & 4 deletions tests/Rector/OcServerToOcpServerRector/Fixture/test_fixture.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class SomeClass
{
$request1 = \OC::$server->get(IRequest::class);
$request2 = \OC::$server->get('\OCP\IRequest');
$request3 = OC::$server->get(IRequest::class);
$request3 = OC::$server->get(\OCP\IRequest::class);
}
}

Expand All @@ -21,16 +21,17 @@ class SomeClass

namespace ChristophWurst\Nextcloud\Rector\Test\Rector\OcServerToOcpServerRector\Fixture;

use OCP\Server;
use OC;
use OCP\IRequest;

class SomeClass
{
public function foo()
{
$request1 = \OCP\Server::get(IRequest::class);
$request2 = \OCP\Server::get('\OCP\IRequest');
$request3 = \OCP\Server::get(IRequest::class);
$request1 = Server::get(IRequest::class);
$request2 = Server::get('\OCP\IRequest');
$request3 = Server::get(IRequest::class);
}
}

Expand Down
13 changes: 10 additions & 3 deletions tests/Set/Fixture/test_fixture.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ namespace ChristophWurst\Nextcloud\Rector\Test\Set\Fixture;

use OC;
use OCP\IRequest;
use OCA\Some\Plugin;

class SomeClass
{
Expand All @@ -12,6 +13,8 @@ class SomeClass
$request1 = \OC::$server->get(IRequest::class);
$request2 = \OC::$server->get('\OCP\IRequest');
$request3 = OC::$server->get(IRequest::class);
$request4 = OC::$server->get(\OCP\IRequest::class);
$plugin = OC::$server->get(\OCP\Other\Plugin::class);
script('mail', 'mail');
}
}
Expand All @@ -22,16 +25,20 @@ class SomeClass

namespace ChristophWurst\Nextcloud\Rector\Test\Set\Fixture;

use OCP\Server;
use OC;
use OCP\IRequest;
use OCA\Some\Plugin;

class SomeClass
{
public function foo()
{
$request1 = \OCP\Server::get(IRequest::class);
$request2 = \OCP\Server::get('\OCP\IRequest');
$request3 = \OCP\Server::get(IRequest::class);
$request1 = Server::get(IRequest::class);
$request2 = Server::get('\OCP\IRequest');
$request3 = Server::get(IRequest::class);
$request4 = Server::get(IRequest::class);
$plugin = Server::get(\OCP\Other\Plugin::class);
\OCP\Util::addScript('mail', 'mail', 'core');
}
}
Expand Down