Skip to content

Commit acec73c

Browse files
tatevikg1tatevikg1
committed
ISSUE-337: fix phpstmd
1 parent 276d397 commit acec73c

File tree

9 files changed

+61
-30
lines changed

9 files changed

+61
-30
lines changed

‎src/DependencyInjection/PhpListRestExtension.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ class PhpListRestExtension extends Extension
3030
*/
3131
public function load(array $configs, ContainerBuilder $container): void
3232
{
33+
// This parameter is unused, but not optional. This line will avoid a static analysis warning this.
34+
$configs;
3335
$loader = new YamlFileLoader($container, new FileLocator(__DIR__ . '/../../config'));
3436
$loader->load('services.yml');
3537
}

‎tests/Integration/Controller/Fixtures/AdministratorFixture.php‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,11 @@ public function load(ObjectManager $manager): void
2929

3030
$headers = fgetcsv($handle);
3131

32-
while (($data = fgetcsv($handle)) !== false) {
32+
do {
33+
$data = fgetcsv($handle);
34+
if ($data === false) {
35+
break;
36+
}
3337
$row = array_combine($headers, $data);
3438

3539
$admin = new Administrator();
@@ -42,9 +46,9 @@ public function load(ObjectManager $manager): void
4246

4347
$manager->persist($admin);
4448

45-
$this->setSubjectProperty($admin,'creationDate', new DateTime($row['created']));
46-
$this->setSubjectProperty($admin,'passwordChangeDate', new DateTime($row['passwordchanged']));
47-
}
49+
$this->setSubjectProperty($admin, 'creationDate', new DateTime($row['created']));
50+
$this->setSubjectProperty($admin, 'passwordChangeDate', new DateTime($row['passwordchanged']));
51+
} while (true);
4852

4953
fclose($handle);
5054
}

‎tests/Integration/Controller/Fixtures/AdministratorTokenFixture.php‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,26 +31,30 @@ public function load(ObjectManager $manager): void
3131
$headers = fgetcsv($handle);
3232
$adminRepository = $manager->getRepository(Administrator::class);
3333

34-
while (($data = fgetcsv($handle)) !== false) {
34+
do {
35+
$data = fgetcsv($handle);
36+
if ($data === false) {
37+
break;
38+
}
3539
$row = array_combine($headers, $data);
3640

3741
$admin = $adminRepository->find($row['adminid']);
3842
if ($admin === null) {
3943
$admin = new Administrator();
40-
$this->setSubjectId($admin,(int)$row['adminid']);
44+
$this->setSubjectId($admin, (int)$row['adminid']);
4145
$admin->setSuperUser(true);
4246
$manager->persist($admin);
4347
}
4448

4549
$adminToken = new AdministratorToken();
46-
$this->setSubjectId($adminToken,(int)$row['id']);
50+
$this->setSubjectId($adminToken, (int)$row['id']);
4751
$adminToken->setKey($row['value']);
4852
$adminToken->setAdministrator($admin);
4953
$manager->persist($adminToken);
5054

51-
$this->setSubjectProperty($adminToken,'expiry', new DateTime($row['expires']));
55+
$this->setSubjectProperty($adminToken, 'expiry', new DateTime($row['expires']));
5256
$this->setSubjectProperty($adminToken, 'creationDate', (bool) $row['entered']);
53-
}
57+
} while (true);
5458

5559
fclose($handle);
5660
}

‎tests/Integration/Controller/Fixtures/SubscriberFixture.php‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,15 @@ public function load(ObjectManager $manager): void
3030

3131
$headers = fgetcsv($handle);
3232

33-
while (($data = fgetcsv($handle)) !== false) {
33+
do {
34+
$data = fgetcsv($handle);
35+
if ($data === false) {
36+
break;
37+
}
3438
$row = array_combine($headers, $data);
3539

3640
$subscriber = new Subscriber();
37-
$this->setSubjectId($subscriber,(int)$row['id']);
41+
$this->setSubjectId($subscriber, (int)$row['id']);
3842

3943
$subscriber->setEmail($row['email']);
4044
$subscriber->setConfirmed((bool) $row['confirmed']);
@@ -46,9 +50,9 @@ public function load(ObjectManager $manager): void
4650
$manager->persist($subscriber);
4751
// avoid pre-persist
4852
$subscriber->setUniqueId($row['uniqid']);
49-
$this->setSubjectProperty($subscriber,'creationDate', new DateTime($row['entered']));
50-
$this->setSubjectProperty($subscriber,'modificationDate', new DateTime($row['modified']));
51-
}
53+
$this->setSubjectProperty($subscriber, 'creationDate', new DateTime($row['entered']));
54+
$this->setSubjectProperty($subscriber, 'modificationDate', new DateTime($row['modified']));
55+
} while (true);
5256

5357
fclose($handle);
5458
}

‎tests/Integration/Controller/Fixtures/SubscriberListFixture.php‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,24 @@ public function load(ObjectManager $manager): void
3232

3333
$adminRepository = $manager->getRepository(Administrator::class);
3434

