Updated Rector to commit 3f3fc412140becdc86cc43a6ef87b5be495c9444

3f3fc41214 [CodeQuality][CodingStyle] Handle crash assert( >= 0 &&  >= 0) on combination CodeQuality and CodingStyle rules (#2707)
This commit is contained in:
Tomas Votruba 2022-07-25 20:13:13 +00:00
parent e9a18115e4
commit fad0b90180
10 changed files with 83 additions and 42 deletions

2
vendor/autoload.php vendored
View File

@ -9,4 +9,4 @@ if (PHP_VERSION_ID < 50600) {
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit23624975ce44a5a43f93ac5b94eb2e7e::getLoader();
return ComposerAutoloaderInit3caa7496b44d88c885742a42bd69e324::getLoader();

View File

@ -1777,6 +1777,7 @@ return array(
'Rector\\Doctrine\\NodeManipulator\\PropertyTypeManipulator' => $vendorDir . '/rector/rector-doctrine/src/NodeManipulator/PropertyTypeManipulator.php',
'Rector\\Doctrine\\NodeManipulator\\ToManyRelationPropertyTypeResolver' => $vendorDir . '/rector/rector-doctrine/src/NodeManipulator/ToManyRelationPropertyTypeResolver.php',
'Rector\\Doctrine\\NodeManipulator\\ToOneRelationPropertyTypeResolver' => $vendorDir . '/rector/rector-doctrine/src/NodeManipulator/ToOneRelationPropertyTypeResolver.php',
'Rector\\Doctrine\\PhpDocParser\\DoctrineClassAnnotationMatcher' => $vendorDir . '/rector/rector-doctrine/src/PhpDocParser/DoctrineClassAnnotationMatcher.php',
'Rector\\Doctrine\\PhpDocParser\\DoctrineDocBlockResolver' => $vendorDir . '/rector/rector-doctrine/src/PhpDocParser/DoctrineDocBlockResolver.php',
'Rector\\Doctrine\\PhpDoc\\ShortClassExpander' => $vendorDir . '/rector/rector-doctrine/src/PhpDoc/ShortClassExpander.php',
'Rector\\Doctrine\\Rector\\ClassMethod\\MakeEntitySetterNullabilityInSyncWithPropertyRector' => $vendorDir . '/rector/rector-doctrine/src/Rector/ClassMethod/MakeEntitySetterNullabilityInSyncWithPropertyRector.php',

View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit23624975ce44a5a43f93ac5b94eb2e7e
class ComposerAutoloaderInit3caa7496b44d88c885742a42bd69e324
{
private static $loader;
@ -22,19 +22,19 @@ class ComposerAutoloaderInit23624975ce44a5a43f93ac5b94eb2e7e
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit23624975ce44a5a43f93ac5b94eb2e7e', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit3caa7496b44d88c885742a42bd69e324', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInit23624975ce44a5a43f93ac5b94eb2e7e', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit3caa7496b44d88c885742a42bd69e324', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit23624975ce44a5a43f93ac5b94eb2e7e::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit3caa7496b44d88c885742a42bd69e324::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$includeFiles = \Composer\Autoload\ComposerStaticInit23624975ce44a5a43f93ac5b94eb2e7e::$files;
$includeFiles = \Composer\Autoload\ComposerStaticInit3caa7496b44d88c885742a42bd69e324::$files;
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire23624975ce44a5a43f93ac5b94eb2e7e($fileIdentifier, $file);
composerRequire3caa7496b44d88c885742a42bd69e324($fileIdentifier, $file);
}
return $loader;
@ -46,7 +46,7 @@ class ComposerAutoloaderInit23624975ce44a5a43f93ac5b94eb2e7e
* @param string $file
* @return void
*/
function composerRequire23624975ce44a5a43f93ac5b94eb2e7e($fileIdentifier, $file)
function composerRequire3caa7496b44d88c885742a42bd69e324($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInit23624975ce44a5a43f93ac5b94eb2e7e
class ComposerStaticInit3caa7496b44d88c885742a42bd69e324
{
public static $files = array (
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
@ -2084,6 +2084,7 @@ class ComposerStaticInit23624975ce44a5a43f93ac5b94eb2e7e
'Rector\\Doctrine\\NodeManipulator\\PropertyTypeManipulator' => __DIR__ . '/..' . '/rector/rector-doctrine/src/NodeManipulator/PropertyTypeManipulator.php',
'Rector\\Doctrine\\NodeManipulator\\ToManyRelationPropertyTypeResolver' => __DIR__ . '/..' . '/rector/rector-doctrine/src/NodeManipulator/ToManyRelationPropertyTypeResolver.php',
'Rector\\Doctrine\\NodeManipulator\\ToOneRelationPropertyTypeResolver' => __DIR__ . '/..' . '/rector/rector-doctrine/src/NodeManipulator/ToOneRelationPropertyTypeResolver.php',
'Rector\\Doctrine\\PhpDocParser\\DoctrineClassAnnotationMatcher' => __DIR__ . '/..' . '/rector/rector-doctrine/src/PhpDocParser/DoctrineClassAnnotationMatcher.php',
'Rector\\Doctrine\\PhpDocParser\\DoctrineDocBlockResolver' => __DIR__ . '/..' . '/rector/rector-doctrine/src/PhpDocParser/DoctrineDocBlockResolver.php',
'Rector\\Doctrine\\PhpDoc\\ShortClassExpander' => __DIR__ . '/..' . '/rector/rector-doctrine/src/PhpDoc/ShortClassExpander.php',
'Rector\\Doctrine\\Rector\\ClassMethod\\MakeEntitySetterNullabilityInSyncWithPropertyRector' => __DIR__ . '/..' . '/rector/rector-doctrine/src/Rector/ClassMethod/MakeEntitySetterNullabilityInSyncWithPropertyRector.php',
@ -3404,9 +3405,9 @@ class ComposerStaticInit23624975ce44a5a43f93ac5b94eb2e7e
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit23624975ce44a5a43f93ac5b94eb2e7e::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit23624975ce44a5a43f93ac5b94eb2e7e::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit23624975ce44a5a43f93ac5b94eb2e7e::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit3caa7496b44d88c885742a42bd69e324::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit3caa7496b44d88c885742a42bd69e324::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit3caa7496b44d88c885742a42bd69e324::$classMap;
}, null, ClassLoader::class);
}

View File

@ -1923,12 +1923,12 @@
"source": {
"type": "git",
"url": "https:\/\/github.com\/rectorphp\/rector-doctrine.git",
"reference": "9b1e906d867982b8f726f2dfd39c6e53986e863e"
"reference": "e6b2be7c1b67969fed3439672aba7db3df651f17"
},
"dist": {
"type": "zip",
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-doctrine\/zipball\/9b1e906d867982b8f726f2dfd39c6e53986e863e",
"reference": "9b1e906d867982b8f726f2dfd39c6e53986e863e",
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-doctrine\/zipball\/e6b2be7c1b67969fed3439672aba7db3df651f17",
"reference": "e6b2be7c1b67969fed3439672aba7db3df651f17",
"shasum": ""
},
"require": {
@ -1953,7 +1953,7 @@
"symplify\/rule-doc-generator": "^11.0",
"symplify\/vendor-patches": "^11.0"
},
"time": "2022-07-21T21:36:03+00:00",
"time": "2022-07-24T11:45:12+00:00",
"default-branch": true,
"type": "rector-extension",
"extra": {
@ -2415,12 +2415,12 @@
"source": {
"type": "git",
"url": "https:\/\/github.com\/rectorphp\/rector-symfony.git",
"reference": "5e47d42f01d06f73e090c0c9377380c57697be79"
"reference": "2bf8fc5da3e052752895d79d99344406d134cb32"
},
"dist": {
"type": "zip",
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-symfony\/zipball\/5e47d42f01d06f73e090c0c9377380c57697be79",
"reference": "5e47d42f01d06f73e090c0c9377380c57697be79",
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-symfony\/zipball\/2bf8fc5da3e052752895d79d99344406d134cb32",
"reference": "2bf8fc5da3e052752895d79d99344406d134cb32",
"shasum": ""
},
"require": {
@ -2449,7 +2449,7 @@
"symplify\/rule-doc-generator": "^11.0",
"symplify\/vendor-patches": "^11.0"
},
"time": "2022-07-21T13:58:52+00:00",
"time": "2022-07-25T09:57:49+00:00",
"default-branch": true,
"type": "rector-extension",
"extra": {
@ -3742,12 +3742,12 @@
"source": {
"type": "git",
"url": "https:\/\/github.com\/symplify\/package-builder.git",
"reference": "76a2b741f7c658ad8eacaf7d1b61c000bd7835ae"
"reference": "492c30215b1a0354f1867ccd6f1d079999259c57"
},
"dist": {
"type": "zip",
"url": "https:\/\/api.github.com\/repos\/symplify\/package-builder\/zipball\/76a2b741f7c658ad8eacaf7d1b61c000bd7835ae",
"reference": "76a2b741f7c658ad8eacaf7d1b61c000bd7835ae",
"url": "https:\/\/api.github.com\/repos\/symplify\/package-builder\/zipball\/492c30215b1a0354f1867ccd6f1d079999259c57",
"reference": "492c30215b1a0354f1867ccd6f1d079999259c57",
"shasum": ""
},
"require": {
@ -3785,7 +3785,7 @@
"require-dev": {
"phpunit\/phpunit": "^9.5.21"
},
"time": "2022-07-21T11:41:07+00:00",
"time": "2022-07-24T13:34:54+00:00",
"default-branch": true,
"type": "library",
"extra": {

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' => 'dev-main ec96616'), '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' => 'dev-main 9b1e906'), 'rector/rector-downgrade-php' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-downgrade-php', 'relative_install_path' => '../../rector-downgrade-php', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 7ee4e58'), 'rector/rector-generator' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-generator', 'relative_install_path' => '../../rector-generator', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main be4b95a'), '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' => 'dev-main 987bdb4'), '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' => 'dev-main e5b2693'), 'rector/rector-phpoffice' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-phpoffice', 'relative_install_path' => '../../rector-phpoffice', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main ad7cfce'), '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' => 'dev-main d876ff2'), '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' => 'dev-main 5e47d42'));
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' => 'dev-main ec96616'), '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' => 'dev-main e6b2be7'), 'rector/rector-downgrade-php' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-downgrade-php', 'relative_install_path' => '../../rector-downgrade-php', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 7ee4e58'), 'rector/rector-generator' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-generator', 'relative_install_path' => '../../rector-generator', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main be4b95a'), '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' => 'dev-main 987bdb4'), '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' => 'dev-main e5b2693'), 'rector/rector-phpoffice' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-phpoffice', 'relative_install_path' => '../../rector-phpoffice', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main ad7cfce'), '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' => 'dev-main d876ff2'), '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' => 'dev-main 2bf8fc5'));
private function __construct()
{
}

View File

@ -0,0 +1,32 @@
<?php
declare (strict_types=1);
namespace Rector\Doctrine\PhpDocParser;
use PhpParser\Node;
use Rector\BetterPhpDocParser\PhpDocParser\ClassAnnotationMatcher;
class DoctrineClassAnnotationMatcher
{
/**
* @readonly
* @var \Rector\BetterPhpDocParser\PhpDocParser\ClassAnnotationMatcher
*/
private $classAnnotationMatcher;
public function __construct(ClassAnnotationMatcher $classAnnotationMatcher)
{
$this->classAnnotationMatcher = $classAnnotationMatcher;
}
public function resolveExpectingDoctrineFQCN(string $value, Node $node) : ?string
{
$fullyQualified = $this->classAnnotationMatcher->resolveTagToKnownFullyQualifiedName($value, $node);
if ($fullyQualified === null) {
// Doctrine FQCNs are strange: In their examples
// they omit the leading slash. This leads to
// ClassAnnotationMatcher searching in the wrong
// namespace. Therefor we try to add the leading
// slash manually here.
$fullyQualified = $this->classAnnotationMatcher->resolveTagToKnownFullyQualifiedName('\\' . $value, $node);
}
return $fullyQualified;
}
}

View File

@ -14,9 +14,9 @@ use PhpParser\Node\Identifier;
use PhpParser\Node\Stmt\Property;
use Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode;
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
use Rector\BetterPhpDocParser\PhpDocParser\ClassAnnotationMatcher;
use Rector\Core\Rector\AbstractRector;
use Rector\Doctrine\NodeAnalyzer\AttributeFinder;
use Rector\Doctrine\PhpDocParser\DoctrineClassAnnotationMatcher;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
/**
@ -32,17 +32,17 @@ final class DoctrineTargetEntityStringToClassConstantRector extends AbstractRect
private const VALID_DOCTRINE_CLASSES = ['Doctrine\\ORM\\Mapping\\OneToMany' => self::ATTRIBUTE_NAME__TARGET_ENTITY, 'Doctrine\\ORM\\Mapping\\ManyToOne' => self::ATTRIBUTE_NAME__TARGET_ENTITY, 'Doctrine\\ORM\\Mapping\\OneToOne' => self::ATTRIBUTE_NAME__TARGET_ENTITY, 'Doctrine\\ORM\\Mapping\\ManyToMany' => self::ATTRIBUTE_NAME__TARGET_ENTITY, 'Doctrine\\ORM\\Mapping\\Embedded' => self::ATTRIBUTE_NAME__CLASS];
/**
* @readonly
* @var \Rector\BetterPhpDocParser\PhpDocParser\ClassAnnotationMatcher
* @var \Rector\Doctrine\PhpDocParser\DoctrineClassAnnotationMatcher
*/
private $classAnnotationMatcher;
private $doctrineClassAnnotationMatcher;
/**
* @readonly
* @var \Rector\Doctrine\NodeAnalyzer\AttributeFinder
*/
private $attributeFinder;
public function __construct(ClassAnnotationMatcher $classAnnotationMatcher, AttributeFinder $attributeFinder)
public function __construct(DoctrineClassAnnotationMatcher $doctrineClassAnnotationMatcher, AttributeFinder $attributeFinder)
{
$this->classAnnotationMatcher = $classAnnotationMatcher;
$this->doctrineClassAnnotationMatcher = $doctrineClassAnnotationMatcher;
$this->attributeFinder = $attributeFinder;
}
public function getRuleDefinition() : RuleDefinition
@ -82,20 +82,26 @@ CODE_SAMPLE
*/
public function refactor(Node $node) : ?Node
{
$hasChanged = \false;
$phpDocInfo = $this->phpDocInfoFactory->createFromNode($node);
if ($phpDocInfo !== null) {
$property = $this->changeTypeInAnnotationTypes($node, $phpDocInfo);
$hasChanged = $property !== null || $phpDocInfo->hasChanged();
$annotationDetected = $property !== null || $phpDocInfo->hasChanged();
if ($annotationDetected) {
return $property;
}
}
return $this->changeTypeInAttributeTypes($node, $hasChanged);
return $this->changeTypeInAttributeTypes($node);
}
private function changeTypeInAttributeTypes(Property $property, bool $hasChanged) : ?Property
private function changeTypeInAttributeTypes(Property $property) : ?Property
{
$attribute = $this->attributeFinder->findAttributeByClasses($property, $this->getAttributeClasses());
if (!$attribute instanceof Attribute) {
return $hasChanged ? $property : null;
return null;
}
return $this->changeTypeInAttribute($attribute, $property);
}
private function changeTypeInAttribute(Attribute $attribute, Property $property) : ?Property
{
$attributeName = $this->getAttributeName($attribute);
foreach ($attribute->args as $arg) {
$argName = $arg->name;
@ -107,17 +113,18 @@ CODE_SAMPLE
}
/** @var string $value - Should always be string at this point */
$value = $this->valueResolver->getValue($arg->value);
$fullyQualified = $this->classAnnotationMatcher->resolveTagToKnownFullyQualifiedName($value, $property);
$fullyQualified = $this->doctrineClassAnnotationMatcher->resolveExpectingDoctrineFQCN($value, $property);
if ($fullyQualified === $value) {
continue;
}
if ($fullyQualified === null) {
continue;
}
$arg->value = $this->nodeFactory->createClassConstFetch($fullyQualified, 'class');
$fullyQualifiedWithoutLeadingBackslash = \ltrim($fullyQualified, '\\');
$arg->value = $this->nodeFactory->createClassConstFetch($fullyQualifiedWithoutLeadingBackslash, 'class');
return $property;
}
return $hasChanged ? $property : null;
return null;
}
private function changeTypeInAnnotationTypes(Property $property, PhpDocInfo $phpDocInfo) : ?Property
{
@ -136,7 +143,7 @@ CODE_SAMPLE
return null;
}
// resolve to FQN
$tagFullyQualifiedName = $this->classAnnotationMatcher->resolveTagToKnownFullyQualifiedName($targetEntity, $property);
$tagFullyQualifiedName = $this->doctrineClassAnnotationMatcher->resolveExpectingDoctrineFQCN($targetEntity, $property);
if ($tagFullyQualifiedName === null) {
return null;
}
@ -144,7 +151,7 @@ CODE_SAMPLE
return null;
}
$doctrineAnnotationTagValueNode->removeValue($key);
$doctrineAnnotationTagValueNode->values[$key] = '\\' . $tagFullyQualifiedName . '::class';
$doctrineAnnotationTagValueNode->values[$key] = '\\' . \ltrim($tagFullyQualifiedName, '\\') . '::class';
return $property;
}
/**

View File

@ -73,7 +73,7 @@ return static function (RectorConfig $rectorConfig) : void {
new MethodCallRename('Symfony\\Component\\HttpKernel\\Log\\NullLogger', 'err', 'error'),
new MethodCallRename('Symfony\\Component\\HttpKernel\\Log\\NullLogger', 'warn', 'warning'),
// property access
new MethodCallRename('getPropertyAccessor', 'Symfony\\Component\\PropertyAccess\\PropertyAccess', 'createPropertyAccessor'),
new MethodCallRename('Symfony\\Component\\PropertyAccess\\PropertyAccess', 'getPropertyAccessor', 'createPropertyAccessor'),
// translator
new MethodCallRename('Symfony\\Component\\Translation\\Dumper\\FileDumper', 'format', 'formatCatalogue'),
new MethodCallRename('Symfony\\Component\\Translation\\Translator', 'getMessages', 'getCatalogue'),