Move the lib directory content under the Movim namespace

Move Moxl under src

CHANGELOG.md

@@ -21,6 +21,8 @@ v0.22 (trunk)
  * Simplify and cleanup the views
  * New Colors and AvatarPlaceholder widgets
  * Refactor and cleanup the Moxl Stanza classes
+ * Move the lib directory content under the Movim namespace
+ * Move Moxl under src
 
 v0.21.1
 ---------------------------

app/widgets/Account/Account.php

@@ -1,5 +1,6 @@
 <?php
 
+use Movim\Librairies\XMPPtoForm;
 use Moxl\Xec\Action\OMEMO\DeleteBundle;
 use Moxl\Xec\Action\Register\ChangePassword;
 use Moxl\Xec\Action\Register\Remove;
@@ -55,7 +56,7 @@ class Account extends \Movim\Widget\Base
         $view = $this->tpl();
 
         if (isset($content->x)) {
-            $xml = new \XMPPtoForm;
+            $xml = new XMPPtoForm;
             $form = $xml->getHTML($content->x);
 
             $view->assign('form', $form);

app/widgets/AccountNext/AccountNext.php

@@ -1,5 +1,6 @@
 <?php
 
+use Movim\Librairies\XMPPtoForm;
 use Moxl\Xec\Action\Register\Set;
 
 use Movim\Session;
@@ -23,7 +24,7 @@ class AccountNext extends \Movim\Widget\Base
     {
         $form = $package->content;
 
-        $xtf = new \XMPPtoForm;
+        $xtf = new XMPPtoForm;
         $html = '';
         if (!empty($form->x)) {
             switch ($form->x->attributes()->xmlns) {

app/widgets/AdHoc/AdHoc.php

@@ -43,7 +43,7 @@ class AdHoc extends \Movim\Widget\Base
             Dialog::fill($view->draw('_adhoc_note'));
             $this->rpc('AdHoc.initForm');
         } elseif (isset($command->x)) {
-            $xml = new \XMPPtoForm();
+            $xml = new \Movim\Librairies\XMPPtoForm;
             $form = $xml->getHTML($command->x);
 
             $view->assign('form', $form);

app/widgets/Chat/Chat.php

@@ -23,6 +23,7 @@ use Movim\ChatStates;
 use Movim\ChatOwnState;
 use Movim\EmbedLight;
 use Movim\Image;
+use Movim\Librairies\XMPPtoForm;
 
 class Chat extends \Movim\Widget\Base
 {
@@ -299,7 +300,7 @@ class Chat extends \Movim\Widget\Base
 
         $view = $this->tpl();
 
-        $xml = new \XMPPtoForm;
+        $xml = new XMPPtoForm;
         $form = $xml->getHTML($config->x);
 
         $view->assign('form', $form);

app/widgets/CommunityConfig/CommunityConfig.php

@@ -1,6 +1,7 @@
 <?php
 
 use Movim\Image;
+use Movim\Librairies\XMPPtoForm;
 use Movim\Widget\Base;
 
 use Moxl\Xec\Action\Pubsub\GetConfig;
@@ -23,7 +24,7 @@ class CommunityConfig extends Base
 
         $view = $this->tpl();
 
-        $xml = new \XMPPtoForm;
+        $xml = new XMPPtoForm;
         $form = $xml->getHTML($config->x);
 
         $view->assign('form', $form);

app/widgets/Visio/Visio.php

@@ -1,5 +1,7 @@
 <?php
 
+use Movim\Librairies\JingletoSDP;
+use Movim\Librairies\SDPtoJingle;
 use Moxl\Xec\Action\Jingle\SessionPropose;
 use Moxl\Xec\Action\Jingle\SessionAccept;
 use Moxl\Xec\Action\Jingle\SessionInitiate;

composer.json

@@ -3,11 +3,11 @@
     "description": "Decentralized social platform based on XMPP",
     "autoload": {
         "psr-0": {
-            "Movim\\": "src/"
+            "Movim\\": "src/",
+            "Moxl\\": "src/"
         },
         "psr-4": {
-            "App\\": "app/",
-            "Moxl\\": "lib/moxl/src/"
+            "App\\": "app/"
         }
     },
     "require": {

src/Movim/Bootstrap.php

@@ -41,7 +41,6 @@ class Bootstrap
         //Check if vital system need is OK
         $this->checkSystem();
 
-        $this->loadCommonLibraries();
         $this->loadDispatcher();
 
         $this->setTimezone();
@@ -180,13 +179,6 @@ class Bootstrap
         $capsule->setAsGlobal();
     }
 
-    private function loadCommonLibraries()
-    {
-        require_once DOCUMENT_ROOT . '/lib/XMPPtoForm.php';
-        require_once DOCUMENT_ROOT . '/lib/SDPtoJingle.php';
-        require_once DOCUMENT_ROOT . '/lib/JingletoSDP.php';
-    }
-
     private function loadHelpers()
     {
         foreach (glob(DOCUMENT_ROOT.'/app/helpers/*Helper.php') as $file) {

lib/JingletoSDP.php → src/Movim/Librairies/JingletoSDP.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Movim\Librairies;
+
 use Movim\Session;
 
 class JingletoSDP

lib/SDPtoJingle.php → src/Movim/Librairies/SDPtoJingle.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Movim\Librairies;
+
 use Movim\Session;
 
 class SDPtoJingle

lib/XMPPtoForm.php → src/Movim/Librairies/XMPPtoForm.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Movim\Librairies;
+
 use Movim\Route;
 
 class XMPPtoForm