Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix plugins composer.json format #9405

Merged
merged 23 commits into from
Apr 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
f0c0614
Check plugins composer.json using CI
mvorisek Apr 4, 2024
b95af5d
Add "require-dev" and "config.allow-plugins" to plugins
mvorisek Apr 4, 2024
d206db7
fix composer.json format - rm invalid email
mvorisek Apr 4, 2024
df868f1
fix composer.json format - fix ext require
mvorisek Apr 4, 2024
aea314c
fix composer.json format - fix plugin name
mvorisek Apr 4, 2024
96da4c9
tmp
mvorisek Apr 4, 2024
17274fa
Revert "tmp"
mvorisek Apr 4, 2024
8202767
fix ext in ext install
mvorisek Apr 4, 2024
3df614f
disable plugin in plugin install until Roundcube is fully autoloadable
mvorisek Apr 4, 2024
ba2b080
fix composer.json format - fix non-canonical license name
mvorisek Apr 4, 2024
cef4123
Revert "Add "require-dev" and "config.allow-plugins" to plugins"
mvorisek Apr 4, 2024
9895927
no composer install for plugins needed
mvorisek Apr 4, 2024
0c3c9b2
Revert "fix ext in ext install"
mvorisek Apr 4, 2024
739981b
add standard "Test" suffix to phpunit files
mvorisek Apr 4, 2024
32f7de8
rm unneeded "suffix" in phpunit config
mvorisek Apr 4, 2024
117ae30
simplify phpunit config
mvorisek Apr 4, 2024
bbafcdd
fix default "xhtml" doctype in unit testing
mvorisek Apr 5, 2024
76487f8
fix test_format_date test to not rely on other tests
mvorisek Apr 5, 2024
40dd380
even more phpunit config simplify
mvorisek Apr 5, 2024
68598e6
stricter/unify phpunit params for E2E tests
mvorisek Apr 5, 2024
06daf0f
run E2E tests on maximal php version too with lowest deps
mvorisek Apr 5, 2024
8bd8b4d
"repositories" in bundled plugins are useless as for root package only
mvorisek Apr 5, 2024
7b8746f
add/unify missing plugin test
mvorisek Apr 5, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ wget -q https://repo1.maven.org/maven2/com/icegreen/greenmail-standalone/$GMV/gr

# Run tests
echo "TESTS_MODE: DESKTOP" \
&& TESTS_MODE=desktop vendor/bin/phpunit -c tests/Browser/phpunit.xml --exclude-group=failsonga \
&& TESTS_MODE=desktop vendor/bin/phpunit -c tests/Browser/phpunit.xml --fail-on-warning --fail-on-risky --exclude-group=failsonga \
&& echo "TESTS_MODE: TABLET" \
&& TESTS_MODE=tablet vendor/bin/phpunit -c tests/Browser/phpunit.xml --exclude-group=failsonga-tablet \
&& TESTS_MODE=tablet vendor/bin/phpunit -c tests/Browser/phpunit.xml --fail-on-warning --fail-on-risky --exclude-group=failsonga-tablet \
# Mobile mode tests are unreliable on Github Actions
# && echo "TESTS_MODE: PHONE" \
# && TESTS_MODE=phone vendor/bin/phpunit -c tests/Browser/phpunit.xml --exclude-group=failsonga-phone \
# && TESTS_MODE=phone vendor/bin/phpunit -c tests/Browser/phpunit.xml --fail-on-warning --fail-on-risky --exclude-group=failsonga-phone \
10 changes: 8 additions & 2 deletions .github/workflows/browser_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php: ["8.1"]
php: ["8.1", "8.3"]

name: Linux / PHP ${{ matrix.php }}

Expand Down Expand Up @@ -44,7 +44,9 @@ jobs:
run: sudo apt-get -y install aspell aspell-en aspell-de

- name: Setup composer
run: composer require "laravel/dusk:^7.9" --no-update
run: |
composer require "nesbot/carbon:^2.62.1" --no-update
composer require "laravel/dusk:^7.9" --no-update

- name: Install dependencies
run: composer update --prefer-dist --no-interaction --no-progress
Expand All @@ -63,5 +65,9 @@ jobs:
npm install --force -g less-plugin-clean-css
npm install --force -g uglify-js

- name: Downgrade dependencies (for PHP 8.3 only)
if: matrix.php == '8.3'
run: composer update --prefer-dist --prefer-stable --prefer-lowest --no-interaction --no-progress --optimize-autoloader

