add missing namespaces/fix wrong class-names

diff --git a/doc/Addons.md b/doc/Addons.md
index 9260ee013ca7eab0eb05bc0419a3b7eb077c7ab7..171f58ff4af9643c65e7ba911ed025110e4bac4f 100644 (file)
--- a/doc/Addons.md
+++ b/doc/Addons.md
@@ -181,6 +181,8 @@ Put your tpl files in the *templates/* subfolder of your addon.
 In your code, like in the function addon_name_content(), load the template file and execute it passing needed values:
 
 ```php
+use Friendica\Core\Renderer;
+
 # load template file. first argument is the template name,
 # second is the addon path relative to friendica top folder
 $tpl = Renderer::getMarkupTemplate('mytemplate.tpl', __DIR__);

diff --git a/doc/autoloader.md b/doc/autoloader.md
index 29d3a005fdb0c1fc9f2aa9cf678353e2098d68cb..e1588688f187443066396031e2be023205957efe 100644 (file)
--- a/doc/autoloader.md
+++ b/doc/autoloader.md
@@ -47,8 +47,10 @@ The code will be something like:
 // mod/network.php
 <?php
 
+use Friendica\App;
+
 function network_content(App $a) {
-       $itemsmanager = new Friendica\ItemsManager();
+       $itemsmanager = new \Friendica\ItemsManager();
        $items = $itemsmanager->getAll();
 
        // pass $items to template
@@ -117,6 +119,8 @@ If your code is in same namespace as the class you need, you don't need to prepe
 
 namespace Friendica;
 
+use Friendica\Protocol\DFRN;
+
 // this is the same content of current include/delivery.php,
 // but has been declared to be in "Friendica" namespace
 

diff --git a/mod/fsuggest.php b/mod/fsuggest.php
index 6d23c31158c4c1aa1436c4b2cf530d5b273f2e05..73b0f09e87e1c32514d8cb0c57dd20240beec854 100644 (file)
--- a/mod/fsuggest.php
+++ b/mod/fsuggest.php
@@ -7,6 +7,7 @@ use Friendica\App;
 use Friendica\Core\ACL;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;
 use Friendica\Worker\Delivery;

diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index f04698c5643641c110909406038cedad429098a4..749d09dc06984f35688106038aa20b642f139e6c 100644 (file)
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -7,6 +7,7 @@ use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\Session;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Attach;
 use Friendica\Model\User;
 use Friendica\Util\Strings;

diff --git a/src/App/Router.php b/src/App/Router.php
index 27ea4ac605d0caaf767f0f5bd3cabd1b1640b161..6ae42bb14191d30f372dbe87115f3ef828940f9d 100644 (file)
--- a/src/App/Router.php
+++ b/src/App/Router.php
@@ -8,6 +8,7 @@ use FastRoute\Dispatcher;
 use FastRoute\RouteCollector;
 use FastRoute\RouteParser\Std;
 use Friendica\Core\Hook;
+use Friendica\DI;
 use Friendica\Network\HTTPException;
 
 /**

diff --git a/src/Core/Installer.php b/src/Core/Installer.php
index 3e790e2e3b172b51d1ccef10edcd5014a198c9ca..01ef1d8c923c5b397ef1e3e3806abdefdba1e594 100644 (file)
--- a/src/Core/Installer.php
+++ b/src/Core/Installer.php
@@ -9,6 +9,7 @@ use Exception;
 use Friendica\Core\Config\Cache\ConfigCache;
 use Friendica\Database\Database;
 use Friendica\Database\DBStructure;
+use Friendica\DI;
 use Friendica\Util\Images;
 use Friendica\Util\Network;
 use Friendica\Util\Strings;

diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php
index e2a45783ba4c96843cdf2330af2b49ad084582f5..d70f7f4ec6b75c7dcba90b556eda3798d82f7469 100644 (file)
--- a/src/Database/DBStructure.php
+++ b/src/Database/DBStructure.php
@@ -9,6 +9,7 @@ use Exception;
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
+use Friendica\DI;
 use Friendica\Util\DateTimeFormat;
 
 require_once __DIR__ . '/../../include/dba.php';

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 5d2c4aa197285f36bf67a8ccfa8e44be8e48ff44..9cbf591de0599da3dc9ba5d68cd507462c52a2aa 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -342,7 +342,7 @@ class Contact
         * @param  integer $uid User ID
         *
         * @return integer|boolean Public contact id for given user id
-        * @throws Exception
+        * @throws \Exception
         */
        public static function getPublicIdByUserId($uid)
        {

diff --git a/src/Module/Credits.php b/src/Module/Credits.php
index 5f2156e649b3d5570049842a6dbf31348a104ace..bafe6311f3b6190c8ace975d1071ea48861d692f 100644 (file)
--- a/src/Module/Credits.php
+++ b/src/Module/Credits.php
@@ -4,6 +4,7 @@ namespace Friendica\Module;
 
 use Friendica\BaseModule;
 use Friendica\Core\Renderer;
+use Friendica\DI;
 
 /**
  * Show a credits page for all the developers who helped with the project

diff --git a/src/Module/Debug/Babel.php b/src/Module/Debug/Babel.php
index 03b27e9ab83e98f59f626a4725768e43607c0038..4b3b47f6490d156c7e6468e35a0b3d975aee53fa 100644 (file)
--- a/src/Module/Debug/Babel.php
+++ b/src/Module/Debug/Babel.php
@@ -5,6 +5,7 @@ namespace Friendica\Module\Debug;
 use Friendica\BaseModule;
 use Friendica\Content\Text;
 use Friendica\Core\Renderer;
+use Friendica\DI;
 use Friendica\Model\Item;
 use Friendica\Util\XML;
 

diff --git a/src/Module/Search/Acl.php b/src/Module/Search/Acl.php
index 6f8a02cb5d856492e461eee657dbb620e4041862..a5a73fb18d8bf4a6f9a60c19d9b7f3c2de4a3c7f 100644 (file)
--- a/src/Module/Search/Acl.php
+++ b/src/Module/Search/Acl.php
@@ -9,6 +9,7 @@ use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Search;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Network\HTTPException;

diff --git a/src/Module/Settings/UserExport.php b/src/Module/Settings/UserExport.php
index 71a18f4eedf13aa58fa047da723320bbe845671d..19b0312672370f8347c30ee8e00e34b2afd2334a 100644 (file)
--- a/src/Module/Settings/UserExport.php
+++ b/src/Module/Settings/UserExport.php
@@ -209,7 +209,7 @@ class UserExport extends BaseSettingsModule
         * echoes account data and items as separated json, one per line
         *
         * @param App $a
-        * @throws Exception
+        * @throws \Exception
         */
        private static function exportAll(App $a)
        {

diff --git a/tests/Util/DbaCacheMockTrait.php b/tests/Util/DbaCacheMockTrait.php
index 95e7cbcb1def2caf2bf3a9d4b85a4a1dcc435342..9d59690c07e227b87e5008f9b67c37db8261025e 100644 (file)
--- a/tests/Util/DbaCacheMockTrait.php
+++ b/tests/Util/DbaCacheMockTrait.php
@@ -2,6 +2,8 @@
 
 namespace Friendica\Test\Util;
 
+use Friendica\Core\Cache\Duration;
+
 trait DbaCacheMockTrait
 {
        /**
@@ -30,7 +32,7 @@ trait DbaCacheMockTrait
                $this->mockIsResult(['v' => $value], isset($return), $times);
        }
 
-       protected function mockSet($key, $value, $ttl = Cache::FIVE_MINUTES, $time = null, $return = true, $times = null)
+       protected function mockSet($key, $value, $ttl = Duration::FIVE_MINUTES, $time = null, $return = true, $times = null)
        {
                if ($time === null) {
                        $time = time();