From 311a5477f8e7042dde2062da585d0133f79c8f24 Mon Sep 17 00:00:00 2001
From: Zankaria <zankaria.auxa@mailu.io>
Date: Sat, 26 Jul 2025 23:34:58 +0200
Subject: [PATCH 1/6] CacheDriver: moved to subdirectory

---
 inc/Data/Driver/{ => Cache}/ApcuCacheDriver.php     | 2 +-
 inc/Data/Driver/{ => Cache}/ArrayCacheDriver.php    | 2 +-
 inc/Data/Driver/{ => Cache}/CacheDriver.php         | 2 +-
 inc/Data/Driver/{ => Cache}/CacheDriverTrait.php    | 2 +-
 inc/Data/Driver/{ => Cache}/FsCachedriver.php       | 2 +-
 inc/Data/Driver/{ => Cache}/MemcacheCacheDriver.php | 2 +-
 inc/Data/Driver/{ => Cache}/NoneCacheDriver.php     | 2 +-
 inc/Data/Driver/{ => Cache}/RedisCacheDriver.php    | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)
 rename inc/Data/Driver/{ => Cache}/ApcuCacheDriver.php (93%)
 rename inc/Data/Driver/{ => Cache}/ArrayCacheDriver.php (93%)
 rename inc/Data/Driver/{ => Cache}/CacheDriver.php (96%)
 rename inc/Data/Driver/{ => Cache}/CacheDriverTrait.php (92%)
 rename inc/Data/Driver/{ => Cache}/FsCachedriver.php (99%)
 rename inc/Data/Driver/{ => Cache}/MemcacheCacheDriver.php (98%)
 rename inc/Data/Driver/{ => Cache}/NoneCacheDriver.php (91%)
 rename inc/Data/Driver/{ => Cache}/RedisCacheDriver.php (97%)

diff --git a/inc/Data/Driver/ApcuCacheDriver.php b/inc/Data/Driver/Cache/ApcuCacheDriver.php
similarity index 93%
rename from inc/Data/Driver/ApcuCacheDriver.php
rename to inc/Data/Driver/Cache/ApcuCacheDriver.php
index a39bb656..4aeb64cd 100644
--- a/inc/Data/Driver/ApcuCacheDriver.php
+++ b/inc/Data/Driver/Cache/ApcuCacheDriver.php
@@ -1,5 +1,5 @@
 <?php
-namespace Vichan\Data\Driver;
+namespace Vichan\Data\Driver\Cache;
 
 defined('TINYBOARD') or exit;
 
diff --git a/inc/Data/Driver/ArrayCacheDriver.php b/inc/Data/Driver/Cache/ArrayCacheDriver.php
similarity index 93%
rename from inc/Data/Driver/ArrayCacheDriver.php
rename to inc/Data/Driver/Cache/ArrayCacheDriver.php
index bb0cd310..1918bb62 100644
--- a/inc/Data/Driver/ArrayCacheDriver.php
+++ b/inc/Data/Driver/Cache/ArrayCacheDriver.php
@@ -1,5 +1,5 @@
 <?php
-namespace Vichan\Data\Driver;
+namespace Vichan\Data\Driver\Cache;
 
 defined('TINYBOARD') or exit;
 
diff --git a/inc/Data/Driver/CacheDriver.php b/inc/Data/Driver/Cache/CacheDriver.php
similarity index 96%
rename from inc/Data/Driver/CacheDriver.php
rename to inc/Data/Driver/Cache/CacheDriver.php
index 083ed652..124cbf71 100644
--- a/inc/Data/Driver/CacheDriver.php
+++ b/inc/Data/Driver/Cache/CacheDriver.php
@@ -1,5 +1,5 @@
 <?php
-namespace Vichan\Data\Driver;
+namespace Vichan\Data\Driver\Cache;
 
 defined('TINYBOARD') or exit;
 
diff --git a/inc/Data/Driver/CacheDriverTrait.php b/inc/Data/Driver/Cache/CacheDriverTrait.php
similarity index 92%
rename from inc/Data/Driver/CacheDriverTrait.php
rename to inc/Data/Driver/Cache/CacheDriverTrait.php
index 16e56ce0..c834b572 100644
--- a/inc/Data/Driver/CacheDriverTrait.php
+++ b/inc/Data/Driver/Cache/CacheDriverTrait.php
@@ -1,5 +1,5 @@
 <?php
