Skip to content

Commit cc552b6

Browse files
chapterjasonchapterjason
committed
Remove security requirement
1 parent d098709 commit cc552b6

7 files changed

Lines changed: 4 additions & 111 deletions

File tree

‎composer.json‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,17 @@
2020
}
2121
],
2222
"require": {
23-
"ext-pcntl": "*",
2423
"symfony/http-kernel": "^7.1",
2524
"symfony/config": "^7.1",
2625
"symfony/dependency-injection": "^7.1",
2726
"symfony/intl": "^7.1"
2827
},
2928
"require-dev": {
3029
"symfony/clock": "^7.1",
31-
"twig/twig": "^v3.2",
3230
"symfony/browser-kit": "^7.1",
3331
"nyholm/symfony-bundle-test": "^3.0",
3432
"phpunit/phpunit": "^9.5",
3533
"symfony/phpunit-bridge": "^7.1",
36-
"symfony/security-bundle": "^7.1",
3734
"symfony/runtime": "^7.1"
3835
},
3936
"config": {

‎src/EventListener/TimezoneListener.php‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,10 @@ private function setTimezone(Request $request): void
4747
{
4848
if ($timezone = $request->attributes->get('_timezone')) {
4949
$this->timezoneManager->setTimezone($timezone);
50+
} else {
51+
$request->attributes->set('_timezone', $this->timezoneManager->getTimezone());
5052
}
5153

52-
if (!$request->hasPreviousSession()) {
53-
return;
54-
}
55-
56-
if ($timezone = $request->getSession()->get('_timezone')) {
57-
$this->timezoneManager->setTimezone($timezone);
58-
}
5954
}
6055

6156
private function setRouterContext(Request $request): void

‎tests/BundleInitializationTest.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
use SoureCode\Bundle\Timezone\Manager\TimezoneManager;
77
use SoureCode\Bundle\Timezone\SoureCodeTimezoneBundle;
88
use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
9-
use Symfony\Bundle\SecurityBundle\SecurityBundle;
109
use Symfony\Component\HttpKernel\KernelInterface;
1110

1211
class BundleInitializationTest extends KernelTestCase
@@ -24,7 +23,6 @@ protected static function createKernel(array $options = []): KernelInterface
2423
$kernel = parent::createKernel($options);
2524
$kernel->setTestProjectDir(__DIR__ . '/app');
2625
$kernel->addTestBundle(SoureCodeTimezoneBundle::class);
27-
$kernel->addTestBundle(SecurityBundle::class);
2826
$kernel->addTestConfig(__DIR__ . '/app/config/config.yml');
2927
$kernel->handleOptions($options);
3028

‎tests/EventListener/TimezoneListenerTest.php‎

Lines changed: 0 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
use Nyholm\BundleTest\TestKernel;
66
use SoureCode\Bundle\Timezone\SoureCodeTimezoneBundle;
77
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
8-
use Symfony\Bundle\SecurityBundle\SecurityBundle;
98
use Symfony\Component\HttpKernel\KernelInterface;
10-
use Symfony\Component\Security\Core\User\InMemoryUser;
119

1210
class TimezoneListenerTest extends WebTestCase
1311
{
@@ -22,7 +20,6 @@ protected static function createKernel(array $options = []): KernelInterface
2220
$kernel = parent::createKernel($options);
2321
$kernel->setTestProjectDir(__DIR__ . '/../app');
2422
$kernel->addTestBundle(SoureCodeTimezoneBundle::class);
25-
$kernel->addTestBundle(SecurityBundle::class);
2623
$kernel->addTestConfig(__DIR__ . '/../app/config/config.yml');
2724
$kernel->addTestRoutingFile(__DIR__ . '/../app/config/routes.yml');
2825
$kernel->handleOptions($options);
@@ -57,66 +54,4 @@ public function testOverrideDefaultTimezone(): void
5754
self::assertResponseStatusCodeSame(200, 'The response is not successful.');
5855
self::assertSame('["Europe\/Berlin"]', $response->getContent(), 'The timezone is not set correctly.');
5956
}
60-
61-
public function testDefaultWithoutSessionTimezone(): void
62-
{
63-
// Arrange
64-
$client = static::createClient();
65-
$client->loginUser(new InMemoryUser('user', 'password'));
66-
67-
// Act
68-
$client->request('GET', '/');
69-
$response = $client->getResponse();
70-
71-
// Assert
72-
self::assertResponseStatusCodeSame(200, 'The response is not successful.');
73-
self::assertSame('["Asia\/Tokyo"]', $response->getContent(), 'The timezone is not set correctly.');
74-
}
75-
76-
public function testOverrideWithoutSessionTimezone(): void
77-
{
78-
// Arrange
79-
$client = static::createClient();
80-
$client->loginUser(new InMemoryUser('user', 'password'));
81-
82-
// Act
83-
$client->request('GET', '/override');
84-
$response = $client->getResponse();
85-
86-
// Assert
87-
self::assertResponseStatusCodeSame(200, 'The response is not successful.');
88-
self::assertSame('["Europe\/Berlin"]', $response->getContent(), 'The timezone is not set correctly.');
89-
}
90-
91-
public function testDefaultWithSessionTimezone(): void
92-
{
93-
// Arrange
94-
$client = static::createClient();
95-
$client->loginUser(new InMemoryUser('user', 'password'));
96-
$client->request('GET', '/set', ['_timezone' => 'Australia/Sydney']);
97-
98-
// Act
99-
$client->request('GET', '/');
100-
$response = $client->getResponse();
101-
102-
// Assert
103-
self::assertResponseStatusCodeSame(200, 'The response is not successful.');
104-
self::assertSame('["Australia\/Sydney"]', $response->getContent(), 'The timezone is not set correctly.');
105-
}
106-
107-
public function testOverrideWithSessionTimezone(): void
108-
{
109-
// Arrange
110-
$client = static::createClient();
111-
$client->loginUser(new InMemoryUser('user', 'password'));
112-
$client->request('GET', '/set', ['_timezone' => 'Australia/Sydney']);
113-
114-
// Act
115-
$client->request('GET', '/override');
116-
$response = $client->getResponse();
117-
118-
// Assert
119-
self::assertResponseStatusCodeSame(200, 'The response is not successful.');
120-
self::assertSame('["Australia\/Sydney"]', $response->getContent(), 'The timezone is not set correctly.');
121-
}
12257
}

