Skip to content

Commit 4e933c9

Browse files
dmetznerdmetzner
authored
Merge pull request #4985 from Catrobat/rector
cleanup - Rector
2 parents ee1c5f4 + ddbf39e commit 4e933c9

File tree

708 files changed

+2870
-1005
lines changed

Some content is hidden

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

708 files changed

+2870
-1005
lines changed

‎config/routes.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
$routingConfigurator->add('apple_login', '/login/check-apple');
1616

1717
$routingConfigurator->add('gesdinet_jwt_refresh_token', '/api/authentication/refresh')
18-
->controller('App\Api\Services\Authentication\JWTTokenRefreshService::refresh')
18+
->controller(App\Api\Services\Authentication\JWTTokenRefreshService::class.'::refresh')
1919
;
2020

2121
$routingConfigurator->import('@OpenAPIServerBundle/Resources/config/routing.yaml')

‎docker/docker-compose.dev.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ services:
66
- APP_ENVIRONMENT=dev
77
context: ../
88
dockerfile: docker/Dockerfile
9+
shm_size: '4gb'
910
container_name: app.catroweb
1011
image: app.catroweb
1112
command: ['sh', '/var/www/catroweb/docker/app/startup.sh']
@@ -97,6 +98,7 @@ services:
9798
db.catroweb.dev:
9899
image: mariadb:10.11
99100
container_name: db.catroweb.dev
101+
shm_size: '2gb'
100102
ports:
101103
- 3306
102104
restart: always
@@ -110,6 +112,7 @@ services:
110112
image: zenika/alpine-chrome:100
111113
container_name: chrome.catroweb
112114
restart: on-failure
115+
shm_size: '2gb'
113116
volumes:
114117
- ./../tests/TestData/DataFixtures:/var/www/catroweb/tests/TestData/DataFixtures:ro
115118
- ./../tests/TestData/UploadDownloadTemp:/var/www/catroweb/tests/TestData/UploadDownloadTemp
@@ -129,6 +132,7 @@ services:
129132
db.catroweb.test:
130133
image: mariadb:10.11
131134
container_name: db.catroweb.test
135+
shm_size: '2gb'
132136
ports:
133137
- 3306
134138
restart: always
@@ -141,6 +145,7 @@ services:
141145
phpmyadmin.catroweb.dev:
142146
image: phpmyadmin:latest
143147
container_name: phpmyadmin.catroweb.dev
148+
shm_size: '2gb'
144149
environment:
145150
- PMA_ARBITRARY=1
146151
restart: always
@@ -158,6 +163,7 @@ services:
158163
elasticsearch:
159164
image: docker.elastic.co/elasticsearch/elasticsearch:7.17.20
160165
container_name: elasticsearch
166+
shm_size: '2gb'
161167
environment:
162168
- cluster.name=docker-cluster
163169
- transport.host=localhost

‎docker/docker-compose.test.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ services:
66
- APP_ENVIRONMENT=test
77
context: ../
88
dockerfile: docker/Dockerfile
9+
shm_size: '4gb'
910
container_name: app.catroweb
1011
image: app.catroweb
1112
command: ['sh', '/var/www/catroweb/docker/app/startup-test.sh']
@@ -25,6 +26,7 @@ services:
2526
chrome.catroweb:
2627
image: zenika/alpine-chrome:100
2728
container_name: chrome.catroweb
29+
shm_size: '2gb'
2830
restart: on-failure
2931
volumes:
3032
- ./../tests/TestData/DataFixtures:/var/www/catroweb/tests/TestData/DataFixtures:ro
@@ -44,6 +46,7 @@ services:
4446
db.catroweb.test:
4547
image: mariadb:10.11
4648
container_name: db.catroweb.test
49+
shm_size: '2gb'
4750
ports:
4851
- 3306
4952
restart: always
@@ -54,6 +57,7 @@ services:
5457
elasticsearch:
5558
image: docker.elastic.co/elasticsearch/elasticsearch:7.17.20
5659
container_name: elasticsearch
60+
shm_size: '2gb'
5761
environment:
5862
- cluster.name=docker-cluster
5963
- transport.host=localhost

‎rector.php‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,23 @@
33
declare(strict_types=1);
44

55
use Rector\Config\RectorConfig;
6-
use Rector\Doctrine\Set\DoctrineSetList;
76

