Skip to content

Commit a0d32a2

Browse files
authored
Merge pull request absolute-quantum#47 from r3hp1c/5.4
Fix test issues
2 parents 1d56c09 + f9b7c8c commit a0d32a2

File tree

6 files changed

+13
-12
lines changed

6 files changed

+13
-12
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
jobs:
1313
static-analysis:
1414
name: Static Analysis
15-
runs-on: ubuntu-24.04
15+
runs-on: ubuntu-latest
1616

1717
steps:
1818
- name: "Checkout code"
@@ -22,7 +22,7 @@ jobs:
2222
uses: "shivammathur/setup-php@v2"
2323
with:
2424
coverage: "none"
25-
php-version: "8.4"
25+
php-version: "8.0"
2626
extensions: pdo, pdo_sqlite
2727

2828
- name: "Validate composer.json"
@@ -51,7 +51,7 @@ jobs:
5151

5252
tests:
5353
name: "Tests ${{ matrix.php-version }} ${{ matrix.dependency-versions }}"
54-
runs-on: ubuntu-24.04
54+
runs-on: ubuntu-latest
5555
needs: static-analysis
5656

5757
strategy:

demo/symfony5.4/tests/SecretTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ protected function setUp(): void
1616
self::bootKernel([]);
1717
}
1818

19-
private function testSecretsAreEncryptedInDatabase(string $className)
19+
private function secretsAreEncryptedInDatabase(string $className)
2020
{
2121
/** @var EntityManagerInterface $entityManager */
2222
$entityManager = self::$container->get('doctrine.orm.entity_manager');
@@ -62,7 +62,7 @@ private function testSecretsAreEncryptedInDatabase(string $className)
6262
*/
6363
public function testAnnotationSecretsAreEncryptedInDatabase(): void
6464
{
65-
$this->testSecretsAreEncryptedInDatabase(Entity\Annotation\Secret::class);
65+
$this->secretsAreEncryptedInDatabase(Entity\Annotation\Secret::class);
6666
}
6767

6868
/**
@@ -73,6 +73,6 @@ public function testAnnotationSecretsAreEncryptedInDatabase(): void
7373
*/
7474
public function testAttributeSecretsAreEncryptedInDatabase(): void
7575
{
76-
$this->testSecretsAreEncryptedInDatabase(Entity\Attribute\Secret::class);
76+
$this->secretsAreEncryptedInDatabase(Entity\Attribute\Secret::class);
7777
}
7878
}

demo/symfony6.x-orm3/phpunit.xml.dist

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<server name="SHELL_VERBOSITY" value="-1" />
1616
<server name="SYMFONY_PHPUNIT_REMOVE" value="" />
1717
<server name="SYMFONY_PHPUNIT_VERSION" value="9.5" />
18+
<env name="SYMFONY_DEPRECATIONS_HELPER" value="disabled" />
1819
</php>
1920

2021
<testsuites>

demo/symfony6.x-orm3/tests/SecretTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ protected function setUp(): void
1616
self::bootKernel([]);
1717
}
1818

19-
public function testSecretsAreEncryptedInDatabase()
19+
public function secretsAreEncryptedInDatabase()
2020
{
2121
/** @var EntityManagerInterface $entityManager */
2222
$entityManager = self::getContainer()->get('doctrine.orm.entity_manager');

demo/symfony6.x/tests/SecretTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ protected function setUp(): void
1616
self::bootKernel([]);
1717
}
1818

19-
private function testSecretsAreEncryptedInDatabase(string $className)
19+
private function secretsAreEncryptedInDatabase(string $className)
2020
{
2121
/** @var EntityManagerInterface $entityManager */
2222
$entityManager = self::getContainer()->get('doctrine.orm.entity_manager');
@@ -62,7 +62,7 @@ private function testSecretsAreEncryptedInDatabase(string $className)
6262
*/
6363
public function testAnnotationSecretsAreEncryptedInDatabase()
6464
{
65-
$this->testSecretsAreEncryptedInDatabase(Entity\Annotation\Secret::class);
65+
$this->secretsAreEncryptedInDatabase(Entity\Annotation\Secret::class);
6666
}
6767

6868
/**
@@ -73,6 +73,6 @@ public function testAnnotationSecretsAreEncryptedInDatabase()
7373
*/
7474
public function testAttributeSecretsAreEncryptedInDatabase()
7575
{
76-
$this->testSecretsAreEncryptedInDatabase(Entity\Attribute\Secret::class);
76+
$this->secretsAreEncryptedInDatabase(Entity\Attribute\Secret::class);
7777
}
7878
}

demo/symfony7.x/tests/SecretTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ protected function setUp(): void
1616
self::bootKernel([]);
1717
}
1818

19-
private function testSecretsAreEncryptedInDatabase(string $className)
19+
private function secretsAreEncryptedInDatabase(string $className)
2020
{
2121
/** @var EntityManagerInterface $entityManager */
2222
$entityManager = self::getContainer()->get('doctrine.orm.entity_manager');
@@ -64,6 +64,6 @@ private function testSecretsAreEncryptedInDatabase(string $className)
6464
*/
6565
public function testAttributeSecretsAreEncryptedInDatabase()
6666
{
67-
$this->testSecretsAreEncryptedInDatabase(Entity\Attribute\Secret::class);
67+
$this->secretsAreEncryptedInDatabase(Entity\Attribute\Secret::class);
6868
}
6969
}

0 commit comments

Comments
 (0)