Skip to content

Commit d70c2d7

Browse files
authored
Merge pull request #4 from greensight/dev-3
Reorganize namespaces.
2 parents 47fb4a2 + d93e6cf commit d70c2d7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+184
-184
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ Each message contains `indexName`, `query` and `timestamp`
179179
```php
180180
ElasticQuery::enableQueryLog();
181181

182-
/** @var \Illuminate\Support\Collection|Greensight\LaravelElasticQuery\Raw\Debug\QueryLogRecord[] $records */
182+
/** @var \Illuminate\Support\Collection|Greensight\LaravelElasticQuery\Debug\QueryLogRecord[] $records */
183183
$records = ElasticQuery::getQueryLog();
184184

185185
ElasticQuery::disableQueryLog();

src/Raw/Aggregating/AggregationCollection.php renamed to src/Aggregating/AggregationCollection.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?php
22

3-
namespace Greensight\LaravelElasticQuery\Raw\Aggregating;
3+
namespace Greensight\LaravelElasticQuery\Aggregating;
44

5-
use Greensight\LaravelElasticQuery\Raw\Contracts\Aggregation;
6-
use Greensight\LaravelElasticQuery\Raw\Contracts\DSLAware;
5+
use Greensight\LaravelElasticQuery\Contracts\Aggregation;
6+
use Greensight\LaravelElasticQuery\Contracts\DSLAware;
77
use Illuminate\Support\Collection;
88
use InvalidArgumentException;
99

src/Raw/Aggregating/AggregationsQuery.php renamed to src/Aggregating/AggregationsQuery.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?php
22

3-
namespace Greensight\LaravelElasticQuery\Raw\Aggregating;
3+
namespace Greensight\LaravelElasticQuery\Aggregating;
44

55
use Closure;
6-
use Greensight\LaravelElasticQuery\Raw\Concerns\ConstructsAggregations;
7-
use Greensight\LaravelElasticQuery\Raw\Contracts\AggregationsBuilder;
8-
use Greensight\LaravelElasticQuery\Raw\Contracts\SearchIndex;
9-
use Greensight\LaravelElasticQuery\Raw\Filtering\BoolQueryBuilder;
6+
use Greensight\LaravelElasticQuery\Concerns\ConstructsAggregations;
7+
use Greensight\LaravelElasticQuery\Contracts\AggregationsBuilder;
8+
use Greensight\LaravelElasticQuery\Contracts\SearchIndex;
9+
use Greensight\LaravelElasticQuery\Filtering\BoolQueryBuilder;
1010
use Illuminate\Support\Collection;
1111

1212
class AggregationsQuery implements AggregationsBuilder

src/Raw/Aggregating/Bucket.php renamed to src/Aggregating/Bucket.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Greensight\LaravelElasticQuery\Raw\Aggregating;
3+
namespace Greensight\LaravelElasticQuery\Aggregating;
44

55
class Bucket
66
{

src/Raw/Aggregating/Bucket/FilterAggregation.php renamed to src/Aggregating/Bucket/FilterAggregation.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?php
22

3-
namespace Greensight\LaravelElasticQuery\Raw\Aggregating\Bucket;
3+
namespace Greensight\LaravelElasticQuery\Aggregating\Bucket;
44

5-
use Greensight\LaravelElasticQuery\Raw\Aggregating\AggregationCollection;
6-
use Greensight\LaravelElasticQuery\Raw\Contracts\Aggregation;
7-
use Greensight\LaravelElasticQuery\Raw\Contracts\Criteria;
5+
use Greensight\LaravelElasticQuery\Aggregating\AggregationCollection;
6+
use Greensight\LaravelElasticQuery\Contracts\Aggregation;
7+
use Greensight\LaravelElasticQuery\Contracts\Criteria;
88
use Webmozart\Assert\Assert;
99

1010
class FilterAggregation implements Aggregation

src/Raw/Aggregating/Bucket/NestedAggregation.php renamed to src/Aggregating/Bucket/NestedAggregation.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?php
22

3-
namespace Greensight\LaravelElasticQuery\Raw\Aggregating\Bucket;
3+
namespace Greensight\LaravelElasticQuery\Aggregating\Bucket;
44

5-
use Greensight\LaravelElasticQuery\Raw\Aggregating\AggregationCollection;
6-
use Greensight\LaravelElasticQuery\Raw\Contracts\Aggregation;
5+
use Greensight\LaravelElasticQuery\Aggregating\AggregationCollection;
6+
use Greensight\LaravelElasticQuery\Contracts\Aggregation;
77
use Webmozart\Assert\Assert;
88

99
class NestedAggregation implements Aggregation

src/Raw/Aggregating/Bucket/TermsAggregation.php renamed to src/Aggregating/Bucket/TermsAggregation.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?php
22

3-
namespace Greensight\LaravelElasticQuery\Raw\Aggregating\Bucket;
3+
namespace Greensight\LaravelElasticQuery\Aggregating\Bucket;
44

5-
use Greensight\LaravelElasticQuery\Raw\Aggregating\BucketCollection;
6-
use Greensight\LaravelElasticQuery\Raw\Aggregating\Result;
7-
use Greensight\LaravelElasticQuery\Raw\Contracts\Aggregation;
5+
use Greensight\LaravelElasticQuery\Aggregating\BucketCollection;
6+
use Greensight\LaravelElasticQuery\Aggregating\Result;
7+
use Greensight\LaravelElasticQuery\Contracts\Aggregation;
88
use Webmozart\Assert\Assert;
99

1010
class TermsAggregation implements Aggregation

src/Raw/Aggregating/BucketCollection.php renamed to src/Aggregating/BucketCollection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Greensight\LaravelElasticQuery\Raw\Aggregating;
3+
namespace Greensight\LaravelElasticQuery\Aggregating;
44

55
use Illuminate\Support\Collection;
66

src/Raw/Aggregating/CompositeAggregationBuilder.php renamed to src/Aggregating/CompositeAggregationBuilder.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?php
22

3-
namespace Greensight\LaravelElasticQuery\Raw\Aggregating;
3+
namespace Greensight\LaravelElasticQuery\Aggregating;
44

5-
use Greensight\LaravelElasticQuery\Raw\Aggregating\Bucket\FilterAggregation;
6-
use Greensight\LaravelElasticQuery\Raw\Concerns\ConstructsAggregations;
7-
use Greensight\LaravelElasticQuery\Raw\Contracts\AggregationsBuilder;
8-
use Greensight\LaravelElasticQuery\Raw\Filtering\BoolQueryBuilder;
5+
use Greensight\LaravelElasticQuery\Aggregating\Bucket\FilterAggregation;
6+
use Greensight\LaravelElasticQuery\Concerns\ConstructsAggregations;
7+
use Greensight\LaravelElasticQuery\Contracts\AggregationsBuilder;
8+
use Greensight\LaravelElasticQuery\Filtering\BoolQueryBuilder;
99

1010
class CompositeAggregationBuilder implements AggregationsBuilder
1111
{

src/Raw/Aggregating/Metrics/MinMaxAggregation.php renamed to src/Aggregating/Metrics/MinMaxAggregation.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?php
22

3-
namespace Greensight\LaravelElasticQuery\Raw\Aggregating\Metrics;
3+
namespace Greensight\LaravelElasticQuery\Aggregating\Metrics;
44

5-
use Greensight\LaravelElasticQuery\Raw\Aggregating\MinMax;
6-
use Greensight\LaravelElasticQuery\Raw\Aggregating\Result;
7-
use Greensight\LaravelElasticQuery\Raw\Contracts\Aggregation;
5+
use Greensight\LaravelElasticQuery\Aggregating\MinMax;
6+
use Greensight\LaravelElasticQuery\Aggregating\Result;
7+
use Greensight\LaravelElasticQuery\Contracts\Aggregation;
88
use Webmozart\Assert\Assert;
99

1010
class MinMaxAggregation implements Aggregation

0 commit comments

Comments
 (0)