Fix line ending sequence issue in checksums

resources/data/filecache.json

@@ -1 +1,82 @@
-{"resources\/views\/components\/article-excerpt.blade.php":{"md5sum":"8088eda1deaf9cdeaa4bdf10c952a85d","last_modified":1648887293},"resources\/views\/homepages\/blank.blade.php":{"md5sum":"908e9df81727c0cc5b4671610c7f0000","last_modified":1648153885},"resources\/views\/homepages\/post-feed.blade.php":{"md5sum":"a774752e9bb7b360efb9e615a8948e5f","last_modified":1648153885},"resources\/views\/homepages\/welcome.blade.php":{"md5sum":"d2b8278c0dbcb6affa68ce695e832532","last_modified":1648477610},"resources\/views\/layouts\/app.blade.php":{"md5sum":"da70362b537ef753ed801ce475402b7c","last_modified":1649356104},"resources\/views\/layouts\/docs.blade.php":{"md5sum":"11b037aa4ee4939d94062a6ef17fa7b2","last_modified":1649480222},"resources\/views\/layouts\/footer.blade.php":{"md5sum":"6d6038140fc7e7dcf19fc901f7313487","last_modified":1648153885},"resources\/views\/layouts\/meta.blade.php":{"md5sum":"cb6118a0e30b152564fb29d449de5973","last_modified":1648153885},"resources\/views\/layouts\/navigation.blade.php":{"md5sum":"12214f98a83ace117cde1c1b5b17572a","last_modified":1648894753},"resources\/views\/layouts\/page.blade.php":{"md5sum":"2aab50fd6b6786cf8700924ec9facd8d","last_modified":1648153885},"resources\/views\/layouts\/post.blade.php":{"md5sum":"53b46763e4bd7a2cfa7aece49721b8b4","last_modified":1648846467},"resources\/views\/pages\/404.blade.php":{"md5sum":"8556456f2cffcd537380bdd03c90b488","last_modified":1648635855},"resources\/frontend\/app.css":{"md5sum":"7294805e1e94a856333999f9c0ad4814","last_modified":1649350535},"resources\/frontend\/hyde.css":{"md5sum":"2e4d0ee06558fa39407e16c15e2ed7bd","last_modified":1649453514},"resources\/frontend\/hyde.scss":{"md5sum":"7ee2c272b8e6d12955b2184d84213106","last_modified":1649453509},"resources\/frontend\/hyde.js":{"md5sum":"578a5345ca91092e8ada0945751a6bcd","last_modified":1649350535}}
+{
+    "resources\/views\/components\/article-excerpt.blade.php": {
+        "md5sum": "8088eda1deaf9cdeaa4bdf10c952a85d",
+        "unixsum": "95e927640b6b6ba13d7d6da882799266",
+        "last_modified": 1648887293
+    },
+    "resources\/views\/homepages\/blank.blade.php": {
+        "md5sum": "908e9df81727c0cc5b4671610c7f0000",
+        "unixsum": "9a1305a8f0a85bf2776332082d359a99",
+        "last_modified": 1648153885
+    },
+    "resources\/views\/homepages\/post-feed.blade.php": {
+        "md5sum": "a774752e9bb7b360efb9e615a8948e5f",
+        "unixsum": "37924ffc7670a7b334f8d949b5f69247",
+        "last_modified": 1648153885
+    },
+    "resources\/views\/homepages\/welcome.blade.php": {
+        "md5sum": "d2b8278c0dbcb6affa68ce695e832532",
+        "unixsum": "d0ff85e2a069555bff4f4eda7ac1ca43",
+        "last_modified": 1648477610
+    },
+    "resources\/views\/layouts\/app.blade.php": {
+        "md5sum": "10d70a2dc94fc1d751527da164e7b4dd",
+        "unixsum": "10d70a2dc94fc1d751527da164e7b4dd",
+        "last_modified": 1649502327
+    },
+    "resources\/views\/layouts\/docs.blade.php": {
+        "md5sum": "11b037aa4ee4939d94062a6ef17fa7b2",
+        "unixsum": "980ce346dd24e5424a7af23a920bab29",
+        "last_modified": 1649480222
+    },
+    "resources\/views\/layouts\/footer.blade.php": {
+        "md5sum": "6d6038140fc7e7dcf19fc901f7313487",
+        "unixsum": "6f7626940d72d4605e8e518572dff46c",
+        "last_modified": 1648153885
+    },
+    "resources\/views\/layouts\/meta.blade.php": {
+        "md5sum": "cb6118a0e30b152564fb29d449de5973",
+        "unixsum": "cb26d69c014458c79a78336fe54ff885",
+        "last_modified": 1648153885
+    },
+    "resources\/views\/layouts\/navigation.blade.php": {
+        "md5sum": "12214f98a83ace117cde1c1b5b17572a",
+        "unixsum": "201491144f2918e054cabbe3c19e091a",
+        "last_modified": 1648894753
+    },
+    "resources\/views\/layouts\/page.blade.php": {
+        "md5sum": "2aab50fd6b6786cf8700924ec9facd8d",
+        "unixsum": "e096a1fdd2f12e6dc4f9172bfd932a53",
+        "last_modified": 1648153885
+    },
+    "resources\/views\/layouts\/post.blade.php": {
+        "md5sum": "53b46763e4bd7a2cfa7aece49721b8b4",
+        "unixsum": "4b03a4b52c9366525f6182205a78dc1f",
+        "last_modified": 1648846467
+    },
+    "resources\/views\/pages\/404.blade.php": {
+        "md5sum": "8556456f2cffcd537380bdd03c90b488",
+        "unixsum": "0f241c641257c68e254ab290b3bc4cbf",
+        "last_modified": 1648635855
+    },
+    "resources\/frontend\/app.css": {
+        "md5sum": "7294805e1e94a856333999f9c0ad4814",
+        "unixsum": "c040ed42da55bbd3300ce3fb11cfc458",
+        "last_modified": 1649350535
+    },
+    "resources\/frontend\/hyde.css": {
+        "md5sum": "2e4d0ee06558fa39407e16c15e2ed7bd",
+        "unixsum": "2e4d0ee06558fa39407e16c15e2ed7bd",
+        "last_modified": 1649453514
+    },
+    "resources\/frontend\/hyde.scss": {
+        "md5sum": "7ee2c272b8e6d12955b2184d84213106",
+        "unixsum": "f46c77bc128c74376fb49cf5a4d51a5c",
+        "last_modified": 1649453509
+    },
+    "resources\/frontend\/hyde.js": {
+        "md5sum": "578a5345ca91092e8ada0945751a6bcd",
+        "unixsum": "21be3ae994b6f3c20a58a036446a8484",
+        "last_modified": 1649350535
+    }
+}

