From b0afbfaaf68e34122d3b603eb446859aee803011 Mon Sep 17 00:00:00 2001
From: Mantas Varatiejus <mantas.varatiejus@nfq.com>
Date: Mon, 28 Dec 2015 09:42:56 +0200
Subject: [PATCH] Exclude filters from CS checking
---
.travis.yml | 2 +-
src/Query/FilteredQuery.php | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 9a0196d..624f94c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ before_script:
- composer install --no-interaction --prefer-dist
script:
- vendor/bin/phpunit --coverage-clover=coverage.clover
- - vendor/bin/phpcs -p --standard=PSR2 --ignore=vendor/ ./
+ - vendor/bin/phpcs -p --standard=PSR2 --ignore=vendor/,src/Filter/ ./
after_script:
- vendor/bin/coveralls
notifications:
diff --git a/src/Query/FilteredQuery.php b/src/Query/FilteredQuery.php
index ce68fc5..0d5504f 100644
--- a/src/Query/FilteredQuery.php
+++ b/src/Query/FilteredQuery.php
@@ -11,12 +11,6 @@
namespace ONGR\ElasticsearchDSL\Query;
-@trigger_error(
- 'The FilteredQuery class is deprecated and will be removed in 2.0. ' .
- 'Use the "bool" query instead with a "filter" clause.',
- E_USER_DEPRECATED
-);
-
use ONGR\ElasticsearchDSL\BuilderInterface;
use ONGR\ElasticsearchDSL\ParametersTrait;
@@ -47,6 +41,12 @@ class FilteredQuery implements BuilderInterface
*/
public function __construct($query = null, $filter = null)
{
+ @trigger_error(
+ 'The FilteredQuery class is deprecated and will be removed in 2.0. ' .
+ 'Use the "bool" query instead with a "filter" clause.',
+ E_USER_DEPRECATED
+ );
+
if ($query !== null) {
$this->setQuery($query);
}
--
GitLab