From 941c79508503e984c5249b45bd2abfe36cf79b49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Tue, 24 Oct 2023 17:24:06 -0300
Subject: [PATCH] Move ./cache directory to ./app/cache
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 app/.gitignore                  | 1 -
 {cache => app/cache}/.gitignore | 0
 app/vendor_config.php           | 2 +-
 phpcs.xml.dist                  | 2 +-
 phpstan.neon.dist               | 2 +-
 phpunit.xml.dist                | 2 +-
 psalm.xml                       | 2 +-
 test/phpstan-constants.php      | 2 +-
 8 files changed, 6 insertions(+), 7 deletions(-)
 rename {cache => app/cache}/.gitignore (100%)

diff --git a/app/.gitignore b/app/.gitignore
index 2af69e6ce2..ea4a1fdaff 100644
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -1,2 +1 @@
-cache/
 language_stats.inc.php
diff --git a/cache/.gitignore b/app/cache/.gitignore
similarity index 100%
rename from cache/.gitignore
rename to app/cache/.gitignore
diff --git a/app/vendor_config.php b/app/vendor_config.php
index c503cf1cb5..9eb2600be0 100644
--- a/app/vendor_config.php
+++ b/app/vendor_config.php
@@ -68,7 +68,7 @@ return [
     /**
      * Define the cache directory for routing cache and other cache files
      */
-    'cacheDir' => ROOT_PATH . 'cache' . DIRECTORY_SEPARATOR,
+    'cacheDir' => ROOT_PATH . 'app' . DIRECTORY_SEPARATOR . 'cache' . DIRECTORY_SEPARATOR,
 
     /**
      * Suffix to add to the phpMyAdmin version
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 6477f5c740..db35d1fc7c 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -15,9 +15,9 @@
     <file>./test</file>
     <file>./config.sample.inc.php</file>
 
+    <exclude-pattern>*/app/cache/*</exclude-pattern>
     <exclude-pattern>*/app/language_stats.inc.php</exclude-pattern>
     <exclude-pattern>*/build/*</exclude-pattern>
-    <exclude-pattern>*/cache/*</exclude-pattern>
     <exclude-pattern>*/config.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
index 77b518879d..c984621762 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -15,7 +15,7 @@ parameters:
     stubFiles:
         - test/stubs/uploadprogress.stub
     excludePaths:
-        - cache/*
+        - app/cache/*
         - test/doctum-config.php
     dynamicConstantNames:
         - ROOT_PATH
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 0295020b53..540f2885e1 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -22,7 +22,7 @@
       <directory suffix=".php">.</directory>
     </include>
     <exclude>
-      <directory>cache</directory>
+      <directory>app/cache</directory>
       <directory>examples</directory>
       <directory>node_modules</directory>
       <directory>test</directory>
diff --git a/psalm.xml b/psalm.xml
index 8df5cceeca..dbaf25c934 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -21,7 +21,7 @@
         <directory name="test/selenium"/>
         <file name="public/index.php"/>
         <ignoreFiles>
-            <directory name="cache"/>
+            <directory name="app/cache"/>
             <directory name="vendor"/>
         </ignoreFiles>
         <ignoreFiles allowMissingFiles="true">
diff --git a/test/phpstan-constants.php b/test/phpstan-constants.php
index b9b557fd58..4b6394b88a 100644
--- 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 . 'cache' . DIRECTORY_SEPARATOR);
+define('CACHE_DIR', ROOT_PATH . 'app' . DIRECTORY_SEPARATOR . 'cache' . DIRECTORY_SEPARATOR);
 define('VERSION_SUFFIX', '');