📦 Use vendor-bin and Mozart to separate dev from production dependencies

.drone.jsonnet

@@ -33,7 +33,9 @@ local Pipeline(test_set, database, services) = {
 				] else []
 			) + [
 				"cd apps/$APP_NAME",
-				"composer install --no-dev",
+				"composer --version",
+				"composer self-update --2",
+				"composer install",
 				"cd tests/integration/",
 				"bash run.sh features/"+test_set
 			]

.drone.yml

@@ -15,7 +15,9 @@ steps:
     apps/notifications
   - ./occ app:enable notifications
   - cd apps/$APP_NAME
-  - composer install --no-dev
+  - composer --version
+  - composer self-update --2
+  - composer install
   - cd tests/integration/
   - bash run.sh features/callapi
   environment:
@@ -49,7 +51,9 @@ steps:
     apps/notifications
   - ./occ app:enable notifications
   - cd apps/$APP_NAME
-  - composer install --no-dev
+  - composer --version
+  - composer self-update --2
+  - composer install
   - cd tests/integration/
   - bash run.sh features/chat
   environment:
@@ -83,7 +87,9 @@ steps:
     apps/notifications
   - ./occ app:enable notifications
   - cd apps/$APP_NAME
-  - composer install --no-dev
+  - composer --version
+  - composer self-update --2
+  - composer install
   - cd tests/integration/
   - bash run.sh features/command
   environment:
@@ -118,7 +124,9 @@ steps:
   - ./occ app:enable notifications
   - git clone --depth 1 -b $GUESTS_BRANCH https://github.com/nextcloud/guests apps/guests
   - cd apps/$APP_NAME
-  - composer install --no-dev
+  - composer --version
+  - composer self-update --2
+  - composer install
   - cd tests/integration/
   - bash run.sh features/conversation
   environment:
@@ -153,7 +161,9 @@ steps:
   - ./occ app:enable notifications
   - git clone --depth 1 -b $GUESTS_BRANCH https://github.com/nextcloud/guests apps/guests
   - cd apps/$APP_NAME
-  - composer install --no-dev
+  - composer --version
+  - composer self-update --2
+  - composer install
   - cd tests/integration/
   - bash run.sh features/conversation-2
   environment:
@@ -187,7 +197,9 @@ steps:
     apps/notifications
   - ./occ app:enable notifications
   - cd apps/$APP_NAME
-  - composer install --no-dev
+  - composer --version
+  - composer self-update --2
+  - composer install
   - cd tests/integration/
   - bash run.sh features/federation
   environment:
@@ -221,7 +233,9 @@ steps:
     apps/notifications
   - ./occ app:enable notifications
   - cd apps/$APP_NAME
-  - composer install --no-dev
+  - composer --version
+  - composer self-update --2
+  - composer install
   - cd tests/integration/
   - bash run.sh features/reaction
   environment:
@@ -255,7 +269,9 @@ steps:
     apps/notifications
   - ./occ app:enable notifications
   - cd apps/$APP_NAME
-  - composer install --no-dev
+  - composer --version
+  - composer self-update --2
+  - composer install
   - cd tests/integration/
   - bash run.sh features/sharing
   environment:
@@ -289,7 +305,9 @@ steps:
     apps/notifications
   - ./occ app:enable notifications
   - cd apps/$APP_NAME
-  - composer install --no-dev
+  - composer --version
+  - composer self-update --2
+  - composer install
   - cd tests/integration/
   - bash run.sh features/sharing-2
   environment:
@@ -337,7 +355,9 @@ steps:
     apps/notifications
   - ./occ app:enable notifications
   - cd apps/$APP_NAME
-  - composer install --no-dev
+  - composer --version
+  - composer self-update --2
+  - composer install
   - cd tests/integration/
   - bash run.sh features/callapi
   environment:
@@ -386,7 +406,9 @@ steps:
     apps/notifications
   - ./occ app:enable notifications
   - cd apps/$APP_NAME
-  - composer install --no-dev
+  - composer --version
+  - composer self-update --2
+  - composer install
   - cd tests/integration/
   - bash run.sh features/chat
   environment:
@@ -435,7 +457,9 @@ steps:
     apps/notifications
   - ./occ app:enable notifications
   - cd apps/$APP_NAME
