From 9df75ef9a999af28e5bf8b40ef1c82412c0190ec Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sun, 3 Mar 2019 15:05:35 +0100
Subject: [PATCH 1/5] Adding REAMDEs to directories

---
 src/Core/Cache.php                                 |  2 +-
 src/Core/Lock.php                                  |  2 +-
 src/Core/README.md                                 |  4 ++++
 src/{Core/Cache => Factory}/CacheDriverFactory.php | 12 +++++++-----
 src/Factory/README.md                              |  9 +++++++++
 src/Model/README.md                                |  5 +++++
 src/Module/README.md                               | 10 ++++++++++
 src/Object/README.md                               |  5 +++++
 src/Worker/README.md                               |  6 ++++++
 9 files changed, 48 insertions(+), 7 deletions(-)
 create mode 100644 src/Core/README.md
 rename src/{Core/Cache => Factory}/CacheDriverFactory.php (73%)
 create mode 100644 src/Factory/README.md
 create mode 100644 src/Model/README.md
 create mode 100644 src/Module/README.md
 create mode 100644 src/Object/README.md
 create mode 100644 src/Worker/README.md

diff --git a/src/Core/Cache.php b/src/Core/Cache.php
index cadb2444b5..7a8f7367ec 100644
--- a/src/Core/Cache.php
+++ b/src/Core/Cache.php
@@ -4,7 +4,7 @@
  */
 namespace Friendica\Core;
 
