Skip to content

Commit fe44f93

Browse files
Symfony 6.0.2
1 parent 3908e64 commit fe44f93

37 files changed

+327
-250
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ jobs:
5656

5757
- run: sudo chown -R $USER:$USER /home/runner/work/elasticsearch-admin/elasticsearch-admin
5858
- run: bin/console app:phpunit
59-
- run: bin/phpunit
59+
- run: bin/phpunit --filter Part1
60+
- run: bin/phpunit --filter Part2
61+
- run: bin/phpunit --filter Manager
62+
- run: bin/phpunit --filter Model
6063
- run: vendor/bin/phpstan analyse -l 6 src
6164
- run: vendor/bin/phpstan analyse -l 6 tests

.travis.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,7 @@ install:
3030

3131
script:
3232
- bin/console app:phpunit
33-
- bin/phpunit
33+
- bin/phpunit --filter Part1
34+
- bin/phpunit --filter Part2
35+
- bin/phpunit --filter Manager
36+
- bin/phpunit --filter Model

composer.lock

Lines changed: 213 additions & 212 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/index.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,5 +338,9 @@ You can run the application from a folder in an existing vhost (ie http://localh
338338
```
339339
vendor/bin/phpstan analyse -l 6 src
340340
vendor/bin/phpstan analyse -l 6 tests
341-
bin/console app:phpunit && bin/phpunit
341+
bin/console app:phpunit
342+
bin/phpunit --filter Part1
343+
bin/phpunit --filter Part2
344+
bin/phpunit --filter Manager
345+
bin/phpunit --filter Model
342346
```

tests/Controller/AppIndexDatabaseImportControllerTest.php renamed to tests/Controller/Part1/AppIndexDatabaseImportControllerTest.php

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

3-
namespace App\Tests\Controller;
3+
namespace App\Tests\Controller\Part1;
4+
5+
use App\Tests\Controller\AbstractAppControllerTest;
46

57
/**
68
* @Route("/admin")

tests/Controller/AppNotificationsControllerTest.php renamed to tests/Controller/Part1/AppNotificationsControllerTest.php

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

3-
namespace App\Tests\Controller;
3+
namespace App\Tests\Controller\Part1;
4+
5+
use App\Tests\Controller\AbstractAppControllerTest;
46

57
/**
68
* @Route("/admin")

tests/Controller/AppOfflineControllerTest.php renamed to tests/Controller/Part1/AppOfflineControllerTest.php

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

3-
namespace App\Tests\Controller;
3+
namespace App\Tests\Controller\Part1;
4+
5+
use App\Tests\Controller\AbstractAppControllerTest;
46

57
/**
68
* @Route("/admin")

tests/Controller/AppRoleControllerTest.php renamed to tests/Controller/Part1/AppRoleControllerTest.php

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

3-
namespace App\Tests\Controller;
3+
namespace App\Tests\Controller\Part1;
4+
5+
use App\Tests\Controller\AbstractAppControllerTest;
46

57
/**
68
* @Route("/admin")

tests/Controller/AppSubscriptionsControllerTest.php renamed to tests/Controller/Part1/AppSubscriptionsControllerTest.php

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

3-
namespace App\Tests\Controller;
3+
namespace App\Tests\Controller\Part1;
4+
5+
use App\Tests\Controller\AbstractAppControllerTest;
46

57
/**
68
* @Route("/admin")

tests/Controller/AppUninstallControllerTest.php renamed to tests/Controller/Part1/AppUninstallControllerTest.php

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

3-
namespace App\Tests\Controller;
3+
namespace App\Tests\Controller\Part1;
4+
5+
use App\Tests\Controller\AbstractAppControllerTest;
46

57
/**
68
* @Route("/admin")

tests/Controller/AppUpgradeControllerTest.php renamed to tests/Controller/Part1/AppUpgradeControllerTest.php

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

3-
namespace App\Tests\Controller;
3+
namespace App\Tests\Controller\Part1;
4+
5+
use App\Tests\Controller\AbstractAppControllerTest;
46

57
/**
68
* @Route("/admin")

tests/Controller/AppUserControllerTest.php renamed to tests/Controller/Part1/AppUserControllerTest.php

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

3-
namespace App\Tests\Controller;
3+
namespace App\Tests\Controller\Part1;
4+
5+
use App\Tests\Controller\AbstractAppControllerTest;
46

57
/**
68
* @Route("/admin")

tests/Controller/ElasticsearchCatControllerTest.php renamed to tests/Controller/Part1/ElasticsearchCatControllerTest.php

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

3-
namespace App\Tests\Controller;
3+
namespace App\Tests\Controller\Part1;
4+
5+
use App\Tests\Controller\AbstractAppControllerTest;
46

57
/**
68
* @Route("/admin")

tests/Controller/ElasticsearchClusterControllerTest.php renamed to tests/Controller/Part1/ElasticsearchClusterControllerTest.php

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

3-
namespace App\Tests\Controller;
3+
namespace App\Tests\Controller\Part1;
4+
5+
use App\Tests\Controller\AbstractAppControllerTest;
46

57
/**
68
* @Route("/admin")

tests/Controller/ElasticsearchComponentTemplateControllerTest.php renamed to tests/Controller/Part1/ElasticsearchComponentTemplateControllerTest.php

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

3-
namespace App\Tests\Controller;
3+
namespace App\Tests\Controller\Part1;
4+
5+
use App\Tests\Controller\AbstractAppControllerTest;
46

57
use App\Model\CallRequestModel;
68

tests/Controller/ElasticsearchConsoleControllerTest.php renamed to tests/Controller/Part1/ElasticsearchConsoleControllerTest.php

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

3-
namespace App\Tests\Controller;
3+
namespace App\Tests\Controller\Part1;
4+
5+
use App\Tests\Controller\AbstractAppControllerTest;
46

57
/**
68
* @Route("/admin")

tests/Controller/ElasticsearchDanglingIndicesControllerTest.php renamed to tests/Controller/Part1/ElasticsearchDanglingIndicesControllerTest.php

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

3-
namespace App\Tests\Controller;
3+
namespace App\Tests\Controller\Part1;
4+
5+
use App\Tests\Controller\AbstractAppControllerTest;
46

57
/**
68
* @Route("/admin")

tests/Controller/ElasticsearchDataStreamControllerTest.php renamed to tests/Controller/Part1/ElasticsearchDataStreamControllerTest.php

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

3-
namespace App\Tests\Controller;
3+
namespace App\Tests\Controller\Part1;
4+
5+
use App\Tests\Controller\AbstractAppControllerTest;
46

57
/**
68
* @Route("/admin")

tests/Controller/ElasticsearchDeprecationControllerTest.php renamed to tests/Controller/Part1/ElasticsearchDeprecationControllerTest.php

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

3-
namespace App\Tests\Controller;
3+
namespace App\Tests\Controller\Part1;
4+
5+
use App\Tests\Controller\AbstractAppControllerTest;
46

57
/**
68
* @Route("/admin")

tests/Controller/ElasticsearchEnrichControllerTest.php renamed to tests/Controller/Part1/ElasticsearchEnrichControllerTest.php

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

3-
namespace App\Tests\Controller;
3+
namespace App\Tests\Controller\Part1;
4+
5+
use App\Tests\Controller\AbstractAppControllerTest;
46

57
/**
68
* @Route("/admin")

tests/Controller/ElasticsearchIlmControllerTest.php renamed to tests/Controller/Part1/ElasticsearchIlmControllerTest.php

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

3-
namespace App\Tests\Controller;
3+
namespace App\Tests\Controller\Part1;
4+
5+
use App\Tests\Controller\AbstractAppControllerTest;
46

57
/**
68
* @Route("/admin")

tests/Controller/ElasticsearchIndexControllerTest.php renamed to tests/Controller/Part1/ElasticsearchIndexControllerTest.php

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

3-
namespace App\Tests\Controller;
3+
namespace App\Tests\Controller\Part1;
4+
5+
use App\Tests\Controller\AbstractAppControllerTest;
46

57
use App\Model\CallRequestModel;
68

@@ -64,7 +66,7 @@ public function testCreate(): void
6466
'data[name]' => GENERATED_NAME,
6567
];
6668
if (true === $this->callManager->checkVersion('7.0')) {
67-
$values['data[mappings_json]'] = file_get_contents(__DIR__.'/../../src/DataFixtures/es-test-mappings.json');
69+
$values['data[mappings_json]'] = file_get_contents(__DIR__.'/../../../src/DataFixtures/es-test-mappings.json');
6870
}
6971
$this->client->submitForm('Submit', $values);
7072

@@ -90,7 +92,7 @@ public function testCreateSystem(): void
9092
'data[name]' => GENERATED_NAME_SYSTEM,
9193
];
9294
if (true === $this->callManager->checkVersion('7.0')) {
93-
$values['data[mappings_json]'] = file_get_contents(__DIR__.'/../../src/DataFixtures/es-test-mappings.json');
95+
$values['data[mappings_json]'] = file_get_contents(__DIR__.'/../../../src/DataFixtures/es-test-mappings.json');
9496
}
9597
$this->client->submitForm('Submit', $values);
9698

tests/Controller/ElasticsearchIndexGraveyardControllerTest.php renamed to tests/Controller/Part1/ElasticsearchIndexGraveyardControllerTest.php

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

3-
namespace App\Tests\Controller;
3+
namespace App\Tests\Controller\Part1;
4+
5+
use App\Tests\Controller\AbstractAppControllerTest;
46

57
/**
68
* @Route("/admin")

tests/Controller/ElasticsearchIndexTemplateControllerTest.php renamed to tests/Controller/Part1/ElasticsearchIndexTemplateControllerTest.php

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

3-
namespace App\Tests\Controller;
3+
namespace App\Tests\Controller\Part1;
4+
5+
use App\Tests\Controller\AbstractAppControllerTest;
46

57
use App\Model\CallRequestModel;
68

tests/Controller/ElasticsearchIndexTemplateLegacyControllerTest.php renamed to tests/Controller/Part1/ElasticsearchIndexTemplateLegacyControllerTest.php

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

3-
namespace App\Tests\Controller;
3+
namespace App\Tests\Controller\Part1;
4+
5+
use App\Tests\Controller\AbstractAppControllerTest;
46

57
use App\Model\CallRequestModel;
68

tests/Controller/ElasticsearchLicenseControllerTest.php renamed to tests/Controller/Part2/ElasticsearchLicenseControllerTest.php

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

3-
namespace App\Tests\Controller;
3+
namespace App\Tests\Controller\Part2;
4+
5+
use App\Tests\Controller\AbstractAppControllerTest;
46

57
/**
68
* @Route("/admin")

tests/Controller/ElasticsearchNodeControllerTest.php renamed to tests/Controller/Part2/ElasticsearchNodeControllerTest.php

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

3-
namespace App\Tests\Controller;
3+
namespace App\Tests\Controller\Part2;
4+
5+
use App\Tests\Controller\AbstractAppControllerTest;
46

57
/**
68
* @Route("/admin")

tests/Controller/ElasticsearchPipelineControllerTest.php renamed to tests/Controller/Part2/ElasticsearchPipelineControllerTest.php

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

3-
namespace App\Tests\Controller;
3+
namespace App\Tests\Controller\Part2;
4+
5+
use App\Tests\Controller\AbstractAppControllerTest;
46

57
/**
68
* @Route("/admin")

tests/Controller/ElasticsearchRemoteClusterControllerTest.php renamed to tests/Controller/Part2/ElasticsearchRemoteClusterControllerTest.php

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

3-
namespace App\Tests\Controller;
3+
namespace App\Tests\Controller\Part2;
4+
5+
use App\Tests\Controller\AbstractAppControllerTest;
46

57
/**
68
* @Route("/admin")

tests/Controller/ElasticsearchRepositoryControllerTest.php renamed to tests/Controller/Part2/ElasticsearchRepositoryControllerTest.php

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

3-
namespace App\Tests\Controller;
3+
namespace App\Tests\Controller\Part2;
4+
5+
use App\Tests\Controller\AbstractAppControllerTest;
46

57
/**
68
* @Route("/admin")

tests/Controller/ElasticsearchRoleControllerTest.php renamed to tests/Controller/Part2/ElasticsearchRoleControllerTest.php

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

3-
namespace App\Tests\Controller;
3+
namespace App\Tests\Controller\Part2;
4+
5+
use App\Tests\Controller\AbstractAppControllerTest;
46

57
/**
68
* @Route("/admin")

tests/Controller/ElasticsearchShardControllerTest.php renamed to tests/Controller/Part2/ElasticsearchShardControllerTest.php

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

3-
namespace App\Tests\Controller;
3+
namespace App\Tests\Controller\Part2;
4+
5+
use App\Tests\Controller\AbstractAppControllerTest;
46

57
/**
68
* @Route("/admin")

tests/Controller/ElasticsearchSlmControllerTest.php renamed to tests/Controller/Part2/ElasticsearchSlmControllerTest.php

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

3-
namespace App\Tests\Controller;
3+
namespace App\Tests\Controller\Part2;
4+
5+
use App\Tests\Controller\AbstractAppControllerTest;
46

57
/**
68
* @Route("/admin")

tests/Controller/ElasticsearchSnapshotControllerTest.php renamed to tests/Controller/Part2/ElasticsearchSnapshotControllerTest.php

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

3-
namespace App\Tests\Controller;
3+
namespace App\Tests\Controller\Part2;
4+
5+
use App\Tests\Controller\AbstractAppControllerTest;
46

57
/**
68
* @Route("/admin")

tests/Controller/ElasticsearchSqlControllerTest.php renamed to tests/Controller/Part2/ElasticsearchSqlControllerTest.php

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

3-
namespace App\Tests\Controller;
3+
namespace App\Tests\Controller\Part2;
4+
5+
use App\Tests\Controller\AbstractAppControllerTest;
46

57
/**
68
* @Route("/admin")

tests/Controller/ElasticsearchTaskControllerTest.php renamed to tests/Controller/Part2/ElasticsearchTaskControllerTest.php

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

3-
namespace App\Tests\Controller;
3+
namespace App\Tests\Controller\Part2;
4+
5+
use App\Tests\Controller\AbstractAppControllerTest;
46

57
/**
68
* @Route("/admin")

tests/Controller/ElasticsearchUserControllerTest.php renamed to tests/Controller/Part2/ElasticsearchUserControllerTest.php

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

3-
namespace App\Tests\Controller;
3+
namespace App\Tests\Controller\Part2;
4+
5+
use App\Tests\Controller\AbstractAppControllerTest;
46

57
/**
68
* @Route("/admin")

0 commit comments

Comments
 (0)