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

Added magic method __call to access loop arguments using getArgname()

Browse Source
This commit is contained in:
franck
2013-07-08 20:04:53 +02:00
parent b130abb9c3
commit 7cea85b43e
4 changed files with 43 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/lib/Thelia/Core/Template/Element/BaseLoop.php
View File

@@ -56,6 +56,19 @@ abstract class BaseLoop
); );
} }
public function __call($name, $arguments) {
if (substr($name, 0, 3) == 'get') {
$argName = strtolower(substr($name, 3));
return $this->getArg($argName)->getValue();
}
throw new \InvalidArgumentException(sprintf("Unsupported magic method %s. only getArgname() is supported.", $name));
}
/** /**
* Create a new Loop * Create a new Loop
* *

17
core/lib/Thelia/Core/Template/Loop/Category.php
View File

@@ -100,21 +100,20 @@ class Category extends BaseLoop
{ {
$search = CategoryQuery::create(); $search = CategoryQuery::create();
$id = $this->getArgValue('id'); $id = $this->getId();
if (!is_null($id)) { if (!is_null($id)) {
$search->filterById($id, Criteria::IN); $search->filterById($id, Criteria::IN);
} }
$parent = $this->getParent();
$parent = $this->getArgValue('parent');
if (!is_null($parent)) { if (!is_null($parent)) {
$search->filterByParent($parent); $search->filterByParent($parent);
} }
$current = $this->getArgValue('current'); $current = $this->getCurrent();
if ($current === true) { if ($current === true) {
$search->filterById($this->request->get("category_id")); $search->filterById($this->request->get("category_id"));
@@ -123,22 +122,22 @@ class Category extends BaseLoop
} }
$exclude = $this->getArgValue('exclude'); $exclude = $this->getExclude();
if (!is_null($exclude)) { if (!is_null($exclude)) {
$search->filterById($exclude, Criteria::NOT_IN); $search->filterById($exclude, Criteria::NOT_IN);
} }
$link = $this->getArgValue('link'); $link = $this->getLink();
if (!is_null($link)) { if (!is_null($link)) {
$search->filterByLink($link); $search->filterByLink($link);
} }
$search->filterByVisible($this->getArgValue('visible') ? 1 : 0); $search->filterByVisible($this->getVisible() ? 1 : 0);
switch ($this->getArgValue('order')) { switch ($this->getOrder()) {
case "alpha": case "alpha":
$search->addAscendingOrderByColumn(\Thelia\Model\CategoryI18nPeer::TITLE); $search->addAscendingOrderByColumn(\Thelia\Model\CategoryI18nPeer::TITLE);
break; break;
@@ -154,7 +153,7 @@ class Category extends BaseLoop
} }
if ($this->getArgValue('random') === true) { if ($this->getRandom() === true) {
$search->clearOrderByColumns(); $search->clearOrderByColumns();
$search->addAscendingOrderByColumn('RAND()'); $search->addAscendingOrderByColumn('RAND()');
} }

19
core/lib/Thelia/Core/Template/Loop/Feed.php
View File

@@ -44,17 +44,8 @@ class Feed extends BaseLoop
public function getArgDefinitions() public function getArgDefinitions()
{ {
return new ArgumentCollection( return new ArgumentCollection(
new Argument( Argument::createAnyTypeArgument('url', null, true),
'url', Argument::createIntTypeArgument('timeout', 10)
new TypeCollection(new Type\AnyType())
),
new Argument(
'timeout',
new TypeCollection(
new Type\IntType()
),
10
)
); );
} }
@@ -73,17 +64,17 @@ class Feed extends BaseLoop
} }
} }
$feed = new \SimplePie($this->getArgValue('url'), THELIA_ROOT . 'cache/feeds'); $feed = new \SimplePie($this->getUrl(), THELIA_ROOT . 'cache/feeds');
$feed->init(); $feed->init();
$feed->handle_content_type(); $feed->handle_content_type();
$feed->set_timeout($this->getArgValue('timeout')); $feed->set_timeout($this->getTimeout());
$items = $feed->get_items(); $items = $feed->get_items();
$limit = min(count($items), $this->getArgValue('limit')); $limit = min(count($items), $this->getLimit());
$loopResult = new LoopResult(); $loopResult = new LoopResult();

34
core/lib/Thelia/Core/Template/Loop/Product.php
View File

@@ -97,24 +97,24 @@ class Product extends BaseLoop
{ {
$search = ProductQuery::create(); $search = ProductQuery::create();
$id = $this->getArgValue('id'); $id = $this->getId();
if (!is_null($id)) { if (!is_null($id)) {
$search->filterById($id, Criteria::IN); $search->filterById($id, Criteria::IN);
} }
$ref = $this->getArgValue('ref'); $ref = $this->getRef();
if (!is_null($ref)) { if (!is_null($ref)) {
$search->filterByRef($ref, Criteria::IN); $search->filterByRef($ref, Criteria::IN);
} }
$category = $this->getArgValue('category'); $category = $this->getCategory();
if (!is_null($category)) { if (!is_null($category)) {
$categories = CategoryQuery::create()->filterById($category, Criteria::IN)->find(); $categories = CategoryQuery::create()->filterById($category, Criteria::IN)->find();
$depth = $this->getArgValue('depth'); $depth = $this->getDepth();
if(null !== $depth) { if(null !== $depth) {
foreach(CategoryQuery::findAllChild($category, $depth) as $subCategory) { foreach(CategoryQuery::findAllChild($category, $depth) as $subCategory) {
@@ -128,7 +128,7 @@ class Product extends BaseLoop
); );
} }
$new = $this->getArgValue('new'); $new = $this->getNew();
if ($new === true) { if ($new === true) {
$search->filterByNewness(1, Criteria::EQUAL); $search->filterByNewness(1, Criteria::EQUAL);
@@ -136,7 +136,7 @@ class Product extends BaseLoop
$search->filterByNewness(0, Criteria::EQUAL); $search->filterByNewness(0, Criteria::EQUAL);
} }
$promo = $this->getArgValue('promo'); $promo = $this->getPromo();
if ($promo === true) { if ($promo === true) {
$search->filterByPromo(1, Criteria::EQUAL); $search->filterByPromo(1, Criteria::EQUAL);
@@ -144,13 +144,13 @@ class Product extends BaseLoop
$search->filterByNewness(0, Criteria::EQUAL); $search->filterByNewness(0, Criteria::EQUAL);
} }
$min_stock = $this->getArgValue('min_stock'); $min_stock = $this->getMin_stock();
if (null != $min_stock) { if (null != $min_stock) {
$search->filterByQuantity($min_stock, Criteria::GREATER_EQUAL); $search->filterByQuantity($min_stock, Criteria::GREATER_EQUAL);
} }
$min_price = $this->getArgValue('min_price'); $min_price = $this->getMin_price();
if(null !== $min_price) { if(null !== $min_price) {
$search->condition('in_promo', ProductPeer::PROMO . Criteria::EQUAL . '1') $search->condition('in_promo', ProductPeer::PROMO . Criteria::EQUAL . '1')
@@ -162,7 +162,7 @@ class Product extends BaseLoop
->where(array('not_in_promo_min_price', 'in_promo_min_price'), Criteria::LOGICAL_OR); ->where(array('not_in_promo_min_price', 'in_promo_min_price'), Criteria::LOGICAL_OR);
} }
$max_price = $this->getArgValue('max_price'); $max_price = $this->getMax_price();
if(null !== $max_price) { if(null !== $max_price) {
$search->condition('in_promo', ProductPeer::PROMO . Criteria::EQUAL . '1') $search->condition('in_promo', ProductPeer::PROMO . Criteria::EQUAL . '1')
@@ -174,19 +174,19 @@ class Product extends BaseLoop
->where(array('not_in_promo_max_price', 'in_promo_max_price'), Criteria::LOGICAL_OR); ->where(array('not_in_promo_max_price', 'in_promo_max_price'), Criteria::LOGICAL_OR);
} }
$min_weight = $this->getArgValue('min_weight'); $min_weight = $this->getMin_weight();
if(null !== $min_weight) { if(null !== $min_weight) {
$search->filterByWeight($min_weight, Criteria::GREATER_EQUAL); $search->filterByWeight($min_weight, Criteria::GREATER_EQUAL);
} }
$max_weight = $this->getArgValue('max_weight'); $max_weight = $this->getMax_weight();
if(null !== $max_weight) { if(null !== $max_weight) {
$search->filterByWeight($max_weight, Criteria::LESS_EQUAL); $search->filterByWeight($max_weight, Criteria::LESS_EQUAL);
} }
$current = $this->getArgValue('current'); $current = $this->getCurrent();
if ($current === true) { if ($current === true) {
$search->filterById($this->request->get("product_id")); $search->filterById($this->request->get("product_id"));
@@ -194,7 +194,7 @@ class Product extends BaseLoop
$search->filterById($this->request->get("product_id"), Criteria::NOT_IN); $search->filterById($this->request->get("product_id"), Criteria::NOT_IN);
} }
$current_category = $this->getArgValue('current_category'); $current_category = $this->getCurrent_category();
if ($current_category === true) { if ($current_category === true) {
$search->filterByCategory( $search->filterByCategory(
@@ -220,9 +220,9 @@ class Product extends BaseLoop
); );
} }
$search->filterByVisible($this->getArgValue('visible')); $search->filterByVisible($this->getVisible());
switch ($this->getArgValue('order')) { switch ($this->getOrder()) {
case "alpha": case "alpha":
$search->addAscendingOrderByColumn(\Thelia\Model\CategoryI18nPeer::TITLE); $search->addAscendingOrderByColumn(\Thelia\Model\CategoryI18nPeer::TITLE);
break; break;
@@ -262,12 +262,12 @@ class Product extends BaseLoop
break; break;
} }
if ($this->getArgValue('random') === true) { if ($this->getRandom() === true) {
$search->clearOrderByColumns(); $search->clearOrderByColumns();
$search->addAscendingOrderByColumn('RAND()'); $search->addAscendingOrderByColumn('RAND()');
} }
$exclude = $this->getArgValue('exclude'); $exclude = $this->getExclude();
if (!is_null($exclude)) { if (!is_null($exclude)) {
$search->filterById($exclude, Criteria::NOT_IN); $search->filterById($exclude, Criteria::NOT_IN);