Merge branch 'main' of github.com:GEWIS/gewisdb into feature/minutes-…

…decision
GEWIS · May 28, 2024 · 9775753 · 9775753
2 parents da81df1 + af03a07
commit 9775753
Show file tree

Hide file tree

Showing 151 changed files with 2,880 additions and 1,518 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,23 @@
+<!-- Provide a general summary of your changes in the title above. -->
+
+# Description
+<!--
+What do you want to achieve with this PR? Why did you write this code? What problem does this PR solve?
+Describe your changes in detail and, if relevant, explain which choices you have made and why.
+When making changes to the UI, make sure to include comparison screenshots!
+-->
+
+## Related issues/external references
+<!--
+Format issues on GitHub as `GH-NNN`. Tickets from support.gewis.nl can also be auto-linked by using
+`ABC-YYMM-NNN`.
+-->
+
+Fixes GH-NNN.
+
+## Types of changes
+<!-- What types of changes does your code introduce? Put an `X` in all the boxes that apply: -->
+- [ ] Bug fix _(non-breaking change which fixes an issue)_
+- [ ] New feature _(non-breaking change which adds functionality)_
+- [ ] Breaking change _(fix or feature that would cause existing functionality to change)_
+- [ ] Documentation improvement
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -13,7 +13,7 @@ jobs:
 
         steps:
             -   name: Checkout
-                uses: actions/checkout@v3
+                uses: actions/checkout@v4
 
             -   name: Install PHP
                 uses: shivammathur/setup-php@v2

diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -30,7 +30,7 @@ jobs:
 
         steps:
             -   name: Checkout head branch
-                uses: actions/checkout@v3
+                uses: actions/checkout@v4
 
             -   name: Install PostgreSQL client
                 run: |
@@ -122,7 +122,7 @@ jobs:
 
         steps:
             -   name: Checkout head branch
-                uses: actions/checkout@v3
+                uses: actions/checkout@v4
 
             -   name: Install PHP
                 uses: shivammathur/setup-php@v2
@@ -159,6 +159,7 @@ jobs:
                 run: |
                     git checkout -- psalm/psalm-baseline.xml
                     git checkout --theirs -- config/modules.config.php
+                    git checkout --theirs -- psalm.xml
                     git checkout -
 
             -   name: Install dependencies with Composer

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -19,13 +19,13 @@ jobs:
 
         steps:
             -   name: Checkout
-                uses: actions/checkout@v3
+                uses: actions/checkout@v4
 
             -   name: Install PHP
                 uses: shivammathur/setup-php@v2
                 with:
                     php-version: '8.3'
-                    extensions: calendar, curl, intl, opcache, pgsql, pdo_pgsql, zip, memcached, xdebug
+                    extensions: calendar, curl, intl, opcache, pdo_sqlite, sqlite3, zip, memcached
 
             -   name: Setup problem matchers for PHPUnit
                 run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
@@ -36,9 +36,8 @@ jobs:
             -   name: Extract configuration files
                 run: |
                     cp config/autoload/doctrine.local.development.php.dist config/autoload/doctrine.local.php
+                    cp config/autoload/laminas-developer-tools.local.php.dist config/autoload/laminas-developer-tools.local.php
                     cp config/autoload/local.development.php.dist config/autoload/local.php
-                    cp config/autoload/doctrine.local.test.php.dist config/autoload/doctrine.local.test.php
-                    cp config/autoload/local.test.php.dist config/autoload/local.test.php
 
             -   name: Load environment variables
                 uses: c-py/action-dotenv-to-setenv@v3

diff --git a/.idea/gewisdb.iml b/.idea/gewisdb.iml
diff --git a/.idea/php.xml b/.idea/php.xml
diff --git a/Makefile b/Makefile
@@ -91,8 +91,6 @@ copyconf:
 copyprodconf:
 		@cp config/autoload/local.production.php.dist config/autoload/local.php
 		@cp config/autoload/doctrine.local.production.php.dist config/autoload/doctrine.local.php
-		@cp config/autoload/local.test.php.dist config/autoload/local.test.php
-		@cp config/autoload/doctrine.local.test.php.dist config/autoload/doctrine.local.test.php
 
 phpstan:
 		@docker compose exec web echo "" > phpstan/phpstan-baseline-pr.neon

diff --git a/composer.json b/composer.json
@@ -2,6 +2,7 @@
     "name": "gewis/gewisdb",
     "description": "GEWIS Database management",
     "license": "GPL-3.0",