35-
while (($data = fgetcsv($handle)) !== false) {
35+
do {
36+
$data = fgetcsv($handle);
37+
if ($data === false) {
38+
break;
39+
}
3640
$row = array_combine($headers, $data);
41+
3742
$admin = $adminRepository->find($row['owner']);
3843
if ($admin === null) {
3944
$admin = new Administrator();
40-
$this->setSubjectId($admin,(int)$row['owner']);
45+
$this->setSubjectId($admin, (int)$row['owner']);
4146
$admin->setSuperUser(true);
4247
$admin->setDisabled(false);
4348
$manager->persist($admin);
4449
}
4550

4651
$subscriberList = new SubscriberList();
47-
$this->setSubjectId($subscriberList,(int)$row['id']);
52+
$this->setSubjectId($subscriberList, (int)$row['id']);
4853
$subscriberList->setName($row['name']);
4954
$subscriberList->setDescription($row['description']);
5055
$subscriberList->setListPosition((int)$row['listorder']);
@@ -55,9 +60,9 @@ public function load(ObjectManager $manager): void
5560

5661
$manager->persist($subscriberList);
5762

58-
$this->setSubjectProperty($subscriberList,'creationDate', new DateTime($row['entered']));
59-
$this->setSubjectProperty($subscriberList,'modificationDate', new DateTime($row['modified']));
60-
}
63+
$this->setSubjectProperty($subscriberList, 'creationDate', new DateTime($row['entered']));
64+
$this->setSubjectProperty($subscriberList, 'modificationDate', new DateTime($row['modified']));
65+
} while (true);
6166

6267
fclose($handle);
6368
}

‎tests/Integration/Controller/Fixtures/SubscriptionFixture.php‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,11 @@ public function load(ObjectManager $manager): void
3535

3636
$headers = fgetcsv($handle);
3737

38-
while (($data = fgetcsv($handle)) !== false) {
38+
do {
39+
$data = fgetcsv($handle);
40+
if ($data === false) {
41+
break;
42+
}
3943
$row = array_combine($headers, $data);
4044

4145
$subscriber = $subscriberRepository->find((int)$row['userid']);
@@ -47,9 +51,9 @@ public function load(ObjectManager $manager): void
4751

4852
$manager->persist($subscription);
4953

50-
$this->setSubjectProperty($subscription,'creationDate', new DateTime($row['entered']));
51-
$this->setSubjectProperty($subscription,'modificationDate', new DateTime($row['modified']));
52-
}
54+
$this->setSubjectProperty($subscription, 'creationDate', new DateTime($row['entered']));
55+
$this->setSubjectProperty($subscription, 'modificationDate', new DateTime($row['modified']));
56+
} while (true);
5357

5458
fclose($handle);
5559
}

‎tests/Integration/Controller/ListControllerTest.php‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,11 @@ public function testGetListMembersForExistingListWithoutSessionKeyReturnsForbidd
187187

188188
public function testGetListMembersForExistingListWithExpiredSessionKeyReturnsForbiddenStatus()
189189
{
190-
$this->loadFixtures([SubscriberListFixture::class, AdministratorFixture::class, AdministratorTokenFixture::class]);
190+
$this->loadFixtures([
191+
SubscriberListFixture::class,
192+
AdministratorFixture::class,
193+
AdministratorTokenFixture::class,
194+
]);
191195

192196
self::getClient()->request(
193197
'get',
@@ -269,7 +273,11 @@ public function testGetListSubscribersCountForExistingListWithoutSessionKeyRetur
269273

270274
public function testGetListSubscribersCountForExistingListWithExpiredSessionKeyReturnsForbiddenStatus()
271275
{
272-
$this->loadFixtures([SubscriberListFixture::class, AdministratorFixture::class, AdministratorTokenFixture::class]);
276+
$this->loadFixtures([
277+
SubscriberListFixture::class,
278+
AdministratorFixture::class,
279+
AdministratorTokenFixture::class,
280+
]);
273281

274282
self::getClient()->request(
275283
'get',
@@ -291,7 +299,7 @@ public function testGetListSubscribersCountWithCurrentSessionKeyForExistingListR
291299
$this->assertHttpOkay();
292300
}
293301

294-
public function testGetListSubscribersCountWithCurrentSessionKeyForExistingListWithNoSubscribersReturnsZero()
302+
public function testGetSubscribersCountForEmptyListWithValidSession()
295303
{
296304
$this->loadFixtures([SubscriberListFixture::class, SubscriberFixture::class, SubscriptionFixture::class]);
297305

@@ -301,7 +309,7 @@ public function testGetListSubscribersCountWithCurrentSessionKeyForExistingListW
301309
self::assertSame(0, $responseContent);
302310
}
303311

304-
public function testGetListSubscribersCountWithCurrentSessionKeyForExistingListWithSubscribersReturnsSubscribersCount()
312+
public function testGetSubscribersCountForListWithValidSession()
305313
{
306314
$this->loadFixtures([SubscriberListFixture::class, SubscriberFixture::class, SubscriptionFixture::class]);
307315

‎tests/Integration/Controller/SessionControllerTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function testControllerIsAvailableViaContainer()
3030
{
3131
self::assertInstanceOf(
3232
SessionController::class,
33-
self:: getContainer()->get(SessionController::class)
33+
self::getContainer()->get(SessionController::class)
3434
);
3535
}
3636

‎tests/System/Controller/SessionControllerTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function testPostSessionsWithInvalidCredentialsReturnsNotAuthorized()
2626
self::getClient()->request(
2727
'POST',
2828
'/api/v2/sessions',
29-
[],
29+
[],
3030
[],
3131
[],
3232
json_encode($jsonData)

0 commit comments

Comments
 (0)