Merge branch 'develop' into snipe-it-17073-asset-requests-are-not-deleted-when-asset-is-deleted

2025-08-04 12:43:03 -07:00
parent 0102599708 06b040a337
commit ff39e8bd2c
1074 changed files with 24382 additions and 310035 deletions
@@ -228,6 +228,7 @@ class LdapTest extends TestCase
        $this->settings->enableLdap()->set(['ldap_client_tls_cert' => 'SAMPLE CERT TEXT']);
        $client_side_cert_path = Setting::get_client_side_cert_path();
        file_put_contents($client_side_cert_path, 'WEIRDLY UPDATED CERT FILE');
+        clearstatcache();
        //the system should respect our cache-file, since the settings haven't been updated
        $possibly_recached_cert_file = Setting::get_client_side_cert_path(); //this should *NOT* re-cache from the Settings
        $this->assertStringEqualsFile($possibly_recached_cert_file, 'WEIRDLY UPDATED CERT FILE');