cosmetic code review

CHANGELOG.md

@@ -1,3 +1,15 @@
+tinyPacker 1.4.3 - 2023.11.04
+===========================================================
+* Require Dotclear 2.28
+* Require PHP 8.1+
+* Code review
+
+tinyPacker 1.4.2 - 2023.10.20
+===========================================================
+* Require Dotclear 2.28
+* Require PHP 8.1+
+* Code review
+
 tinyPacker 1.4.1 - 2023.10.09
 ===========================================================
 * Require Dotclear 2.28

README.md

@@ -1,12 +1,11 @@
 # README
 
-[![Release](https://img.shields.io/badge/release-1.4.1-a2cbe9.svg)](https://git.dotclear.watch/JcDenis/tinyPacker/releases)
+[![Release](https://img.shields.io/badge/release-1.4.3-a2cbe9.svg)](https://git.dotclear.watch/JcDenis/tinyPacker/releases)
-![Date](https://img.shields.io/badge/date-2023.10.07-c44d58.svg)
+![Date](https://img.shields.io/badge/date-2023.11.04-c44d58.svg)
 [![Dotclear](https://img.shields.io/badge/dotclear-v2.28-137bbb.svg)](https://fr.dotclear.org/download)
 [![Dotaddict](https://img.shields.io/badge/dotaddict-official-9ac123.svg)](https://plugins.dotaddict.org/dc2/details/tinyPacker)
 [![License](https://img.shields.io/badge/license-GPL--2.0-ececec.svg)](https://git.dotclear.watch/JcDenis/tinyPacker/src/branch/master/LICENSE)
 
-
 ## ABOUT
 
 _tinyPacker_ is a plugin for the open-source web publishing software called [Dotclear](https://www.dotclear.org).
@@ -15,10 +14,10 @@ _tinyPacker_ is a plugin for the open-source web publishing software called [Dot
 
 ## REQUIREMENTS
 
-* Super administrator permissions
-* A writable public directory.
 * Dotclear 2.28
 * PHP 8.1+
+* System writable public directory
+* Dotlear super admin permissions
 
 ## USAGE
 
@@ -38,6 +37,6 @@ and it's pack into current blog public directory.
 
 ## CONTRIBUTORS
 
-* Jean-Christian Denis
+* Jean-Christian Denis (author)
 
 You are welcome to contribute to this code.

_define.php

@@ -9,7 +9,6 @@
  * Quick pack theme or plugin into public dir.
  *
  * @author      Jean-Christian Denis
- * @copyright   Jean-Christian Denis
  * @copyright   GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
  */
 declare(strict_types=1);
@@ -18,9 +17,10 @@ $this->registerModule(
     'Tiny packer',
     'Quick pack theme or plugin into public dir',
     'Jean-Christian Denis',
-    '1.4',
+    '1.4.3',
     [
         'requires'    => [['core', '2.28']],
+        'permissions' => 'My',
         'type'        => 'plugin',
         'support'     => 'https://git.dotclear.watch/JcDenis/' . basename(__DIR__) . '/issues',
         'details'     => 'https://git.dotclear.watch/JcDenis/' . basename(__DIR__) . '/src/branch/master/README.md',

dcstore.xml

@@ -2,10 +2,10 @@
 <modules xmlns:da="http://dotaddict.org/da/">
   <module id="tinyPacker">
     <name>Tiny packer</name>
-    <version>1.4.1</version>
+    <version>1.4.3</version>
     <author>Jean-Christian Denis</author>
     <desc>Quick pack theme or plugin into public dir</desc>
-    <file>https://git.dotclear.watch/JcDenis/tinyPacker/releases/download/v1.4.1/plugin-tinyPacker.zip</file>
+    <file>https://git.dotclear.watch/JcDenis/tinyPacker/releases/download/v1.4.3/plugin-tinyPacker.zip</file>
     <da:dcmin>2.28</da:dcmin>
     <da:details>https://git.dotclear.watch/JcDenis/tinyPacker/src/branch/master/README.md</da:details>
     <da:support>https://git.dotclear.watch/JcDenis/tinyPacker/issues</da:support>

src/Backend.php

@@ -23,7 +23,6 @@ use Exception;
  * Add action and button to modules lists.
  *
  * @author      Jean-Christian Denis
- * @copyright   Jean-Christian Denis
  * @copyright   GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
  */
 class Backend extends Process
@@ -69,7 +68,7 @@ class Backend extends Process
                 $modules = array_keys($_POST[My::id()]);
                 $id      = $modules[0];
 
-                $module = $list->modules->getDefine($id);
+                $module = $list->modules->getDefine((string) $id);
                 if (!$module->isDefined()) {
                     throw new Exception(__('No such module.'));
                 }
@@ -93,7 +92,7 @@ class Backend extends Process
                         ));
                     }
 
-                    $zip->addDirectory((string) Path::real($module->get('root')), $id, true);
+                    $zip->addDirectory((string) Path::real($module->get('root')), (string) $id, true);
                     $zip->write();
                     $zip->close();
                     unset($zip, $fp);

src/My.php

@@ -1,15 +1,5 @@
 <?php
-/**
+
- * @brief tinyPacker, a plugin for Dotclear 2
- *
- * @package Dotclear
- * @subpackage Plugin
- *
- * @author Jean-Christian Denis
- *
- * @copyright Jean-Christian Denis
- * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
- */
 declare(strict_types=1);
 
 namespace Dotclear\Plugin\tinyPacker;
@@ -17,6 +7,13 @@ namespace Dotclear\Plugin\tinyPacker;
 use Dotclear\App;
 use Dotclear\Module\MyPlugin;
 
+/**
+ * @brief       tinyPacker My helper.
+ * @ingroup     tinyPacker
+ *
+ * @author      Jean-Christian Denis
+ * @copyright   GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
+ */
 class My extends MyPlugin
 {
     /**
@@ -47,7 +44,10 @@ class My extends MyPlugin
 
     public static function checkCustomContext(int $context): ?bool
     {
-        // Only backend and super admin
+        return match ($context) {
-        return $context === self::INSTALL ? null : App::task()->checkContext('BACKEND') && App::auth()->isSuperAdmin();
+            // Limit to super admin
+            self::MODULE => App::auth()->isSuperAdmin(),
+            default      => null,
+        };
     }
 }