Skip to content

Commit

Permalink
Feat/v0.3.0 (#111)
Browse files Browse the repository at this point in the history
* refactor(FE table): Skeleton setup for the custom table

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* Pull psalm test setup & deps update from master

* tests(psalm): Add psalm with current baseline

Signed-off-by: Julius Härtl <jus@bitgrid.net>

* tests(psalm): Add nextcloud/ocp

Signed-off-by: Julius Härtl <jus@bitgrid.net>

* tests(psalm): mute some warnings about external dependencies and magic methods for now

Signed-off-by: Julius Härtl <jus@bitgrid.net>

* tests(psalm): Fix some annotations to improve static analysis

Signed-off-by: Julius Härtl <jus@bitgrid.net>

* fix(ColumnController): Use proper parameter order for column deletion

Signed-off-by: Julius Härtl <jus@bitgrid.net>

* ci(psalm): Run psalm check on github actions

Signed-off-by: Julius Härtl <jus@bitgrid.net>

* Bump @nextcloud/eslint-config from 8.1.5 to 8.2.0

Bumps [@nextcloud/eslint-config](https://github.com/nextcloud/eslint-config) from 8.1.5 to 8.2.0.
- [Release notes](https://github.com/nextcloud/eslint-config/releases)
- [Changelog](https://github.com/nextcloud/eslint-config/blob/master/CHANGELOG.md)
- [Commits](nextcloud-libraries/eslint-config@v8.1.5...v8.2.0)

---
updated-dependencies:
- dependency-name: "@nextcloud/eslint-config"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump @nextcloud/vue from 7.3.0 to 7.4.0

Bumps [@nextcloud/vue](https://github.com/nextcloud/nextcloud-vue) from 7.3.0 to 7.4.0.
- [Release notes](https://github.com/nextcloud/nextcloud-vue/releases)
- [Changelog](https://github.com/nextcloud/nextcloud-vue/blob/master/CHANGELOG.md)
- [Commits](nextcloud-libraries/nextcloud-vue@v7.3.0...v7.4.0)

---
updated-dependencies:
- dependency-name: "@nextcloud/vue"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Fix(l10n): 🔠 Update translations from Transifex

Signed-off-by: Nextcloud bot <bot@nextcloud.com>

* fix: Use NcContent component instead of div

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Co-authored-by: Julius Härtl <jus@bitgrid.net>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Nextcloud bot <bot@nextcloud.com>

* chore(make): update makefile

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* refactor(table): skeleton for the custom table, (multi)selection for rows, edit button for rows

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* refactor(table): this is the first replacement for the table component, it could not be avoided to touch also some other stuff

not yet working:
- delete selected rows
- import data from csv & clipboard

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* fix(table): reset status if columns was removed

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* fix(table): don't try to update columns by child component

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* fix(table): delete selected rows working again

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* fix(table): remove unnecessary debug info

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* style(table): sticky table header

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* refactor(modals): use NC component for buttons

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* feat(navigation): use emojis for tables

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* feat(page): new startpage

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* feat(nav): filter tables

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* fix(nav): deprecation vue nav component

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* fix(nav): create table modal - cancel-button and size adjustment

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* feat(navigation): bump version to trigger db update

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* Pull psalm test setup & deps update from master

* tests(psalm): Add psalm with current baseline

Signed-off-by: Julius Härtl <jus@bitgrid.net>

* tests(psalm): Add nextcloud/ocp

Signed-off-by: Julius Härtl <jus@bitgrid.net>

* tests(psalm): mute some warnings about external dependencies and magic methods for now

Signed-off-by: Julius Härtl <jus@bitgrid.net>

* tests(psalm): Fix some annotations to improve static analysis

Signed-off-by: Julius Härtl <jus@bitgrid.net>

* fix(ColumnController): Use proper parameter order for column deletion

Signed-off-by: Julius Härtl <jus@bitgrid.net>

* ci(psalm): Run psalm check on github actions

Signed-off-by: Julius Härtl <jus@bitgrid.net>

* Bump @nextcloud/eslint-config from 8.1.5 to 8.2.0

Bumps [@nextcloud/eslint-config](https://github.com/nextcloud/eslint-config) from 8.1.5 to 8.2.0.
- [Release notes](https://github.com/nextcloud/eslint-config/releases)
- [Changelog](https://github.com/nextcloud/eslint-config/blob/master/CHANGELOG.md)
- [Commits](nextcloud-libraries/eslint-config@v8.1.5...v8.2.0)

---
updated-dependencies:
- dependency-name: "@nextcloud/eslint-config"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump @nextcloud/vue from 7.3.0 to 7.4.0

Bumps [@nextcloud/vue](https://github.com/nextcloud/nextcloud-vue) from 7.3.0 to 7.4.0.
- [Release notes](https://github.com/nextcloud/nextcloud-vue/releases)
- [Changelog](https://github.com/nextcloud/nextcloud-vue/blob/master/CHANGELOG.md)
- [Commits](nextcloud-libraries/nextcloud-vue@v7.3.0...v7.4.0)

---
updated-dependencies:
- dependency-name: "@nextcloud/vue"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Fix(l10n): 🔠 Update translations from Transifex

Signed-off-by: Nextcloud bot <bot@nextcloud.com>

* fix: Use NcContent component instead of div

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Co-authored-by: Julius Härtl <jus@bitgrid.net>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Nextcloud bot <bot@nextcloud.com>

* chore(make): update makefile

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* fix: fix merge errors

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* Pull psalm test setup & deps update from master

* tests(psalm): Add psalm with current baseline

Signed-off-by: Julius Härtl <jus@bitgrid.net>

* tests(psalm): Add nextcloud/ocp

Signed-off-by: Julius Härtl <jus@bitgrid.net>

* tests(psalm): mute some warnings about external dependencies and magic methods for now

Signed-off-by: Julius Härtl <jus@bitgrid.net>

* tests(psalm): Fix some annotations to improve static analysis

Signed-off-by: Julius Härtl <jus@bitgrid.net>

* fix(ColumnController): Use proper parameter order for column deletion

Signed-off-by: Julius Härtl <jus@bitgrid.net>

* ci(psalm): Run psalm check on github actions

Signed-off-by: Julius Härtl <jus@bitgrid.net>

* Bump @nextcloud/eslint-config from 8.1.5 to 8.2.0

Bumps [@nextcloud/eslint-config](https://github.com/nextcloud/eslint-config) from 8.1.5 to 8.2.0.
- [Release notes](https://github.com/nextcloud/eslint-config/releases)
- [Changelog](https://github.com/nextcloud/eslint-config/blob/master/CHANGELOG.md)
- [Commits](nextcloud-libraries/eslint-config@v8.1.5...v8.2.0)

---
updated-dependencies:
- dependency-name: "@nextcloud/eslint-config"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump @nextcloud/vue from 7.3.0 to 7.4.0

Bumps [@nextcloud/vue](https://github.com/nextcloud/nextcloud-vue) from 7.3.0 to 7.4.0.
- [Release notes](https://github.com/nextcloud/nextcloud-vue/releases)
- [Changelog](https://github.com/nextcloud/nextcloud-vue/blob/master/CHANGELOG.md)
- [Commits](nextcloud-libraries/nextcloud-vue@v7.3.0...v7.4.0)

---
updated-dependencies:
- dependency-name: "@nextcloud/vue"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Fix(l10n): 🔠 Update translations from Transifex

Signed-off-by: Nextcloud bot <bot@nextcloud.com>

* fix: Use NcContent component instead of div

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Co-authored-by: Julius Härtl <jus@bitgrid.net>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Nextcloud bot <bot@nextcloud.com>

* Pull psalm test setup & deps update from master

* tests(psalm): Add psalm with current baseline

Signed-off-by: Julius Härtl <jus@bitgrid.net>

* tests(psalm): Add nextcloud/ocp

Signed-off-by: Julius Härtl <jus@bitgrid.net>

* tests(psalm): mute some warnings about external dependencies and magic methods for now

Signed-off-by: Julius Härtl <jus@bitgrid.net>

* tests(psalm): Fix some annotations to improve static analysis

Signed-off-by: Julius Härtl <jus@bitgrid.net>

* fix(ColumnController): Use proper parameter order for column deletion

Signed-off-by: Julius Härtl <jus@bitgrid.net>

* ci(psalm): Run psalm check on github actions

Signed-off-by: Julius Härtl <jus@bitgrid.net>

* Bump @nextcloud/eslint-config from 8.1.5 to 8.2.0

Bumps [@nextcloud/eslint-config](https://github.com/nextcloud/eslint-config) from 8.1.5 to 8.2.0.
- [Release notes](https://github.com/nextcloud/eslint-config/releases)
- [Changelog](https://github.com/nextcloud/eslint-config/blob/master/CHANGELOG.md)
- [Commits](nextcloud-libraries/eslint-config@v8.1.5...v8.2.0)

---
updated-dependencies:
- dependency-name: "@nextcloud/eslint-config"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump @nextcloud/vue from 7.3.0 to 7.4.0

Bumps [@nextcloud/vue](https://github.com/nextcloud/nextcloud-vue) from 7.3.0 to 7.4.0.
- [Release notes](https://github.com/nextcloud/nextcloud-vue/releases)
- [Changelog](https://github.com/nextcloud/nextcloud-vue/blob/master/CHANGELOG.md)
- [Commits](nextcloud-libraries/nextcloud-vue@v7.3.0...v7.4.0)

---
updated-dependencies:
- dependency-name: "@nextcloud/vue"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Fix(l10n): 🔠 Update translations from Transifex

Signed-off-by: Nextcloud bot <bot@nextcloud.com>

* fix: Use NcContent component instead of div

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Co-authored-by: Julius Härtl <jus@bitgrid.net>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Nextcloud bot <bot@nextcloud.com>

* fix: fix merge errors

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* fix(table): tables-106 Export "long text" without html in CSV

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* fix(table): close modal after creating a column correctly

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* fix(table): remove debug info

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* fix(table): load default values, if empty

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* feat(table): nice hint if there are no columns for a table

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* style(layout): heading position

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* feat(table): partials for column types to render in table view mode

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* feat(header): add edit button for table title and emoji

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* chore: cs-fixer

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* Update appinfo/info.xml

Co-authored-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Florian <florian@nextcloud.com>

* chore(psalm): psalm setup

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* chore(psalm): psalm fix

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* chore(psalm): psalm fix

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* chore(lint): lint fix

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* chore(cs): cs fix

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* chore(cs): cs fix

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* fix(sidebar-sharing): fix event-bus and more

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* fix(sidebar): add emoji in title

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* fix: unused import

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* chore(make): add new command for mirroring ci from github

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* chore(release): update version numbers for realising

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* style(sharing): add group info to shared groups in sidebar

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* fix(sharing): show correct display names and fix group renaming problem #70

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* feat(navigation): show share icon and rows counter -> TODO: update if changes in FE still open

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* rebase

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* chore(deps-dev): update and fix

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* style(mobile): adjust spaces and mobile menu for selected rows

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* refactor(FE table): Skeleton setup for the custom table

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* refactor(table): this is the first replacement for the table component, it could not be avoided to touch also some other stuff

not yet working:
- delete selected rows
- import data from csv & clipboard

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* feat(API): add basic reading features for API calls - see docs https://github.com/nextcloud/tables/wiki/API

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* feat(API): add basic reading features for API calls - see docs https://github.com/nextcloud/tables/wiki/API

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* Analytics

* Analytics

* Analytics

* Analytics

* Analytics

* Analytics

* rebase

* rebase

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* fix(integration): some fixes for analytics integration

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* Update src/shared/components/ncTable/partials/TableCellStars.vue

Co-authored-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Florian <florian@nextcloud.com>

* style(table): set default min and max width for columns and truncate very long texts

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* chore(cs-fixer): add cache file to repo

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* chore(deps-dev): replace deprecated sass

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* fix(navigation): in/decrease rows count if changed

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* style(table): optimize UI/UX for the table and mobile view

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* style(table): optimize UI/UX for the table and mobile view

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* fix(sharing): many fixes due to shares, specially in UI

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* chore(cs-fixer): commit cache file

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* chore(npm): update lockfile

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* refactor(css): use general styling only in vue

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* Update src/store/data.js

Co-authored-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Florian <florian@nextcloud.com>

* chore(npm): cleanup, small fixes, preparation from and for PR

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* chore(npm): cleanup, small fixes, preparation from and for PR

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* chore(npm): cleanup, small fixes, preparation from and for PR

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* chore(git): clean up test

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* style(table): add small space

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* feat(occ): list tables via occ command

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* fix(occ): refactor code to impersonate users and allow anonymous access via cli

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* chore(clean): clean old code

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* fix(table): fix a bug where options are not shown on own tables

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* fix(style): fix css scope bug

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* fix(store): fix a bug to update columns in BE

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* fix(style): change margin to padding for sticky options

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* fix(table): fix alert if mandatory fields are empty in combination with stars column-type

Signed-off-by: Florian Steffens <florian@nextcloud.com>

* fix(sharing): fix behavior if shared with yourself

Signed-off-by: Florian Steffens <florian@nextcloud.com>

---------

Signed-off-by: Florian Steffens <florian@nextcloud.com>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: Florian <florian@nextcloud.com>
Co-authored-by: Julius Härtl <jus@bitgrid.net>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Nextcloud bot <bot@nextcloud.com>
Co-authored-by: Rello <github@scherello.de>
  • Loading branch information
5 people authored Feb 21, 2023
1 parent 19c6993 commit 04269de
Show file tree
Hide file tree
Showing 147 changed files with 11,174 additions and 5,529 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint-php-cs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: Set up php
uses: shivammathur/setup-php@1a18b2267f80291a81ca1d33e7c851fe09e7dfc4 # v2
with:
php-version: 8.1
php-version: 8.0
coverage: none
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
41 changes: 41 additions & 0 deletions .github/workflows/psalm.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# This workflow is provided via the organization template repository
#
# https://github.com/nextcloud/.github
# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization

name: Static analysis

on:
pull_request:
push:
branches:
- master
- main
- stable*

concurrency:
group: psalm-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

jobs:
static-analysis:
runs-on: ubuntu-latest

name: Nextcloud
steps:
- name: Checkout
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3

- name: Set up php
uses: shivammathur/setup-php@1a18b2267f80291a81ca1d33e7c851fe09e7dfc4 # v2
with:
php-version: 8.1
coverage: none
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Install dependencies
run: composer i

- name: Run coding standards check
run: composer run psalm
13 changes: 7 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
.idea
\.idea/
*.iml
/vendor/
/build/
vendor/
build/
node_modules/
/.php_cs.cache
.php_cs.cache
.php-cs-fixer.cache
js/*hot-update.*
# Project exclude paths
/js/
js/
appinfo/info.xsd
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## 0.3.0 - 2023-02-03
### Updated
- Table component replaced
- code cleanup
- initial CI setup
- UI and UX improvements

## 0.2.2 - 2023-01-10
### Updated
- translation
Expand Down
39 changes: 11 additions & 28 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,6 @@ build: clean build-js-production assemble

appstore: build
@echo "Signing…"
# php ../server/occ integrity:sign-app \
# --privateKey=$(cert_dir)/$(app_name).key\
# --certificate=$(cert_dir)/$(app_name).crt\
# --path=$(build_dir)/$(app_name)
tar -czf $(build_dir)/$(app_name).tar.gz \
-C $(build_dir) $(app_name)
openssl dgst -sha512 -sign $(cert_dir)/$(app_name).key $(build_dir)/$(app_name).tar.gz | openssl base64
Expand Down Expand Up @@ -70,6 +66,7 @@ assemble:
--exclude=.idea \
--exclude=vendor \
--exclude=webpack*.js \
--exclude=doc \
$(project_dir) $(build_dir)

build-js:
Expand All @@ -88,40 +85,31 @@ test: test-api
test-api:
phpunit --bootstrap vendor/autoload.php --testdox tests/api/


ci: lint-js lint-xml lint-php-cs-fixer lint-php-psalm

##### Linting #####

lint: lint-php lint-js lint-css lint-xml


lint-php: lint-phpfast lint-php-phan
lint-phpfast: lint-php-lint lint-php-ncversion lint-php-cs-fixer lint-php-phpcs

lint-phpfast: lint-php-lint lint-php-cs-fixer lint-php-phpcs

lint-php-lint:
# Check PHP syntax errors
@! find $(php_dirs) -name "*.php" | xargs -I{} php -l '{}' | grep -v "No syntax errors detected"

lint-php-ncversion:
# Check min-version consistency
# TODO needs to be fixed
# php tests/nextcloud-version.php

lint-php-phan:
# PHAN
# TODO needs to be fixed
# vendor/bin/phan --allow-polyfill-parser -k tests/phan-config.php --no-progress-bar -m checkstyle | vendor/bin/cs2pr --graceful-warnings --colorize

lint-php-phpcs:
# PHP CodeSniffer
# TODO needs to be fixed
# vendor/bin/phpcs --standard=tests/phpcs.xml $(php_dirs) --report=checkstyle | vendor/bin/cs2pr --graceful-warnings --colorize
# PHAN - TODO
vendor/bin/phan --allow-polyfill-parser -k tests/phan-config.php --no-progress-bar -m checkstyle | vendor/bin/cs2pr --graceful-warnings --colorize

lint-php-cs-fixer:
# PHP Coding Standards Fixer (with Nextcloud coding standards)
# vendor/bin/php-cs-fixer fix --dry-run --diff
PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix --dry-run --diff
vendor/bin/php-cs-fixer fix --dry-run --diff

lint-php-psalm:
composer psalm

lint-js:
npm run lint
Expand All @@ -141,9 +129,8 @@ lint-xml:
lint-fix: lint-php-fix lint-js-fix lint-css-fix

lint-php-fix:
# TODO needs to be fixed
# vendor/bin/phpcbf --standard=tests/phpcs.xml $(php_dirs)
PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix
vendor/bin/php-cs-fixer fix

lint-js-fix:
npm run lint:fix
Expand All @@ -161,8 +148,4 @@ clean:

clean-dev:
rm -rf node_modules
rm -rf vendor

# logging
log:
sudo -u www-data php /var/www/html/nextcloud/23/occ log:watch
rm -rf vendor
5 changes: 4 additions & 1 deletion appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Share your tables with users and groups within your cloud.
Have a good time and manage whatever you want.
]]></description>
<version>0.2.2</version>
<version>0.3.0</version>
<licence>agpl</licence>
<author mail="florian@nextcloud.com" >Florian Steffens</author>
<namespace>Tables</namespace>
Expand All @@ -38,6 +38,9 @@ Have a good time and manage whatever you want.
<dependencies>
<nextcloud min-version="25" max-version="26"/>
</dependencies>
<commands>
<command>OCA\Tables\Command\ListTables</command>
</commands>
<navigations>
<navigation>
<name>Tables</name>
Expand Down
9 changes: 9 additions & 0 deletions appinfo/routes.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,19 @@

return [
'routes' => [

// enable CORS for api calls (API version 1)
['name' => 'api1#preflighted_cors', 'url' => '/api/1/{path}',
'verb' => 'OPTIONS', 'requirements' => ['path' => '.+']],

['name' => 'page#index', 'url' => '/', 'verb' => 'GET'],

['name' => 'tableTemplate#list', 'url' => '/table/templates', 'verb' => 'GET'],

// API
['name' => 'api1#index', 'url' => '/api/1/tables', 'verb' => 'GET'],
['name' => 'api1#data', 'url' => '/api/1/table/{tableId}', 'verb' => 'GET'],

// table
['name' => 'table#index', 'url' => '/table', 'verb' => 'GET'],
['name' => 'table#show', 'url' => '/table/{id}', 'verb' => 'GET'],
Expand Down
15 changes: 11 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,27 @@
"email": "florian@nextcloud.com"
}
],
"require": {},
"require-dev": {
"nextcloud/coding-standard": "^1.0.0"
"nextcloud/coding-standard": "^v1.0.0",
"vimeo/psalm": "^5.6.0",
"nextcloud/ocp": "dev-master",
"phan/phan": "5.x",
"staabm/annotate-pull-request-from-checkstyle": "^1.8"
},
"config": {
"optimize-autoloader": true,
"classmap-authoritative": true,
"platform": {
"php": "7.4"
"php": "8.0"
}
},
"scripts": {
"lint": "find . -name \\*.php -not -path './vendor/*' -not -path './build/*' -print0 | xargs -0 -n1 php -l",
"cs:check": "php-cs-fixer fix --dry-run --diff",
"cs:fix": "php-cs-fixer fix"
"cs:fix": "php-cs-fixer fix",
"psalm": "./vendor/bin/psalm --show-info=true --no-cache",
"psalm:update-baseline": "./vendor/bin/psalm --update-baseline",
"psalm:fix": "./vendor/bin/psalm --no-cache --alter --issues=InvalidReturnType,InvalidNullableReturnType,MismatchingDocblockParamType,MismatchingDocblockReturnType,MissingParamType,InvalidFalsableReturnType",
"psalm:fix:dry": "./vendor/bin/psalm --no-cache --alter --issues=InvalidReturnType,InvalidNullableReturnType,MismatchingDocblockParamType,MismatchingDocblockReturnType,MissingParamType,InvalidFalsableReturnType --dry-run"
}
}
Loading

0 comments on commit 04269de

Please sign in to comment.