Merge pull request #36 from mfleeson/Extensions-and-General-Fixes

Extensions and general fixes
joomla-projects · Dec 4, 2024 · c3139ae · c3139ae
2 parents a7d4c23 + 2f91151
commit c3139ae
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/fix-formatting.bat b/fix-formatting.bat
@@ -1 +1,3 @@
-vendor\bin\php-cs-fixer fix -vvv --diff
+vendor\bin\php-cs-fixer fix -vvv --diff
+vendor\bin\phpcs --extensions=php -p --standard=ruleset.xml src/
+vendor\bin\phpcbf --extensions=php -p --standard=ruleset.xml src/
diff --git a/src/administrator/components/com_jed/src/Field/ApprovedField.php b/src/administrator/components/com_jed/src/Field/ApprovedField.php
@@ -7,18 +7,18 @@
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-namespace Joomla\Component\Jed\Administrator\Field;
+namespace Jed\Component\Jed\Administrator\Field;
 
-defined('_JEXEC') or die;
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
 
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Form\Field\ListField;
 use Joomla\CMS\HTML\HTMLHelper;
 
 use RuntimeException;
 
-use function defined;
-
 /**
  * List of approved states.
  *
@@ -43,7 +43,7 @@ class ApprovedField extends ListField
      * @since   4.0.0
      * @throws  RuntimeException
      */
-    public function getOptions(): array
+    protected function getOptions(): array
     {
         $params  = ComponentHelper::getParams('com_jed');
         $codes   = $params->get('awaiting_response_codes');

diff --git a/src/administrator/components/com_jed/src/Helper/JedHelper.php b/src/administrator/components/com_jed/src/Helper/JedHelper.php
@@ -389,7 +389,7 @@ public static function prettyDate(mixed $datestr): string
         }
     }
 
-    public static function OutputFieldsets(array $fieldsets, Form $form): bool
+    public static function outputFieldsets(array $fieldsets, Form $form): bool
     {
         $fscount = 0;
         foreach ($fieldsets as $fscat => $fs) {

diff --git a/src/administrator/components/com_jed/tmpl/extension/edit.php b/src/administrator/components/com_jed/tmpl/extension/edit.php
@@ -105,7 +105,7 @@
     $fieldsets['integration']['fields']      = [['download_integration_type', 'download_integration_url']];
     $fieldsets['integration']['hidden']      = [];
 
-    JedHelper::OutputFieldsets($fieldsets, $varied_form);
+    JedHelper::outputFieldsets($fieldsets, $varied_form);
     $fieldsets = [];
 
     echo HTMLHelper::_('uitab.endTab');
@@ -149,7 +149,7 @@
 
                 </div>
                 <div class="row ticket-header-row">
-                   
+
                     <div class="col-md-4  ticket-header">
 
                         <h1>Version - <?php echo $review->version; ?></h1>