From a3cdb853170c206cab21fd0ca2aec896a329d25d Mon Sep 17 00:00:00 2001 From: zebardy Date: Wed, 19 Feb 2020 00:24:01 +0000 Subject: [PATCH] bug fixes following merge --- controllers/BaseController.php | 6 ++++++ controllers/BatteriesApiController.php | 2 -- controllers/BatteriesController.php | 2 -- controllers/CalendarApiController.php | 3 --- controllers/CalendarController.php | 2 -- controllers/ChoresApiController.php | 2 -- controllers/ChoresController.php | 2 -- controllers/FilesApiController.php | 2 -- controllers/LoginController.php | 4 ---- controllers/OpenApiController.php | 3 --- controllers/RecipesApiController.php | 2 -- controllers/RecipesController.php | 4 ---- controllers/StockApiController.php | 2 -- controllers/StockController.php | 3 --- controllers/SystemController.php | 3 --- controllers/TasksApiController.php | 2 -- controllers/TasksController.php | 2 -- controllers/UsersApiController.php | 2 -- services/BaseService.php | 4 ++-- services/CalendarService.php | 10 +++++----- services/ChoresService.php | 2 +- services/DatabaseService.php | 2 +- services/DemoDataGeneratorService.php | 2 +- services/LocalizationService.php | 2 +- services/RecipesService.php | 2 +- 25 files changed, 18 insertions(+), 54 deletions(-) diff --git a/controllers/BaseController.php b/controllers/BaseController.php index e00bbbfa..d9773b3e 100644 --- a/controllers/BaseController.php +++ b/controllers/BaseController.php @@ -5,8 +5,14 @@ namespace Grocy\Controllers; use \Grocy\Services\DatabaseService; use \Grocy\Services\ApplicationService; use \Grocy\Services\LocalizationService; +use \Grocy\Services\StockService; use \Grocy\Services\UsersService; use \Grocy\Services\UserfieldsService; +use \Grocy\Services\BatteriesService; +use \Grocy\Services\CalendarService; +use \Grocy\Services\SessionService; +use \Grocy\Services\RecipesService; +use \Grocy\Services\TasksService; class BaseController { diff --git a/controllers/BatteriesApiController.php b/controllers/BatteriesApiController.php index 412ad14c..b0cc0700 100644 --- a/controllers/BatteriesApiController.php +++ b/controllers/BatteriesApiController.php @@ -2,8 +2,6 @@ namespace Grocy\Controllers; -use \Grocy\Services\BatteriesService; - class BatteriesApiController extends BaseApiController { public function __construct(\DI\Container $container) diff --git a/controllers/BatteriesController.php b/controllers/BatteriesController.php index 601877fe..f0daa4fa 100644 --- a/controllers/BatteriesController.php +++ b/controllers/BatteriesController.php @@ -2,8 +2,6 @@ namespace Grocy\Controllers; -use \Grocy\Services\BatteriesService; - class BatteriesController extends BaseController { public function __construct(\DI\Container $container) diff --git a/controllers/CalendarApiController.php b/controllers/CalendarApiController.php index cd587322..183d6245 100644 --- a/controllers/CalendarApiController.php +++ b/controllers/CalendarApiController.php @@ -2,9 +2,6 @@ namespace Grocy\Controllers; -use \Grocy\Services\CalendarService; -use \Grocy\Services\ApiKeyService; - class CalendarApiController extends BaseApiController { public function __construct(\DI\Container $container) diff --git a/controllers/CalendarController.php b/controllers/CalendarController.php index ef273532..48592404 100644 --- a/controllers/CalendarController.php +++ b/controllers/CalendarController.php @@ -2,8 +2,6 @@ namespace Grocy\Controllers; -use \Grocy\Services\CalendarService; - class CalendarController extends BaseController { public function __construct(\DI\Container $container) diff --git a/controllers/ChoresApiController.php b/controllers/ChoresApiController.php index 8e8d84ee..e05495fa 100644 --- a/controllers/ChoresApiController.php +++ b/controllers/ChoresApiController.php @@ -2,8 +2,6 @@ namespace Grocy\Controllers; -use \Grocy\Services\ChoresService; - class ChoresApiController extends BaseApiController { public function __construct(\DI\Container $container) diff --git a/controllers/ChoresController.php b/controllers/ChoresController.php index 93f7544a..e9078926 100644 --- a/controllers/ChoresController.php +++ b/controllers/ChoresController.php @@ -2,8 +2,6 @@ namespace Grocy\Controllers; -use \Grocy\Services\ChoresService; - class ChoresController extends BaseController { public function __construct(\DI\Container $container) diff --git a/controllers/FilesApiController.php b/controllers/FilesApiController.php index b12bce38..58aa1b70 100644 --- a/controllers/FilesApiController.php +++ b/controllers/FilesApiController.php @@ -2,8 +2,6 @@ namespace Grocy\Controllers; -use \Grocy\Services\FilesService; - class FilesApiController extends BaseApiController { public function __construct(\DI\Container $container) diff --git a/controllers/LoginController.php b/controllers/LoginController.php index 388f3364..21dbd956 100644 --- a/controllers/LoginController.php +++ b/controllers/LoginController.php @@ -2,10 +2,6 @@ namespace Grocy\Controllers; -use \Grocy\Services\SessionService; -use \Grocy\Services\DatabaseMigrationService; -use \Grocy\Services\DemoDataGeneratorService; - class LoginController extends BaseController { public function __construct(\DI\Container $container, string $sessionCookieName) diff --git a/controllers/OpenApiController.php b/controllers/OpenApiController.php index 982cb33a..ae5530db 100644 --- a/controllers/OpenApiController.php +++ b/controllers/OpenApiController.php @@ -2,9 +2,6 @@ namespace Grocy\Controllers; -#use \Grocy\Services\ApplicationService; -use \Grocy\Services\ApiKeyService; - class OpenApiController extends BaseApiController { public function __construct(\DI\Container $container) diff --git a/controllers/RecipesApiController.php b/controllers/RecipesApiController.php index cfacdfca..cb6f6c0f 100644 --- a/controllers/RecipesApiController.php +++ b/controllers/RecipesApiController.php @@ -2,8 +2,6 @@ namespace Grocy\Controllers; -use \Grocy\Services\RecipesService; - class RecipesApiController extends BaseApiController { public function __construct(\DI\Container $container) diff --git a/controllers/RecipesController.php b/controllers/RecipesController.php index fd90632c..72a51056 100644 --- a/controllers/RecipesController.php +++ b/controllers/RecipesController.php @@ -2,10 +2,6 @@ namespace Grocy\Controllers; -use \Grocy\Services\RecipesService; -use \Grocy\Services\StockService; -use \Grocy\Services\UserfieldsService; - class RecipesController extends BaseController { public function __construct(\DI\Container $container) diff --git a/controllers/StockApiController.php b/controllers/StockApiController.php index d8b1967d..14e4c728 100644 --- a/controllers/StockApiController.php +++ b/controllers/StockApiController.php @@ -2,8 +2,6 @@ namespace Grocy\Controllers; -use \Grocy\Services\StockService; - class StockApiController extends BaseApiController { public function __construct(\DI\Container $container) diff --git a/controllers/StockController.php b/controllers/StockController.php index a9dd13aa..416058ca 100644 --- a/controllers/StockController.php +++ b/controllers/StockController.php @@ -2,9 +2,6 @@ namespace Grocy\Controllers; -use \Grocy\Services\StockService; -use \Grocy\Services\UserfieldsService; - class StockController extends BaseController { diff --git a/controllers/SystemController.php b/controllers/SystemController.php index 0b5a5a22..7dc9b61f 100644 --- a/controllers/SystemController.php +++ b/controllers/SystemController.php @@ -2,9 +2,6 @@ namespace Grocy\Controllers; -use \Grocy\Services\DatabaseMigrationService; -use \Grocy\Services\DemoDataGeneratorService; - class SystemController extends BaseController { diff --git a/controllers/TasksApiController.php b/controllers/TasksApiController.php index 9310f87a..fb8ad72a 100644 --- a/controllers/TasksApiController.php +++ b/controllers/TasksApiController.php @@ -2,8 +2,6 @@ namespace Grocy\Controllers; -use \Grocy\Services\TasksService; - class TasksApiController extends BaseApiController { public function __construct(\DI\Container $container) diff --git a/controllers/TasksController.php b/controllers/TasksController.php index d75ca1da..ab57c547 100644 --- a/controllers/TasksController.php +++ b/controllers/TasksController.php @@ -2,8 +2,6 @@ namespace Grocy\Controllers; -use \Grocy\Services\TasksService; - class TasksController extends BaseController { public function __construct(\DI\Container $container) diff --git a/controllers/UsersApiController.php b/controllers/UsersApiController.php index f1b50d86..00625bf2 100644 --- a/controllers/UsersApiController.php +++ b/controllers/UsersApiController.php @@ -2,8 +2,6 @@ namespace Grocy\Controllers; -use \Grocy\Services\UsersService; - class UsersApiController extends BaseApiController { public function __construct(\DI\Container $container) diff --git a/services/BaseService.php b/services/BaseService.php index 09114f97..8962f54e 100644 --- a/services/BaseService.php +++ b/services/BaseService.php @@ -2,8 +2,8 @@ namespace Grocy\Services; -use \Grocy\Services\DatabaseService; -use \Grocy\Services\LocalizationService; +#use \Grocy\Services\DatabaseService; +#use \Grocy\Services\LocalizationService; class BaseService { diff --git a/services/CalendarService.php b/services/CalendarService.php index eac0d712..d653cbbb 100644 --- a/services/CalendarService.php +++ b/services/CalendarService.php @@ -2,11 +2,11 @@ namespace Grocy\Services; -use \Grocy\Services\StockService; -use \Grocy\Services\TasksService; -use \Grocy\Services\ChoresService; -use \Grocy\Services\BatteriesService; -use \Grocy\Services\UsersService; +#use \Grocy\Services\StockService; +#use \Grocy\Services\TasksService; +#use \Grocy\Services\ChoresService; +#use \Grocy\Services\BatteriesService; +#use \Grocy\Services\UsersService; use \Grocy\Helpers\UrlManager; class CalendarService extends BaseService diff --git a/services/ChoresService.php b/services/ChoresService.php index dbd39ca6..65c49699 100644 --- a/services/ChoresService.php +++ b/services/ChoresService.php @@ -2,7 +2,7 @@ namespace Grocy\Services; -use \Grocy\Services\StockService; +#use \Grocy\Services\StockService; class ChoresService extends BaseService { diff --git a/services/DatabaseService.php b/services/DatabaseService.php index 874a077b..23fc7b9d 100644 --- a/services/DatabaseService.php +++ b/services/DatabaseService.php @@ -2,7 +2,7 @@ namespace Grocy\Services; -use \Grocy\Services\ApplicationService; +#use \Grocy\Services\ApplicationService; class DatabaseService { diff --git a/services/DemoDataGeneratorService.php b/services/DemoDataGeneratorService.php index dc573737..6a32b9e3 100644 --- a/services/DemoDataGeneratorService.php +++ b/services/DemoDataGeneratorService.php @@ -2,7 +2,7 @@ namespace Grocy\Services; -use \Grocy\Services\LocalizationService; +#use \Grocy\Services\LocalizationService; class DemoDataGeneratorService extends BaseService { diff --git a/services/LocalizationService.php b/services/LocalizationService.php index b2a34a66..e11c7f85 100644 --- a/services/LocalizationService.php +++ b/services/LocalizationService.php @@ -2,7 +2,7 @@ namespace Grocy\Services; -use \Grocy\Services\DatabaseService; +#use \Grocy\Services\DatabaseService; use \Gettext\Translation; use \Gettext\Translations; use \Gettext\Translator; diff --git a/services/RecipesService.php b/services/RecipesService.php index a3c33213..aefd44b3 100644 --- a/services/RecipesService.php +++ b/services/RecipesService.php @@ -2,7 +2,7 @@ namespace Grocy\Services; -use \Grocy\Services\StockService; +#use \Grocy\Services\StockService; class RecipesService extends BaseService {