Rector 0.11.7

This commit is contained in:
Tomas Votruba 2021-05-29 19:51:43 +00:00
parent 57270b99f9
commit d009bac6f0
13 changed files with 43 additions and 34 deletions

2
vendor/autoload.php vendored
View File

@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInitd8b9023238cc1a1d5c6c0b1c50f1da32::getLoader();
return ComposerAutoloaderInitb03907ce8f77d8a6e3d4f5730e144d84::getLoader();

File diff suppressed because one or more lines are too long

View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInitd8b9023238cc1a1d5c6c0b1c50f1da32
class ComposerAutoloaderInitb03907ce8f77d8a6e3d4f5730e144d84
{
private static $loader;
@ -22,15 +22,15 @@ class ComposerAutoloaderInitd8b9023238cc1a1d5c6c0b1c50f1da32
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInitd8b9023238cc1a1d5c6c0b1c50f1da32', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInitb03907ce8f77d8a6e3d4f5730e144d84', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
spl_autoload_unregister(array('ComposerAutoloaderInitd8b9023238cc1a1d5c6c0b1c50f1da32', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInitb03907ce8f77d8a6e3d4f5730e144d84', 'loadClassLoader'));
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) {
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInitd8b9023238cc1a1d5c6c0b1c50f1da32::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInitb03907ce8f77d8a6e3d4f5730e144d84::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
@ -42,19 +42,19 @@ class ComposerAutoloaderInitd8b9023238cc1a1d5c6c0b1c50f1da32
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInitd8b9023238cc1a1d5c6c0b1c50f1da32::$files;
$includeFiles = Composer\Autoload\ComposerStaticInitb03907ce8f77d8a6e3d4f5730e144d84::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequired8b9023238cc1a1d5c6c0b1c50f1da32($fileIdentifier, $file);
composerRequireb03907ce8f77d8a6e3d4f5730e144d84($fileIdentifier, $file);
}
return $loader;
}
}
function composerRequired8b9023238cc1a1d5c6c0b1c50f1da32($fileIdentifier, $file)
function composerRequireb03907ce8f77d8a6e3d4f5730e144d84($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;

View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInitd8b9023238cc1a1d5c6c0b1c50f1da32
class ComposerStaticInitb03907ce8f77d8a6e3d4f5730e144d84
{
public static $files = array (
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@ -3824,9 +3824,9 @@ class ComposerStaticInitd8b9023238cc1a1d5c6c0b1c50f1da32
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInitd8b9023238cc1a1d5c6c0b1c50f1da32::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitd8b9023238cc1a1d5c6c0b1c50f1da32::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitd8b9023238cc1a1d5c6c0b1c50f1da32::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInitb03907ce8f77d8a6e3d4f5730e144d84::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitb03907ce8f77d8a6e3d4f5730e144d84::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitb03907ce8f77d8a6e3d4f5730e144d84::$classMap;
}, null, ClassLoader::class);
}

View File

