[Fix] Remove forgotten J6 deprecations

administrator/com_joomgallery/src/Extension/JoomgalleryComponent.php

@@ -61,7 +61,6 @@ class JoomgalleryComponent extends MVCComponent implements BootableExtensionInte
   use MessageTrait;
 	use AssociationServiceTrait;
 	use HTMLRegistryAwareTrait;
-  // use RouterServiceTrait;
   use RouterServiceTrait {RouterServiceTrait::createRouter as traitCreateRouter;}
 
   /**

administrator/com_joomgallery/src/Helper/JoomHelper.php

@@ -1243,4 +1243,31 @@ public static function pluralize(string $word): string
     // Default rule: add 's'
     return $word . 's';
   }
+
+  /**
+   * Returns a Table Object
+   *
+   * @param   string    $tableClass   The name of the table (e.g '\\Joomla\\CMS\\Table\\Module')
+   *
+   * @return  object|bool   Table object on success, false otherwise.
+   *
+   * @since   4.2.0
+   * NOTE:    Use Factory::getApplication()->bootComponent('...')->getMVCFactory()->createTable($name, $prefix, $config); instead
+   */
+  public static function getTableInstance(string $tableClass)
+  {
+    if(!\class_exists($tableClass))
+    {
+      return false;
+    }
+
+    // Check for a possible service from the container otherwise manually instantiate the class
+    if(Factory::getContainer()->has($tableClass))
+    {
+      return Factory::getContainer()->get($tableClass);
+    }
+
+    // Instantiate a new table class and return it.
+    return new $tableClass(Factory::getContainer()->get(DatabaseInterface::class));
+  }
 }

administrator/com_joomgallery/src/Service/Config/ConfigInterface.php

