Skip to content

Commit

Permalink
fix: rename meta classes
Browse files Browse the repository at this point in the history
  • Loading branch information
npldevfr committed Jan 29, 2024
1 parent 4839d01 commit 5151c34
Show file tree
Hide file tree
Showing 7 changed files with 43 additions and 43 deletions.
4 changes: 2 additions & 2 deletions src/ConditionsBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use Exception;
use Npldevfr\Liquipedia\Interfaces\ConditionsBuilderInterface;
use Npldevfr\Liquipedia\Meta\Conditions;
use Npldevfr\Liquipedia\Meta\Operator;

final class ConditionsBuilder implements ConditionsBuilderInterface
{
Expand Down Expand Up @@ -38,7 +38,7 @@ public static function build(
*/
private static function ensureValidOperator(string $operator): void
{
$isValid = in_array($operator, Conditions::all());
$isValid = in_array($operator, Operator::all());

if (! $isValid) {
throw new Exception('[LiquipediaBuilder] Operator '.$operator.' is not valid.');
Expand Down
6 changes: 3 additions & 3 deletions src/LiquipediaBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

use Exception;
use GuzzleHttp\Client;
use Npldevfr\Liquipedia\Meta\Conditions;
use Npldevfr\Liquipedia\Meta\Endpoints;
use Npldevfr\Liquipedia\Meta\Endpoint;
use Npldevfr\Liquipedia\Meta\Operator;
use Npldevfr\Liquipedia\Meta\SortOrder;
use Npldevfr\Liquipedia\Query\QueryBuilder;
use Npldevfr\Liquipedia\Query\QueryParameters;
Expand Down Expand Up @@ -108,7 +108,7 @@ public function offset(int $offset): self
*/
public function endpoint(string $endpoint): self
{
if (! Endpoints::fromValue($endpoint)) {
if (! Endpoint::fromValue($endpoint)) {
throw new Exception('[LiquipediaBuilder] Endpoint '.$endpoint.' is not valid.');
}
$this->endpoint = $endpoint;
Expand Down
2 changes: 1 addition & 1 deletion src/Meta/Endpoints.php → src/Meta/Endpoint.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use Npldevfr\Liquipedia\Traits\HasConstants;

final class Endpoints
final class Endpoint
{
use HasConstants;

Expand Down
2 changes: 1 addition & 1 deletion src/Meta/Conditions.php → src/Meta/Operator.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use Npldevfr\Liquipedia\Traits\HasConstants;

final class Conditions
final class Operator
{
use HasConstants;

Expand Down
2 changes: 1 addition & 1 deletion src/Meta/Wikis.php → src/Meta/Wiki.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use Npldevfr\Liquipedia\Traits\HasConstants;

final class Wikis
final class Wiki
{
use HasConstants;

Expand Down
18 changes: 9 additions & 9 deletions tests/ConditionsBuilderTest.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

use Npldevfr\Liquipedia\ConditionsBuilder;
use Npldevfr\Liquipedia\Meta\Conditions;
use Npldevfr\Liquipedia\Meta\Operator;

it('can build a with all conditions', function ($condition) {

Expand All @@ -11,12 +11,12 @@

expect($builder->toValue())
->toBe('([[my_key'.$condition.'my_value]])');
})->with(Conditions::all());
})->with(Operator::all());

it('can build with default constructor & and method', function () {

expect(
ConditionsBuilder::build('build_key', Conditions::NOT_EQUAL, 'build_value')
ConditionsBuilder::build('build_key', Operator::NOT_EQUAL, 'build_value')
->and('my_key', '::', 'my_value')
->toValue()
)->toBe('([[build_key::!build_value]]) AND ([[my_key::my_value]])');
Expand All @@ -34,7 +34,7 @@
it('can build with default constructor & andManyA d method', function () {

expect(
ConditionsBuilder::build('build_key', Conditions::NOT_EQUAL, 'build_value')
ConditionsBuilder::build('build_key', Operator::NOT_EQUAL, 'build_value')
->andManyAnd('my_key', '::', ['my_value', 'my_value2'])
->toValue()
)->toBe('([[build_key::!build_value]]) AND ([[my_key::my_value]] AND [[my_key::my_value2]])');
Expand All @@ -43,7 +43,7 @@
it('can build with default constructor & andManyOr method', function () {

expect(
ConditionsBuilder::build('build_key', Conditions::NOT_EQUAL, 'build_value')
ConditionsBuilder::build('build_key', Operator::NOT_EQUAL, 'build_value')
->andManyOr('my_key', '::', ['my_value', 'my_value2'])
->toValue()
)->toBe('([[build_key::!build_value]]) AND ([[my_key::my_value]] OR [[my_key::my_value2]])');
Expand All @@ -52,7 +52,7 @@
it('can build with default constructor & or method', function () {

expect(
ConditionsBuilder::build('build_key', Conditions::NOT_EQUAL, 'build_value')
ConditionsBuilder::build('build_key', Operator::NOT_EQUAL, 'build_value')
->or('my_key', '::', 'my_value')
->toValue()
)->toBe('([[build_key::!build_value]]) OR ([[my_key::my_value]])');
Expand All @@ -61,7 +61,7 @@
it('can build with default constructor & orManyAnd method', function () {

expect(
ConditionsBuilder::build('build_key', Conditions::NOT_EQUAL, 'build_value')
ConditionsBuilder::build('build_key', Operator::NOT_EQUAL, 'build_value')
->orManyAnd('my_key', '::', ['my_value', 'my_value2'])
->toValue()
)->toBe('([[build_key::!build_value]]) OR ([[my_key::my_value]] AND [[my_key::my_value2]])');
Expand All @@ -70,7 +70,7 @@
it('can build with default constructor & orManyOr method', function () {

expect(
ConditionsBuilder::build('build_key', Conditions::NOT_EQUAL, 'build_value')
ConditionsBuilder::build('build_key', Operator::NOT_EQUAL, 'build_value')
->orManyOr('my_key', '::', ['my_value', 'my_value2'])
->toValue()
)->toBe('([[build_key::!build_value]]) OR ([[my_key::my_value]] OR [[my_key::my_value2]])');
Expand All @@ -79,7 +79,7 @@
it('can build with default constructor & andManyAnd method', function () {

expect(
ConditionsBuilder::build('build_key', Conditions::NOT_EQUAL, 'build_value')
ConditionsBuilder::build('build_key', Operator::NOT_EQUAL, 'build_value')
->andManyAnd('my_key', '::', ['my_value', 'my_value2'])
->toValue()
)->toBe('([[build_key::!build_value]]) AND ([[my_key::my_value]] AND [[my_key::my_value2]])');
Expand Down
52 changes: 26 additions & 26 deletions tests/LiquipediaBuilderTest.php
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?php

use Npldevfr\Liquipedia\LiquipediaBuilder;
use Npldevfr\Liquipedia\Meta\Endpoints;
use Npldevfr\Liquipedia\Meta\Endpoint;
use Npldevfr\Liquipedia\Meta\SortOrder;
use Npldevfr\Liquipedia\Meta\Wikis;
use Npldevfr\Liquipedia\Meta\Wiki;
use Npldevfr\Liquipedia\Query\QueryParameters;

it('can build with wiki', function () {
$builder = LiquipediaBuilder::query([
'wiki' => Wikis::LEAGUE_OF_LEGENDS,
'wiki' => Wiki::LEAGUE_OF_LEGENDS,
]);

expect($builder->build())->toBe([
Expand All @@ -19,7 +19,7 @@

it('can build a query with a query parameter object', function () {
$builder = LiquipediaBuilder::query([], new QueryParameters([
'wiki' => Wikis::LEAGUE_OF_LEGENDS,
'wiki' => Wiki::LEAGUE_OF_LEGENDS,
]));

expect($builder->build())->toBe([
Expand All @@ -29,7 +29,7 @@

it('can build a query with a query parameter object and params', function () {
$builder = LiquipediaBuilder::query([
'wiki' => Wikis::LEAGUE_OF_LEGENDS,
'wiki' => Wiki::LEAGUE_OF_LEGENDS,
], new QueryParameters([
'limit' => 1,
]));
Expand All @@ -40,7 +40,7 @@
});

it('can set one wiki', function () {
$builder = LiquipediaBuilder::query()->wikis(Wikis::LEAGUE_OF_LEGENDS);
$builder = LiquipediaBuilder::query()->wikis(Wiki::LEAGUE_OF_LEGENDS);

expect($builder->build())->toBe([
'wiki' => 'leagueoflegends',
Expand All @@ -50,8 +50,8 @@
it('can set multiple wikis', function () {
$builder = LiquipediaBuilder::query()
->wikis([
Wikis::LEAGUE_OF_LEGENDS,
Wikis::OVERWATCH,
Wiki::LEAGUE_OF_LEGENDS,
Wiki::OVERWATCH,
]);

expect($builder->build())->toBe([
Expand All @@ -62,8 +62,8 @@
it('can set multiple wikis with duplicates', function () {
$builder = LiquipediaBuilder::query()
->wikis([
Wikis::LEAGUE_OF_LEGENDS,
Wikis::LEAGUE_OF_LEGENDS,
Wiki::LEAGUE_OF_LEGENDS,
Wiki::LEAGUE_OF_LEGENDS,
]);

expect($builder->build())->toBe([
Expand All @@ -74,7 +74,7 @@
it('can set multiple wikis with duplicates and a string', function () {
$builder = LiquipediaBuilder::query()
->wikis([
Wikis::LEAGUE_OF_LEGENDS,
Wiki::LEAGUE_OF_LEGENDS,
'overwatch',
]);

Expand All @@ -85,8 +85,8 @@

it('can add a wiki', function () {
$builder = LiquipediaBuilder::query()
->wikis(Wikis::LEAGUE_OF_LEGENDS)
->addWiki(Wikis::OVERWATCH);
->wikis(Wiki::LEAGUE_OF_LEGENDS)
->addWiki(Wiki::OVERWATCH);

expect($builder->build())->toBe([
'wiki' => 'leagueoflegends|overwatch',
Expand All @@ -95,8 +95,8 @@

it('can add a wiki with duplicates', function () {
$builder = LiquipediaBuilder::query()
->wikis(Wikis::LEAGUE_OF_LEGENDS)
->addWiki(Wikis::LEAGUE_OF_LEGENDS);
->wikis(Wiki::LEAGUE_OF_LEGENDS)
->addWiki(Wiki::LEAGUE_OF_LEGENDS);

expect($builder->build())->toBe([
'wiki' => 'leagueoflegends',
Expand All @@ -105,9 +105,9 @@

it('can add a wiki with duplicates and a string', function () {
$builder = LiquipediaBuilder::query()
->wikis(Wikis::LEAGUE_OF_LEGENDS)
->addWiki(Wikis::LEAGUE_OF_LEGENDS)
->addWiki(Wikis::OVERWATCH)
->wikis(Wiki::LEAGUE_OF_LEGENDS)
->addWiki(Wiki::LEAGUE_OF_LEGENDS)
->addWiki(Wiki::OVERWATCH)
->addWiki('overwatch');

expect($builder->build())->toBe([
Expand Down Expand Up @@ -146,23 +146,23 @@

it('can set an endpoint', function () {
$builder = LiquipediaBuilder::query()
->endpoint(Endpoints::MATCHES);
->endpoint(Endpoint::MATCHES);

expect($builder->getEndpoint())->toBe(Endpoints::MATCHES);
expect($builder->getEndpoint())->toBe(Endpoint::MATCHES);
});

it('can set an endpoint and a wiki', function () {

$builder = LiquipediaBuilder::query()
->endpoint(Endpoints::MATCHES)
->wikis(Wikis::LEAGUE_OF_LEGENDS);
->endpoint(Endpoint::MATCHES)
->wikis(Wiki::LEAGUE_OF_LEGENDS);

expect($builder->build())
->toBe([
'wiki' => 'leagueoflegends',
])
->and($builder->getEndpoint())
->toBe(Endpoints::MATCHES);
->toBe(Endpoint::MATCHES);

});

Expand Down Expand Up @@ -365,7 +365,7 @@
it('can build a complex query', function ($wiki) {
$builder = LiquipediaBuilder::query()
->wikis($wiki)
->endpoint(Endpoints::MATCHES)
->endpoint(Endpoint::MATCHES)
->limit(1)
->offset(1)
->select([
Expand All @@ -390,6 +390,6 @@
'date' => '2020-01-01',
]);
})->with([
Wikis::LEAGUE_OF_LEGENDS,
Wikis::OVERWATCH,
Wiki::LEAGUE_OF_LEGENDS,
Wiki::OVERWATCH,
]);

0 comments on commit 5151c34

Please sign in to comment.