Merge pull request #1317 from nextcloud/enh/21

nextcloud · Feb 2, 2021 · 5744c9a · 5744c9a
2 parents 65685cd + 9279332
commit 5744c9a
Show file tree

Hide file tree

Showing 14 changed files with 227 additions and 244 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -1,47 +1,6 @@
 kind: pipeline
-name: compatibility
-steps:
-  - name: compatibility
-    image: nextcloudci/php7.0:php7.0-19
-    environment:
-      APP_NAME: richdocuments
-      CORE_BRANCH: stable15
-      DB: sqlite
-    commands:
-      - composer install
-      - bash ./tests/drone-server-setup.sh $APP_NAME $CORE_BRANCH $DB
-      - cd ../server
-      - ./occ app:check-code $APP_NAME -c strong-comparison
-      # TODO: disabled until we have a proper api in the server for static calls
-      - ./occ app:check-code $APP_NAME -c deprecation || true
-trigger:
-  branch:
-    - master
-  event:
-    - pull_request
-    - push
----
-kind: pipeline
 name: syntax
 steps:
-  - name: syntax-php7.0
-    image: nextcloudci/php7.0:php7.0-19
-    commands:
-      - composer install
-      - find lib/ -name "*.php" -print0 | xargs -0 -n1 -P8 php -l
-      - ./vendor/bin/parallel-lint --exclude ./vendor/ .
-  - name: syntax-php7.1
-    image: nextcloudci/php7.1:php7.1-15
-    commands:
-      - composer install
-      - find lib/ -name "*.php" -print0 | xargs -0 -n1 -P8 php -l
-      - ./vendor/bin/parallel-lint --exclude ./vendor/ .
-  - name: syntax-php7.2
-    image: nextcloudci/php7.2:php7.2-9
-    commands:
-      - composer install
-      - find lib/ -name "*.php" -print0 | xargs -0 -n1 -P8 php -l
-      - ./vendor/bin/parallel-lint --exclude ./vendor/ .
   - name: syntax-php7.3
     image: nextcloudci/php7.3:php7.3-2
     commands:

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -18,7 +18,7 @@ jobs:
       # do not stop on another job's failure
       fail-fast: false
       matrix:
-        php-versions: ['7.4']
+        php-versions: ['7.3', '7.4']
         databases: ['sqlite']
         server-versions: ['master']
 
@@ -56,7 +56,7 @@ jobs:
         uses: shivammathur/setup-php@v1
         with:
           php-version: ${{ matrix.php-versions }}
-          tools: phpunit
+          tools: phpunit:8.5.14
           extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite
           coverage: none
 
@@ -131,7 +131,7 @@ jobs:
         uses: shivammathur/setup-php@v1
         with:
           php-version: ${{ matrix.php-versions }}
-          tools: phpunit
+          tools: phpunit:8.5.14
           extensions: mbstring, iconv, fileinfo, intl, mysql, pdo_mysql
           coverage: none
 
@@ -208,7 +208,7 @@ jobs:
         uses: shivammathur/setup-php@v1
         with:
           php-version: ${{ matrix.php-versions }}
-          tools: phpunit
+          tools: phpunit:8.5.14
           extensions: mbstring, iconv, fileinfo, intl, pgsql, pdo_pgsql
           coverage: none
 
@@ -281,7 +281,7 @@ jobs:
         with:
           php-version: "${{ matrix.php-versions }}"
           extensions: mbstring, iconv, fileinfo, intl, oci8
-          tools: phpunit:8.5.2
+          tools: phpunit:8.5.15
           coverage: none
 
       - name: Set up PHPUnit

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ['7.0', '7.1', '7.2', '7.3', 7.4]
+        php-versions: ['7.3', '7.4', '8.0']
     name: php${{ matrix.php-versions }} lint
     steps:
     - name: Checkout

diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -18,7 +18,7 @@ jobs:
       # do not stop on another job's failure
       fail-fast: false
       matrix:
-        php-versions: ['7.4']
+        php-versions: ['7.3', '7.4', '8.0']
         databases: ['sqlite']
         server-versions: ['master']
 
@@ -44,10 +44,10 @@ jobs:
           path: apps/${{ env.APP_NAME }}
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@v1
+        uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-versions }}
-          tools: phpunit:8.5.2
+          tools: phpunit:8.5.14
           extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite
           coverage: none
 
@@ -111,10 +111,10 @@ jobs:
           path: apps/${{ env.APP_NAME }}
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@v1
+        uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-versions }}
-          tools: phpunit:8.5.2
+          tools: phpunit:8.5.14
           extensions: mbstring, iconv, fileinfo, intl, mysql, pdo_mysql
           coverage: none
 
@@ -180,10 +180,10 @@ jobs:
           path: apps/${{ env.APP_NAME }}
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@v1
+        uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-versions }}
-          tools: phpunit:8.5.2
+          tools: phpunit:8.5.14
           extensions: mbstring, iconv, fileinfo, intl, pgsql, pdo_pgsql
           coverage: none
 
@@ -248,7 +248,7 @@ jobs:
         with:
           php-version: "${{ matrix.php-versions }}"
           extensions: mbstring, iconv, fileinfo, intl, oci8
-          tools: phpunit:8.5.2
+          tools: phpunit:8.5.14
           coverage: none
 
       - name: Set up PHPUnit

diff --git a/.travis.yml b/.travis.yml
diff --git a/appinfo/app.php b/appinfo/app.php
diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -6,7 +6,7 @@
 	<description><![CDATA[This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.
 
 You can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store.]]></description>
-	<version>3.7.14</version>
+	<version>4.0.0-beta1</version>
 	<licence>agpl</licence>
 	<author>Collabora Productivity based on work of Frank Karlitschek, Victor Dubiniuk</author>
 	<types>
@@ -29,7 +29,7 @@ You can also edit your documents off-line with the Collabora Office app from the
 	<screenshot>https://www.collaboraoffice.com/downloads/nextcloud/richdocuments/collabora-online-screenshot-4.png</screenshot>
 	<screenshot>https://www.collaboraoffice.com/downloads/nextcloud/richdocuments/collabora-online-screenshot-5.png</screenshot>
 	<dependencies>
-		<nextcloud min-version="15" max-version="20" />
+		<nextcloud min-version="21" max-version="21" />
 	</dependencies>
 	<background-jobs>
 		<job>OCA\Richdocuments\Backgroundjobs\ObtainCapabilities</job>

diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
     "type": "project",
     "require-dev": {
         "roave/security-advisories": "dev-master",
-        "christophwurst/nextcloud": "^15.0",
+        "christophwurst/nextcloud": "^21@dev",
         "jakub-onderka/php-parallel-lint": "^1.0.0"
     },
     "license": "AGPLv3",
@@ -13,7 +13,6 @@
             "email": "jus@bitgrid.net"
         }
     ],
-    "require": {},
     "scripts": {
       "lint": "find . -name \\*.php -not -path './vendor/*' -print0 | xargs -0 -n1 php -l"
     }

diff --git a/composer.lock b/composer.lock