This commit is contained in:
Manuel Raynaud
2014-01-22 12:52:36 +01:00
parent 9d1c1e3979
commit 1974d3e3c3
1201 changed files with 80 additions and 88 deletions

0
core/bootstrap.php Executable file → Normal file
View File

0
core/lib/Thelia/Action/BaseAction.php Executable file → Normal file
View File

0
core/lib/Thelia/Action/Cart.php Executable file → Normal file
View File

0
core/lib/Thelia/Action/Category.php Executable file → Normal file
View File

0
core/lib/Thelia/Action/Coupon.php Executable file → Normal file
View File

0
core/lib/Thelia/Action/Customer.php Executable file → Normal file
View File

0
core/lib/Thelia/Action/HttpException.php Executable file → Normal file
View File

0
core/lib/Thelia/Action/Image.php Executable file → Normal file
View File

View File

@@ -94,8 +94,7 @@ class Module extends BaseAction implements EventSubscriberInterface
$fs = new Filesystem();
$fs->remove($path);
}
catch (\ReflectionException $ex) {
} catch (\ReflectionException $ex) {
// Happens probably because the module directory has been deleted.
// Log a warning, and delete the database entry.
Tlog::getInstance()->addWarning(

0
core/lib/Thelia/Action/Order.php Executable file → Normal file
View File

0
core/lib/Thelia/Cart/CartTrait.php Executable file → Normal file
View File

0
core/lib/Thelia/Command/BaseModuleGenerate.php Executable file → Normal file
View File

0
core/lib/Thelia/Command/CacheClear.php Executable file → Normal file
View File

0
core/lib/Thelia/Command/ClearImageCache.php Executable file → Normal file
View File

0
core/lib/Thelia/Command/ContainerAwareCommand.php Executable file → Normal file
View File

View File

@@ -91,6 +91,7 @@ class CreateAdminUser extends ContainerAwareCommand
protected function enterData($dialog, $output, $label, $error_message, $hidden = false)
{
$command = $hidden ? 'askHiddenResponse' : 'askAndValidate';
return $dialog->$command(
$output,
$this->decorateInfo($label),

0
core/lib/Thelia/Command/Install.php Executable file → Normal file
View File

0
core/lib/Thelia/Command/ModuleActivateCommand.php Executable file → Normal file
View File

3
core/lib/Thelia/Command/ModuleGenerateCommand.php Executable file → Normal file
View File

@@ -110,8 +110,7 @@ class ModuleGenerateCommand extends BaseModuleGenerate
$schemaContent = str_replace("%%NAMESPACE%%", $this->module, $schemaContent);
file_put_contents($this->moduleDirectory . DIRECTORY_SEPARATOR . "Config". DIRECTORY_SEPARATOR . "schema.xml", $schemaContent);
}
catch (\Exception $ex) {
} catch (\Exception $ex) {
$fs->remove($this->moduleDirectory);
throw $ex;

0
core/lib/Thelia/Command/ModuleGenerateModelCommand.php Executable file → Normal file
View File

0
core/lib/Thelia/Command/ModuleGenerateSqlCommand.php Executable file → Normal file
View File

0
core/lib/Thelia/Command/Output/TheliaConsoleOutput.php Executable file → Normal file
View File

2
core/lib/Thelia/Command/Skeleton/Module/Class.php Executable file → Normal file
View File

@@ -33,4 +33,4 @@ class %%CLASSNAME%% extends BaseModule
*
* Have fun !
*/
}
}

6
core/lib/Thelia/Command/Skeleton/Module/config.xml Executable file → Normal file
View File

@@ -22,12 +22,6 @@
-->
</commands>
<templateDirectives>
<!-- Sample definition
<templateDirectives class="MyModule\Directive\MyTemplateDirective" name="my_filter"/>
-->
</templateDirectives>
<!--
<services>

2
core/lib/Thelia/Command/Skeleton/Module/module.xml Executable file → Normal file
View File

@@ -15,4 +15,4 @@
<type>classic</type>
<thelia>2.0.0</thelia>
<stability>other</stability>
</module>
</module>

0
core/lib/Thelia/Command/Skeleton/Module/schema.xml Executable file → Normal file
View File

0
core/lib/Thelia/Config/DatabaseConfiguration.php Executable file → Normal file
View File

0
core/lib/Thelia/Config/DefinePropel.php Executable file → Normal file
View File

0
core/lib/Thelia/Config/Resources/action.xml Executable file → Normal file
View File

0
core/lib/Thelia/Config/Resources/config.xml Executable file → Normal file
View File

0
core/lib/Thelia/Config/Resources/routing.xml Executable file → Normal file
View File

0
core/lib/Thelia/Config/Resources/routing/admin.xml Executable file → Normal file
View File

View File

0
core/lib/Thelia/Controller/Admin/AdminController.php Executable file → Normal file
View File

View File

@@ -56,11 +56,13 @@ class BaseAdminController extends BaseController
*/
private $currentRouter = "router.admin";
protected function getCurrentRouter() {
protected function getCurrentRouter()
{
return $this->currentRouter;
}
protected function setCurrentRouter($routerId) {
protected function setCurrentRouter($routerId)
{
$this->currentRouter = $routerId;
}

View File

View File

@@ -242,6 +242,7 @@ class ContentController extends AbstractSeoCrudController
if (null !== $content) {
$content->setLocale($this->getCurrentEditionLocale());
}
return $content;
}

0
core/lib/Thelia/Controller/Admin/CouponController.php Executable file → Normal file
View File

0
core/lib/Thelia/Controller/Admin/FileController.php Executable file → Normal file
View File

View File

@@ -205,6 +205,7 @@ class FolderController extends AbstractSeoCrudController
if (null !== $folder) {
$folder->setLocale($this->getCurrentEditionLocale());
}
return $folder;
}

0
core/lib/Thelia/Controller/Admin/SessionController.php Executable file → Normal file
View File

0
core/lib/Thelia/Controller/BaseController.php Executable file → Normal file
View File

View File

0
core/lib/Thelia/Controller/Front/DefaultController.php Executable file → Normal file
View File

0
core/lib/Thelia/Core/Application.php Executable file → Normal file
View File

0
core/lib/Thelia/Core/Bundle/TheliaBundle.php Executable file → Normal file
View File

0
core/lib/Thelia/Core/Controller/ControllerResolver.php Executable file → Normal file
View File

View File

0
core/lib/Thelia/Core/Event/ActionEvent.php Executable file → Normal file
View File

0
core/lib/Thelia/Core/Event/Cart/CartEvent.php Executable file → Normal file
View File

0
core/lib/Thelia/Core/Event/Cart/CartItemEvent.php Executable file → Normal file
View File

View File

@@ -248,5 +248,4 @@ class CustomerCreateOrUpdateEvent extends CustomerEvent
return $this->ref;
}
}

