Updated test with default time zone.

laurentmuller · Jun 6, 2024 · fabe3c7 · fabe3c7
1 parent 5724549
commit fabe3c7
Show file tree

Hide file tree

Showing 7 changed files with 90 additions and 51 deletions.
diff --git a/.github/workflows/php_unit.yaml b/.github/workflows/php_unit.yaml
@@ -14,7 +14,7 @@ jobs:
                 uses: shivammathur/setup-php@v2
                 with:
                     php-version: '8.2'
-                    ini-values: date.timezone="Europe/Zurich"
+                    ini-values: date.timezone=Europe/Zurich
                     coverage: xdebug
 
             -   name: Install dependencies

diff --git a/composer.lock b/composer.lock
diff --git a/resources/data/csp.dev.json b/resources/data/csp.dev.json
@@ -1,12 +1,28 @@
 {
-    "base-uri": "none",
-    "media-src": "none",
-    "object-src": "none",
-    "default-src": "self",
-    "form-action": "self",
-    "manifest-src": "self",
-    "frame-ancestors": "self",
-    "script-src": "nonce",
+    "base-uri": [
+        "none"
+    ],
+    "media-src": [
+        "none"
+    ],
+    "object-src": [
+        "none"
+    ],
+    "default-src": [
+        "self"
+    ],
+    "form-action": [
+        "self"
+    ],
+    "manifest-src": [
+        "self"
+    ],
+    "frame-ancestors": [
+        "self"
+    ],
+    "script-src": [
+        "nonce"
+    ],
     "script-src-elem": [
         "nonce",
         "https://www.google.com",

diff --git a/resources/data/csp.prod.json b/resources/data/csp.prod.json
@@ -1,12 +1,28 @@
 {
-    "base-uri": "none",
-    "media-src": "none",
-    "object-src": "none",
-    "default-src": "self",
-    "form-action": "self",
-    "manifest-src": "self",
-    "frame-ancestors": "self",
-    "script-src": "nonce",
+    "base-uri": [
+        "none"
+    ],
+    "media-src": [
+        "none"
+    ],
+    "object-src": [
+        "none"
+    ],
+    "default-src": [
+        "self"
+    ],
+    "form-action": [
+        "self"
+    ],
+    "manifest-src": [
+        "self"
+    ],
+    "frame-ancestors": [
+        "self"
+    ],
+    "script-src": [
+        "nonce"
+    ],
     "script-src-elem": [
         "nonce",
         "https://www.google.com",
@@ -41,5 +57,7 @@
         "https://robohash.org",
         "https://openweathermap.org"
     ],
-    "report-uri": "report"
+    "report-uri": [
+        "report"
+    ]
 }
diff --git a/src/Listener/ResponseListener.php b/src/Listener/ResponseListener.php
@@ -30,9 +30,10 @@
 /**
  * Listener to add content security policy (CSP) to response.
  *
- * Processing Content Security Policy violation reports:
- *
- * @see https://mathiasbynens.be/notes/csp-reports.
+ * @see https://mathiasbynens.be/notes/csp-reports
+ * @see https://securityheaders.com/
+ * @see https://github.com/aidantwoods/SecureHeaders
+ * @see https://www.sentrium.co.uk/labs/application-security-101-http-headers
  */
 class ResponseListener
 {
@@ -57,10 +58,6 @@ class ResponseListener
 
     /**
      * The default headers to add.
-     *
-     * @see https://securityheaders.com/
-     * @see https://github.com/aidantwoods/SecureHeaders
-     * @see https://www.sentrium.co.uk/labs/application-security-101-http-headers
      */
     private const DEFAULT_HEADERS = [
         'referrer-policy' => 'same-origin',
@@ -92,7 +89,7 @@ public function onKernelResponse(ResponseEvent $event): void
             return;
         }
 
-        if ($this->debug && $this->isDevRequest($event->getRequest())) {
+        if ($this->debug && $this->isDevFirewall($event->getRequest())) {
             return;
         }
 
@@ -129,6 +126,8 @@ private function buildCSP(): string
      * @psalm-return array<string, string[]>
      *
      * @throws InvalidArgumentException
+     *
+     * @psalm-suppress MixedArgumentTypeCoercion
      */
     private function getCSP(): array
     {
@@ -137,9 +136,14 @@ private function getCSP(): array
                 return [];
             }
 
-            $content = $this->loadFile();
+            try {
+                /* @psalm-var array<string, string[]> $content */
+                $content = FileUtils::decodeJson($this->file);
 
-            return $this->replaceValues($content);
+                return $this->replaceValues($content);
+            } catch (\InvalidArgumentException) {
+                return [];
+            }
         });
     }
 
@@ -148,23 +152,11 @@ private function getReportURL(): string
         return $this->generator->generate(CspReportController::ROUTE_NAME, [], UrlGeneratorInterface::ABSOLUTE_URL);
     }
 
