Inject dependencies for services

* Inject dependencies for services

* CS

* Remove un-used import

* Fake change to trigger CI

* Do not inject application. Will try to figure out later

* One more, sorry

* CS

* More

Author: joomdonation

src/administrator/components/com_weblinks/src/Extension/WeblinksComponent.php

@@ -30,6 +30,7 @@
 use Joomla\CMS\Tag\TagServiceTrait;
 use Joomla\Component\Weblinks\Administrator\Service\HTML\AdministratorService;
 use Joomla\Component\Weblinks\Administrator\Service\HTML\Icon;
+use Joomla\Database\DatabaseInterface;
 use Psr\Container\ContainerInterface;
 
 /**
@@ -68,10 +69,15 @@ class WeblinksComponent extends MVCComponent implements
      * @since   4.0.0
      */
 
-
     public function boot(ContainerInterface $container)
     {
-        $this->getRegistry()->register('weblinksadministrator', new AdministratorService());
+        $this->getRegistry()->register(
+            'weblinksadministrator',
+            new AdministratorService(
+                $container->get(DatabaseInterface::class)
+            )
+        );
+
         $this->getRegistry()->register('weblinkicon', new Icon($container->get(SiteApplication::class)));
     }
 

src/administrator/components/com_weblinks/src/Service/HTML/AdministratorService.php

@@ -19,6 +19,8 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\CMS\Router\Route;
+use Joomla\Database\DatabaseAwareTrait;
+use Joomla\Database\DatabaseInterface;
 use Joomla\Database\ParameterType;
 
 /**
@@ -28,6 +30,20 @@
  */
 class AdministratorService
 {
+    use DatabaseAwareTrait;
+
+    /**
+     * Service constructor
+     *
+     * @param   DatabaseInterface  $database
+     *
+     * @since    __DEPLOY_VERSION__
+     */
+    public function __construct(DatabaseInterface $database)
+    {
+        $this->setDatabase($database);
+    }
+
     /**
      * Get the associated language flags
      *
@@ -48,7 +64,7 @@ public function association($weblinkid)
             }
 
             // Get the associated contact items
-            $db    = Factory::getDbo();
+            $db    = $this->getDatabase();
             $query = $db->getQuery(true)
                 ->select([
                         $db->quoteName('c.id'),
@@ -66,6 +82,7 @@ public function association($weblinkid)
                 ->where($db->quoteName('c.id') . ' != :id')
                 ->bind(':id', $weblinkid, ParameterType::INTEGER);
             $db->setQuery($query);
+
             try {
                 $items = $db->loadObjectList('id');
             } catch (\RuntimeException $e) {

src/administrator/components/com_weblinks/src/Service/HTML/Icon.php

@@ -38,13 +38,14 @@ class Icon
      * @since  4.0.0
      */
     private $application;
+
     /**
-         * Service constructor
-         *
-         * @param   CMSApplication  $application  The application
-         *
-         * @since   4.0.0
-         */
+     * Service constructor
+     *
+     * @param   CMSApplication  $application  The application
+     *
+     * @since   4.0.0
+     */
     public function __construct(CMSApplication $application)
     {
         $this->application = $application;
@@ -61,7 +62,7 @@ public function __construct(CMSApplication $application)
      *
      * @since  4.0.0
      */
-    public static function create($category, $params, $attribs = [])
+    public function create($category, $params, $attribs = [])
     {
         $uri  = Uri::getInstance();
         $url  = 'index.php?option=com_weblinks&task=weblink.add&return=' . base64_encode($uri) . '&w_id=0&catid=' . $category->id;
@@ -93,9 +94,9 @@ public static function create($category, $params, $attribs = [])
      *
      * @since   4.0.0
      */
-    public static function edit($weblink, $params, $attribs = [], $legacy = false)
+    public function edit($weblink, $params, $attribs = [], $legacy = false)
     {
-        $user = Factory::getApplication()->getIdentity();
+        $user = $this->application->getIdentity();
         $uri  = Uri::getInstance();
         // Ignore if in a popup window.
         if ($params && $params->get('popup')) {

src/administrator/components/com_weblinks/tmpl/weblink/edit.php

@@ -17,6 +17,7 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\CMS\Router\Route;
+
 HTMLHelper::_('behavior.formvalidator');
 $app = Factory::getApplication();
 $input = $app->input;

src/administrator/components/com_weblinks/tmpl/weblink/edit_associations.php

@@ -12,4 +12,5 @@
 \defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 use Joomla\CMS\Layout\LayoutHelper;
+
 echo LayoutHelper::render('joomla.edit.associations', $this);

src/administrator/components/com_weblinks/tmpl/weblink/edit_metadata.php

@@ -12,4 +12,5 @@
 \defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 use Joomla\CMS\Layout\LayoutHelper;
+
 echo LayoutHelper::render('joomla.edit.metadata', $this);

src/administrator/components/com_weblinks/tmpl/weblink/edit_params.php

@@ -12,6 +12,7 @@
 \defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 use Joomla\CMS\Language\Text;
+
 $fieldSets = $this->form->getFieldsets('params'); ?>
 <?php foreach ($fieldSets as $name => $fieldSet) :
     ?>

src/administrator/components/com_weblinks/tmpl/weblink/modal_associations.php

@@ -12,4 +12,5 @@
 \defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 use Joomla\CMS\Layout\LayoutHelper;
+
 echo LayoutHelper::render('joomla.edit.associations', $this);

src/administrator/components/com_weblinks/tmpl/weblink/modal_metadata.php

@@ -12,4 +12,5 @@
 \defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 use Joomla\CMS\Layout\LayoutHelper;
+
 echo LayoutHelper::render('joomla.edit.metadata', $this);

src/administrator/components/com_weblinks/tmpl/weblink/modal_params.php

@@ -12,6 +12,7 @@
 \defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 use Joomla\CMS\Language\Text;
+
 $fieldSets = $this->form->getFieldsets('params'); ?>
 <?php foreach ($fieldSets as $name => $fieldSet) :
     ?>