@@ -9,7 +9,7 @@
 
 namespace Joomgallery\Component\Joomgallery\Administrator\Service\Config;
 
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 
 /**
 * Interface for the configuration classes

administrator/com_joomgallery/src/Service/Config/ConfigServiceInterface.php

@@ -9,7 +9,7 @@
 
 namespace Joomgallery\Component\Joomgallery\Administrator\Service\Config;
 
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 
 /**
 * The Config service

administrator/com_joomgallery/src/Service/Config/ConfigServiceTrait.php

@@ -9,7 +9,7 @@
 
 namespace Joomgallery\Component\Joomgallery\Administrator\Service\Config;
 
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 
 use \Joomgallery\Component\Joomgallery\Administrator\Service\Config\DefaultConfig;
 use \Joomla\CMS\Component\ComponentHelper;

administrator/com_joomgallery/src/Service/Filesystem/FilesystemServiceInterface.php

@@ -9,7 +9,7 @@
 
 namespace Joomgallery\Component\Joomgallery\Administrator\Service\Filesystem;
 
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 
 /**
 * The Filesystem service

administrator/com_joomgallery/src/Service/Filesystem/FilesystemServiceTrait.php

@@ -9,7 +9,7 @@
 
 namespace Joomgallery\Component\Joomgallery\Administrator\Service\Filesystem;
 
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 
 use \Joomgallery\Component\Joomgallery\Administrator\Service\Filesystem\Filesystem;
 

administrator/com_joomgallery/src/Service/Messenger/PmMessenger.php

@@ -14,8 +14,9 @@
 
 use \Joomla\CMS\Factory;
 use \Joomla\CMS\Language\Text;
-use \Joomla\CMS\User\UserFactoryInterface;
 use \Joomla\CMS\Mail\MailTemplate;
+use \Joomla\Database\DatabaseInterface;
+use \Joomla\CMS\User\UserFactoryInterface;
 use \Joomgallery\Component\Joomgallery\Administrator\Service\Messenger\Messenger;
 use \Joomgallery\Component\Joomgallery\Administrator\Service\Messenger\MessengerInterface;
 

administrator/com_joomgallery/src/Service/Refresher/RefresherInterface.php

@@ -9,7 +9,7 @@
 
 namespace Joomgallery\Component\Joomgallery\Administrator\Service\Refresher;
 
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 
 
 /**

administrator/com_joomgallery/src/Service/Refresher/RefresherServiceInterface.php

@@ -9,7 +9,7 @@
 
 namespace Joomgallery\Component\Joomgallery\Administrator\Service\Refresher;
 
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 
 /**
 * The Refresher service

administrator/com_joomgallery/src/Service/Refresher/RefresherServiceTrait.php

@@ -9,7 +9,7 @@
 
 namespace Joomgallery\Component\Joomgallery\Administrator\Service\Refresher;
 
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 
 use \Joomgallery\Component\Joomgallery\Administrator\Service\Refresher\Refresher;
 

administrator/com_joomgallery/src/Service/Uploader/HTMLUploader.php

@@ -13,8 +13,8 @@
 
 use \Joomla\CMS\Factory;
 use \Joomla\CMS\Language\Text;
-use \Joomla\CMS\Filesystem\File as JFile;
-use \Joomla\CMS\Filesystem\Path as JPath;
+use \Joomla\Filesystem\File as JFile;
+use \Joomla\Filesystem\Path as JPath;
 
 use \Joomgallery\Component\Joomgallery\Administrator\Service\Uploader\UploaderInterface;
 use \Joomgallery\Component\Joomgallery\Administrator\Service\Uploader\Uploader as BaseUploader;

administrator/com_joomgallery/src/Service/Uploader/SingleUploader.php

@@ -13,8 +13,8 @@
 
 use \Joomla\CMS\Factory;
 use \Joomla\CMS\Language\Text;
-use \Joomla\CMS\Filesystem\File as JFile;
-use \Joomla\CMS\Filesystem\Path as JPath;
+use \Joomla\Filesystem\File as JFile;
+use \Joomla\Filesystem\Path as JPath;
 use \Joomgallery\Component\Joomgallery\Administrator\Table\ImageTable;
 use \Joomgallery\Component\Joomgallery\Administrator\Service\Uploader\UploaderInterface;
 use \Joomgallery\Component\Joomgallery\Administrator\Service\Uploader\Uploader as BaseUploader;

administrator/com_joomgallery/src/Service/Uploader/TUSUploader.php

@@ -13,8 +13,8 @@
 
 use \Joomla\CMS\Factory;
 use \Joomla\CMS\Language\Text;
-use \Joomla\CMS\Filesystem\File as JFile;
-use \Joomla\CMS\Filesystem\Path as JPath;
+use \Joomla\Filesystem\File as JFile;
+use \Joomla\Filesystem\Path as JPath;
 
 use \Joomgallery\Component\Joomgallery\Administrator\Service\Uploader\UploaderInterface;
 use \Joomgallery\Component\Joomgallery\Administrator\Service\Uploader\Uploader as BaseUploader;

administrator/com_joomgallery/src/Service/Uploader/Uploader.php

@@ -13,12 +13,10 @@
 
 use \Joomla\CMS\Factory;
 use \Joomla\CMS\Language\Text;
-use \Joomla\CMS\Filesystem\File as JFile;
-use \Joomla\CMS\Filesystem\Path as JPath;
+use \Joomla\Filesystem\File as JFile;
 use \Joomla\CMS\Filter\InputFilter;
 use \Joomla\CMS\Filter\OutputFilter;
-use \Joomla\CMS\Object\CMSObject;
-
+use \Joomla\Database\DatabaseInterface;
 use \Joomgallery\Component\Joomgallery\Administrator\Service\Uploader\UploaderInterface;
 use \Joomgallery\Component\Joomgallery\Administrator\Extension\ServiceTrait;
 
@@ -264,7 +262,7 @@ public function overrideData(&$data): bool
     require_once JPATH_ADMINISTRATOR.'/components/'._JOOM_OPTION.'/includes/iptcarray.php';
     require_once JPATH_ADMINISTRATOR.'/components/'._JOOM_OPTION.'/includes/exifarray.php';
 
-    $lang = Factory::getLanguage();
+    $lang = $this->app->getLanguage();
     $lang->load(_JOOM_OPTION.'.exif', JPATH_ADMINISTRATOR.'/components/'._JOOM_OPTION);
     $lang->load(_JOOM_OPTION.'.iptc', JPATH_ADMINISTRATOR.'/components/'._JOOM_OPTION);
 
@@ -418,7 +416,7 @@ public function overrideData(&$data): bool
         $data['title'] = $filter->clean($source_value, 'string');
 
         // Recreate alias
-        if(Factory::getConfig()->get('unicodeslugs') == 1)
+        if($this->app->getConfig()->get('unicodeslugs') == 1)
         {
           $data['alias'] = OutputFilter::stringURLUnicodeSlug(trim($data['title']));
         }
@@ -500,7 +498,7 @@ public function createImage($data_row): bool
       $this->component->createMessenger($jg_filenamenumber);
 
       // Get user
-      $user = Factory::getUser();
+      $user = $this->app->getIdentity();
 
       // Get category
       $cat = JoomHelper::getRecord('category', $data_row->catid, $this->component);
@@ -541,7 +539,7 @@ public function createImage($data_row): bool
   /**
    * Rollback an erroneous upload
    *
-   * @param   CMSObject   $data_row     Image object containing at least catid and filename (default: false)
+   * @param   object  $data_row   Image object containing at least catid and filename (default: false)
    *
    * @return  void
    *
@@ -599,7 +597,7 @@ public function deleteTmp(): bool
    */
   protected function getImageNumber($userid)
   {
-    $db = Factory::getDbo();
+    $db = Factory::getContainer()->get(DatabaseInterface::class);
 
     $query = $db->getQuery(true)
           ->select('COUNT(id)')
@@ -679,7 +677,7 @@ protected function resetUserStates()
    *
    * @param   array   $data      The form data
    *
-   * @return  CMSObject
+   * @return  object
    *
    * @since   4.0.0
    */
@@ -691,10 +689,10 @@ protected function tempImgObj($data)
       throw new \Exception('Form data must have at least catid and filename');
     }
 
-    $img = new CMSObject;
+    $img = new stdClass;
 
-    $img->set('catid', $data['catid']);
-    $img->set('filename', $data['filename']);
+    $img->catid = $data['catid'];
+    $img->filename = $data['filename'];
 
     return $img;
   }

administrator/com_joomgallery/src/Service/Uploader/UploaderInterface.php

@@ -9,7 +9,7 @@
 
 namespace Joomgallery\Component\Joomgallery\Administrator\Service\Uploader;
 
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 
 use \Joomgallery\Component\Joomgallery\Administrator\Table\ImageTable;
 

administrator/com_joomgallery/src/Service/Uploader/UploaderServiceInterface.php

@@ -9,7 +9,7 @@
 
 namespace Joomgallery\Component\Joomgallery\Administrator\Service\Uploader;
 
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 
 /**
 * The Uploader service

administrator/com_joomgallery/src/Service/Uploader/UploaderServiceTrait.php

@@ -9,7 +9,7 @@
 
 namespace Joomgallery\Component\Joomgallery\Administrator\Service\Uploader;
 
-\defined('JPATH_PLATFORM') or die;
+\defined('_JEXEC') or die;
 
 use \Joomgallery\Component\Joomgallery\Administrator\Service\Uploader\HTMLUploader;
 use \Joomgallery\Component\Joomgallery\Administrator\Service\Uploader\TUSUploader;