diff --git a/.github/workflows/php-test-master.yml b/.github/workflows/php-test-master.yml deleted file mode 100644 index 16a16c5..0000000 --- a/.github/workflows/php-test-master.yml +++ /dev/null @@ -1,10 +0,0 @@ -name: PHP Codeception Tests - master - -on: - push: - -jobs: - tests: - uses: humhub/actions/.github/workflows/module-tests-master.yml@main - with: - module-id: example-basic diff --git a/.github/workflows/php-test-main.yml b/.github/workflows/php-test-next.yml similarity index 100% rename from .github/workflows/php-test-main.yml rename to .github/workflows/php-test-next.yml diff --git a/assets/Assets.php b/assets/Assets.php index f9ff1c7..a825312 100644 --- a/assets/Assets.php +++ b/assets/Assets.php @@ -2,7 +2,7 @@ namespace acmeCorp\humhub\modules\exampleBasic\assets; -use yii\web\AssetBundle; +use humhub\components\assets\AssetBundle; class Assets extends AssetBundle { @@ -14,11 +14,9 @@ class Assets extends AssetBundle /** * @inheritdoc */ - public $publishOptions = [ - // TIPP: Change forceCopy to true when testing your js in order to rebuild - // this assets on every request (otherwise they will be cached) - 'forceCopy' => false, - ]; + // TIP: Change forceCopy to true when testing your js in order to rebuild + // this assets on every request (otherwise they will be cached) + public $forceCopy = false; /** * @inheritdoc diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 1f58ce6..e6a125d 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,6 +1,10 @@ Changelog ========= +1.1.0 (Unreleased) +---------------------- +- Enh #12: Migration to Bootstrap 5 for HumHub 1.18 + 1.0.2 (Unreleased) ---------------------- - Enh #5: Add `requirements.php` diff --git a/module.json b/module.json index 385faeb..f85ac06 100644 --- a/module.json +++ b/module.json @@ -4,9 +4,9 @@ "description": "A very basic module example", "keywords": [ ], - "version": "1.0.2", + "version": "1.1.0", "humhub": { - "minVersion": "1.2" + "minVersion": "1.18" }, "screenshots": ["resources/screen1.jpg"] } diff --git a/tests/codeception.yml b/tests/codeception.yml index 5e7e29d..cc449b0 100644 --- a/tests/codeception.yml +++ b/tests/codeception.yml @@ -13,7 +13,7 @@ settings: backup_globals: true paths: tests: codeception - log: codeception/_output + output: codeception/_output data: codeception/_data helpers: codeception/_support envs: ../../../humhub/tests/config/env @@ -21,4 +21,3 @@ config: # the entry script URL (with host info) for functional and acceptance tests # PLEASE ADJUST IT TO THE ACTUAL ENTRY SCRIPT URL test_entry_url: http://localhost:8080/index-test.php - \ No newline at end of file diff --git a/tests/codeception/acceptance.suite.yml b/tests/codeception/acceptance.suite.yml index cdc84a3..57ca5eb 100644 --- a/tests/codeception/acceptance.suite.yml +++ b/tests/codeception/acceptance.suite.yml @@ -8,7 +8,7 @@ # RUN `build` COMMAND AFTER ADDING/REMOVING MODULES. -class_name: AcceptanceTester +actor: AcceptanceTester modules: enabled: - WebDriver @@ -19,4 +19,4 @@ modules: url: 'http://localhost:8080/' browser: chrome restart: true - port: 4444 \ No newline at end of file + port: 4444 diff --git a/tests/codeception/functional.suite.yml b/tests/codeception/functional.suite.yml index 1a84351..7ed53e3 100644 --- a/tests/codeception/functional.suite.yml +++ b/tests/codeception/functional.suite.yml @@ -5,7 +5,7 @@ # (tip: better to use with frameworks). # RUN `build` COMMAND AFTER ADDING/REMOVING MODULES. -class_name: FunctionalTester +actor: FunctionalTester modules: enabled: - Filesystem @@ -15,4 +15,4 @@ modules: - tests\codeception\_support\HumHubHelper config: Yii2: - configFile: 'codeception/config/functional.php' \ No newline at end of file + configFile: 'codeception/config/functional.php' diff --git a/tests/codeception/unit.suite.yml b/tests/codeception/unit.suite.yml index b51817c..953ec41 100644 --- a/tests/codeception/unit.suite.yml +++ b/tests/codeception/unit.suite.yml @@ -3,7 +3,7 @@ # suite for unit (internal) tests. # RUN `build` COMMAND AFTER ADDING/REMOVING MODULES. -class_name: UnitTester +actor: UnitTester modules: enabled: - tests\codeception\_support\CodeHelper diff --git a/views/index/index.php b/views/index/index.php index 91c3271..997f67c 100644 --- a/views/index/index.php +++ b/views/index/index.php @@ -1,9 +1,11 @@