Merge pull request #18740 from MauricioFauth/cache-dir

MauricioFauth · web-flow · commit 5878be532305 · 2023-09-30T17:38:03.000-03:00
Move ./libraries/cache directory to ./cache
diff --git a/cache/.gitignore b/cache/.gitignore
diff --git a/libraries/.gitignore b/libraries/.gitignore
@@ -1 +1,2 @@
+cache/
 language_stats.inc.php
diff --git a/libraries/vendor_config.php b/libraries/vendor_config.php
@@ -68,7 +68,7 @@
     /**
      * Define the cache directory for routing cache and other cache files
      */
-    'cacheDir' => ROOT_PATH . 'libraries' . DIRECTORY_SEPARATOR . 'cache' . DIRECTORY_SEPARATOR,
+    'cacheDir' => ROOT_PATH . 'cache' . DIRECTORY_SEPARATOR,
 
     /**
      * Suffix to add to the phpMyAdmin version
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -16,8 +16,8 @@
     <file>./config.sample.inc.php</file>
 
     <exclude-pattern>*/build/*</exclude-pattern>
+    <exclude-pattern>*/cache/*</exclude-pattern>
     <exclude-pattern>*/config.inc.php</exclude-pattern>
-    <exclude-pattern>*/libraries/cache/*</exclude-pattern>
     <exclude-pattern>*/libraries/language_stats.inc.php</exclude-pattern>
     <exclude-pattern>*/node_modules/*</exclude-pattern>
     <exclude-pattern>*/test/doctum-config.php</exclude-pattern>
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -15,7 +15,7 @@ parameters:
     stubFiles:
         - test/stubs/uploadprogress.stub
     excludePaths:
-        - libraries/cache/*
+        - cache/*
         - test/doctum-config.php
     dynamicConstantNames:
         - ROOT_PATH
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -22,8 +22,8 @@
       <directory suffix=".php">.</directory>
     </include>
     <exclude>
+      <directory>cache</directory>
       <directory>examples</directory>
-      <directory>libraries/cache</directory>
       <directory>node_modules</directory>
       <directory>test</directory>
       <directory>tmp</directory>
diff --git a/psalm.xml b/psalm.xml
@@ -21,8 +21,8 @@
         <directory name="test/selenium"/>
         <file name="public/index.php"/>
         <ignoreFiles>
+            <directory name="cache"/>
             <directory name="vendor"/>
-            <directory name="libraries/cache"/>
         </ignoreFiles>
         <ignoreFiles allowMissingFiles="true">
             <file name="config.inc.php"/>
diff --git a/test/classes/ConfigTest.php b/test/classes/ConfigTest.php
@@ -905,4 +905,30 @@ public static function connectionParamsWhenConnectionIsUserOrAuxiliaryProvider()
             '12345',
         ];
     }
+
+    public function testVendorConfigFile(): void
+    {
+        $vendorConfig = include ROOT_PATH . 'libraries/vendor_config.php';
+        $expected = [
+            'autoloadFile' => ROOT_PATH . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php',
+            'tempDir' => ROOT_PATH . 'tmp' . DIRECTORY_SEPARATOR,
+            'changeLogFile' => ROOT_PATH . 'ChangeLog',
+            'licenseFile' => ROOT_PATH . 'LICENSE',
+            'sqlDir' => ROOT_PATH . 'sql' . DIRECTORY_SEPARATOR,
+            'configFile' => ROOT_PATH . 'config.inc.php',
+            'customHeaderFile' => ROOT_PATH . 'config.header.inc.php',
+            'customFooterFile' => ROOT_PATH . 'config.footer.inc.php',
+            'versionCheckDefault' => true,
+            'localePath' => ROOT_PATH . 'locale' . DIRECTORY_SEPARATOR,
+            'cacheDir' => ROOT_PATH . 'cache' . DIRECTORY_SEPARATOR,
+            'versionSuffix' => '',
+        ];
+        self::assertSame($expected, $vendorConfig);
+        self::assertFileExists($vendorConfig['autoloadFile']);
+        self::assertFileExists($vendorConfig['changeLogFile']);
+        self::assertFileExists($vendorConfig['licenseFile']);
+        self::assertDirectoryExists($vendorConfig['sqlDir']);
+        self::assertDirectoryExists($vendorConfig['localePath']);
+        self::assertDirectoryExists($vendorConfig['cacheDir']);
+    }
 }
diff --git a/test/phpstan-constants.php b/test/phpstan-constants.php
@@ -3,5 +3,5 @@
 declare(strict_types=1);
 
 define('ROOT_PATH', dirname(__DIR__) . DIRECTORY_SEPARATOR);
-define('CACHE_DIR', ROOT_PATH . 'libraries' . DIRECTORY_SEPARATOR . 'cache' . DIRECTORY_SEPARATOR);
+define('CACHE_DIR', ROOT_PATH . 'cache' . DIRECTORY_SEPARATOR);
 define('VERSION_SUFFIX', '');
