Skip to content

Commit bebf202

Browse files
phpstan
1 parent 51f7c74 commit bebf202

18 files changed

+198
-133
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,5 @@ jobs:
5555
- run: sudo chown -R $USER:$USER /home/runner/work/elasticsearch-admin/elasticsearch-admin
5656
- run: bin/console app:phpunit
5757
- run: bin/phpunit
58-
- run: vendor/bin/phpstan analyse -l 6 src
59-
- run: vendor/bin/phpstan analyse -l 6 tests
58+
- run: vendor/bin/phpstan analyse -l 7 src
59+
- run: vendor/bin/phpstan analyse -l 7 tests

tests/Controller/AbstractAppControllerTest.php

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
namespace App\Tests\Controller;
44

5-
use App\Core\Traits\JwtTrait;
65
use App\Manager\AppUserManager;
76
use App\Manager\CallManager;
87
use App\Manager\ElasticsearchClusterManager;
@@ -11,8 +10,6 @@
1110
use App\Model\CallRequestModel;
1211
use Symfony\Bundle\FrameworkBundle\KernelBrowser;
1312
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
14-
use Symfony\Component\BrowserKit\Cookie;
15-
use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
1613

1714
abstract class AbstractAppControllerTest extends WebTestCase
1815
{
@@ -49,15 +46,25 @@ protected function setUp(): void
4946
{
5047
$this->client = static::createClient([], ['HTTPS' => true]);
5148

52-
$this->callManager = static::getContainer()->get('App\Manager\CallManager');
53-
54-
$this->appUserManager = static::getContainer()->get('App\Manager\AppUserManager');
49+
$callManager = static::getContainer()->get('App\Manager\CallManager');
50+
if ($callManager instanceof CallManager) {
51+
$this->callManager = $callManager;
52+
}
5553

56-
$this->elasticsearchClusterManager = static::getContainer()->get('App\Manager\ElasticsearchClusterManager');
54+
$appUserManager = static::getContainer()->get('App\Manager\AppUserManager');
55+
if ($appUserManager instanceof AppUserManager) {
56+
$this->appUserManager = $appUserManager;
57+
}
5758

58-
$this->elasticsearchNodeManager = static::getContainer()->get('App\Manager\ElasticsearchNodeManager');
59+
$elasticsearchClusterManager = static::getContainer()->get('App\Manager\ElasticsearchClusterManager');
60+
if ($elasticsearchClusterManager instanceof ElasticsearchClusterManager) {
61+
$this->elasticsearchClusterManager = $elasticsearchClusterManager;
62+
}
5963

60-
$firewallName = 'main';
64+
$elasticsearchNodeManager = static::getContainer()->get('App\Manager\ElasticsearchNodeManager');
65+
if ($elasticsearchNodeManager instanceof ElasticsearchNodeManager) {
66+
$this->elasticsearchNodeManager = $elasticsearchNodeManager;
67+
}
6168

6269
$query = [
6370
'q' => 'email:"example@example.com"',

tests/Manager/AppRoleManagerTest.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace App\Tests\Manager;
44

5+
use App\Manager\AppRoleManager;
56
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
67

78
class AppRoleManagerTest extends WebTestCase
@@ -10,8 +11,10 @@ public function testGetByNameNull(): void
1011
{
1112
$appRoleManager = static::getContainer()->get('App\Manager\AppRoleManager');
1213

13-
$role = $appRoleManager->getByName(uniqid());
14+
if ($appRoleManager instanceof AppRoleManager) {
15+
$role = $appRoleManager->getByName(uniqid());
1416

15-
$this->assertNull($role);
17+
$this->assertNull($role);
18+
}
1619
}
1720
}

tests/Manager/AppUserManagerTest.php

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace App\Tests\Manager;
44

5+
use App\Manager\AppUserManager;
56
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
67

78
class AppUserManagerTest extends WebTestCase
@@ -10,17 +11,21 @@ public function testGetByIdNull(): void
1011
{
1112
$appUserManager = static::getContainer()->get('App\Manager\AppUserManager');
1213

13-
$user = $appUserManager->getById(uniqid());
14+
if ($appUserManager instanceof AppUserManager) {
15+
$user = $appUserManager->getById(uniqid());
1416

15-
$this->assertNull($user);
17+
$this->assertNull($user);
18+
}
1619
}
1720

1821
public function testGetByEmailNull(): void
1922
{
2023
$appUserManager = static::getContainer()->get('App\Manager\AppUserManager');
2124

22-
$user = $appUserManager->getByEmail(uniqid());
25+
if ($appUserManager instanceof AppUserManager) {
26+
$user = $appUserManager->getByEmail(uniqid());
2327

24-
$this->assertNull($user);
28+
$this->assertNull($user);
29+
}
2530
}
2631
}

tests/Manager/ElasticsearchComponentTemplateManagerTest.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace App\Tests\Manager;
44

5+
use App\Manager\ElasticsearchComponentTemplateManager;
56
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
67

78
class ElasticsearchComponentTemplateManagerTest extends WebTestCase
@@ -10,8 +11,10 @@ public function testGetByNameNull(): void
1011
{
1112
$elasticsearchComponentTemplateManager = static::getContainer()->get('App\Manager\ElasticsearchComponentTemplateManager');
1213

13-
$template = $elasticsearchComponentTemplateManager->getByName(uniqid());
14+
if ($elasticsearchComponentTemplateManager instanceof ElasticsearchComponentTemplateManager) {
15+
$template = $elasticsearchComponentTemplateManager->getByName(uniqid());
1416

15-
$this->assertNull($template);
17+
$this->assertNull($template);
18+
}
1619
}
1720
}

