diff --git a/src/app/basket/controllers/BasketController.php b/src/app/basket/controllers/BasketController.php index ed4fdd82a0b98cf46d2a33876b84af8b34e484df..19651c63f4665a5c05e731653e707fc1d5b41149 100644 --- a/src/app/basket/controllers/BasketController.php +++ b/src/app/basket/controllers/BasketController.php @@ -17,7 +17,7 @@ namespace Basket\controllers; use Basket\models\BasketModel; use Action\models\ActionModel; use Core\Models\ServiceModel; -use Core\Models\ValidatorModel; +use SrcCore\models\ValidatorModel; use Group\models\GroupModel; use History\controllers\HistoryController; use Respect\Validation\Validator; diff --git a/src/app/basket/models/BasketModelAbstract.php b/src/app/basket/models/BasketModelAbstract.php index 929f7f82fb5ab4729e50e7842ee056e7877db7be..8c65f3d9744d2a9150a929a6dfa8e6ef8f6df361 100644 --- a/src/app/basket/models/BasketModelAbstract.php +++ b/src/app/basket/models/BasketModelAbstract.php @@ -15,7 +15,7 @@ namespace Basket\models; use Core\Models\UserModel; -use Core\Models\ValidatorModel; +use SrcCore\models\ValidatorModel; use Resource\models\ResModel; use SrcCore\controllers\PreparedClauseController; use SrcCore\models\CoreConfigModel; diff --git a/src/app/docserver/controllers/DocserverController.php b/src/app/docserver/controllers/DocserverController.php index 782b6e5af478d7509a56817db993de06185efa42..41183981075d0baef0e65ef5a8551fb600460eac 100644 --- a/src/app/docserver/controllers/DocserverController.php +++ b/src/app/docserver/controllers/DocserverController.php @@ -16,7 +16,7 @@ namespace Docserver\controllers; use Core\Models\ServiceModel; -use Core\Models\ValidatorModel; +use SrcCore\models\ValidatorModel; use Psr\Http\Message\RequestInterface; use Psr\Http\Message\ResponseInterface; use Docserver\models\DocserverModel; diff --git a/src/app/entity/controllers/ListTemplateController.php b/src/app/entity/controllers/ListTemplateController.php index ab1529a081f74cfe4656d24421777f6b35f5edf6..983cabc6463b850d88e165f4519d4e9919b40c4f 100644 --- a/src/app/entity/controllers/ListTemplateController.php +++ b/src/app/entity/controllers/ListTemplateController.php @@ -15,7 +15,7 @@ namespace Entity\controllers; use Core\Models\ServiceModel; -use Core\Models\ValidatorModel; +use SrcCore\models\ValidatorModel; use Entity\models\EntityModel; use Entity\models\ListTemplateModel; use History\controllers\HistoryController; diff --git a/src/app/entity/models/EntityModelAbstract.php b/src/app/entity/models/EntityModelAbstract.php index 7974bf2450bca09eefc9796103ccd500d1627448..bbd0115bcc63cd2db6f757992e4fd20a8034a2f7 100644 --- a/src/app/entity/models/EntityModelAbstract.php +++ b/src/app/entity/models/EntityModelAbstract.php @@ -15,7 +15,7 @@ namespace Entity\models; use Core\Models\UserModel; -use Core\Models\ValidatorModel; +use SrcCore\models\ValidatorModel; use SrcCore\models\CoreConfigModel; use SrcCore\models\DatabaseModel; diff --git a/src/app/entity/models/ListInstanceModelAbstract.php b/src/app/entity/models/ListInstanceModelAbstract.php index eb835481407bab04299d044cd9ba5c6cc5ae94d7..d644ed2ceb40fe7851fb3599c6f868dd98e4a742 100644 --- a/src/app/entity/models/ListInstanceModelAbstract.php +++ b/src/app/entity/models/ListInstanceModelAbstract.php @@ -14,7 +14,7 @@ namespace Entity\models; -use Core\Models\ValidatorModel; +use SrcCore\models\ValidatorModel; use SrcCore\models\DatabaseModel; class ListInstanceModelAbstract diff --git a/src/app/entity/models/ListTemplateModelAbstract.php b/src/app/entity/models/ListTemplateModelAbstract.php index fc9827b5cc999d70deef54ee0a27496223e8e9b1..1238d8f7d4170c6c6421cd457cfa72b3e853d6f2 100644 --- a/src/app/entity/models/ListTemplateModelAbstract.php +++ b/src/app/entity/models/ListTemplateModelAbstract.php @@ -14,7 +14,7 @@ namespace Entity\models; -use Core\Models\ValidatorModel; +use SrcCore\models\ValidatorModel; use SrcCore\models\DatabaseModel; class ListTemplateModelAbstract diff --git a/src/app/entity/models/UserEntityModelAbstract.php b/src/app/entity/models/UserEntityModelAbstract.php index ebfe2ab484f20780f7ade1e4bd00b180772d54c5..a66a20fd4655e0817a6b975ebdb7e4b75036f440 100644 --- a/src/app/entity/models/UserEntityModelAbstract.php +++ b/src/app/entity/models/UserEntityModelAbstract.php @@ -14,7 +14,7 @@ namespace Entity\models; -use Core\Models\ValidatorModel; +use SrcCore\models\ValidatorModel; use SrcCore\models\DatabaseModel; class UserEntityModelAbstract diff --git a/src/app/folder/models/FolderTypeModelAbstract.php b/src/app/folder/models/FolderTypeModelAbstract.php index 7d5689585461089c57be5d2a934fe134bfe6d269..08cf1f81daaac59af1b7b7f96006b1ec24747498 100644 --- a/src/app/folder/models/FolderTypeModelAbstract.php +++ b/src/app/folder/models/FolderTypeModelAbstract.php @@ -11,7 +11,7 @@ namespace Folder\models; -use Core\Models\ValidatorModel; +use SrcCore\models\ValidatorModel; use SrcCore\models\CoreConfigModel; use SrcCore\models\DatabaseModel; diff --git a/src/app/history/controllers/HistoryController.php b/src/app/history/controllers/HistoryController.php index 8f1ac38f92c0dc9f1f4d7dd1d85519625a9b8023..66c78c4f2ba5a7727edeaed883e4c42fe18c1dfa 100644 --- a/src/app/history/controllers/HistoryController.php +++ b/src/app/history/controllers/HistoryController.php @@ -17,7 +17,7 @@ namespace History\controllers; use Core\Models\TextFormatModel; use Core\Models\UserModel; use Core\Models\ServiceModel; -use Core\Models\ValidatorModel; +use SrcCore\models\ValidatorModel; use History\models\HistoryModel; use Notification\controllers\NotificationsEventsController; use Slim\Http\Request; diff --git a/src/app/history/models/HistoryModelAbstract.php b/src/app/history/models/HistoryModelAbstract.php index d1f32e2a78d7ad6b199eee83cfa592e7626ae897..4f30762c6b20b829d32dc2ef814e29c67121920b 100644 --- a/src/app/history/models/HistoryModelAbstract.php +++ b/src/app/history/models/HistoryModelAbstract.php @@ -15,7 +15,7 @@ namespace History\models; -use Core\Models\ValidatorModel; +use SrcCore\models\ValidatorModel; use SrcCore\models\CoreConfigModel; use SrcCore\models\DatabaseModel; diff --git a/src/app/parameter/models/ParameterModelAbstract.php b/src/app/parameter/models/ParameterModelAbstract.php index 73cb26f519117f9f54096418cc781d23e7550199..6909c20527926a040687cc24b4110b30a70b00bd 100644 --- a/src/app/parameter/models/ParameterModelAbstract.php +++ b/src/app/parameter/models/ParameterModelAbstract.php @@ -17,7 +17,7 @@ namespace Parameter\models; -use Core\Models\ValidatorModel; +use SrcCore\models\ValidatorModel; use SrcCore\models\DatabaseModel; class ParameterModelAbstract diff --git a/src/app/priority/models/PriorityModelAbstract.php b/src/app/priority/models/PriorityModelAbstract.php index 2e17010af99805d3eb8c7fa0a89a99348fe7dad9..0c870ec5fe633614ddafec191e20e177c8047850 100644 --- a/src/app/priority/models/PriorityModelAbstract.php +++ b/src/app/priority/models/PriorityModelAbstract.php @@ -13,7 +13,7 @@ namespace Priority\models; -use Core\Models\ValidatorModel; +use SrcCore\models\ValidatorModel; use SrcCore\models\DatabaseModel; abstract class PriorityModelAbstract diff --git a/src/app/report/models/ReportModelAbstract.php b/src/app/report/models/ReportModelAbstract.php index afaf979c43bbf2f3afb937ce584ceea0f69154fa..0b044a6cdc483fd45e2cc293cb27d44903366d76 100644 --- a/src/app/report/models/ReportModelAbstract.php +++ b/src/app/report/models/ReportModelAbstract.php @@ -14,7 +14,7 @@ namespace Report\models; -use Core\Models\ValidatorModel; +use SrcCore\models\ValidatorModel; use SrcCore\models\CoreConfigModel; use SrcCore\models\DatabaseModel; diff --git a/src/app/resource/controllers/ResController.php b/src/app/resource/controllers/ResController.php index 5be0cefaabd9b574bd47e1a18308f7b77c469a4d..2cdfb91aefcce1bb3b08ee64c79bb7ed157eca23 100755 --- a/src/app/resource/controllers/ResController.php +++ b/src/app/resource/controllers/ResController.php @@ -19,7 +19,7 @@ use SrcCore\controllers\StoreController; use Core\Models\ServiceModel; use Status\models\StatusModel; use Core\Models\UserModel; -use Core\Models\ValidatorModel; +use SrcCore\models\ValidatorModel; use History\controllers\HistoryController; use Resource\models\ResModel; use Respect\Validation\Validator; diff --git a/src/app/resource/models/ResModelAbstract.php b/src/app/resource/models/ResModelAbstract.php index 10f1dda45c9f7c999c08cc53a7498e3a39711ac3..b3bc6abeb75dbaa9b8b632f415657718b508035d 100644 --- a/src/app/resource/models/ResModelAbstract.php +++ b/src/app/resource/models/ResModelAbstract.php @@ -14,7 +14,7 @@ namespace Resource\models; -use Core\Models\ValidatorModel; +use SrcCore\models\ValidatorModel; use SrcCore\models\DatabaseModel; class ResModelAbstract diff --git a/src/core/controllers/LogsController.php b/src/core/controllers/LogsController.php index c0c38c6072b9a3abfba41e9b4c2d1d6c7b9a32d2..584cc67cb2f39243ff0edb1d938739b3c013a26c 100644 --- a/src/core/controllers/LogsController.php +++ b/src/core/controllers/LogsController.php @@ -16,7 +16,7 @@ namespace SrcCore\controllers; use Core\Models\TextFormatModel; -use Core\Models\ValidatorModel; +use SrcCore\models\ValidatorModel; if (!defined('_LOG4PHP')) define( diff --git a/src/core/controllers/PreparedClauseController.php b/src/core/controllers/PreparedClauseController.php index 0c544a9c43f3ae5c4dc34d10c3b121935a2a2732..a68b0529f7d74cf1730bfcd9290c77c9727a8798 100644 --- a/src/core/controllers/PreparedClauseController.php +++ b/src/core/controllers/PreparedClauseController.php @@ -15,7 +15,7 @@ namespace SrcCore\controllers; use Core\Models\UserModel; -use Core\Models\ValidatorModel; +use SrcCore\models\ValidatorModel; use Entity\models\EntityModel; use Resource\models\ResModel; diff --git a/src/core/controllers/StoreController.php b/src/core/controllers/StoreController.php index 0e0ec514c272a844dae68ea1de9b2be6d55c0c14..fe2450683c05b284bd41c5e9699ef8de27e44262 100644 --- a/src/core/controllers/StoreController.php +++ b/src/core/controllers/StoreController.php @@ -22,7 +22,7 @@ use Docserver\controllers\DocserverController; use Docserver\models\DocserverModel; use Docserver\models\DocserverTypeModel; use Core\Models\UserModel; -use Core\Models\ValidatorModel; +use SrcCore\models\ValidatorModel; use Entity\models\EntityModel; use Resource\models\ResModel; use Resource\models\ResExtModel; diff --git a/src/core/models/CoreConfigModel.php b/src/core/models/CoreConfigModel.php index 88cc232f651e27de283555e4b5faf42cfb24b98e..70d9a427f97b8944427794fa9f4020a8731fdcc1 100644 --- a/src/core/models/CoreConfigModel.php +++ b/src/core/models/CoreConfigModel.php @@ -16,7 +16,7 @@ namespace SrcCore\models; //This model is not customizable -use Core\Models\ValidatorModel; +use SrcCore\models\ValidatorModel; class CoreConfigModel { diff --git a/src/core/models/DatabaseModel.php b/src/core/models/DatabaseModel.php index 965d4bfb30cf580d009dfc82bef27529db9a88c1..ffcd82e8709f236a84ffebacba501ce5372364bc 100644 --- a/src/core/models/DatabaseModel.php +++ b/src/core/models/DatabaseModel.php @@ -14,7 +14,7 @@ namespace SrcCore\models; -use Core\Models\ValidatorModel; +use SrcCore\models\ValidatorModel; class DatabaseModel { diff --git a/src/core/models/DatabasePDO.php b/src/core/models/DatabasePDO.php index 50ca81503ba2aae44d0c2fd55022bfc66cd8984c..ce43fb839a54720ecf3c1d487ce91f1e8fe7f6cb 100644 --- a/src/core/models/DatabasePDO.php +++ b/src/core/models/DatabasePDO.php @@ -15,7 +15,7 @@ namespace SrcCore\models; -use Core\Models\ValidatorModel; +use SrcCore\models\ValidatorModel; class DatabasePDO {