Merge branch 'units' into 'main'

Improve unit test coverage

See merge request !9

.gitlab-ci.yml

@@ -2,11 +2,11 @@
 # Composer stores all downloaded packages in the vendor/ directory.
 # Do not use the following if the vendor/ directory is committed to
 # your git repository.
-cache:
-  # We key the cache using the commit unique identifier.
-  key: ${CI_COMMIT_REF_SLUG}
-  paths:
-    - vendor/
+#cache:
+#  # We key the cache using the commit unique identifier.
+#  key: ${CI_COMMIT_REF_SLUG}
+#  paths:
+#    - vendor/
 
 # List of stages for jobs, and their order of execution
 stages:
@@ -21,6 +21,7 @@ test-74:
   image: cicnavi/dap:74
   script:
     - composer install --prefer-dist --no-progress --no-suggest
+    - vendor/bin/psalm --clear-cache
     - composer run-script pre-commit
 
 # PHP v8.1
@@ -31,6 +32,7 @@ test-81:
   image: cicnavi/dap:81
   script:
     - composer install --prefer-dist --no-progress --no-suggest
+    - vendor/bin/psalm --clear-cache
     - composer run-script pre-commit
 
 # TODO mivanci remove when GEANT project finishes

config-templates/module_accounting.php

@@ -72,10 +72,9 @@ $config = [
     ModuleConfiguration::OPTION_PROVIDER_FOR_CONNECTED_SERVICES =>
         /**
          * Default connected services provider which expects Doctrine DBAL compatible connection to be set below.
-         * CurrentDataProvider only gathers current (latest information) about the service and user (there is no
-         * versioning, so it's faster). VersionedDataProvider keeps track of any changes in data about the service
-         * and user.
-         *
+         * CurrentDataProvider only gathers current (latest information) about the service (there is no
+         * versioning, so it's faster). VersionedDataProvider keeps track of any changes in data about
+         * the service.
          */
         Providers\ConnectedServices\DoctrineDbal\CurrentDataProvider::class,
         //Providers\ConnectedServices\DoctrineDbal\VersionedDataProvider::class,
@@ -91,9 +90,12 @@ $config = [
     ModuleConfiguration::OPTION_PROVIDER_FOR_ACTIVITY =>
         /**
          * Default activity provider which expects Doctrine DBAL compatible connection to be set below.
-         * Currently only VersionedDataProvider is available, which tracks all changes in services and users.
+         * CurrentDataProvider only gathers current (latest information) about the service (there is no
+         * versioning, so it's faster). VersionedDataProvider keeps track of any changes in data about
+         * the service.
          */
-        Providers\Activity\DoctrineDbal\VersionedDataProvider::class,
+        Providers\Activity\DoctrineDbal\CurrentDataProvider::class,
+        //Providers\Activity\DoctrineDbal\VersionedDataProvider::class,
 
     /**
      * Trackers
@@ -134,6 +136,12 @@ $config = [
                 'doctrine_dbal_pdo_mysql',
             ],
         ],
+        Providers\Activity\DoctrineDbal\CurrentDataProvider::class => [
+            ModuleConfiguration\ConnectionType::MASTER => 'doctrine_dbal_pdo_mysql',
+            ModuleConfiguration\ConnectionType::SLAVE => [
+                'doctrine_dbal_pdo_mysql',
+            ],
+        ],
         Providers\Activity\DoctrineDbal\VersionedDataProvider::class => [
             ModuleConfiguration\ConnectionType::MASTER => 'doctrine_dbal_pdo_mysql',
             ModuleConfiguration\ConnectionType::SLAVE => [

psalm.xml

@@ -7,6 +7,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+    cacheDirectory="./build/psalm/cache"
 >
     <projectFiles>
         <directory name="src" />