OC app visible

OpenCatalogi · Aug 5, 2024 · 424e296 · 424e296
1 parent 795eb15
commit 424e296
Show file tree

Hide file tree

Showing 3 changed files with 74 additions and 68 deletions.
diff --git a/.github/workflows/CI-workflows.yaml b/.github/workflows/CI-workflows.yaml
@@ -16,7 +16,7 @@ jobs:
           extensions: mbstring, zip, xml, curl, intl, sqlite, gd, pdo_mysql
           tools: cs2pr, phpcbf, phpcs, phpmd, phpunit
 
-      - name: Install Composer
+      - name: Install Composer dependencies
         run: composer install
 
       - name: Run phpcbf
@@ -39,8 +39,14 @@ jobs:
         run: phpmd src xml phpmd.xml --not-strict
         continue-on-error: ${{ github.ref != 'refs/heads/main' }}
 
-      - name: Install Composer dependencies
-        run: composer install
+      - name: List files in repository root
+        run: ls -alh
+
+      - name: List files in tests directory
+        run: ls -alh ./tests
+
+      - name: List files in vendor directory
+        run: ls -alh ./vendor
 
       - name: Run PHPUnit tests
         env:
@@ -99,11 +105,11 @@ jobs:
             echo "PHP CodeSniffer found issues. Please fix them before merging."
             exit 1
           fi
-          if grep -q "ERROR" <(phpmd src text phpmd.xml --strict); then
+          if grep -q "ERROR" <(phpmd src xml phpmd.xml --strict); then
             echo "PHP Mess Detector found issues. Please fix them before merging."
             exit 1
           fi
-          if ! phpunit --configuration phpunit.xml; then
+          if ! phpunit --bootstrap ./tests/bootstrap.php --configuration phpunit.xml; then
             echo "PHPUnit tests failed. Please fix them before merging."
             exit 1
           fi

diff --git a/composer.json b/composer.json
@@ -1,64 +1,64 @@
 {
-	"name": "conductionnl/opencatalogi",
-	"description": "This is a DSO Nextcloud project for the municipality Buren and is done by ConductionNL",
-	"license": "AGPL-3.0-or-later",
-	"authors": [
-		{
-			"name": "Conduction b.v.",
-			"email": "[email protected]",
-			"homepage": "https://conduction.nl"
-		},
-		{
-			"name": "Remko Huisman (Conduction)",
-			"email": "[email protected]",
-			"homepage": "https://conduction.nl"
-		},
-		{
-			"name": "Ruben van der Linde (Conduction)",
-			"email": "[email protected]",
-			"homepage": "https://conduction.nl"
-		}
-	],
-	"autoload": {
-		"psr-4": {
-			"OCA\\OpenCatalogi\\": "lib/"
-		}
-	},
-	"scripts": {
-		"post-install-cmd": [
-			"@composer bin all install --ansi"
-		],
-		"post-update-cmd": [
-			"@composer bin all update --ansi"
-		],
-		"lint": "find . -name \\*.php -not -path './vendor/*' -not -path './vendor-bin/*' -not -path './build/*' -print0 | xargs -0 -n1 php -l",
-		"cs:check": "php-cs-fixer fix --dry-run --diff",
-		"cs:fix": "php-cs-fixer fix",
-		"psalm": "psalm --threads=1 --no-cache",
-		"test:unit": "phpunit tests -c tests/phpunit.xml --colors=always --fail-on-warning --fail-on-risky",
-		"openapi": "generate-spec"
-	},
-	"require": {
-		"php": "^8.1",
-		"adbario/php-dot-notation": "^3.3.0",
-		"bamarni/composer-bin-plugin": "^1.8",
-		"elasticsearch/elasticsearch": "^v8.14.0",
-		"guzzlehttp/guzzle": "^7.0",
-		"symfony/uid": "^6.4"
-	},
-	"require-dev": {
-		"nextcloud/ocp": "dev-stable29",
-		"roave/security-advisories": "dev-latest"
-	},
-	"config": {
-		"allow-plugins": {
-			"bamarni/composer-bin-plugin": true,
-			"php-http/discovery": true
-		},
-		"optimize-autoloader": true,
-		"sort-packages": true,
-		"platform": {
-			"php": "8.1"
-		}
-	}
+    "name": "conductionnl/opencatalogi",
+    "description": "This is a DSO Nextcloud project for the municipality Buren and is done by ConductionNL",
+    "license": "AGPL-3.0-or-later",
+    "authors": [
+        {
+            "name": "Conduction b.v.",
+            "email": "[email protected]",
+            "homepage": "https://conduction.nl"
+        },
+        {
+            "name": "Remko Huisman (Conduction)",
+            "email": "[email protected]",
+            "homepage": "https://conduction.nl"
+        },
+        {
+            "name": "Ruben van der Linde (Conduction)",
+            "email": "[email protected]",
+            "homepage": "https://conduction.nl"
+        }
+    ],
+    "autoload": {
+        "psr-4": {
+            "OCA\\OpenCatalogi\\": "lib/"
+        }
+    },
+    "scripts": {
+        "post-install-cmd": [
+            "@composer bin all install --ansi"
+        ],
+        "post-update-cmd": [
+            "@composer bin all update --ansi"
+        ],
+        "lint": "find . -name \\*.php -not -path './vendor/*' -not -path './vendor-bin/*' -not -path './build/*' -print0 | xargs -0 -n1 php -l",
+        "cs:check": "php-cs-fixer fix --dry-run --diff",
+        "cs:fix": "php-cs-fixer fix",
+        "psalm": "psalm --threads=1 --no-cache",
+        "test:unit": "phpunit tests -c tests/phpunit.xml --colors=always --fail-on-warning --fail-on-risky",
+        "openapi": "generate-spec"
+    },
+    "require": {
+        "php": "^8.1",
+        "adbario/php-dot-notation": "^3.3.0",
+        "bamarni/composer-bin-plugin": "^1.8",
+        "elasticsearch/elasticsearch": "^v8.14.0",
+        "guzzlehttp/guzzle": "^7.0",
+        "symfony/uid": "^6.4"
+    },
+    "require-dev": {
+        "nextcloud/ocp": "dev-stable29",
+        "roave/security-advisories": "dev-latest"
+    },
+    "config": {
+        "allow-plugins": {
+            "bamarni/composer-bin-plugin": true,
+            "php-http/discovery": true
+        },
+        "optimize-autoloader": true,
+        "sort-packages": true,
+        "platform": {
+            "php": "8.1"
+        }
+    }
 }
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-// require_once __DIR__ . '/../vendor/autoload.php';
+require_once __DIR__ . '/../vendor/autoload.php';
 
 \OC_App::loadApp(OCA\OpenCatalogi\AppInfo\Application::APP_ID);
 OC_Hook::clear();