0
core/lib/Thelia/Core/Event/Customer/CustomerEvent.php Executable file → Normal file
View File

View File

0
core/lib/Thelia/Core/Event/DefaultActionEvent.php Executable file → Normal file
View File

View File

View File

View File

0
core/lib/Thelia/Core/Event/Image/ImageDeleteEvent.php Executable file → Normal file
View File

0
core/lib/Thelia/Core/Event/Image/ImageEvent.php Executable file → Normal file
View File

View File

@@ -65,6 +65,7 @@ class ModuleDeleteEvent extends ModuleEvent
public function setDeleteData($delete_data)
{
$this->delete_data = $delete_data;
return $this;
}
}
}

0
core/lib/Thelia/Core/Event/Order/OrderAddressEvent.php Executable file → Normal file
View File

0
core/lib/Thelia/Core/Event/Order/OrderEvent.php Executable file → Normal file
View File

View File

@@ -151,7 +151,6 @@ class ProductCombinationGenerationEvent extends ProductEvent
$this->ean_code = $ean_code;
return $this;
return $this;
}
public function getCombinations()

View File

@@ -129,4 +129,4 @@ class TaxEvent extends ActionEvent
{
return $this->requirements;
}
}
}

View File

@@ -129,4 +129,4 @@ class TaxRuleEvent extends ActionEvent
{
return $this->taxList;
}
}
}

0
core/lib/Thelia/Core/Event/TheliaEvents.php Executable file → Normal file
View File

0
core/lib/Thelia/Core/Event/UpdateFilePositionEvent.php Executable file → Normal file
View File

0
core/lib/Thelia/Core/Event/UpdateSeoEvent.php Executable file → Normal file
View File

View File

0
core/lib/Thelia/Core/EventListener/ViewListener.php Executable file → Normal file
View File

0
core/lib/Thelia/Core/Factory/ActionEventFactory.php Executable file → Normal file
View File

0
core/lib/Thelia/Core/HttpFoundation/Request.php Executable file → Normal file
View File

View File

View File

View File

View File

View File

View File

0
core/lib/Thelia/Core/Security/Role/Role.php Executable file → Normal file
View File

0
core/lib/Thelia/Core/Security/Role/RoleInterface.php Executable file → Normal file
View File

0
core/lib/Thelia/Core/Security/SecurityContext.php Executable file → Normal file
View File

0
core/lib/Thelia/Core/Security/User/UserInterface.php Executable file → Normal file
View File

View File

View File

View File

View File

2
core/lib/Thelia/Core/Template/Element/BaseLoop.php Executable file → Normal file
View File

@@ -179,7 +179,7 @@ abstract class BaseLoop
$faultActor[] = $argument->name;
$faultDetails[] = sprintf('"%s" parameter is missing in loop type: %s, name: %s', $argument->name, $loopType, $loopName);
} else if ($value === '') {
if(!$argument->empty) {
if (!$argument->empty) {
/* check if empty */
$faultActor[] = $argument->name;
$faultDetails[] = sprintf('"%s" parameter cannot be empty in loop type: %s, name: %s', $argument->name, $loopType, $loopName);

Some files were not shown because too many files have changed in this diff Show More