-namespace Vichan\Data\Driver;
+namespace Vichan\Data\Driver\Cache;
 
 
 trait CacheDriverTrait {
diff --git a/inc/Data/Driver/FsCachedriver.php b/inc/Data/Driver/Cache/FsCachedriver.php
similarity index 99%
rename from inc/Data/Driver/FsCachedriver.php
rename to inc/Data/Driver/Cache/FsCachedriver.php
index b543cfa6..a6ca727f 100644
--- a/inc/Data/Driver/FsCachedriver.php
+++ b/inc/Data/Driver/Cache/FsCachedriver.php
@@ -1,5 +1,5 @@
 <?php
-namespace Vichan\Data\Driver;
+namespace Vichan\Data\Driver\Cache;
 
 defined('TINYBOARD') or exit;
 
diff --git a/inc/Data/Driver/MemcacheCacheDriver.php b/inc/Data/Driver/Cache/MemcacheCacheDriver.php
similarity index 98%
rename from inc/Data/Driver/MemcacheCacheDriver.php
rename to inc/Data/Driver/Cache/MemcacheCacheDriver.php
index 22330108..24dbb792 100644
--- a/inc/Data/Driver/MemcacheCacheDriver.php
+++ b/inc/Data/Driver/Cache/MemcacheCacheDriver.php
@@ -1,5 +1,5 @@
 <?php
-namespace Vichan\Data\Driver;
+namespace Vichan\Data\Driver\Cache;
 
 defined('TINYBOARD') or exit;
 
diff --git a/inc/Data/Driver/NoneCacheDriver.php b/inc/Data/Driver/Cache/NoneCacheDriver.php
similarity index 91%
rename from inc/Data/Driver/NoneCacheDriver.php
rename to inc/Data/Driver/Cache/NoneCacheDriver.php
index 8b260a50..92d0394b 100644
--- a/inc/Data/Driver/NoneCacheDriver.php
+++ b/inc/Data/Driver/Cache/NoneCacheDriver.php
@@ -1,5 +1,5 @@
 <?php
-namespace Vichan\Data\Driver;
+namespace Vichan\Data\Driver\Cache;
 
 defined('TINYBOARD') or exit;
 
diff --git a/inc/Data/Driver/RedisCacheDriver.php b/inc/Data/Driver/Cache/RedisCacheDriver.php
similarity index 97%
rename from inc/Data/Driver/RedisCacheDriver.php
rename to inc/Data/Driver/Cache/RedisCacheDriver.php
index c71c8779..b49d8e55 100644
--- a/inc/Data/Driver/RedisCacheDriver.php
+++ b/inc/Data/Driver/Cache/RedisCacheDriver.php
@@ -1,5 +1,5 @@
 <?php
-namespace Vichan\Data\Driver;
+namespace Vichan\Data\Driver\Cache;
 
 defined('TINYBOARD') or exit;
 

From 3cb6fa3b5a068687fe8f26d1c4b2a5bdb72754bc Mon Sep 17 00:00:00 2001
From: Zankaria <zankaria.auxa@mailu.io>
Date: Sat, 26 Jul 2025 23:39:42 +0200
Subject: [PATCH 2/6] Use cache subdirectory

---
 inc/Data/IpNoteQueries.php | 2 +-
 inc/cache.php              | 2 +-
 inc/context.php            | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/inc/Data/IpNoteQueries.php b/inc/Data/IpNoteQueries.php
index ba6fdb15..835b50c2 100644
--- a/inc/Data/IpNoteQueries.php
+++ b/inc/Data/IpNoteQueries.php
@@ -1,7 +1,7 @@
 <?php
 namespace Vichan\Data;
 
-use Vichan\Data\Driver\CacheDriver;
+use Vichan\Data\Driver\Cache\CacheDriver;
 
 
 class IpNoteQueries {
diff --git a/inc/cache.php b/inc/cache.php
index 182d6fda..56cf90e2 100644
--- a/inc/cache.php
+++ b/inc/cache.php
@@ -4,7 +4,7 @@
  *  Copyright (c) 2010-2013 Tinyboard Development Group
  */
 
-use Vichan\Data\Driver\{CacheDriver, ApcuCacheDriver, ArrayCacheDriver, FsCacheDriver, MemcachedCacheDriver, NoneCacheDriver, RedisCacheDriver};
+use Vichan\Data\Driver\Cache\{CacheDriver, ApcuCacheDriver, ArrayCacheDriver, FsCacheDriver, MemcachedCacheDriver, NoneCacheDriver, RedisCacheDriver};
 
 defined('TINYBOARD') or exit;
 
diff --git a/inc/context.php b/inc/context.php
index 78812121..595a6aa0 100644
--- a/inc/context.php
+++ b/inc/context.php
@@ -2,7 +2,8 @@
 namespace Vichan;
 
 use Vichan\Data\{IpNoteQueries, ReportQueries, SearchQueries, UserPostQueries, Flags};
-use Vichan\Data\Driver\{CacheDriver, ErrorLogLogDriver, FileLogDriver, LogDriver, StderrLogDriver, SyslogLogDriver};
+use Vichan\Data\Driver\Cache\CacheDriver;
+use Vichan\Data\Driver\{ErrorLogLogDriver, FileLogDriver, LogDriver, StderrLogDriver, SyslogLogDriver};
 use Vichan\Service\SearchService;
 
 defined('TINYBOARD') or exit;

From c5ce9a80303875cf9dc86998c9fdac3e757f7ec7 Mon Sep 17 00:00:00 2001
From: Zankaria <zankaria.auxa@mailu.io>
Date: Sat, 26 Jul 2025 23:42:10 +0200
Subject: [PATCH 3/6] LogDriver: move to subdirectory

---
 inc/Data/Driver/{ => Log}/ErrorLogLogDriver.php | 2 +-
 inc/Data/Driver/{ => Log}/FileLogDriver.php     | 2 +-
 inc/Data/Driver/{ => Log}/LogDriver.php         | 2 +-
 inc/Data/Driver/{ => Log}/LogTrait.php          | 2 +-
 inc/Data/Driver/{ => Log}/StderrLogDriver.php   | 2 +-
 inc/Data/Driver/{ => Log}/SyslogLogDriver.php   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename inc/Data/Driver/{ => Log}/ErrorLogLogDriver.php (93%)
 rename inc/Data/Driver/{ => Log}/FileLogDriver.php (97%)
 rename inc/Data/Driver/{ => Log}/LogDriver.php (93%)
 rename inc/Data/Driver/{ => Log}/LogTrait.php (93%)
 rename inc/Data/Driver/{ => Log}/StderrLogDriver.php (93%)
 rename inc/Data/Driver/{ => Log}/SyslogLogDriver.php (95%)

diff --git a/inc/Data/Driver/ErrorLogLogDriver.php b/inc/Data/Driver/Log/ErrorLogLogDriver.php
similarity index 93%
rename from inc/Data/Driver/ErrorLogLogDriver.php
rename to inc/Data/Driver/Log/ErrorLogLogDriver.php
index e2050606..cca5d88b 100644
--- a/inc/Data/Driver/ErrorLogLogDriver.php
+++ b/inc/Data/Driver/Log/ErrorLogLogDriver.php
@@ -1,5 +1,5 @@
 <?php
-namespace Vichan\Data\Driver;
+namespace Vichan\Data\Driver\Log;
 
 defined('TINYBOARD') or exit;
 
diff --git a/inc/Data/Driver/FileLogDriver.php b/inc/Data/Driver/Log/FileLogDriver.php
similarity index 97%
rename from inc/Data/Driver/FileLogDriver.php
rename to inc/Data/Driver/Log/FileLogDriver.php
index 2c9f14a0..985a7726 100644
--- a/inc/Data/Driver/FileLogDriver.php
+++ b/inc/Data/Driver/Log/FileLogDriver.php
@@ -1,5 +1,5 @@
 <?php
-namespace Vichan\Data\Driver;
+namespace Vichan\Data\Driver\Log;
 
 defined('TINYBOARD') or exit;
 
diff --git a/inc/Data/Driver/LogDriver.php b/inc/Data/Driver/Log/LogDriver.php
similarity index 93%
rename from inc/Data/Driver/LogDriver.php
rename to inc/Data/Driver/Log/LogDriver.php
index fddc3f27..aecdfe64 100644
--- a/inc/Data/Driver/LogDriver.php
+++ b/inc/Data/Driver/Log/LogDriver.php
@@ -1,5 +1,5 @@
 <?php
-namespace Vichan\Data\Driver;
+namespace Vichan\Data\Driver\Log;
 
 defined('TINYBOARD') or exit;
 
diff --git a/inc/Data/Driver/LogTrait.php b/inc/Data/Driver/Log/LogTrait.php
similarity index 93%
rename from inc/Data/Driver/LogTrait.php
rename to inc/Data/Driver/Log/LogTrait.php
index 0664d5c4..131b2be3 100644
--- a/inc/Data/Driver/LogTrait.php
+++ b/inc/Data/Driver/Log/LogTrait.php
@@ -1,5 +1,5 @@
 <?php
-namespace Vichan\Data\Driver;
+namespace Vichan\Data\Driver\Log;
 
 defined('TINYBOARD') or exit;
 
diff --git a/inc/Data/Driver/StderrLogDriver.php b/inc/Data/Driver/Log/StderrLogDriver.php
similarity index 93%
rename from inc/Data/Driver/StderrLogDriver.php
rename to inc/Data/Driver/Log/StderrLogDriver.php
index 4c766033..e26debd8 100644
--- a/inc/Data/Driver/StderrLogDriver.php
+++ b/inc/Data/Driver/Log/StderrLogDriver.php
@@ -1,5 +1,5 @@
 <?php
-namespace Vichan\Data\Driver;
+namespace Vichan\Data\Driver\Log;
 
 defined('TINYBOARD') or exit;
 
diff --git a/inc/Data/Driver/SyslogLogDriver.php b/inc/Data/Driver/Log/SyslogLogDriver.php
similarity index 95%
rename from inc/Data/Driver/SyslogLogDriver.php
rename to inc/Data/Driver/Log/SyslogLogDriver.php
index c0df5304..56269f2f 100644
--- a/inc/Data/Driver/SyslogLogDriver.php
+++ b/inc/Data/Driver/Log/SyslogLogDriver.php
@@ -1,5 +1,5 @@
 <?php
-namespace Vichan\Data\Driver;
+namespace Vichan\Data\Driver\Log;
 
 defined('TINYBOARD') or exit;
 

From 1c78a7ad21c76f191dab8bd864dd1d671d9a890e Mon Sep 17 00:00:00 2001
From: Zankaria <zankaria.auxa@mailu.io>
Date: Sat, 26 Jul 2025 23:53:45 +0200
Subject: [PATCH 4/6] Use Log subdirectory

---
 inc/Service/SearchService.php | 2 +-
 inc/context.php               | 2 +-
 post.php                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/inc/Service/SearchService.php b/inc/Service/SearchService.php
index e542e41a..01792dad 100644
--- a/inc/Service/SearchService.php
+++ b/inc/Service/SearchService.php
@@ -1,7 +1,7 @@
 <?php
 namespace Vichan\Service;
 
-use Vichan\Data\Driver\LogDriver;
+use Vichan\Data\Driver\Log\LogDriver;
 use Vichan\Data\{FiltersParseResult, UserPostQueries, SearchFilters, SearchQueries};
 
 
diff --git a/inc/context.php b/inc/context.php
index 595a6aa0..1ba4d9c7 100644
--- a/inc/context.php
+++ b/inc/context.php
@@ -3,7 +3,7 @@ namespace Vichan;
 
 use Vichan\Data\{IpNoteQueries, ReportQueries, SearchQueries, UserPostQueries, Flags};
 use Vichan\Data\Driver\Cache\CacheDriver;
-use Vichan\Data\Driver\{ErrorLogLogDriver, FileLogDriver, LogDriver, StderrLogDriver, SyslogLogDriver};
+use Vichan\Data\Driver\Log\{ErrorLogLogDriver, FileLogDriver, LogDriver, StderrLogDriver, SyslogLogDriver};
 use Vichan\Service\SearchService;
 
 defined('TINYBOARD') or exit;
diff --git a/post.php b/post.php
index 37af514f..099e92b1 100644
--- a/post.php
+++ b/post.php
@@ -5,7 +5,7 @@
 
 use Vichan\Context;
 use Vichan\Data\ReportQueries;
-use Vichan\Data\Driver\LogDriver;
+use Vichan\Data\Driver\Log\LogDriver;
 
 require_once 'inc/bootstrap.php';
 

From 80d7ad9322b062d95053215b534a8f3bdffa5475 Mon Sep 17 00:00:00 2001
From: Zankaria <zankaria.auxa@mailu.io>
Date: Sat, 26 Jul 2025 23:56:25 +0200
Subject: [PATCH 5/6] Data: make more proper Model directory and namespace

---
 inc/Data/{ => Model}/FiltersParseResult.php | 2 +-
 inc/Data/{ => Model}/Flags.php              | 2 +-
 inc/Data/{ => Model}/PageFetchResult.php    | 2 +-
 inc/Data/{ => Model}/SearchFilters.php      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename inc/Data/{ => Model}/FiltersParseResult.php (89%)
 rename inc/Data/{ => Model}/Flags.php (98%)
 rename inc/Data/{ => Model}/PageFetchResult.php (87%)
 rename inc/Data/{ => Model}/SearchFilters.php (94%)

diff --git a/inc/Data/FiltersParseResult.php b/inc/Data/Model/FiltersParseResult.php
similarity index 89%
rename from inc/Data/FiltersParseResult.php
rename to inc/Data/Model/FiltersParseResult.php
index 1eb1acd8..89881c46 100644
--- a/inc/Data/FiltersParseResult.php
+++ b/inc/Data/Model/FiltersParseResult.php
@@ -1,5 +1,5 @@
 <?php
-namespace Vichan\Data;
+namespace Vichan\Data\Model;
 
 
 class FiltersParseResult {
diff --git a/inc/Data/Flags.php b/inc/Data/Model/Flags.php
similarity index 98%
rename from inc/Data/Flags.php
rename to inc/Data/Model/Flags.php
index 00d37f12..6f843484 100644
--- a/inc/Data/Flags.php
+++ b/inc/Data/Model/Flags.php
@@ -1,5 +1,5 @@
 <?php
-namespace Vichan\Data;
+namespace Vichan\Data\Model;
 
 
 class Flags {
diff --git a/inc/Data/PageFetchResult.php b/inc/Data/Model/PageFetchResult.php
similarity index 87%
rename from inc/Data/PageFetchResult.php
rename to inc/Data/Model/PageFetchResult.php
index b33e7ac2..62be0156 100644
--- a/inc/Data/PageFetchResult.php
+++ b/inc/Data/Model/PageFetchResult.php
@@ -1,5 +1,5 @@
 <?php
-namespace Vichan\Data;
+namespace Vichan\Data\Model;
 
 
 /**
diff --git a/inc/Data/SearchFilters.php b/inc/Data/Model/SearchFilters.php
similarity index 94%
rename from inc/Data/SearchFilters.php
rename to inc/Data/Model/SearchFilters.php
index 36beb921..8552bf00 100644
--- a/inc/Data/SearchFilters.php
+++ b/inc/Data/Model/SearchFilters.php
@@ -1,5 +1,5 @@
 <?php
-namespace Vichan\Data;
+namespace Vichan\Data\Model;
 
 
 /**

From 1ec3f464e22bfdd55a8db32c53a074918ae34d32 Mon Sep 17 00:00:00 2001
From: Zankaria <zankaria.auxa@mailu.io>
Date: Sat, 26 Jul 2025 23:58:10 +0200
Subject: [PATCH 6/6] Use Model directory

---
 inc/Data/UserPostQueries.php  | 1 +
 inc/Service/SearchService.php | 3 ++-
 inc/context.php               | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/inc/Data/UserPostQueries.php b/inc/Data/UserPostQueries.php
index 52671dc5..072157ea 100644
--- a/inc/Data/UserPostQueries.php
+++ b/inc/Data/UserPostQueries.php
@@ -2,6 +2,7 @@
 namespace Vichan\Data;
 
 use Vichan\Functions\Net;
+use Vichan\Data\Model\PageFetchResult;
 
 
 /**
diff --git a/inc/Service/SearchService.php b/inc/Service/SearchService.php
index 01792dad..c57d96a9 100644
--- a/inc/Service/SearchService.php
+++ b/inc/Service/SearchService.php
@@ -2,7 +2,8 @@
 namespace Vichan\Service;
 
 use Vichan\Data\Driver\Log\LogDriver;
-use Vichan\Data\{FiltersParseResult, UserPostQueries, SearchFilters, SearchQueries};
+use Vichan\Data\{UserPostQueries, SearchQueries};
+use Vichan\Data\Model\{FiltersParseResult, SearchFilters};
 
 
 class SearchService {
diff --git a/inc/context.php b/inc/context.php
index 1ba4d9c7..ae6caa17 100644
--- a/inc/context.php
+++ b/inc/context.php
@@ -1,9 +1,10 @@
 <?php
 namespace Vichan;
 
-use Vichan\Data\{IpNoteQueries, ReportQueries, SearchQueries, UserPostQueries, Flags};
+use Vichan\Data\{IpNoteQueries, ReportQueries, SearchQueries, UserPostQueries};
 use Vichan\Data\Driver\Cache\CacheDriver;
 use Vichan\Data\Driver\Log\{ErrorLogLogDriver, FileLogDriver, LogDriver, StderrLogDriver, SyslogLogDriver};
+use Vichan\Data\Model\Flags;
 use Vichan\Service\SearchService;
 
 defined('TINYBOARD') or exit;