-    private function isDevRequest(Request $request): bool
+    private function isDevFirewall(Request $request): bool
     {
         return self::FIREWALL_DEV === $this->security->getFirewallConfig($request)?->getName();
     }
 
-    /**
-     * @psalm-return array<string, string[]>
-     */
-    private function loadFile(): array
-    {
-        /* @psalm-var array<string, string|string[]> $content */
-        $content = FileUtils::decodeJson($this->file);
-
-        /** @psalm-var array<string, string[]> */
-        return \array_map(static fn (string|array $value): array => (array) $value, $content);
-    }
-
     /**
      * @psalm-param array<string, string[]> $array
      *

diff --git a/tests/Utils/DateUtilsTest.php b/tests/Utils/DateUtilsTest.php
@@ -21,10 +21,13 @@
 #[CoversClass(DateUtils::class)]
 class DateUtilsTest extends TestCase
 {
+    private const TIME_ZONE = 'Europe/Zurich';
+
     protected function setUp(): void
     {
         \Locale::setDefault(FormatUtils::DEFAULT_LOCALE);
         \setlocale(\LC_ALL, FormatUtils::DEFAULT_LOCALE);
+        \date_default_timezone_set(self::TIME_ZONE);
     }
 
     public static function getCompletYears(): \Iterator
@@ -323,6 +326,12 @@ public function testSubByString(): void
         self::assertSame('2020-01-03', $add->format('Y-m-d'));
     }
 
+    public function testTimeZone(): void
+    {
+        $actual = \date_default_timezone_get();
+        self::assertSame(self::TIME_ZONE, $actual);
+    }
+
     #[DataProvider('getWeekdayNames')]
     public function testWeekdayNames(string $name, int $index, string $firstDay = 'sunday'): void
     {

diff --git a/tests/Utils/FormatUtilsTest.php b/tests/Utils/FormatUtilsTest.php
@@ -22,17 +22,15 @@
 class FormatUtilsTest extends TestCase
 {
     private const DATE_TIME = '2022-02-20 12:59:59';
-
     private const PERCENT_SYMBOL = '%';
-
     private const TIME_STAMP = 1_645_358_399;
-
     private const TIME_ZONE = 'Europe/Zurich';
 
     protected function setUp(): void
     {
         \Locale::setDefault(FormatUtils::DEFAULT_LOCALE);
-        \setlocale(\LC_TIME, FormatUtils::DEFAULT_LOCALE);
+        \setlocale(\LC_ALL, FormatUtils::DEFAULT_LOCALE);
+        \date_default_timezone_set(self::TIME_ZONE);
     }
 
     public static function getAmounts(): \Iterator
@@ -367,6 +365,12 @@ public function testTimeType(): void
         self::assertSame(\IntlDateFormatter::SHORT, FormatUtils::TIME_TYPE);
     }
 
+    public function testTimeZone(): void
+    {
+        $actual = \date_default_timezone_get();
+        self::assertSame(self::TIME_ZONE, $actual);
+    }
+
     /**
      * @throws \Exception
      */