From 1ac1ea7bd248dd065e514a92fa9279de13d2047e Mon Sep 17 00:00:00 2001 From: ElectricMaxxx Date: Wed, 16 Aug 2017 08:07:03 +0200 Subject: [PATCH] patch from styleCI --- src/Datagrid/ProxyQuery.php | 2 ++ .../Compiler/AddTemplatesCompilerPass.php | 1 + src/Filter/DateFilter.php | 6 ++++++ src/Filter/NodeNameFilter.php | 1 + src/Filter/NumberFilter.php | 4 ++++ src/Filter/StringFilter.php | 1 + 6 files changed, 15 insertions(+) diff --git a/src/Datagrid/ProxyQuery.php b/src/Datagrid/ProxyQuery.php index 1e0c54dc..8f87b0c4 100644 --- a/src/Datagrid/ProxyQuery.php +++ b/src/Datagrid/ProxyQuery.php @@ -134,9 +134,11 @@ public function execute(array $params = array(), $hydrationMode = null) switch ($this->sortOrder) { case 'DESC': $this->qb->orderBy()->desc()->field($this->alias.'.'.$this->sortBy); + break; case 'ASC': $this->qb->orderBy()->asc()->field($this->alias.'.'.$this->sortBy); + break; default: throw new \Exception('Unsupported sort order direction: '.$this->sortOrder); diff --git a/src/DependencyInjection/Compiler/AddTemplatesCompilerPass.php b/src/DependencyInjection/Compiler/AddTemplatesCompilerPass.php index d98fef1b..b305ae85 100644 --- a/src/DependencyInjection/Compiler/AddTemplatesCompilerPass.php +++ b/src/DependencyInjection/Compiler/AddTemplatesCompilerPass.php @@ -60,6 +60,7 @@ protected function fixSettings(ContainerBuilder $container) foreach ($methods as $pos => $calls) { if ($calls[0] == '__hack_doctrine_phpcr__') { $settings = $calls[1]; + break; } } diff --git a/src/Filter/DateFilter.php b/src/Filter/DateFilter.php index c2259942..3f0e6771 100644 --- a/src/Filter/DateFilter.php +++ b/src/Filter/DateFilter.php @@ -35,21 +35,27 @@ public function filter(ProxyQueryInterface $proxyQuery, $alias, $field, $data) switch ($data['type']) { case DateType::TYPE_GREATER_EQUAL: $where->gte()->field('a.'.$field)->literal($from); + break; case DateType::TYPE_GREATER_THAN: $where->gt()->field('a.'.$field)->literal($from); + break; case DateType::TYPE_LESS_EQUAL: $where->lte()->field('a.'.$field)->literal($from); + break; case DateType::TYPE_LESS_THAN: $where->lt()->field('a.'.$field)->literal($from); + break; case DateType::TYPE_NULL: $where->eq()->field('a.'.$field)->literal(null); + break; case DateType::TYPE_NOT_NULL: $where->neq()->field('a.'.$field)->literal(null); + break; case DateType::TYPE_EQUAL: default: diff --git a/src/Filter/NodeNameFilter.php b/src/Filter/NodeNameFilter.php index c57fd2c4..055c5956 100644 --- a/src/Filter/NodeNameFilter.php +++ b/src/Filter/NodeNameFilter.php @@ -37,6 +37,7 @@ public function filter(ProxyQueryInterface $proxyQuery, $alias, $field, $data) switch ($data['type']) { case ChoiceType::TYPE_EQUAL: $where->eq()->localName($alias)->literal($data['value']); + break; case ChoiceType::TYPE_CONTAINS: default: diff --git a/src/Filter/NumberFilter.php b/src/Filter/NumberFilter.php index 95feef5f..7d128d12 100644 --- a/src/Filter/NumberFilter.php +++ b/src/Filter/NumberFilter.php @@ -33,15 +33,19 @@ public function filter(ProxyQueryInterface $proxyQuery, $alias, $field, $data) switch ($type) { case NumberType::TYPE_GREATER_EQUAL: $where->gte()->field('a.'.$field)->literal($value); + break; case NumberType::TYPE_GREATER_THAN: $where->gt()->field('a.'.$field)->literal($value); + break; case NumberType::TYPE_LESS_EQUAL: $where->lte()->field('a.'.$field)->literal($value); + break; case NumberType::TYPE_LESS_THAN: $where->lt()->field('a.'.$field)->literal($value); + break; case NumberType::TYPE_EQUAL: default: diff --git a/src/Filter/StringFilter.php b/src/Filter/StringFilter.php index 89d62af6..9111f14d 100644 --- a/src/Filter/StringFilter.php +++ b/src/Filter/StringFilter.php @@ -46,6 +46,7 @@ public function filter(ProxyQueryInterface $proxyQuery, $alias, $field, $data) break; case ChoiceType::TYPE_NOT_CONTAINS: $where->fullTextSearch('a.'.$field, '* -'.$value); + break; case ChoiceType::TYPE_CONTAINS: if ($isComparisonLowerCase) {