From 2c7337d8e0a60ef1fca80e2e7271065fbbba490d Mon Sep 17 00:00:00 2001 From: Franck Allimant Date: Sat, 17 May 2014 10:49:34 +0200 Subject: [PATCH] Applied php-cs-fixer with level psr2 --- core/lib/Thelia/Model/Coupon.php | 8 +- core/lib/Thelia/Model/Module.php | 4 +- core/lib/Thelia/Model/OrderCoupon.php | 6 +- core/lib/Thelia/Model/RewritingUrlQuery.php | 224 ++++++++++---------- 4 files changed, 123 insertions(+), 119 deletions(-) diff --git a/core/lib/Thelia/Model/Coupon.php b/core/lib/Thelia/Model/Coupon.php index f5c56ed46..0e4853de1 100644 --- a/core/lib/Thelia/Model/Coupon.php +++ b/core/lib/Thelia/Model/Coupon.php @@ -261,7 +261,8 @@ class Coupon extends BaseCoupon * Return the countries for which free shipping is valid * @return array|mixed|\Propel\Runtime\Collection\ObjectCollection */ - public function getFreeShippingForCountries() { + public function getFreeShippingForCountries() + { return CouponCountryQuery::create()->filterByCouponId($this->getId())->find(); } @@ -270,7 +271,8 @@ class Coupon extends BaseCoupon * * @return array|mixed|\Propel\Runtime\Collection\ObjectCollection */ - public function getFreeShippingForModules() { + public function getFreeShippingForModules() + { return CouponModuleQuery::create()->filterByCouponId($this->getId())->find(); } @@ -301,4 +303,4 @@ class Coupon extends BaseCoupon return $usageLeft; } -} \ No newline at end of file +} diff --git a/core/lib/Thelia/Model/Module.php b/core/lib/Thelia/Model/Module.php index 7166146b0..691fbc1e2 100644 --- a/core/lib/Thelia/Model/Module.php +++ b/core/lib/Thelia/Model/Module.php @@ -189,8 +189,8 @@ class Module extends BaseModule * @return BaseModuleInterface a module instance * @throws \InvalidArgumentException if the module could not be found in the container/ */ - public function getModuleInstance(ContainerInterface $container) { - + public function getModuleInstance(ContainerInterface $container) + { $instance = $container->get(sprintf('module.%s', $this->getCode())); if ($instance == null) { diff --git a/core/lib/Thelia/Model/OrderCoupon.php b/core/lib/Thelia/Model/OrderCoupon.php index ebee15c94..93ab23e39 100644 --- a/core/lib/Thelia/Model/OrderCoupon.php +++ b/core/lib/Thelia/Model/OrderCoupon.php @@ -12,7 +12,8 @@ class OrderCoupon extends BaseOrderCoupon * Return the countries for which free shipping is valid * @return array|mixed|\Propel\Runtime\Collection\ObjectCollection */ - public function getFreeShippingForCountries() { + public function getFreeShippingForCountries() + { return OrderCouponCountryQuery::create()->filterByOrderCoupon($this)->find(); } @@ -21,7 +22,8 @@ class OrderCoupon extends BaseOrderCoupon * * @return array|mixed|\Propel\Runtime\Collection\ObjectCollection */ - public function getFreeShippingForModules() { + public function getFreeShippingForModules() + { return OrderCouponModuleQuery::create()->filterByOrderCoupon($this)->find(); } } diff --git a/core/lib/Thelia/Model/RewritingUrlQuery.php b/core/lib/Thelia/Model/RewritingUrlQuery.php index 8fd556ee4..3e408a6a6 100644 --- a/core/lib/Thelia/Model/RewritingUrlQuery.php +++ b/core/lib/Thelia/Model/RewritingUrlQuery.php @@ -1,112 +1,112 @@ -addExplicitCondition(RewritingUrlTableMap::TABLE_NAME, 'REDIRECTED', 'ru', RewritingUrlTableMap::TABLE_NAME, 'ID', 'is_redirected'); - $redirectedJoin->setJoinType(Criteria::LEFT_JOIN); - - $search = RewritingArgumentQuery::create() - ->joinRewritingUrl('ru', Criteria::RIGHT_JOIN) - ->addJoinObject($redirectedJoin) - ->where('`ru`.URL = ?', $rewrittenUrl, \PDO::PARAM_STR) - ->withColumn('`ru`.URL', 'ru_url') - ->withColumn('`ru`.VIEW', 'ru_view') - ->withColumn('`ru`.VIEW_LOCALE', 'ru_locale') - ->withColumn('`ru`.VIEW_ID', 'ru_viewId') - ->withColumn('`is_redirected`.URL', 'ru_redirected_to_url') - ->find(); - - return $search; - } - - /** - * @param $view - * @param $viewId - * @param $viewLocale - * - * @return null|RewritingUrl - */ - public function getViewUrlQuery($view, $viewLocale, $viewId) - { - return RewritingUrlQuery::create() - ->joinRewritingArgument('ra', Criteria::LEFT_JOIN) - ->where('ISNULL(`ra`.REWRITING_URL_ID)') - ->filterByView($view) - ->filterByViewLocale($viewLocale) - ->filterByViewId($viewId) - ->filterByRedirected(null) - ->orderById(Criteria::DESC) - ->findOne(); - } - - /** - * @param $view - * @param $viewLocale - * @param $viewId - * @param $viewOtherParameters - * - * @return null|RewritingUrl - */ - public function getSpecificUrlQuery($view, $viewLocale, $viewId, $viewOtherParameters) - { - $urlQuery = RewritingUrlQuery::create() - ->joinRewritingArgument('ra', Criteria::LEFT_JOIN) - ->withColumn('`ra`.REWRITING_URL_ID', 'ra_REWRITING_URL_ID') - ->filterByView($view) - ->filterByViewLocale($viewLocale) - ->filterByViewId($viewId) - ->filterByRedirected(null) - ->orderById(Criteria::DESC); - - $otherParametersCount = count($viewOtherParameters); - if ($otherParametersCount > 0) { - $parameterConditions = array(); - - foreach ($viewOtherParameters as $parameter => $value) { - $conditionName = 'other_parameter_condition_' . count($parameterConditions); - $urlQuery->condition('parameter_condition', '`ra`.PARAMETER= ?', $parameter, \PDO::PARAM_STR) - ->condition('value_condition', '`ra`.VALUE = ?', $value, \PDO::PARAM_STR) - ->combine(array('parameter_condition', 'value_condition'), Criteria::LOGICAL_AND, $conditionName); - $parameterConditions[] = $conditionName; - } - - $urlQuery->where($parameterConditions, Criteria::LOGICAL_OR); - - $urlQuery->groupBy(RewritingUrlTableMap::ID); - - $urlQuery->condition('count_condition_1', 'COUNT(' . RewritingUrlTableMap::ID . ') = ?', $otherParametersCount, \PDO::PARAM_INT) // ensure we got all the asked parameters (provided by the query) - ->condition('count_condition_2', 'COUNT(' . RewritingUrlTableMap::ID . ') = (SELECT COUNT(*) FROM rewriting_argument WHERE rewriting_argument.REWRITING_URL_ID = ra_REWRITING_URL_ID)'); // ensure we don't miss any parameters (needed to match the rewritten url) - - $urlQuery->having(array('count_condition_1', 'count_condition_2'), Criteria::LOGICAL_AND); - } else { - $urlQuery->where('ISNULL(`ra`.REWRITING_URL_ID)'); - } - - return $urlQuery->findOne(); - } -} // RewritingUrlQuery +addExplicitCondition(RewritingUrlTableMap::TABLE_NAME, 'REDIRECTED', 'ru', RewritingUrlTableMap::TABLE_NAME, 'ID', 'is_redirected'); + $redirectedJoin->setJoinType(Criteria::LEFT_JOIN); + + $search = RewritingArgumentQuery::create() + ->joinRewritingUrl('ru', Criteria::RIGHT_JOIN) + ->addJoinObject($redirectedJoin) + ->where('`ru`.URL = ?', $rewrittenUrl, \PDO::PARAM_STR) + ->withColumn('`ru`.URL', 'ru_url') + ->withColumn('`ru`.VIEW', 'ru_view') + ->withColumn('`ru`.VIEW_LOCALE', 'ru_locale') + ->withColumn('`ru`.VIEW_ID', 'ru_viewId') + ->withColumn('`is_redirected`.URL', 'ru_redirected_to_url') + ->find(); + + return $search; + } + + /** + * @param $view + * @param $viewId + * @param $viewLocale + * + * @return null|RewritingUrl + */ + public function getViewUrlQuery($view, $viewLocale, $viewId) + { + return RewritingUrlQuery::create() + ->joinRewritingArgument('ra', Criteria::LEFT_JOIN) + ->where('ISNULL(`ra`.REWRITING_URL_ID)') + ->filterByView($view) + ->filterByViewLocale($viewLocale) + ->filterByViewId($viewId) + ->filterByRedirected(null) + ->orderById(Criteria::DESC) + ->findOne(); + } + + /** + * @param $view + * @param $viewLocale + * @param $viewId + * @param $viewOtherParameters + * + * @return null|RewritingUrl + */ + public function getSpecificUrlQuery($view, $viewLocale, $viewId, $viewOtherParameters) + { + $urlQuery = RewritingUrlQuery::create() + ->joinRewritingArgument('ra', Criteria::LEFT_JOIN) + ->withColumn('`ra`.REWRITING_URL_ID', 'ra_REWRITING_URL_ID') + ->filterByView($view) + ->filterByViewLocale($viewLocale) + ->filterByViewId($viewId) + ->filterByRedirected(null) + ->orderById(Criteria::DESC); + + $otherParametersCount = count($viewOtherParameters); + if ($otherParametersCount > 0) { + $parameterConditions = array(); + + foreach ($viewOtherParameters as $parameter => $value) { + $conditionName = 'other_parameter_condition_' . count($parameterConditions); + $urlQuery->condition('parameter_condition', '`ra`.PARAMETER= ?', $parameter, \PDO::PARAM_STR) + ->condition('value_condition', '`ra`.VALUE = ?', $value, \PDO::PARAM_STR) + ->combine(array('parameter_condition', 'value_condition'), Criteria::LOGICAL_AND, $conditionName); + $parameterConditions[] = $conditionName; + } + + $urlQuery->where($parameterConditions, Criteria::LOGICAL_OR); + + $urlQuery->groupBy(RewritingUrlTableMap::ID); + + $urlQuery->condition('count_condition_1', 'COUNT(' . RewritingUrlTableMap::ID . ') = ?', $otherParametersCount, \PDO::PARAM_INT) // ensure we got all the asked parameters (provided by the query) + ->condition('count_condition_2', 'COUNT(' . RewritingUrlTableMap::ID . ') = (SELECT COUNT(*) FROM rewriting_argument WHERE rewriting_argument.REWRITING_URL_ID = ra_REWRITING_URL_ID)'); // ensure we don't miss any parameters (needed to match the rewritten url) + + $urlQuery->having(array('count_condition_1', 'count_condition_2'), Criteria::LOGICAL_AND); + } else { + $urlQuery->where('ISNULL(`ra`.REWRITING_URL_ID)'); + } + + return $urlQuery->findOne(); + } +} // RewritingUrlQuery