-use Friendica\Core\Cache\CacheDriverFactory;
+use Friendica\Factory\CacheDriverFactory;
 
 /**
  * @brief Class for storing data for a short time
diff --git a/src/Core/Lock.php b/src/Core/Lock.php
index e8c8a70416..2c597064d9 100644
--- a/src/Core/Lock.php
+++ b/src/Core/Lock.php
@@ -7,7 +7,7 @@
 
 namespace Friendica\Core;
 
-use Friendica\Core\Cache\CacheDriverFactory;
+use Friendica\Factory\CacheDriverFactory;
 use Friendica\Core\Cache\IMemoryCacheDriver;
 
 /**
diff --git a/src/Core/README.md b/src/Core/README.md
new file mode 100644
index 0000000000..8a5a3788b5
--- /dev/null
+++ b/src/Core/README.md
@@ -0,0 +1,4 @@
+## Friendica\Core
+
+The Core namespace contains classes, which are essential to Friendica.
+ 
\ No newline at end of file
diff --git a/src/Core/Cache/CacheDriverFactory.php b/src/Factory/CacheDriverFactory.php
similarity index 73%
rename from src/Core/Cache/CacheDriverFactory.php
rename to src/Factory/CacheDriverFactory.php
index 307f52a2ea..1008b67944 100644
--- a/src/Core/Cache/CacheDriverFactory.php
+++ b/src/Factory/CacheDriverFactory.php
@@ -1,8 +1,10 @@
 <?php
 
-namespace Friendica\Core\Cache;
+namespace Friendica\Factory;
 
+use Friendica\Core\Cache\ICacheDriver;
 use Friendica\Core\Config;
+use Friendica\Core\Cache;
 
 /**
  * Class CacheDriverFactory
@@ -27,22 +29,22 @@ class CacheDriverFactory
 				$memcache_host = Config::get('system', 'memcache_host');
 				$memcache_port = Config::get('system', 'memcache_port');
 
-				return new MemcacheCacheDriver($memcache_host, $memcache_port);
+				return new Cache\MemcacheCacheDriver($memcache_host, $memcache_port);
 				break;
 
 			case 'memcached':
 				$memcached_hosts = Config::get('system', 'memcached_hosts');
 
-				return new MemcachedCacheDriver($memcached_hosts);
+				return new Cache\MemcachedCacheDriver($memcached_hosts);
 				break;
 			case 'redis':
 				$redis_host = Config::get('system', 'redis_host');
 				$redis_port = Config::get('system', 'redis_port');
 
-				return new RedisCacheDriver($redis_host, $redis_port);
+				return new Cache\RedisCacheDriver($redis_host, $redis_port);
 				break;
 			default:
-				return new DatabaseCacheDriver();
+				return new Cache\DatabaseCacheDriver();
 		}
 	}
 }
diff --git a/src/Factory/README.md b/src/Factory/README.md
new file mode 100644
index 0000000000..572d9403c9
--- /dev/null
+++ b/src/Factory/README.md
@@ -0,0 +1,9 @@
+## Friendica\Factory
+
+This namespace contains Factories.
+A Factory is used to create specific objects based on its configuration.
+
+See [Factory Method](https://designpatternsphp.readthedocs.io/en/latest/Creational/FactoryMethod/README.html)
+
+Use the classes inside this directory if you want to change the way how new objects should get created.
+Don't use the classes to change the behaviour of the concrete objects.
diff --git a/src/Model/README.md b/src/Model/README.md
new file mode 100644
index 0000000000..fb41e7309a
--- /dev/null
+++ b/src/Model/README.md
@@ -0,0 +1,5 @@
+### Friendica\Model
+
+Models are the glue between the business logic of the app and the datastore(s).
+
+In the namespace Model should only be static classes that interact with the DB with the same name as a database table.
\ No newline at end of file
diff --git a/src/Module/README.md b/src/Module/README.md
new file mode 100644
index 0000000000..f888f26326
--- /dev/null
+++ b/src/Module/README.md
@@ -0,0 +1,10 @@
+## Friendica\Module
+
+The Module namespace contains the different modules of Friendica.
+Each module is loaded through the [`App`](https://github.com/friendica/friendica/blob/develop/src/App.php).
+
+Rules for Modules:
+- 	Named like the call (i.e. https://friendica.test/contact => `Contact`)
+-	Start with capitals and are **not** camelCased.
+-	Directly interacting with a given request (POST or GET)
+-	Extending [`BaseModule`](https://github.com/friendica/friendica/blob/develop/src/BaseModule.php).
\ No newline at end of file
diff --git a/src/Object/README.md b/src/Object/README.md
new file mode 100644
index 0000000000..e4089db089
--- /dev/null
+++ b/src/Object/README.md
@@ -0,0 +1,5 @@
+## Friendica\Object
+
+The namespace Object contains dynamic classes which are **note** directly interacting with the datastore.
+
+They are used to implement business logic for a particular object (i.e. an Image). 
\ No newline at end of file
diff --git a/src/Worker/README.md b/src/Worker/README.md
new file mode 100644
index 0000000000..fc937b33bc
--- /dev/null
+++ b/src/Worker/README.md
@@ -0,0 +1,6 @@
+## Friendica\Worker
+
+The Worker namespace contains all asynchronous workers of Friendica.
+The all have to implement the function `public static function execute()`.
+
+They are all executed by the [`Worker`](https://github.com/friendica/friendica/blob/develop/src/Core/Worker.php).
\ No newline at end of file

From 3a2f0c741f752aa0a389d51a21237f7cbfe8b694 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sun, 3 Mar 2019 15:09:00 +0100
Subject: [PATCH 2/5] typo

---
 src/Object/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Object/README.md b/src/Object/README.md
index e4089db089..155bc5d0cb 100644
--- a/src/Object/README.md
+++ b/src/Object/README.md
@@ -1,5 +1,5 @@
 ## Friendica\Object
 
-The namespace Object contains dynamic classes which are **note** directly interacting with the datastore.
+The namespace Object contains dynamic classes which are **not** directly interacting with the datastore.
 
 They are used to implement business logic for a particular object (i.e. an Image). 
\ No newline at end of file

From 98c1e186d75bdca22817231f568991e41aa0b538 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sun, 3 Mar 2019 15:15:53 +0100
Subject: [PATCH 3/5] typo

---
 src/Model/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Model/README.md b/src/Model/README.md
index fb41e7309a..e712d82503 100644
--- a/src/Model/README.md
+++ b/src/Model/README.md
@@ -1,4 +1,4 @@
-### Friendica\Model
+## Friendica\Model
 
 Models are the glue between the business logic of the app and the datastore(s).
 

From 134435d72a2a06fdfd7ceed6410fe283c598f6be Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sun, 3 Mar 2019 15:34:07 +0100
Subject: [PATCH 4/5] testfix - namespaces

---
 tests/src/Core/Cache/DatabaseCacheDriverTest.php     | 2 +-
 tests/src/Core/Cache/MemcachedCacheDriverTest.php    | 2 +-
 tests/src/Core/Cache/RedisCacheDriverTest.php        | 2 +-
 tests/src/Core/Lock/MemcacheCacheLockDriverTest.php  | 2 +-
 tests/src/Core/Lock/MemcachedCacheLockDriverTest.php | 2 +-
 tests/src/Core/Lock/RedisCacheLockDriverTest.php     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/src/Core/Cache/DatabaseCacheDriverTest.php b/tests/src/Core/Cache/DatabaseCacheDriverTest.php
index 775a083a9b..2d29c2ad96 100644
--- a/tests/src/Core/Cache/DatabaseCacheDriverTest.php
+++ b/tests/src/Core/Cache/DatabaseCacheDriverTest.php
@@ -3,7 +3,7 @@
 namespace Friendica\Test\src\Core\Cache;
 
 use Friendica\Core\Cache;
-use Friendica\Core\Cache\CacheDriverFactory;
+use Friendica\Factory\CacheDriverFactory;
 use Friendica\Test\Util\DbaCacheMockTrait;
 
 /**
diff --git a/tests/src/Core/Cache/MemcachedCacheDriverTest.php b/tests/src/Core/Cache/MemcachedCacheDriverTest.php
index 4e16ef947f..9f0ed8d4fe 100644
--- a/tests/src/Core/Cache/MemcachedCacheDriverTest.php
+++ b/tests/src/Core/Cache/MemcachedCacheDriverTest.php
@@ -3,7 +3,7 @@
 
 namespace Friendica\Test\src\Core\Cache;
 
-use Friendica\Core\Cache\CacheDriverFactory;
+use Friendica\Factory\CacheDriverFactory;
 
 /**
  * @requires extension memcached
diff --git a/tests/src/Core/Cache/RedisCacheDriverTest.php b/tests/src/Core/Cache/RedisCacheDriverTest.php
index 20fe7eb53f..80baa9f4b3 100644
--- a/tests/src/Core/Cache/RedisCacheDriverTest.php
+++ b/tests/src/Core/Cache/RedisCacheDriverTest.php
@@ -3,7 +3,7 @@
 
 namespace Friendica\Test\src\Core\Cache;
 
-use Friendica\Core\Cache\CacheDriverFactory;
+use Friendica\Factory\CacheDriverFactory;
 
 /**
  * @requires extension redis
diff --git a/tests/src/Core/Lock/MemcacheCacheLockDriverTest.php b/tests/src/Core/Lock/MemcacheCacheLockDriverTest.php
index ad20f5bfdb..8d32ad527d 100644
--- a/tests/src/Core/Lock/MemcacheCacheLockDriverTest.php
+++ b/tests/src/Core/Lock/MemcacheCacheLockDriverTest.php
@@ -3,7 +3,7 @@
 
 namespace Friendica\Test\src\Core\Lock;
 
-use Friendica\Core\Cache\CacheDriverFactory;
+use Friendica\Factory\CacheDriverFactory;
 use Friendica\Core\Lock\CacheLockDriver;
 
 /**
diff --git a/tests/src/Core/Lock/MemcachedCacheLockDriverTest.php b/tests/src/Core/Lock/MemcachedCacheLockDriverTest.php
index a5bdeaedb8..f08ffa3817 100644
--- a/tests/src/Core/Lock/MemcachedCacheLockDriverTest.php
+++ b/tests/src/Core/Lock/MemcachedCacheLockDriverTest.php
@@ -3,7 +3,7 @@
 
 namespace Friendica\Test\src\Core\Lock;
 
-use Friendica\Core\Cache\CacheDriverFactory;
+use Friendica\Factory\CacheDriverFactory;
 use Friendica\Core\Lock\CacheLockDriver;
 
 /**
diff --git a/tests/src/Core/Lock/RedisCacheLockDriverTest.php b/tests/src/Core/Lock/RedisCacheLockDriverTest.php
index 5f047bc664..d21f3b6d86 100644
--- a/tests/src/Core/Lock/RedisCacheLockDriverTest.php
+++ b/tests/src/Core/Lock/RedisCacheLockDriverTest.php
@@ -3,7 +3,7 @@
 
 namespace Friendica\Test\src\Core\Lock;
 
-use Friendica\Core\Cache\CacheDriverFactory;
+use Friendica\Factory\CacheDriverFactory;
 use Friendica\Core\Lock\CacheLockDriver;
 
 /**

From 50f9f79600f4540e9c166449f04bcc4590786e3a Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sun, 3 Mar 2019 15:41:14 +0100
Subject: [PATCH 5/5] testfix - namespaces

---
 tests/src/Core/Cache/MemcacheCacheDriverTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/src/Core/Cache/MemcacheCacheDriverTest.php b/tests/src/Core/Cache/MemcacheCacheDriverTest.php
index f9df9eaba0..f8de88ac95 100644
--- a/tests/src/Core/Cache/MemcacheCacheDriverTest.php
+++ b/tests/src/Core/Cache/MemcacheCacheDriverTest.php
@@ -3,7 +3,7 @@
 
 namespace Friendica\Test\src\Core\Cache;
 
-use Friendica\Core\Cache\CacheDriverFactory;
+use Friendica\Factory\CacheDriverFactory;
 
 /**
  * @requires extension memcache