Commit 8d11cf05 authored by Thomas Löffler's avatar Thomas Löffler
Browse files

Merge branch '96-old-class-usages' into 'develop'

Resolve "Old class usages"

Closes #96

See merge request !115
parents 529929b8 3982f2ec
Pipeline #1740 passed with stages
in 3 minutes and 37 seconds
......@@ -204,19 +204,10 @@ class tx_ter_api
*
* @param $extensionInfoData
* @return void
* @deprecated The method used to notifiy via Tx_Amqp_Service_ProducerService, which is no longer available
*/
protected static function notifyExtensionVersionUpload($extensionInfoData)
{
$objectManager = GeneralUtility::makeInstance('Tx_Extbase_Object_ObjectManager');
/** @var Tx_Amqp_Service_ProducerService $producerService */
$producerService = $objectManager->get('Tx_Amqp_Service_ProducerService');
$data = [
'extensionKey' => $extensionInfoData->extensionKey,
'version' => $extensionInfoData->version
];
$producerService->sendToExchange($data, 'org.typo3.ter.version.upload');
}
/**
......@@ -387,18 +378,10 @@ class tx_ter_api
*
* @param $registerExtensionKeyData
* @return mixed
* @deprecated The method used to notifiy via Tx_Amqp_Service_ProducerService, which is no longer available
*/
protected function notifyExtensionKeyRegistration($registerExtensionKeyData)
{
$objectManager = GeneralUtility::makeInstance('Tx_Extbase_Object_ObjectManager');
/** @var Tx_Amqp_Service_ProducerService $producerService */
$producerService = $objectManager->get('Tx_Amqp_Service_ProducerService');
$data = [
'extensionKey' => $registerExtensionKeyData->extensionKey,
];
return $producerService->sendToExchange($data, 'org.typo3.ter.key.register');
}
/**
......@@ -532,18 +515,10 @@ class tx_ter_api
*
* @param $extensionKey
* @return mixed
* @deprecated The method used to notifiy via Tx_Amqp_Service_ProducerService, which is no longer available
*/
protected function notifyExtensionKeyDelete($extensionKey)
{
$objectManager = GeneralUtility::makeInstance('Tx_Extbase_Object_ObjectManager');
/** @var Tx_Amqp_Service_ProducerService $producerService */
$producerService = $objectManager->get('Tx_Amqp_Service_ProducerService');
$data = [
'extensionKey' => $extensionKey,
];
$producerService->sendToExchange($data, 'org.typo3.ter.key.delete');
}
/**
......@@ -903,8 +878,8 @@ class tx_ter_api
break;
case 'ext_emconf.php':
$autoload = [];
if (is_callable('Tx_TerFe2_Utility_Archive::extractEmConf')) {
$emConfData = Tx_TerFe2_Utility_Archive::extractEmConf(base64_decode($fileData->content));
if (is_callable('\T3o\TerFe2\Utility\Archive::extractEmConf')) {
$emConfData = \T3o\TerFe2\Utility\Archive::extractEmConf(base64_decode($fileData->content));
if (!empty($emConfData['autoload'])) {
$autoload = $emConfData['autoload'];
}
......
......@@ -103,6 +103,7 @@ class ObjectBuilder implements \TYPO3\CMS\Core\SingletonInterface
foreach ($attributes as $key => $value) {
$propertyName = \TYPO3\CMS\Core\Utility\GeneralUtility::underscoredToLowerCamelCase($key);
$protertyInfo = $classSchema->getProperty($propertyName);
// @todo: needs to be reviewed, could be an issue due to namespace related changes
if (empty($protertyInfo) || stripos($protertyInfo['type'], 'Tx_') === 0) {
continue;
}
......
......@@ -25,6 +25,8 @@ namespace T3o\TerFe2\Utility;
* This copyright notice MUST APPEAR in all copies of the script!
******************************************************************/
use T3o\TerFe2\Visitor\ArrayAssurer;
/**
* Utilities to manage zip and t3x files
*/
......@@ -374,7 +376,7 @@ class Archive
// We will need to resolved names
$traverser->addVisitor(new \PhpParser\NodeVisitor\NameResolver);
// Our own node visitor
$traverser->addVisitor(\TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('\T3o\TerFe2\Visitor\ArrayAssurer'));
$traverser->addVisitor(\TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(ArrayAssurer::class));
$statements = $traverser->traverse($statements);
$code = $prettyPrinter->prettyPrint($statements);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment