TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Uses new helper functions

Browse Source
This commit is contained in:
Franck Allimant
2014-04-26 16:02:23 +02:00
parent addbd9a84c
commit 5c6940b427
5 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/lib/Thelia/Action/Module.php
View File

@@ -50,9 +50,8 @@ class Module extends BaseAction implements EventSubscriberInterface
public function toggleActivation(ModuleToggleActivationEvent $event) public function toggleActivation(ModuleToggleActivationEvent $event)
{ {
if (null !== $module = ModuleQuery::create()->findPk($event->getModuleId())) { if (null !== $module = ModuleQuery::create()->findPk($event->getModuleId())) {
$moduleClass = new \ReflectionClass($module->getFullNamespace());
$moduleInstance = $moduleClass->newInstance(); $moduleInstance = $module->createInstance();
if ( method_exists($moduleInstance, 'setContainer')) { if ( method_exists($moduleInstance, 'setContainer')) {
$moduleInstance->setContainer($this->container); $moduleInstance->setContainer($this->container);
@@ -85,12 +84,11 @@ class Module extends BaseAction implements EventSubscriberInterface
} }
try { try {
$reflected = new \ReflectionClass($module->getFullNamespace()); $instance = $module->createInstance();
$instance = $reflected->newInstance();
$instance->setContainer($this->container); $instance->setContainer($this->container);
$path = dirname($reflected->getFileName()); $path = $module->getAbsoluteBaseDir();
$instance->destroy($con, $event->getDeleteData()); $instance->destroy($con, $event->getDeleteData());

4
core/lib/Thelia/Command/ModuleActivateCommand.php
View File

@@ -52,9 +52,7 @@ class ModuleActivateCommand extends BaseModuleGenerate
} }
try { try {
$moduleReflection = new \ReflectionClass($module->getFullNamespace()); $moduleInstance = $module->createInstance();
$moduleInstance = $moduleReflection->newInstance();
$moduleInstance->activate(); $moduleInstance->activate();
} catch (\Exception $e) { } catch (\Exception $e) {

4
core/lib/Thelia/Command/ModuleDeactivateCommand.php
View File

@@ -52,9 +52,7 @@ class ModuleDeactivateCommand extends BaseModuleGenerate
} }
try { try {
$moduleReflection = new \ReflectionClass($module->getFullNamespace()); $moduleInstance = $module->createInstance();
$moduleInstance = $moduleReflection->newInstance();
$moduleInstance->deActivate(); $moduleInstance->deActivate();
} catch (\Exception $e) { } catch (\Exception $e) {

3
core/lib/Thelia/Form/OrderDelivery.php
View File

@@ -74,8 +74,7 @@ class OrderDelivery extends BaseForm
if (null === $module) { if (null === $module) {
$context->addViolation(Translator::getInstance()->trans("Delivery module ID not found")); $context->addViolation(Translator::getInstance()->trans("Delivery module ID not found"));
} else { } else {
$moduleReflection = new \ReflectionClass($module->getFullNamespace()); if (! $module->isDeliveryModule()) {
if ($moduleReflection->isSubclassOf("Thelia\Module\DeliveryModuleInterface") === false) {
$context->addViolation( $context->addViolation(
sprintf(Translator::getInstance()->trans("delivery module %s is not a Thelia\Module\DeliveryModuleInterface"), $module->getCode()) sprintf(Translator::getInstance()->trans("delivery module %s is not a Thelia\Module\DeliveryModuleInterface"), $module->getCode())
); );

3
core/lib/Thelia/Form/OrderPayment.php
View File

@@ -75,8 +75,7 @@ class OrderPayment extends BaseForm
$context->addViolation("Payment module ID not found"); $context->addViolation("Payment module ID not found");
} }
$moduleReflection = new \ReflectionClass($module->getFullNamespace()); if (! $module->isPayementModule()) {
if ($moduleReflection->isSubclassOf("Thelia\Module\PaymentModuleInterface") === false) {
$context->addViolation( $context->addViolation(
sprintf(Translator::getInstance()->trans("payment module %s is not a Thelia\Module\PaymentModuleInterface"), $module->getCode()) sprintf(Translator::getInstance()->trans("payment module %s is not a Thelia\Module\PaymentModuleInterface"), $module->getCode())
); );