Skip to content

Commit 2f169a5

Browse files
committed
Strict types and client is redundant
1 parent a4762b0 commit 2f169a5

1 file changed

Lines changed: 9 additions & 43 deletions

File tree

src/Model/AbstractBaseService.php

Lines changed: 9 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -5,62 +5,29 @@
55
abstract class AbstractBaseService implements ServiceInterface
66
{
77

8-
/**
9-
* @var string
10-
*/
11-
protected $index;
8+
protected string $index;
129

13-
/**
14-
* @var \Elasticsearch\Client
15-
*/
16-
protected $client;
10+
protected \Spameri\Elastic\Model\Insert $insert;
1711

18-
/**
19-
* @var \Spameri\Elastic\Model\Insert
20-
*/
21-
protected $insert;
12+
protected \Spameri\Elastic\Model\Get $get;
2213

23-
/**
24-
* @var \Spameri\Elastic\Model\Get
25-
*/
26-
protected $get;
14+
protected \Spameri\Elastic\Model\Delete $delete;
2715

28-
/**
29-
* @var \Spameri\Elastic\Model\Delete
30-
*/
31-
protected $delete;
16+
protected \Spameri\Elastic\Model\GetBy $getBy;
3217

33-
/**
34-
* @var \Spameri\Elastic\Model\GetBy
35-
*/
36-
protected $getBy;
18+
protected \Spameri\Elastic\Model\GetAllBy $getAllBy;
3719

38-
/**
39-
* @var \Spameri\Elastic\Model\GetAllBy
40-
*/
41-
protected $getAllBy;
42-
43-
/**
44-
* @var \Spameri\Elastic\Factory\EntityFactoryInterface
45-
*/
46-
protected $entityFactory;
20+
protected \Spameri\Elastic\Factory\EntityFactoryInterface $entityFactory;
4721

48-
/**
49-
* @var \Spameri\Elastic\Factory\CollectionFactoryInterface
50-
*/
51-
private $collectionFactory;
22+
protected \Spameri\Elastic\Factory\CollectionFactoryInterface $collectionFactory;
5223

53-
/**
54-
* @var \Spameri\Elastic\Model\Aggregate
55-
*/
56-
private $aggregate;
24+
protected \Spameri\Elastic\Model\Aggregate $aggregate;
5725

5826

5927
public function __construct(
6028
string $index,
6129
\Spameri\Elastic\Factory\EntityFactoryInterface $entityFactory,
6230
\Spameri\Elastic\Factory\CollectionFactoryInterface $collectionFactory,
63-
\Spameri\Elastic\ClientProvider $client,
6431
\Spameri\Elastic\Model\Insert $insert,
6532
\Spameri\Elastic\Model\Get $get,
6633
\Spameri\Elastic\Model\GetBy $getBy,
@@ -69,7 +36,6 @@ public function __construct(
6936
\Spameri\Elastic\Model\Aggregate $aggregate
7037
)
7138
{
72-
$this->client = $client->client();
7339
$this->index = $index;
7440
$this->insert = $insert;
7541
$this->get = $get;

0 commit comments

Comments
 (0)