resources/data/filecacheGenerator.php

@@ -15,12 +15,20 @@
 
 foreach ($files as $file) {
     $filecache[str_replace(__DIR__.'/../../', '', $file)] = [
-        'md5sum' => md5_file($file),
+        'unixsum' => unixsum(file_get_contents($file)),
         'last_modified' => filemtime($file),
     ];
 }
 
-file_put_contents('filecache.json', json_encode($filecache));
+function unixsum(string $string): string
+{
+    // Replace all end of line characters with a unix line ending
+    $string = str_replace(["\r\n", "\r"], "\n", $string);
+
+    return md5($string);
+}
+
+file_put_contents('filecache.json', json_encode($filecache, JSON_PRETTY_PRINT));
 
 $execution_time = (microtime(true) - $time_start);
 echo sprintf(

src/Commands/HydePublishHomepageCommand.php

@@ -105,7 +105,7 @@ protected function canExistingIndexFileBeOverwritten(): bool
             return true;
         }
 
-        return FileCacheService::checksumMatchesAny(md5_file(
+        return FileCacheService::checksumMatchesAny(FileCacheService::unixsumFile(
             Hyde::path('resources/views/pages/index.blade.php')
         )) ?? $this->option('force');
     }

src/Services/FileCacheService.php

@@ -31,4 +31,24 @@ public static function checksumMatchesAny(string $checksum): bool
     {
         return in_array($checksum, static::getChecksums());
     }
+
+    /**
+     * A EOL agnostic wrapper for calculating MD5 checksums.
+     *
+     * @internal This function is not cryptographically secure.
+     *
+     * @see https://github.com/hydephp/framework/issues/85
+     */
+    public static function unixsum(string $string): string
+    {
+        $string = str_replace(["\r\n", "\r"], "\n", $string);
+
+        return md5($string);
+    }
+
+    /* Shorthand for @see static::unixsum() but loads a file */
+    public static function unixsumFile(string $file): string
+    {
+        return static::unixsum(file_get_contents($file));
+    }
 }