- name: Execute tests
run: .github/run.sh
9 changes: 9 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,15 @@ jobs:
npm add -D eslint eslint-plugin-import eslint-config-airbnb-base eslint-plugin-unicorn
npx eslint --ext .js .

- name: Plugins - Check composer.json format
run: |
for plugin_dir in plugins/*/; do (
echo "========== $plugin_dir =========="
cd "$plugin_dir"
composer validate --strict --no-check-lock && composer normalize --dry-run --no-check-lock "$plugin_dir/composer.json"
echo " "
); done

phpstan:
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.head_commit.message, '[ci skip]')"
Expand Down
6 changes: 0 additions & 6 deletions plugins/acl/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@
"role": "Lead"
}
],
"repositories": [
{
"type": "composer",
"url": "https://plugins.roundcube.net"
}
],
"require": {
"php": ">=7.3.0",
"roundcube/plugin-installer": ">=0.1.3"
Expand Down
File renamed without changes.
6 changes: 0 additions & 6 deletions plugins/additional_message_headers/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@
"role": "Lead"
}
],
"repositories": [
{
"type": "composer",
"url": "https://plugins.roundcube.net"
}
],
"require": {
"php": ">=7.3.0",
"roundcube/plugin-installer": ">=0.1.3"
Expand Down
6 changes: 0 additions & 6 deletions plugins/archive/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@
"role": "Developer"
}
],
"repositories": [
{
"type": "composer",
"url": "https://plugins.roundcube.net"
}
],
"require": {
"php": ">=7.3.0",
"roundcube/plugin-installer": ">=0.1.3"
Expand Down
7 changes: 0 additions & 7 deletions plugins/attachment_reminder/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,9 @@
},
{
"name": "Thomas Yu - Sian, Liu",
"email": "",
"role": "Lead"
}
],
"repositories": [
{
"type": "composer",
"url": "https://plugins.roundcube.net"
}
],
"require": {
"php": ">=7.3.0",
"roundcube/plugin-installer": ">=0.1.3"
Expand Down
6 changes: 0 additions & 6 deletions plugins/autologon/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@
"role": "Lead"
}
],
"repositories": [
{
"type": "composer",
"url": "https://plugins.roundcube.net"
}
],
"require": {
"php": ">=7.3.0",
"roundcube/plugin-installer": ">=0.1.3"
Expand Down
2 changes: 1 addition & 1 deletion plugins/autologout/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "roundcube/autologout",
"type": "roundcube-plugin",
"description": "Plugin to auto log out users with a POST request sent from an external site.",
"license": "GPLv3+",
"license": "GPL-3.0-or-later",
"version": "1.0",
"authors": [
{
Expand Down
6 changes: 0 additions & 6 deletions plugins/database_attachments/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@
"role": "Developer"
}
],
"repositories": [
{
"type": "composer",
"url": "https://plugins.roundcube.net"
}
],
"require": {
"php": ">=7.3.0",
"roundcube/plugin-installer": ">=0.1.3",
Expand Down
6 changes: 0 additions & 6 deletions plugins/debug_logger/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@
"role": "Lead"
}
],
"repositories": [
{
"type": "composer",
"url": "https://plugins.roundcube.net"
}
],
"require": {
"php": ">=7.3.0",
"roundcube/plugin-installer": ">=0.1.3"
Expand Down
6 changes: 0 additions & 6 deletions plugins/emoticons/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@
"role": "Developer"
}
],
"repositories": [
{
"type": "composer",
"url": "https://plugins.roundcube.net"
}
],
"require": {
"php": ">=7.3.0",
"roundcube/plugin-installer": ">=0.1.3"
Expand Down
6 changes: 0 additions & 6 deletions plugins/enigma/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@
"role": "Lead"
}
],
"repositories": [
{
"type": "composer",
"url": "https://plugins.roundcube.net"
}
],
"require": {
"php": ">=7.3.0",
"roundcube/plugin-installer": "~0.1.6",
Expand Down
File renamed without changes.
6 changes: 0 additions & 6 deletions plugins/example_addressbook/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@
"role": "Lead"
}
],
"repositories": [
{
"type": "composer",
"url": "https://plugins.roundcube.net"
}
],
"require": {
"php": ">=7.3.0",
"roundcube/plugin-installer": ">=0.1.3"
Expand Down
6 changes: 0 additions & 6 deletions plugins/filesystem_attachments/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@
"role": "Developer"
}
],
"repositories": [
{
"type": "composer",
"url": "https://plugins.roundcube.net"
}
],
"require": {
"php": ">=7.3.0",
"roundcube/plugin-installer": ">=0.1.3"
Expand Down
6 changes: 0 additions & 6 deletions plugins/help/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@
"role": "Lead"
}
],
"repositories": [
{
"type": "composer",
"url": "https://plugins.roundcube.net"
}
],
"require": {
"php": ">=7.3.0",
"roundcube/plugin-installer": ">=0.1.3"
Expand Down
File renamed without changes.
6 changes: 0 additions & 6 deletions plugins/hide_blockquote/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@
"role": "Lead"
}
],
"repositories": [
{
"type": "composer",
"url": "https://plugins.roundcube.net"
}
],
"require": {
"php": ">=7.3.0",
"roundcube/plugin-installer": ">=0.1.3"
Expand Down
6 changes: 0 additions & 6 deletions plugins/http_authentication/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@
"role": "Lead"
}
],
"repositories": [
{
"type": "composer",
"url": "https://plugins.roundcube.net"
}
],
"require": {
"php": ">=7.3.0",
"roundcube/plugin-installer": ">=0.1.3"
Expand Down
8 changes: 1 addition & 7 deletions plugins/identicon/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,9 @@
"role": "Lead"
}
],
"repositories": [
{
"type": "composer",
"url": "https://plugins.roundcube.net"
}
],
"require": {
"php": ">=7.3.0",
"php-gd": "*",
"ext-gd": "*",
"roundcube/plugin-installer": ">=0.1.3"
}
}
6 changes: 0 additions & 6 deletions plugins/identity_select/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@
"role": "Lead"
}
],
"repositories": [
{
"type": "composer",
"url": "https://plugins.roundcube.net"
}
],
"require": {
"php": ">=7.3.0",
"roundcube/plugin-installer": ">=0.1.3"
Expand Down
6 changes: 0 additions & 6 deletions plugins/jqueryui/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@
"role": "Lead"
}
],
"repositories": [
{
"type": "composer",
"url": "https://plugins.roundcube.net"
}
],
"require": {
"php": ">=7.3.0",
"roundcube/plugin-installer": ">=0.1.3"
Expand Down
6 changes: 0 additions & 6 deletions plugins/krb_authentication/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@
"role": "Lead"
}
],
"repositories": [
{
"type": "composer",
"url": "https://plugins.roundcube.net"
}
],
"require": {
"php": ">=7.3.0",
"roundcube/plugin-installer": ">=0.1.3"
Expand Down
6 changes: 0 additions & 6 deletions plugins/managesieve/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@
"role": "Lead"
}
],
"repositories": [
{
"type": "composer",
"url": "https://plugins.roundcube.net"
}
],
"require": {
"php": ">=7.3.0",
"roundcube/plugin-installer": ">=0.1.3",
Expand Down
6 changes: 0 additions & 6 deletions plugins/markasjunk/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@
"role": "Developer"
}
],
"repositories": [
{
"type": "composer",
"url": "https://plugins.roundcube.net"
}
],
"require": {
"php": ">=7.3.0",
"roundcube/plugin-installer": ">=0.1.3"
Expand Down
6 changes: 0 additions & 6 deletions plugins/new_user_dialog/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@
"role": "Lead"
}
],
"repositories": [
{
"type": "composer",
"url": "https://plugins.roundcube.net"
}
],
"require": {
"php": ">=7.3.0",
"roundcube/plugin-installer": ">=0.1.3"
Expand Down
6 changes: 0 additions & 6 deletions plugins/new_user_identity/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@
"role": "Lead"
}
],
"repositories": [
{
"type": "composer",
"url": "https://plugins.roundcube.net"
}
],
"require": {
"php": ">=7.3.0",
"roundcube/plugin-installer": ">=0.1.3"
Expand Down
6 changes: 0 additions & 6 deletions plugins/newmail_notifier/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@
"role": "Lead"
}
],
"repositories": [
{
"type": "composer",
"url": "https://plugins.roundcube.net"
}
],
"require": {
"php": ">=7.3.0",
"roundcube/plugin-installer": ">=0.1.3"
Expand Down
6 changes: 0 additions & 6 deletions plugins/password/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@
"role": "Lead"
}
],
"repositories": [
{
"type": "composer",
"url": "https://plugins.roundcube.net"
}
],
"require": {
"php": ">=7.3.0",
"roundcube/plugin-installer": ">=0.1.3"
Expand Down
Loading