Added public Translate class to WebAppService

Author: robinsonjohn

CHANGELOG.md

@@ -13,6 +13,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `Fixed` for any bug fixes.
 - `Security` in case of vulnerabilities
 
+## [1.4.0] - 2025.01.10
+
+### Added
+
+Added public `Translate` class to `WebAppService`
+
 ## [1.3.0] - 2025.01.19
 
 ### Added

docs/setup.md

@@ -14,7 +14,7 @@ This service requires the following Bones services to exist in the container:
 
 In addition, this service also requires the following library to exist in the container:
 
-- [Translate](https://github.com/bayfrontmedia/translation)
+- [Translation](https://github.com/bayfrontmedia/translation)
 
 The default locale used in the `Translate` class constructor should be set 
 to the `webapp.locale.default` config value (see below).

docs/webappservice-class.md

@@ -6,4 +6,5 @@ The `WebAppService` class contains the following Bones services:
 - [FilterService](https://github.com/bayfrontmedia/bones/blob/master/docs/services/filters.md) as `$this->filters`
 - [Response](https://github.com/bayfrontmedia/bones/blob/master/docs/services/response.md) as `$this->response`
 - [Router](https://github.com/bayfrontmedia/bones/blob/master/docs/services/router.md) as `$this->router`
+- [Translation](https://github.com/bayfrontmedia/translation) as `$this->translate`
 - [Veil](https://github.com/bayfrontmedia/bones/blob/master/docs/services/veil.md) as `$this->veil`

src/WebAppService.php

@@ -5,14 +5,13 @@
 use Bayfront\Bones\Abstracts\Service;
 use Bayfront\Bones\Application\Services\Events\EventService;
 use Bayfront\Bones\Application\Services\Filters\FilterService;
-use Bayfront\Bones\Application\Utilities\App;
 use Bayfront\Bones\Exceptions\ServiceException;
 use Bayfront\BonesService\WebApp\Events\WebAppServiceEvents;
 use Bayfront\BonesService\WebApp\Exceptions\WebAppServiceException;
 use Bayfront\BonesService\WebApp\Filters\WebAppServiceFilters;
-use Bayfront\Container\NotFoundException;
 use Bayfront\HttpResponse\Response;
 use Bayfront\RouteIt\Router;
+use Bayfront\Translation\Translate;
 use Bayfront\Veil\Veil;
 
 class WebAppService extends Service
@@ -22,6 +21,7 @@ class WebAppService extends Service
     public FilterService $filters;
     public Response $response;
     public Router $router;
+    public Translate $translate;
     public Veil $veil;
 
     /**
@@ -32,30 +32,27 @@ class WebAppService extends Service
      * @param FilterService $filters
      * @param Response $response
      * @param Router $router
+     * @param Translate $translate
      * @param Veil $veil
      * @throws WebAppServiceException
      */
 
-    public function __construct(EventService $events, FilterService $filters, Response $response, Router $router, Veil $veil)
+    public function __construct(EventService $events, FilterService $filters, Response $response, Router $router, Translate $translate, Veil $veil)
     {
         $this->events = $events;
         $this->filters = $filters;
         $this->response = $response;
         $this->router = $router;
+        $this->translate = $translate;
         $this->veil = $veil;
 
         parent::__construct($events);
 
-        if (!App::has('Bayfront\Translation\Translate')) {
-            throw new WebAppServiceException('Unable to start WebAppService: Required dependency not found (Bayfront\Translation\Translate)');
-        }
-
         // Enqueue events
 
         try {
-            $translate = App::get('Bayfront\Translation\Translate');
             $this->events->addSubscriptions(new WebAppServiceEvents($this, $translate));
-        } catch (ServiceException|NotFoundException $e) {
+        } catch (ServiceException $e) {
             throw new WebAppServiceException('Unable to start WebAppService: ' . $e->getMessage(), $e->getCode(), $e->getPrevious());
         }