[REFACTORING] Service to src + clean core

core/Models/ValidatorModel.php

-<?php
-
-/**
-* Copyright Maarch since 2008 under licence GPLv3.
-* See LICENCE.txt file at the root folder for more details.
-* This file is part of Maarch software.
-*
-*/
-
-/**
-* @brief Validator Model
-* @author dev@maarch.org
-* @ingroup core
-*/
-
-namespace Core\Models;
-
-use Respect\Validation\Validator;
-
-class ValidatorModel
-{
-    public static function notEmpty(array $aArgs, $aKeys)
-    {
-        if (!Validator::arrayType()->notEmpty()->validate($aArgs)) {
-            throw new \Exception('First argument must be a non empty array');
-        }
-        foreach ($aKeys as $key) {
-            if (!Validator::notEmpty()->validate($aArgs[$key])) {
-                throw new \Exception("Argument {$key} is empty");
-            }
-        }
-    }
-
-    public static function intVal(array $aArgs, $aKeys)
-    {
-        foreach ($aKeys as $key) {
-            if (empty($aArgs[$key])) {
-                continue;
-            }
-            if (!Validator::intVal()->validate($aArgs[$key])) {
-                throw new \Exception("Argument {$key} is not an integer (value)");
-            }
-        }
-    }
-
-    public static function intType(array $aArgs, $aKeys)
-    {
-        foreach ($aKeys as $key) {
-            if (empty($aArgs[$key])) {
-                continue;
-            }
-            if (!Validator::intType()->validate($aArgs[$key])) {
-                throw new \Exception("Argument {$key} is not an integer (type)");
-            }
-        }
-    }
-
-    public static function stringType(array $aArgs, $aKeys)
-    {
-        foreach ($aKeys as $key) {
-            if (empty($aArgs[$key])) {
-                continue;
-            }
-            if (!Validator::stringType()->validate($aArgs[$key])) {
-                throw new \Exception("Argument {$key} is not a string (type)");
-            }
-        }
-    }
-
-    public static function arrayType(array $aArgs, $aKeys)
-    {
-        foreach ($aKeys as $key) {
-            if (empty($aArgs[$key])) {
-                continue;
-            }
-            if (!Validator::arrayType()->validate($aArgs[$key])) {
-                throw new \Exception("Argument {$key} is not an array (type)");
-            }
-        }
-    }
-
-    public static function boolType(array $aArgs, $aKeys)
-    {
-        foreach ($aKeys as $key) {
-            if (empty($aArgs[$key])) {
-                continue;
-            }
-            if (!Validator::boolType()->validate($aArgs[$key])) {
-                throw new \Exception("Argument {$key} is not a boolean (type)");
-            }
-        }
-    }
-
-}

core/Test/ContactControllerTest.php

@@ -102,10 +102,10 @@ class ContactControllerTest extends TestCase
         //  READ
         $contact = \Contact\models\ContactModel::getById(['id' => self::$id]);
         $this->assertInternalType('array', $contact);
-        $this->assertEmpty(null, $contact);
+        $this->assertEmpty($contact);
 
         $contact = \Contact\models\ContactModel::getByAddressId(['addressId' => self::$addressId]);
         $this->assertInternalType('array', $contact);
-        $this->assertEmpty(null, $contact);
+        $this->assertEmpty($contact);
     }
 }

modules/convert/Models/ProcessConvertModelAbstract.php

@@ -15,9 +15,9 @@
 
 namespace Convert\Models;
 
-use Core\Models\ValidatorModel;
 use History\controllers\HistoryController;
 use SrcCore\models\DatabaseModel;