‎tests/Manager/TimezoneManagerTest.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
use SoureCode\Bundle\Timezone\Manager\TimezoneManager;
88
use SoureCode\Bundle\Timezone\SoureCodeTimezoneBundle;
99
use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
10-
use Symfony\Bundle\SecurityBundle\SecurityBundle;
1110
use Symfony\Component\HttpKernel\KernelInterface;
1211

1312
class TimezoneManagerTest extends KernelTestCase
@@ -24,7 +23,6 @@ protected static function createKernel(array $options = []): KernelInterface
2423
$kernel = parent::createKernel($options);
2524
$kernel->setTestProjectDir(__DIR__ . '/../app');
2625
$kernel->addTestBundle(SoureCodeTimezoneBundle::class);
27-
$kernel->addTestBundle(SecurityBundle::class);
2826
$kernel->addTestConfig(__DIR__ . '/../app/config/config.yml');
2927
$kernel->handleOptions($options);
3028

‎tests/app/config/config.yml‎

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -17,34 +17,4 @@ services:
1717

1818
soure_code_timezone:
1919
default_timezone: 'Asia/Tokyo'
20-
enabled_timezones: ['Etc/UTC', 'Europe/Berlin', 'Asia/Tokyo', 'Australia/Sydney']
21-
22-
framework:
23-
session:
24-
enabled: true
25-
storage_factory_id: session.storage.factory.php_bridge
26-
27-
security:
28-
password_hashers:
29-
Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface: 'auto'
30-
providers:
31-
app_user_provider:
32-
memory:
33-
users:
34-
test: { password: '$2y$13$jxGxc...IuqDju', roles: ['ROLE_ADMIN'] }
35-
firewalls:
36-
main:
37-
provider: app_user_provider
38-
39-
when@test:
40-
security:
41-
password_hashers:
42-
# By default, password hashers are resource intensive and take time. This is
43-
# important to generate secure password hashes. In tests however, secure hashes
44-
# are not important, waste resources and increase test times. The following
45-
# reduces the work factor to the lowest possible values.
46-
Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface:
47-
algorithm: auto
48-
cost: 4 # Lowest possible value for bcrypt
49-
time_cost: 3 # Lowest possible value for argon
50-
memory_cost: 10 # Lowest possible value for argon
20+
enabled_timezones: [ 'Etc/UTC', 'Europe/Berlin', 'Asia/Tokyo', 'Australia/Sydney' ]

‎tests/app/src/Controller/TestController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function override(TimezoneManager $timezoneManager): JsonResponse
2626

2727
#[Route('/set', name: 'app_set')]
2828
public function set(
29-
Request $request,
29+
Request $request,
3030
TimezoneManager $timezoneManager
3131
): JsonResponse
3232
{

0 commit comments

Comments
 (0)