@ -1751,17 +1751,17 @@
},
{
"name": "ssch\/typo3-rector",
"version": "v0.11.11",
"version_normalized": "0.11.11.0",
"version": "v0.11.12",
"version_normalized": "0.11.12.0",
"source": {
"type": "git",
"url": "https:\/\/github.com\/sabbelasichon\/typo3-rector.git",
"reference": "2f10936c81b151242a8824c75a733fffda8415b5"
"reference": "53ee84672595ffe851fa3de582fbf4d6299da493"
},
"dist": {
"type": "zip",
"url": "https:\/\/api.github.com\/repos\/sabbelasichon\/typo3-rector\/zipball\/2f10936c81b151242a8824c75a733fffda8415b5",
"reference": "2f10936c81b151242a8824c75a733fffda8415b5",
"url": "https:\/\/api.github.com\/repos\/sabbelasichon\/typo3-rector\/zipball\/53ee84672595ffe851fa3de582fbf4d6299da493",
"reference": "53ee84672595ffe851fa3de582fbf4d6299da493",
"shasum": ""
},
"require": {
@ -1786,7 +1786,7 @@
"symplify\/rule-doc-generator": "^9.3",
"tracy\/tracy": "^2.8"
},
"time": "2021-05-26T10:16:48+00:00",
"time": "2021-05-29T19:19:44+00:00",
"type": "rector-extension",
"extra": {
"rector": {
@ -1815,7 +1815,7 @@
"description": "Instant fixes for your TYPO3 code by using Rector.",
"support": {
"issues": "https:\/\/github.com\/sabbelasichon\/typo3-rector\/issues",
"source": "https:\/\/github.com\/sabbelasichon\/typo3-rector\/tree\/v0.11.11"
"source": "https:\/\/github.com\/sabbelasichon\/typo3-rector\/tree\/v0.11.12"
},
"funding": [
{

File diff suppressed because one or more lines are too long

View File

@ -9,7 +9,7 @@ namespace Rector\RectorInstaller;
*/
final class GeneratedConfig
{
public const EXTENSIONS = array('rector/rector-cakephp' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-cakephp', 'relative_install_path' => '../../rector-cakephp', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => '0.11.2'), 'rector/rector-doctrine' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-doctrine', 'relative_install_path' => '../../rector-doctrine', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => '0.11.2'), 'rector/rector-laravel' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-laravel', 'relative_install_path' => '../../rector-laravel', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => '0.11.1'), 'rector/rector-nette' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-nette', 'relative_install_path' => '../../rector-nette', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => '0.11.4'), 'rector/rector-nette-to-symfony' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-nette-to-symfony', 'relative_install_path' => '../../rector-nette-to-symfony', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => '0.11.2'), 'rector/rector-phpunit' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-phpunit', 'relative_install_path' => '../../rector-phpunit', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => '0.11.1'), 'rector/rector-symfony' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-symfony', 'relative_install_path' => '../../rector-symfony', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => '0.11.2'), 'ssch/typo3-rector' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/ssch/typo3-rector', 'relative_install_path' => '../../../ssch/typo3-rector', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'v0.11.11'));
public const EXTENSIONS = array('rector/rector-cakephp' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-cakephp', 'relative_install_path' => '../../rector-cakephp', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => '0.11.2'), 'rector/rector-doctrine' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-doctrine', 'relative_install_path' => '../../rector-doctrine', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => '0.11.2'), 'rector/rector-laravel' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-laravel', 'relative_install_path' => '../../rector-laravel', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => '0.11.1'), 'rector/rector-nette' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-nette', 'relative_install_path' => '../../rector-nette', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => '0.11.4'), 'rector/rector-nette-to-symfony' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-nette-to-symfony', 'relative_install_path' => '../../rector-nette-to-symfony', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => '0.11.2'), 'rector/rector-phpunit' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-phpunit', 'relative_install_path' => '../../rector-phpunit', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => '0.11.1'), 'rector/rector-symfony' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-symfony', 'relative_install_path' => '../../rector-symfony', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => '0.11.2'), 'ssch/typo3-rector' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/ssch/typo3-rector', 'relative_install_path' => '../../../ssch/typo3-rector', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'v0.11.12'));
private function __construct()
{
}

View File