8-
return static function (RectorConfig $rectorConfig): void {
9-
$rectorConfig->paths([
7+
return RectorConfig::configure()
8+
9+
->withPaths([
1010
__DIR__.'/src',
1111
__DIR__.'/config',
12-
]);
13-
14-
$rectorConfig->symfonyContainerXml(__DIR__.'/var/cache/dev/App_KernelDevDebugContainer.xml');
12+
__DIR__.'/tests',
13+
])
1514

16-
$rectorConfig->sets([
17-
DoctrineSetList::DOCTRINE_CODE_QUALITY,
18-
]);
15+
->withPhpSets(php83: true)
1916

20-
$rectorConfig->skip([__DIR__.'/src/System/Testing/DataFixtures/DataBaseUtils.php']);
21-
};
17+
// here we can define, what prepared sets of rules will be applied
18+
->withPreparedSets(
19+
deadCode: true,
20+
codeQuality: true,
21+
typeDeclarations: true,
22+
earlyReturn: true,
23+
strictBooleans: true,
24+
)
25+
;

‎src/Admin/ApkGeneration/ApkController.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function resetApkBuildStatusAction(): RedirectResponse
3030
$project = $this->admin->getSubject();
3131

3232
if (null === $project) {
33-
$this->addFlash('sonata_flash_error', 'Can\'t reset APK status');
33+
$this->addFlash('sonata_flash_error', "Can't reset APK status");
3434
} else {
3535
$project->setApkStatus(Program::APK_NONE);
3636
$project->setApkRequestTime(null);
@@ -50,7 +50,7 @@ public function requestApkRebuildAction(): RedirectResponse
5050
$project = $this->admin->getSubject();
5151

5252
if (null === $project) {
53-
$this->addFlash('sonata_flash_error', 'Can\'t trigger APK rebuild');
53+
$this->addFlash('sonata_flash_error', "Can't trigger APK rebuild");
5454
} else {
5555
$this->jenkins_dispatcher->sendBuildRequest($project->getId());
5656
$project->setApkRequestTime(TimeUtils::getDateTime());

‎src/Admin/ApkGeneration/ApkPendingAdmin.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ class ApkPendingAdmin extends AbstractAdmin
2626

2727
protected $baseRoutePattern = 'apk_pending';
2828

29+
#[\Override]
2930
protected function configureDefaultSortValues(array &$sortValues): void
3031
{
3132
$sortValues[DatagridInterface::SORT_BY] = 'apk_request_time';
@@ -45,6 +46,7 @@ public function getThumbnailImageUrl($object): string
4546
return '/'.$this->screenshot_repository->getThumbnailWebPath($object->getId());
4647
}
4748

49+
#[\Override]
4850
protected function configureQuery(ProxyQueryInterface $query): ProxyQueryInterface
4951
{
5052
/** @var ProxyQuery $query */
@@ -65,6 +67,7 @@ protected function configureQuery(ProxyQueryInterface $query): ProxyQueryInterfa
6567
*
6668
* Fields to be shown on filter forms
6769
*/
70+
#[\Override]
6871
protected function configureDatagridFilters(DatagridMapper $filter): void
6972
{
7073
$filter
@@ -88,6 +91,7 @@ protected function configureDatagridFilters(DatagridMapper $filter): void
8891
*
8992
* Fields to be shown on lists
9093
*/
94+
#[\Override]
9195
protected function configureListFields(ListMapper $list): void
9296
{
9397
$list
@@ -122,6 +126,7 @@ protected function configureListFields(ListMapper $list): void
122126
;
123127
}
124128

129+
#[\Override]
125130
protected function configureRoutes(RouteCollectionInterface $collection): void
126131
{
127132
$collection->add('resetApkBuildStatus', $this->getRouterIdParameter().'/resetApkBuildStatus');

‎src/Admin/ApkGeneration/ApkReadyAdmin.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ class ApkReadyAdmin extends AbstractAdmin
2626
*/
2727
protected $baseRoutePattern = 'apk_ready';
2828

29+
#[\Override]
2930
protected function configureDefaultSortValues(array &$sortValues): void
3031
{
3132
$sortValues[DatagridInterface::SORT_BY] = 'apk_request_time';
@@ -42,6 +43,7 @@ public function getThumbnailImageUrl(Program $object): string
4243
return '/'.$this->screenshot_repository->getThumbnailWebPath($object->getId());
4344
}
4445

46+
#[\Override]
4547
protected function configureQuery(ProxyQueryInterface $query): ProxyQueryInterface
4648
{
4749
/** @var ProxyQuery $query */
@@ -62,6 +64,7 @@ protected function configureQuery(ProxyQueryInterface $query): ProxyQueryInterfa
6264
*
6365
* Fields to be shown on filter forms
6466
*/
67+
#[\Override]
6568
protected function configureDatagridFilters(DatagridMapper $filter): void
6669
{
6770
$filter
@@ -77,6 +80,7 @@ protected function configureDatagridFilters(DatagridMapper $filter): void
7780
*
7881
* Fields to be shown on lists
7982
*/
83+
#[\Override]
8084
protected function configureListFields(ListMapper $list): void
8185
{
8286
$list
@@ -105,6 +109,7 @@ protected function configureListFields(ListMapper $list): void
105109
;
106110
}
107111

112+
#[\Override]
108113
protected function configureRoutes(RouteCollectionInterface $collection): void
109114
{
110115
$collection->clearExcept(['list']);

‎src/Admin/Comments/CommentsAdmin.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ class CommentsAdmin extends AbstractAdmin
1919

2020
protected $baseRoutePattern = 'comments';
2121

22+
#[\Override]
2223
protected function configureDefaultSortValues(array &$sortValues): void
2324
{
2425
$sortValues[DatagridInterface::SORT_BY] = 'uploaded_at';
@@ -30,6 +31,7 @@ protected function configureDefaultSortValues(array &$sortValues): void
3031
*
3132
* Fields to be shown on lists
3233
*/
34+
#[\Override]
3335
protected function configureListFields(ListMapper $list): void
3436
{
3537
$list
@@ -39,6 +41,7 @@ protected function configureListFields(ListMapper $list): void
3941
;
4042
}
4143

44+
#[\Override]
4245
protected function configureRoutes(RouteCollectionInterface $collection): void
4346
{
4447
$collection->remove('create')->remove('delete')->remove('export');

‎src/Admin/Comments/ReportedComments/ReportedCommentsAdmin.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ class ReportedCommentsAdmin extends AbstractAdmin
2323

2424
protected $baseRoutePattern = 'report';
2525

26+
#[\Override]
2627
protected function configureQuery(ProxyQueryInterface $query): ProxyQueryInterface
2728
{
2829
/** @var ProxyQuery $query */
@@ -42,6 +43,7 @@ protected function configureQuery(ProxyQueryInterface $query): ProxyQueryInterfa
4243
*
4344
* Fields to be shown on filter forms
4445
*/
46+
#[\Override]
4547
protected function configureDatagridFilters(DatagridMapper $filter): void
4648
{
4749
$filter
@@ -54,6 +56,7 @@ protected function configureDatagridFilters(DatagridMapper $filter): void
5456
*
5557
* Fields to be shown on lists
5658
*/
59+
#[\Override]
5760
protected function configureListFields(ListMapper $list): void
5861
{
5962
$list
@@ -74,6 +77,7 @@ protected function configureListFields(ListMapper $list): void
7477
;
7578
}
7679

80+
#[\Override]
7781
protected function configureRoutes(RouteCollectionInterface $collection): void
7882
{
7983
$collection->add('deleteComment');

‎src/Admin/Comments/ReportedComments/ReportedCommentsController.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,11 @@ public function unreportProjectAction(): RedirectResponse
2828
if (null === $object) {
2929
throw new NotFoundHttpException();
3030
}
31+
3132
$project = $object->getProgram();
3233
$project->setVisible(true);
3334
$project->setApproved(true);
35+
3436
$object->setState(3);
3537
$this->admin->update($object);
3638
$this->addFlash('sonata_flash_success', 'Project '.$object->getId().' is no longer reported');
@@ -43,6 +45,7 @@ public function unreportCommentAction(): RedirectResponse
4345
/* @var $object UserComment */
4446
$object = $this->admin->getSubject();
4547
$object->setIsReported(false);
48+
4649
$this->admin->update($object);
4750
$this->addFlash('sonata_flash_success', 'Comment '.$object->getId().' is no longer reported');
4851

@@ -57,6 +60,7 @@ public function deleteCommentAction(): RedirectResponse
5760
if (null === $comment) {
5861
throw $this->createNotFoundException('No comment found for this id '.$object->getId());
5962
}
63+
6064
$this->entity_manager->remove($comment);
6165
$this->entity_manager->flush();
6266
$this->addFlash('sonata_flash_success', 'Comment '.$object->getId().' deleted');

0 commit comments

Comments
 (0)