Tests located outside of plugins have been manually converted, the others have been converted with custom Rector [0] rules and some manual fixes. rector.php: ``` <?php declare(strict_types=1); use Rector\Renaming\Rector\Name\RenameClassRector; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; use Rector\Core\ValueObject\PhpVersion; use Rector\Core\Configuration\Option; use Tuleap\ReplaceGuzzleClientCall; require_once __DIR__ . '/rules.php'; return static function (ContainerConfigurator $containerConfigurator): void { $parameters = $containerConfigurator->parameters(); $parameters->set(Option::BOOTSTRAP_FILES, [ __DIR__ . '/tests/rest/lib/bootstrap.php', ]); $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_74); $services = $containerConfigurator->services(); $services->set(Tuleap\ReplaceGuzzleResponse::class); $services->set(RenameClassRector::class) ->call( 'configure', [ [ RenameClassRector::OLD_TO_NEW_CLASSES => [ 'Guzzle\Http\Message\Response' => 'Psr\Http\Message\ResponseInterface', ], ] ] ); $services->set(ReplaceGuzzleClientCall::class); }; ``` rules.php: ``` <?php declare(strict_types=1); namespace Tuleap; use PhpParser\Node\Arg; use PhpParser\Node\Expr\ConstFetch; use PhpParser\Node\Expr\FuncCall; use PhpParser\Node\Expr\MethodCall; use PhpParser\Node\Expr\PropertyFetch; use PhpParser\Node\Name; use PhpParser\Node\Scalar\LNumber; use PhpParser\Node\Scalar\String_; use PHPStan\Type\ObjectType; use Rector\NodeTypeResolver\Node\AttributeKey; final class ReplaceGuzzleResponse extends \Rector\Core\Rector\AbstractRector { private \Rector\Defluent\NodeAnalyzer\FluentChainMethodCallNodeAnalyzer $fluent_chain_method_call_node_analyzer; public function __construct(\Rector\Defluent\NodeAnalyzer\FluentChainMethodCallNodeAnalyzer $fluent_chain_method_call_node_analyzer) { $this->fluent_chain_method_call_node_analyzer = $fluent_chain_method_call_node_analyzer; } public function getRuleDefinition(): \Symplify\RuleDocGenerator\ValueObject\RuleDefinition { throw new Exception("Not needed"); } public function getNodeTypes(): array { return [MethodCall::class]; } /** * @param MethodCall $node */ public function refactor(\PhpParser\Node $node) { if ($node->args === [] && $this->isName($node->name, 'json')) { return new FuncCall( new Name('json_decode'), [ new Arg(new MethodCall(new MethodCall($node->var, 'getBody'), 'getContents')), new Arg($this->nodeFactory->createTrue()), new Arg(new LNumber(512)), new ConstFetch(new Name('JSON_THROW_ON_ERROR')) ] ); } if ($this->isName($node->name, 'getBody') && isset($node->args[0]) && $node->args[0]->value instanceof ConstFetch && $node->args[0]->value->name->getFirst() === "true") { return new MethodCall(new MethodCall($node->var, 'getBody'), 'getContents'); } if ($this->isName($node->name, 'getHeader') && isset($node->args[0]) && $node->args[0]->value instanceof String_) { if ($node->args[0]->value->value === "Allow") { return $this->nodeFactory->createFuncCall( 'explode', [ ', ', $this->nodeFactory->createMethodCall( $node->var, 'getHeaderLine', ['Allow'] ) ] ); } return $this->nodeFactory->createMethodCall( $node->var, 'getHeader', $node->args ); } if ($this->isNames($node->name, ['normalize', 'toArray'])) { $chain_method_calls = $this->fluent_chain_method_call_node_analyzer->collectAllMethodCallsInChain($node); foreach ($chain_method_calls as $chainMethodCall) { if ($this->isNames($chainMethodCall->name, ['normalize', 'toArray'])) { continue; } $node = $this->refactor(new \PhpParser\Node\Expr\MethodCall($chainMethodCall->var, $chainMethodCall->name, $chainMethodCall->args)); } return $node; } return null; } } final class ReplaceGuzzleClientCall extends \Rector\Core\Rector\AbstractRector { public function getRuleDefinition(): \Symplify\RuleDocGenerator\ValueObject\RuleDefinition { throw new Exception("Not needed"); } public function getNodeTypes(): array { return [MethodCall::class]; } /** * @param MethodCall $node */ public function refactor(\PhpParser\Node $node) { if ($node->args === []) { return; } if (! $node->var instanceof PropertyFetch || $node->var->name->name !== 'client') { return; } if ($this->isName($node->name, 'get')) { return $this->getBaseRequest($node, 'GET'); } if ($this->isName($node->name, 'post')) { return $this->getRequestWithPossibleBody($node, 'POST'); } if ($this->isName($node->name, 'put')) { return $this->getRequestWithPossibleBody($node, 'PUT'); } if ($this->isName($node->name, 'patch')) { return $this->getRequestWithPossibleBody($node, 'PATCH'); } if ($this->isName($node->name, 'delete')) { return $this->getBaseRequest($node, 'DELETE'); } if ($this->isName($node->name, 'options')) { return $this->getBaseRequest($node, 'OPTIONS'); } return null; } private function getBaseRequest(MethodCall $current_node, string $method): MethodCall { return $this->nodeFactory->createMethodCall( $this->nodeFactory->createPropertyFetch('this', 'request_factory'), 'createRequest', [$method, $current_node->args[0]] ); } private function getRequestWithPossibleBody(MethodCall $current_node, string $method): MethodCall { $init_request = $this->getBaseRequest($current_node, $method); if (! isset($current_node->args[2])) { return $init_request; } $request_body = $this->nodeFactory->createMethodCall( $this->nodeFactory->createPropertyFetch('this', 'stream_factory'), 'createStream', [$current_node->args[2]] ); return $this->nodeFactory->createMethodCall($init_request, 'withBody', [$request_body]); } } ``` Part of request #21863: Run REST tests under PHP 8.0 [0] https://github.com/rectorphp/rector Change-Id: Icb9bce85d27a079cce2ef70447d058dcebafe3d4

+4444 −4408

Author

Thomas Gerbet (tgerbet) 2021-06-25 09:27

Committer

Thomas Gerbet (tgerbet) 2021-06-25 18:28

Hash 48752640e33b22f027d5638621703357f5e5c914

Parent d2940aaa8b2db00c10402274348048b6b79762ef

Reference git #tuleap/stable/48752640e33b22f027d5638621703357f5e5c914