@ -21,8 +21,8 @@ if (!class_exists('SomeTestCase', false) && !interface_exists('SomeTestCase', fa
if (!class_exists('CheckoutEntityFactory', false) && !interface_exists('CheckoutEntityFactory', false) && !trait_exists('CheckoutEntityFactory', false)) {
spl_autoload_call('RectorPrefix20210529\CheckoutEntityFactory');
}
if (!class_exists('ComposerAutoloaderInitd8b9023238cc1a1d5c6c0b1c50f1da32', false) && !interface_exists('ComposerAutoloaderInitd8b9023238cc1a1d5c6c0b1c50f1da32', false) && !trait_exists('ComposerAutoloaderInitd8b9023238cc1a1d5c6c0b1c50f1da32', false)) {
spl_autoload_call('RectorPrefix20210529\ComposerAutoloaderInitd8b9023238cc1a1d5c6c0b1c50f1da32');
if (!class_exists('ComposerAutoloaderInitb03907ce8f77d8a6e3d4f5730e144d84', false) && !interface_exists('ComposerAutoloaderInitb03907ce8f77d8a6e3d4f5730e144d84', false) && !trait_exists('ComposerAutoloaderInitb03907ce8f77d8a6e3d4f5730e144d84', false)) {
spl_autoload_call('RectorPrefix20210529\ComposerAutoloaderInitb03907ce8f77d8a6e3d4f5730e144d84');
}
if (!class_exists('Doctrine\Inflector\Inflector', false) && !interface_exists('Doctrine\Inflector\Inflector', false) && !trait_exists('Doctrine\Inflector\Inflector', false)) {
spl_autoload_call('RectorPrefix20210529\Doctrine\Inflector\Inflector');
@ -3320,9 +3320,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20210529\print_node(...func_get_args());
}
}
if (!function_exists('composerRequired8b9023238cc1a1d5c6c0b1c50f1da32')) {
function composerRequired8b9023238cc1a1d5c6c0b1c50f1da32() {
return \RectorPrefix20210529\composerRequired8b9023238cc1a1d5c6c0b1c50f1da32(...func_get_args());
if (!function_exists('composerRequireb03907ce8f77d8a6e3d4f5730e144d84')) {
function composerRequireb03907ce8f77d8a6e3d4f5730e144d84() {
return \RectorPrefix20210529\composerRequireb03907ce8f77d8a6e3d4f5730e144d84(...func_get_args());
}
}
if (!function_exists('parseArgs')) {

File diff suppressed because one or more lines are too long

View File

@ -1868,10 +1868,11 @@ Refactor printContent methods of classes TaskModuleController and PageLayoutCont
```diff
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
+use TYPO3\CMS\Core\Http\Response;
$tsfe = GeneralUtility::makeInstance(TypoScriptFrontendController::class);
-$tsfe->processOutput();
+$tsfe->applyHttpHeadersToResponse();
+$tsfe->applyHttpHeadersToResponse(new Response());
+$tsfe->processContentForOutput();
```

View File

@ -7,7 +7,7 @@ In TYPO3 Rector specifically we have already five of them:
1. TypoScriptProcessor
1. FlexFormsProcessor
1. ExtensionComposerProcessor
1. ComposerProcessor
1. IconsProcessor
1. FormYamlProcessor
@ -22,8 +22,8 @@ The IconsProcessor is part of the TYPO3_87 set.
The FlexFormsProcessor takes all xml files starting with the xml Node T3DataStructure and can do some modifications on it.
For now only the renderType is added in the config section if missing.
## ExtensionComposerProcessor
The ExtensionComposerProcessor takes all composer.json files of type typo3-cms-extension.
## ComposerProcessor
The ComposerProcessor takes all composer.json files of type typo3-cms-extension.
It adds an extension-key if it is missing. You can configure this Processor in your rector.php configuration file to add the typo3/cms-core dependency with the right version to your composer.json:
```php

View File

@ -5,7 +5,9 @@ namespace Ssch\TYPO3Rector\Rector\v9\v5;
use PhpParser\Node;
use PhpParser\Node\Expr\MethodCall;
use PhpParser\Node\Expr\New_;
use PhpParser\Node\Identifier;
use PhpParser\Node\Name\FullyQualified;
use PHPStan\Type\ObjectType;
use Rector\Core\Rector\AbstractRector;
use Ssch\TYPO3Rector\Helper\Typo3NodeResolver;
@ -66,9 +68,10 @@ CODE_SAMPLE
, <<<'CODE_SAMPLE'
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
use TYPO3\CMS\Core\Http\Response;
$tsfe = GeneralUtility::makeInstance(TypoScriptFrontendController::class);
$tsfe->applyHttpHeadersToResponse();
$tsfe->applyHttpHeadersToResponse(new Response());
$tsfe->processContentForOutput();
CODE_SAMPLE
)]);
@ -76,6 +79,8 @@ CODE_SAMPLE
private function refactorToNewMethodCalls(\PhpParser\Node\Expr\MethodCall $node) : void
{
$node->name = new \PhpParser\Node\Identifier('applyHttpHeadersToResponse');
$response = new \PhpParser\Node\Expr\New_(new \PhpParser\Node\Name\FullyQualified('TYPO3\\CMS\\Core\\Http\\Response'));
$node->args[0] = $this->nodeFactory->createArg($response);
$newNode = $this->nodeFactory->createMethodCall($node->var, 'processContentForOutput');
$this->addNodeAfterNode($newNode, $node);
}

View File

@ -2,6 +2,7 @@
namespace RectorPrefix20210529\TYPO3\CMS\Frontend\Controller;
use RectorPrefix20210529\Psr\Http\Message\ResponseInterface;
use RectorPrefix20210529\TYPO3\CMS\Core\Charset\CharsetConverter;
use RectorPrefix20210529\TYPO3\CMS\Core\Context\Context;
use RectorPrefix20210529\TYPO3\CMS\Core\Page\PageRenderer;
@ -142,7 +143,7 @@ class TypoScriptFrontendController
/**
* @return void
*/
public function applyHttpHeadersToResponse()
public function applyHttpHeadersToResponse(\RectorPrefix20210529\Psr\Http\Message\ResponseInterface $response)
{
}
/**