-  - composer install --no-dev
+  - composer --version
+  - composer self-update --2
+  - composer install
   - cd tests/integration/
   - bash run.sh features/command
   environment:
@@ -485,7 +509,9 @@ steps:
   - ./occ app:enable notifications
   - git clone --depth 1 -b $GUESTS_BRANCH https://github.com/nextcloud/guests apps/guests
   - cd apps/$APP_NAME
-  - composer install --no-dev
+  - composer --version
+  - composer self-update --2
+  - composer install
   - cd tests/integration/
   - bash run.sh features/conversation
   environment:
@@ -535,7 +561,9 @@ steps:
   - ./occ app:enable notifications
   - git clone --depth 1 -b $GUESTS_BRANCH https://github.com/nextcloud/guests apps/guests
   - cd apps/$APP_NAME
-  - composer install --no-dev
+  - composer --version
+  - composer self-update --2
+  - composer install
   - cd tests/integration/
   - bash run.sh features/conversation-2
   environment:
@@ -584,7 +612,9 @@ steps:
     apps/notifications
   - ./occ app:enable notifications
   - cd apps/$APP_NAME
-  - composer install --no-dev
+  - composer --version
+  - composer self-update --2
+  - composer install
   - cd tests/integration/
   - bash run.sh features/federation
   environment:
@@ -633,7 +663,9 @@ steps:
     apps/notifications
   - ./occ app:enable notifications
   - cd apps/$APP_NAME
-  - composer install --no-dev
+  - composer --version
+  - composer self-update --2
+  - composer install
   - cd tests/integration/
   - bash run.sh features/reaction
   environment:
@@ -682,7 +714,9 @@ steps:
     apps/notifications
   - ./occ app:enable notifications
   - cd apps/$APP_NAME
-  - composer install --no-dev
+  - composer --version
+  - composer self-update --2
+  - composer install
   - cd tests/integration/
   - bash run.sh features/sharing
   environment:
@@ -731,7 +765,9 @@ steps:
     apps/notifications
   - ./occ app:enable notifications
   - cd apps/$APP_NAME
-  - composer install --no-dev
+  - composer --version
+  - composer self-update --2
+  - composer install
   - cd tests/integration/
   - bash run.sh features/sharing-2
   environment:
@@ -775,7 +811,9 @@ steps:
     apps/notifications
   - ./occ app:enable notifications
   - cd apps/$APP_NAME
-  - composer install --no-dev
+  - composer --version
+  - composer self-update --2
+  - composer install
   - cd tests/integration/
   - bash run.sh features/callapi
   environment:
@@ -818,7 +856,9 @@ steps:
     apps/notifications
   - ./occ app:enable notifications
   - cd apps/$APP_NAME
-  - composer install --no-dev
+  - composer --version
+  - composer self-update --2
+  - composer install
   - cd tests/integration/
   - bash run.sh features/chat
   environment:
@@ -861,7 +901,9 @@ steps:
     apps/notifications
   - ./occ app:enable notifications
   - cd apps/$APP_NAME
-  - composer install --no-dev
+  - composer --version
+  - composer self-update --2
+  - composer install
   - cd tests/integration/
   - bash run.sh features/command
   environment:
@@ -905,7 +947,9 @@ steps:
   - ./occ app:enable notifications
   - git clone --depth 1 -b $GUESTS_BRANCH https://github.com/nextcloud/guests apps/guests
   - cd apps/$APP_NAME
-  - composer install --no-dev
+  - composer --version
+  - composer self-update --2
+  - composer install
   - cd tests/integration/
   - bash run.sh features/conversation
   environment:
@@ -949,7 +993,9 @@ steps:
   - ./occ app:enable notifications
   - git clone --depth 1 -b $GUESTS_BRANCH https://github.com/nextcloud/guests apps/guests
   - cd apps/$APP_NAME
-  - composer install --no-dev
+  - composer --version
+  - composer self-update --2
+  - composer install
   - cd tests/integration/
   - bash run.sh features/conversation-2
   environment:
@@ -992,7 +1038,9 @@ steps:
     apps/notifications
   - ./occ app:enable notifications
   - cd apps/$APP_NAME
-  - composer install --no-dev
+  - composer --version
+  - composer self-update --2
+  - composer install
   - cd tests/integration/
   - bash run.sh features/federation
   environment:
@@ -1035,7 +1083,9 @@ steps:
     apps/notifications
   - ./occ app:enable notifications
   - cd apps/$APP_NAME
-  - composer install --no-dev
+  - composer --version
+  - composer self-update --2
+  - composer install
   - cd tests/integration/
   - bash run.sh features/reaction
   environment:
@@ -1078,7 +1128,9 @@ steps:
     apps/notifications
   - ./occ app:enable notifications
   - cd apps/$APP_NAME
-  - composer install --no-dev
+  - composer --version
+  - composer self-update --2
+  - composer install
   - cd tests/integration/
   - bash run.sh features/sharing
   environment:
@@ -1121,7 +1173,9 @@ steps:
     apps/notifications
   - ./occ app:enable notifications
   - cd apps/$APP_NAME
-  - composer install --no-dev
+  - composer --version
+  - composer self-update --2
+  - composer install
   - cd tests/integration/
   - bash run.sh features/sharing-2
   environment:

.github/dependabot.yml

@@ -8,6 +8,38 @@ updates:
     time: "03:00"
     timezone: Europe/Paris
   open-pull-requests-limit: 10
+- package-ecosystem: composer
+  directory: "/vendor-bin/csfixer"
+  schedule:
+    interval: weekly
+    day: saturday
+    time: "03:00"
+    timezone: Europe/Paris
+  open-pull-requests-limit: 10
+- package-ecosystem: composer
+  directory: "/vendor-bin/mozart"
+  schedule:
+    interval: weekly
+    day: saturday
+    time: "03:00"
+    timezone: Europe/Paris
+  open-pull-requests-limit: 10
+- package-ecosystem: composer
+  directory: "/vendor-bin/phpunit"
+  schedule:
+    interval: weekly
+    day: saturday
+    time: "03:00"
+    timezone: Europe/Paris
+  open-pull-requests-limit: 10
+- package-ecosystem: composer
+  directory: "/vendor-bin/psalm"
+  schedule:
+    interval: weekly
+    day: saturday
+    time: "03:00"
+    timezone: Europe/Paris
+  open-pull-requests-limit: 10
 - package-ecosystem: npm
   directory: "/"
   schedule:

.github/workflows/phpunit.yml

@@ -75,8 +75,8 @@ jobs:
 #          php -S localhost:8080 &
 
       - name: PHPUnit
-        working-directory: apps/${{ env.APP_NAME }}/tests/php
-        run: ../../vendor/phpunit/phpunit/phpunit -c phpunit.xml
+        working-directory: apps/${{ env.APP_NAME }}
+        run: composer run test
 
 #      - name: PHPUnit integration
 #        working-directory: apps/${{ env.APP_NAME }}
@@ -150,8 +150,8 @@ jobs:
 #          php -S localhost:8080 &
 
       - name: PHPUnit
-        working-directory: apps/${{ env.APP_NAME }}/tests/php
-        run: ../../vendor/phpunit/phpunit/phpunit -c phpunit.xml
+        working-directory: apps/${{ env.APP_NAME }}
+        run: composer run test
 
 #      - name: PHPUnit integration
 #        working-directory: apps/${{ env.APP_NAME }}
@@ -222,8 +222,8 @@ jobs:
 #          php -S localhost:8080 &
 
       - name: PHPUnit
-        working-directory: apps/${{ env.APP_NAME }}/tests/php
-        run: ../../vendor/phpunit/phpunit/phpunit -c phpunit.xml
+        working-directory: apps/${{ env.APP_NAME }}
+        run: composer run test
 
 #      - name: PHPUnit integration
 #        working-directory: apps/${{ env.APP_NAME }}
@@ -287,8 +287,8 @@ jobs:
 #          php -S localhost:8080 &
 
       - name: PHPUnit
-        working-directory: apps/${{ env.APP_NAME }}/tests/php
-        run: ../../vendor/phpunit/phpunit/phpunit -c phpunit.xml
+        working-directory: apps/${{ env.APP_NAME }}
+        run: composer run test
 
 #      - name: PHPUnit integration
 #        working-directory: apps/${{ env.APP_NAME }}

.gitignore

@@ -4,6 +4,8 @@
 
 # PHP Code Sniffer
 /vendor
+/vendor-bin/*/vendor
+/lib/Vendor
 /.php-cs-fixer.cache
 
 # Local docs