+use SrcCore\models\ValidatorModel;
 
 class ProcessConvertModelAbstract
 {

modules/convert/Models/ProcessFulltextModelAbstract.php

@@ -15,9 +15,9 @@
 
 namespace Convert\Models;
 
-use Core\Models\ValidatorModel;
 use History\controllers\HistoryController;
 use SrcCore\models\DatabaseModel;
+use SrcCore\models\ValidatorModel;
 
 class ProcessFulltextModelAbstract
 {

modules/convert/Models/ProcessThumbnailsModelAbstract.php

@@ -15,9 +15,9 @@
 
 namespace Convert\Models;
 
-use Core\Models\ValidatorModel;
 use History\controllers\HistoryController;
 use SrcCore\models\DatabaseModel;
+use SrcCore\models\ValidatorModel;
 
 class ProcessThumbnailsModelAbstract
 {

modules/visa/Controllers/VisaController.php

@@ -19,8 +19,8 @@ use Action\models\ActionModel;
 use Contact\models\ContactModel;
 use Core\Models\LangModel;
 use Docserver\models\DocserverModel;
-use Core\Models\ServiceModel;
 use Entity\models\ListInstanceModel;
+use Group\models\ServiceModel;
 use Link\models\LinkModel;
 use Note\models\NoteModel;
 use Psr\Http\Message\RequestInterface;

modules/visa/Models/VisaModelAbstract.php

@@ -9,8 +9,8 @@
 
 namespace Visa\Models;
 
-use Core\Models\ValidatorModel;
 use SrcCore\models\DatabaseModel;
+use SrcCore\models\ValidatorModel;
 
 class VisaModelAbstract
 {

phpunit.xml

@@ -27,7 +27,6 @@
       <whitelist>
           <directory suffix="Test.php">core/Test</directory>
           <directory suffix=".php">src</directory>
-          <directory suffix=".php">core/Models</directory>
           <directory suffix=".php">modules/visa/Controllers</directory>
           <directory suffix=".php">modules/visa/Models</directory>          
           <directory suffix=".php">modules/convert/Controllers</directory>

src/app/action/controllers/ActionController.php

@@ -16,7 +16,7 @@ use Respect\Validation\Validator;
 use Action\models\ActionModel;
 use SrcCore\models\CoreConfigModel;
 use Status\models\StatusModel;
-use Core\Models\ServiceModel;
+use Group\models\ServiceModel;
 use Slim\Http\Request;
 use Slim\Http\Response;
 

src/app/attachment/models/AttachmentModelAbstract.php

@@ -14,9 +14,9 @@
 
 namespace Attachment\models;
 
-use Core\Models\ValidatorModel;
 use SrcCore\models\CoreConfigModel;
 use SrcCore\models\DatabaseModel;
+use SrcCore\models\ValidatorModel;
 
 class AttachmentModelAbstract
 {

src/app/basket/controllers/BasketController.php

@@ -16,7 +16,7 @@ namespace Basket\controllers;
 
 use Basket\models\BasketModel;
 use Action\models\ActionModel;
-use Core\Models\ServiceModel;
+use Group\models\ServiceModel;
 use SrcCore\models\ValidatorModel;
 use Group\models\GroupModel;
 use History\controllers\HistoryController;

src/app/docserver/controllers/DocserverController.php

@@ -14,7 +14,7 @@
 
 namespace Docserver\controllers;
 
-use Core\Models\ServiceModel;
+use Group\models\ServiceModel;
 use Slim\Http\Request;
 use Slim\Http\Response;
 use SrcCore\models\ValidatorModel;

src/app/docserver/controllers/DocserverTypeController.php

@@ -14,7 +14,7 @@
 
 namespace Docserver\controllers;
 
-use Core\Models\ServiceModel;
+use Group\models\ServiceModel;
 use Docserver\models\DocserverTypeModel;
 use Slim\Http\Request;
 use Slim\Http\Response;

src/app/doctype/controllers/DoctypeController.php

@@ -19,7 +19,7 @@ use Doctype\models\DoctypeModel;
 use Doctype\models\DoctypeExtModel;
 use Doctype\models\DoctypeIndexesModel;
 use Doctype\models\TemplateDoctypeModel;
-use Core\Models\ServiceModel;
+use Group\models\ServiceModel;
 use Template\models\TemplateModel;
 use Slim\Http\Request;
 use Slim\Http\Response;

src/app/doctype/controllers/FirstLevelController.php

@@ -17,7 +17,7 @@ use Doctype\models\FirstLevelModel;
 use Doctype\models\SecondLevelModel;
 use Doctype\models\DoctypeModel;
 use Folder\models\FolderTypeModel;
-use Core\Models\ServiceModel;
+use Group\models\ServiceModel;
 use Slim\Http\Request;
 use Slim\Http\Response;
 use Template\models\TemplateModel;

src/app/doctype/controllers/SecondLevelController.php

@@ -17,7 +17,7 @@ use Respect\Validation\Validator;
 use Doctype\models\FirstLevelModel;
 use Doctype\models\SecondLevelModel;
 use Doctype\models\DoctypeModel;
-use Core\Models\ServiceModel;
+use Group\models\ServiceModel;
 use Slim\Http\Request;
 use Slim\Http\Response;
 

src/app/entity/controllers/EntityController.php

@@ -15,11 +15,11 @@
 namespace Entity\controllers;
 
 use Basket\models\BasketModel;
-use Core\Models\ServiceModel;
 use Entity\models\EntityModel;
 use Entity\models\ListInstanceModel;
 use Entity\models\ListTemplateModel;
 use Entity\models\UserEntityModel;
+use Group\models\ServiceModel;
 use History\controllers\HistoryController;
 use Resource\models\ResModel;
 use Respect\Validation\Validator;

src/app/entity/controllers/ListTemplateController.php

@@ -14,7 +14,7 @@
 
 namespace Entity\controllers;
 
-use Core\Models\ServiceModel;
+use Group\models\ServiceModel;
 use SrcCore\models\ValidatorModel;
 use Entity\models\EntityModel;
 use Entity\models\ListTemplateModel;

src/app/group/controllers/GroupController.php

@@ -2,7 +2,7 @@
 
 namespace Group\controllers;
 
-use Core\Models\ServiceModel;
+use Group\models\ServiceModel;
 use Group\models\GroupModel;
 use Respect\Validation\Validator;
 use Slim\Http\Request;

src/app/group/models/GroupModelAbstract.php

@@ -14,7 +14,7 @@
 
 namespace Group\models;
 
-use Core\Models\ServiceModel;
+use Group\models\ServiceModel;
 use Group\controllers\GroupController;
 use SrcCore\models\DatabaseModel;
 use SrcCore\models\ValidatorModel;