Merge pull request #29 from GreenMeteor/develop

v1.17.0 Test

.github/workflows/php.yml

@@ -11,7 +11,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ github.event.pull_request.head.ref }}
           fetch-depth: 0
@@ -34,7 +34,7 @@ jobs:
       - name: Cache Composer packages
         if: github.event_name == 'pull_request'
         id: composer-cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: vendor
           key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}

Module.php

@@ -13,32 +13,6 @@ class Module extends BaseModule
      */
     public $resourcesPath = 'resources';
 
-    // Define the namespace for web controllers
-    public $controllerNamespace = 'humhub\modules\composer\controllers';
-
-    // Define the namespace for console commands
-    public $commandNamespace = 'humhub\modules\composer\commands';
-
-    public function init()
-    {
-        parent::init();
-        if (Yii::$app instanceof \yii\console\Application) {
-            // Set controller namespace to default web controllers namespace for console application
-            $this->controllerNamespace = 'humhub\modules\composer\controllers';
-            // Define console command mappings
-            $this->controllerMap = [
-                'theme' => 'humhub\modules\composer\commands\ThemeController',
-            ];
-        }
-    }
-
-    public function actions()
-    {
-        return [
-            'theme/compile' => 'humhub\modules\composer\commands\ThemeController',
-        ];
-    }
-
     /**
      * @inheritdoc
      */

composer.json

@@ -12,8 +12,7 @@
     "require": {
         "php": "^8.2",
         "symfony/process": "^7.1",
-        "composer/installers": "^2.2",
-        "oyejorge/less.php": "^1.7"
+        "composer/installers": "^2.2"
     },
     "require-dev": {
         "composer/composer": "^2.7"
@@ -29,9 +28,9 @@
             "type": "package",
             "package": {
                 "name": "gruntjs/grunt",
-                "version": "1.4.1",
+                "version": "1.6.1",
                 "dist": {
-                    "url": "https://registry.npmjs.org/grunt/-/grunt-1.4.1.tgz",
+                    "url": "https://registry.npmjs.org/grunt/-/grunt-1.6.1.tgz",
                     "type": "tar"
                 },
                 "autoload": {

controllers/GruntController.php

@@ -46,26 +46,6 @@ public function actionBuildAssets()
         }
     }
 
-    /**
-     * Builds a theme using Grunt.
-     *
-     * @param string|null $themeName The name of the theme to build.
-     * @return string The rendering result.
-     */
-    public function actionBuildTheme()
-    {
-        $themeName = Yii::$app->request->post('themeName');
-
-        if ($themeName === null) {
-            throw new \yii\web\BadRequestHttpException('Theme name cannot be null.');
-        }
-
-        $gruntService = new GruntService();
-        $output = $gruntService->buildTheme($themeName);
-
-        return $this->asJson(['success' => true, 'output' => $output]);
-    }
-
     /**
      * Builds the search index using Grunt.
      *

package.json

@@ -1,10 +1,9 @@
 {
   "name": "greenmeteor/composer",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Update your Composer installed HumHub instance",
   "scripts": {
     "grunt-build-assets": "grunt build-assets",
-    "grunt-build-theme": "grunt build-theme",
     "grunt-build-search": "grunt build-search",
     "grunt-migrate-up": "grunt migrate-up"
   },
@@ -14,8 +13,8 @@
   },
   "license": "AGPL-3.0-or-later",
   "devDependencies": {
-    "grunt": "^1.4.1",
-    "grunt-cli": "^1.4.3",
-    "symfony/process": "^5.0"
+    "grunt": "^1.6.1",
+    "grunt-cli": "^1.5.0",
+    "symfony/process": "^7.1"
   }
-}
+}

services/GruntService.php

@@ -14,7 +14,6 @@ class GruntService
      * Executes a Grunt command and returns the output.
      *
      * @param string $command The Grunt command to execute.
-     * @param string|null $themeName The name of the theme to build (optional).
      * @return array The output of the Grunt command.
      * @throws \yii\web\ForbiddenHttpException If the user is not allowed to perform this action.
      * @throws \yii\web\ServerErrorHttpException If the working directory is invalid.
@@ -63,17 +62,6 @@ public function buildAssets(): array
         return $this->executeCommand('build-assets');
     }
 
-    /**
-     * Builds a theme using Grunt.
-     *
-     * @param string $themeName The name of the theme to build.
-     * @return array The output of the Grunt build-theme command.
-     */
-    public function buildTheme(string $themeName): array
-    {
-        return $this->executeCommand('build-theme', $themeName);
-    }
-
     /**
      * Builds the search index using Grunt.
      *

vendor/bin/composer

@@ -112,9 +112,8 @@ if (PHP_VERSION_ID < 80000) {
         (function_exists('stream_get_wrappers') && in_array('phpvfscomposer', stream_get_wrappers(), true))
         || (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper'))
     ) {
-        include("phpvfscomposer://" . __DIR__ . '/..'.'/composer/composer/bin/composer');
-        exit(0);
+        return include("phpvfscomposer://" . __DIR__ . '/..'.'/composer/composer/bin/composer');
     }
 }
 
-include __DIR__ . '/..'.'/composer/composer/bin/composer';
+return include __DIR__ . '/..'.'/composer/composer/bin/composer';

vendor/bin/jsonlint

@@ -112,9 +112,8 @@ if (PHP_VERSION_ID < 80000) {
         (function_exists('stream_get_wrappers') && in_array('phpvfscomposer', stream_get_wrappers(), true))
         || (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper'))
     ) {
-        include("phpvfscomposer://" . __DIR__ . '/..'.'/seld/jsonlint/bin/jsonlint');
-        exit(0);
+        return include("phpvfscomposer://" . __DIR__ . '/..'.'/seld/jsonlint/bin/jsonlint');
     }
 }
 
-include __DIR__ . '/..'.'/seld/jsonlint/bin/jsonlint';
+return include __DIR__ . '/..'.'/seld/jsonlint/bin/jsonlint';