Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 1 addition & 3 deletions .github/workflows/cypress-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ jobs:
env:
PHP_CLI_SERVER_WORKERS: 3

- name: Add Nextcloud users and a collective for full-text search
- name: Add Nextcloud users
run: |
for user in alice bob jane john; do \
OC_PASS="$user" ./occ user:add --password-from-env "$user"; \
Expand All @@ -261,8 +261,6 @@ jobs:
for user in bob jane; do \
OC_PASS="$user" ./occ group:adduser "Bobs Group" "$user"; \
done
./occ collectives:create SearchTest --owner=bob
./occ collectives:index

- name: Register index for cypress-split
env:
Expand Down
1 change: 0 additions & 1 deletion DEVELOPING.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ The following tools are required for app development:
* npm: to install NodeJS dependencies and compile JS assets
* g++: to compile some NodeJS dependencies
* rsync and openssl: for generating release tarballs
* php `dom` and `sqlite` extension
* composer for installing php dependencies
* nextcloud server for running php tests
* teams/circles app for passing some php tests that depend on it
Expand Down
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ build: node-modules build-js-production composer-install-no-dev
--exclude="$(APP_NAME)/stylelint.config.cjs" \
--exclude="$(APP_NAME)/tests" \
--exclude="$(APP_NAME)/tsconfig.json" \
--exclude="$(APP_NAME)/vendor/.scoped" \
--exclude="$(APP_NAME)/vendor-bin" \
--exclude="$(APP_NAME)/vite.*" \
$(PROJECT_DIR) $(RELEASE_DIR)/
Expand Down
4 changes: 0 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,6 @@ organize together. Come and gather in collectives to build shared knowledge.
In your Nextcloud instance, simply navigate to **»Apps«**, find the
**»Teams«** and **»Collectives«** apps and enable them.

## Requirements

For full-text search to work the sqlite and pdo PHP extensions must be installed.

## Documentation and help

Take a look at our [online documentation](https://nextcloud.github.io/collectives/).
Expand Down
14 changes: 9 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
"php": "^8.1",
"ext-json": "*",
"ext-pdo": "*",
"ext-pdo_sqlite": "*",
"bamarni/composer-bin-plugin": "^1.9",
"league/commonmark": "^2.7",
"patrickschur/language-detection": "^5.3",
"symfony/string": "^6.0",
"symfony/translation-contracts": "^3.6",
"teamtnt/tntsearch": "^5.0"
"wamania/php-stemmer": "^4.0"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We use this one in a few other apps: https://github.com/search?q=org%3Anextcloud+wamania%2Fphp-stemmer&type=code

Maybe worth to consider scoping the dependency to avoid conflicts with different versions between apps. https://arthur-schiwon.de/isolating-nextcloud-app-dependencies-php-scoper

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added dependency scoping in commit 83f65aa

},
"require-dev": {
"ext-dom": "*",
"bamarni/composer-bin-plugin": "^1.8",
"guzzlehttp/guzzle": "^7.8",
"rector/rector": "^2.0.3"
},
Expand All @@ -36,10 +36,14 @@
"psalm:update-baseline": "psalm --threads=1 --update-baseline --set-baseline=tests/psalm-baseline.xml",
"test:unit": "phpunit -c tests/phpunit.xml",
"post-install-cmd": [
"[ $COMPOSER_DEV_MODE -eq 0 ] || composer bin all install --ansi"
"composer install --working-dir=vendor-bin/php-scoper --ansi --no-interaction",
"test -f vendor/.scoped || (vendor-bin/php-scoper/vendor/bin/php-scoper add-prefix --prefix='OCA\\Collectives\\Vendor' --output-dir=\"/tmp/scoped-vendor\" --working-dir=\"./vendor/\" -f --config=\"../scoper.inc.php\" && cp -rf /tmp/scoped-vendor/* ./vendor/ && rm -rf /tmp/scoped-vendor && touch vendor/.scoped)",
"composer dump-autoload"
],
"post-update-cmd": [
"[ $COMPOSER_DEV_MODE -eq 0 ] || composer bin all update --ansi"
"composer install --working-dir=vendor-bin/php-scoper --ansi --no-interaction",
"test -f vendor/.scoped || (vendor-bin/php-scoper/vendor/bin/php-scoper add-prefix --prefix='OCA\\Collectives\\Vendor' --output-dir=\"/tmp/scoped-vendor\" --working-dir=\"./vendor/\" -f --config=\"../scoper.inc.php\" && cp -rf /tmp/scoped-vendor/* ./vendor/ && rm -rf /tmp/scoped-vendor && touch vendor/.scoped)",
"composer dump-autoload"
]
},
"extra": {
Expand Down
Loading
Loading