Merge pull request #189 from pdsinterop/fix/php-linting

Fix/php linting

Author: ylebre

.github/workflows/php.yml

@@ -63,35 +63,6 @@ jobs:
             --no-scripts
             --strict
         working-directory: "solid"
-  # 02.test.php.test-unit.yml
-  php-unittest:
-    name: PHP Unit Tests
-    needs:
-      - lint-php-syntax
-      - validate-dependencies-file
-    runs-on: ubuntu-24.04
-    strategy:
-      fail-fast: false
-      matrix:
-        php:
-          - '8.0'  # from 2020-11 to 2022-11 (2023-11)
-          - '8.1'  # from 2021-11 to 2023-11 (2025-12)
-          - '8.2'  # from 2022-12 to 2024-12 (2026-12)
-          - '8.3'  # from 2023-11 to 2025-12 (2027-12)
-    steps:
-      - uses: actions/checkout@v4
-      - uses: shivammathur/setup-php@v2
-        with:
-          coverage: xdebug
-          ini-values: error_reporting=E_ALL, display_errors=On
-          php-version: ${{ matrix.php }}
-      - name: Install and Cache Composer dependencies
-        uses: "ramsey/composer-install@v2"
-        with:
-          working-directory: "solid"
-        env:
-          COMPOSER_AUTH: '{"github-oauth": {"github.com": "${{ secrets.GITHUB_TOKEN }}"}}'
-      - run: bin/phpunit --configuration .config/phpunit.xml.dist
   # 03.quality.php.scan.dependencies-vulnerabilities.yml
   scan-dependencies-vulnerabilities:
     name: Scan Dependencies Vulnerabilities
@@ -134,7 +105,6 @@ jobs:
       fail-fast: false
       matrix:
         php:
-          - '8.0'  # from 2020-11 to 2022-11 (2023-11)
           - '8.1'  # from 2021-11 to 2023-11 (2025-12)
           - '8.2'  # from 2022-12 to 2024-12 (2026-12)
           - '8.3'  # from 2023-11 to 2025-12 (2027-12)

solid/appinfo/routes.php

@@ -1,11 +1,4 @@
 <?php
-
-use OC\AllConfig;
-use OC\AppConfig;
-use OCA\Solid\AppInfo\Application;
-use OCP\IConfig;
-use OCP\IRequest;
-
 /**
  * Create your routes in here. The name is the lowercase name of the controller
  * without the controller part, the stuff after the hash is the method.
@@ -15,6 +8,12 @@
  * it's instantiated in there
  */
 
+use OC\AllConfig;
+use OC\AppConfig;
+use OCA\Solid\AppInfo\Application;
+use OCP\IConfig;
+use OCP\IRequest;
+
 $routes = [
 	['name' => 'page#approval', 'url' => '/sharing/{clientId}', 'verb' => 'GET'],
 	['name' => 'page#handleRevoke', 'url' => '/revoke/{clientId}', 'verb' => 'DELETE'],

solid/composer.json

@@ -38,7 +38,7 @@
     "require-dev": {
         "doctrine/dbal": "*",
         "nextcloud/server": "*",
-        "phpunit/phpunit": "^8 || ^9"
+        "phpunit/phpunit": "^8.5.32"
     },
     "repositories": [
         {