tests/Manager/ElasticsearchEnrichPolicyManagerTest.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace App\Tests\Manager;
44

5+
use App\Manager\ElasticsearchEnrichPolicyManager;
56
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
67

78
class ElasticsearchEnrichPolicyManagerTest extends WebTestCase
@@ -10,8 +11,10 @@ public function testGetByNameNull(): void
1011
{
1112
$elasticsearchEnrichPolicyManager = static::getContainer()->get('App\Manager\ElasticsearchEnrichPolicyManager');
1213

13-
$policy = $elasticsearchEnrichPolicyManager->getByName(uniqid());
14+
if ($elasticsearchEnrichPolicyManager instanceof ElasticsearchEnrichPolicyManager) {
15+
$policy = $elasticsearchEnrichPolicyManager->getByName(uniqid());
1416

15-
$this->assertNull($policy);
17+
$this->assertNull($policy);
18+
}
1619
}
1720
}

tests/Manager/ElasticsearchIlmManagerTest.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace App\Tests\Manager;
44

5+
use App\Manager\ElasticsearchIlmPolicyManager;
56
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
67

78
class ElasticsearchIlmManagerTest extends WebTestCase
@@ -10,8 +11,10 @@ public function testGetByNameNull(): void
1011
{
1112
$elasticsearchIlmPolicyManager = static::getContainer()->get('App\Manager\ElasticsearchIlmPolicyManager');
1213

13-
$policy = $elasticsearchIlmPolicyManager->getByName(uniqid());
14+
if ($elasticsearchIlmPolicyManager instanceof ElasticsearchIlmPolicyManager) {
15+
$policy = $elasticsearchIlmPolicyManager->getByName(uniqid());
1416

15-
$this->assertNull($policy);
17+
$this->assertNull($policy);
18+
}
1619
}
1720
}

tests/Manager/ElasticsearchIndexManagerTest.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace App\Tests\Manager;
44

5+
use App\Manager\ElasticsearchIndexManager;
56
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
67

78
class ElasticsearchIndexManagerTest extends WebTestCase
@@ -10,8 +11,10 @@ public function testGetByNameNull(): void
1011
{
1112
$elasticsearchIndexManager = static::getContainer()->get('App\Manager\ElasticsearchIndexManager');
1213

13-
$index = $elasticsearchIndexManager->getByName(uniqid());
14+
if ($elasticsearchIndexManager instanceof ElasticsearchIndexManager) {
15+
$index = $elasticsearchIndexManager->getByName(uniqid());
1416

15-
$this->assertNull($index);
17+
$this->assertNull($index);
18+
}
1619
}
1720
}

tests/Manager/ElasticsearchIndexTemplateLegacyManagerTest.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace App\Tests\Manager;
44

5+
use App\Manager\ElasticsearchIndexTemplateLegacyManager;
56
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
67

78
class ElasticsearchIndexTemplateLegacyManagerTest extends WebTestCase
@@ -10,8 +11,10 @@ public function testGetByNameNull(): void
1011
{
1112
$elasticsearchIndexTemplateLegacyManager = static::getContainer()->get('App\Manager\ElasticsearchIndexTemplateLegacyManager');
1213

13-
$template = $elasticsearchIndexTemplateLegacyManager->getByName(uniqid());
14+
if ($elasticsearchIndexTemplateLegacyManager instanceof ElasticsearchIndexTemplateLegacyManager) {
15+
$template = $elasticsearchIndexTemplateLegacyManager->getByName(uniqid());
1416

15-
$this->assertNull($template);
17+
$this->assertNull($template);
18+
}
1619
}
1720
}

tests/Manager/ElasticsearchIndexTemplateManagerTest.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace App\Tests\Manager;
44

5+
use App\Manager\ElasticsearchIndexTemplateManager;
56
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
67

78
class ElasticsearchIndexTemplateManagerTest extends WebTestCase
@@ -10,8 +11,10 @@ public function testGetByNameNull(): void
1011
{
1112
$elasticsearchIndexTemplateManager = static::getContainer()->get('App\Manager\ElasticsearchIndexTemplateManager');
1213

13-
$template = $elasticsearchIndexTemplateManager->getByName(uniqid());
14+
if ($elasticsearchIndexTemplateManager instanceof ElasticsearchIndexTemplateManager) {
15+
$template = $elasticsearchIndexTemplateManager->getByName(uniqid());
1416

15-
$this->assertNull($template);
17+
$this->assertNull($template);
18+
}
1619
}
1720
}

0 commit comments

Comments
 (0)