+    "type": "project",
     "keywords": [
         "members",
         "decisions",
@@ -21,12 +22,12 @@
         "laminas/laminas-crypt": "^3.11.0",
         "laminas/laminas-eventmanager": "^3.13.0",
         "laminas/laminas-filter": "^2.34.0",
-        "laminas/laminas-form": "^3.19.1",
+        "laminas/laminas-form": "^3.19.2",
         "laminas/laminas-http": "^2.19.0",
         "laminas/laminas-hydrator": "^4.15.0",
         "laminas/laminas-i18n": "^2.26.0",
         "laminas/laminas-i18n-resources": "^2.10.0",
-        "laminas/laminas-inputfilter": "^2.29.0",
+        "laminas/laminas-inputfilter": "^2.30.0",
         "laminas/laminas-json": "^3.6.0",
         "laminas/laminas-ldap": "^2.18.1",
         "laminas/laminas-mail": "^2.25.1",
@@ -37,17 +38,17 @@
         "laminas/laminas-mvc-plugin-identity": "^1.6.0",
         "laminas/laminas-mvc-i18n": "^1.8.0",
         "laminas/laminas-progressbar": "^2.13.0",
-        "laminas/laminas-router": "^3.12.0",
-        "laminas/laminas-session": "^2.17.0",
+        "laminas/laminas-router": "^3.13.0",
+        "laminas/laminas-session": "^2.20.0",
         "laminas/laminas-serializer": "^2.17.0",
         "laminas/laminas-servicemanager": "^3.22.1",
         "laminas/laminas-stdlib": "^3.19.0",
-        "laminas/laminas-validator": "^2.47.0",
+        "laminas/laminas-validator": "^2.52.0",
         "laminas/laminas-view": "^2.34.0",
-        "doctrine/dbal": "^3.8.0",
-        "doctrine/orm": "^2.17.3",
+        "doctrine/dbal": "^3.8.3",
+        "doctrine/orm": "^2.19.3",
         "doctrine/common": "^3.4.3",
-        "doctrine/doctrine-module": "^6.1.0",
+        "doctrine/doctrine-module": "^6.1.1",
         "doctrine/doctrine-orm-module": "^6.1.0",
         "doctrine/doctrine-laminas-hydrator": "^3.4.0",
         "monolog/monolog": "^1.27.1",
@@ -60,20 +61,20 @@
         "laminas/laminas-loader": "^2.10.0",
         "laminas/laminas-test": "^4.10.0",
         "san/san-session-toolbar": "^4.0.1",
-        "phpunit/phpunit": "^10.5.9",
-        "squizlabs/php_codesniffer": "^3.8.1",
-        "friendsofphp/php-cs-fixer": "^3.48.0",
-        "phpstan/phpstan": "^1.10.57",
+        "phpunit/phpunit": "^10.5.16",
+        "squizlabs/php_codesniffer": "^3.9.0",
+        "friendsofphp/php-cs-fixer": "^3.52.1",
+        "phpstan/phpstan": "^1.10.66",
         "phpstan/extension-installer": "^1.3.1",
         "bnf/phpstan-psr-container": "^1.0.1",
         "slam/phpstan-laminas-framework": "^1.5.0",
-        "phpstan/phpstan-doctrine": "^1.3.59",
-        "phpstan/phpstan-phpunit": "^1.3.15",
-        "vimeo/psalm": "^5.20.0",
+        "phpstan/phpstan-doctrine": "^1.3.64",
+        "phpstan/phpstan-phpunit": "^1.3.16",
+        "vimeo/psalm": "^5.23.1",
         "lctrs/psalm-psr-container-plugin": "^1.10.0",
         "weirdan/doctrine-psalm-plugin": "^2.9.0",
         "psalm/plugin-phpunit": "^0.18.4",
-        "maglnet/composer-require-checker": "^4.8.0",
+        "maglnet/composer-require-checker": "^4.10.0",
         "icanhazstring/composer-unused": "^0.8.11",
         "gewis/gewisphp-coding-standards": "^1.1.0"
     },
@@ -98,7 +99,7 @@
     "extra": {
         "patches": {
             "doctrine/orm": {
-                "Fix issues with SubDecisions.": "https://raw.githubusercontent.com/GEWIS/orm/2.17.x/1-to-1-multiple-join-columns.patch"
+                "Fix issues with SubDecisions.": "https://raw.githubusercontent.com/GEWIS/orm/2.19.x/1-to-1-multiple-join-columns.patch"
             }
         }
     },