fix: Resolve PHPCS and Psalm errors after merge with development

rubenvdlinde · rubenvdlinde · commit 9c686af087f5 · 2026-03-19T10:26:34.000+01:00
- Fix named argument mismatches in ArchiMate services (propDefMap)
- Fix undefined $propRef variable in ArchiMateExportService
- Fix $this-&gt;_appName → $this-&gt;appName in SettingsService
- Fix empty() on boolean in SettingsService
- Add @psalm-suppress for Doctrine PostgreSQLPlatform in OrganizationSyncService
- Fix PHPCS formatting in OrganizationHandler
diff --git a/lib/Service/ArchiMateExportService.php b/lib/Service/ArchiMateExportService.php
@@ -1096,7 +1096,7 @@ private function generateXmlDirectly(array $objects, array $schemaIdMap): string
                         folder: $sectionFolder,
                         object: $object,
                         sectionName: $sectionName,
-                        propertyDefinitionMap: $propertyDefinitionMap
+                        propertyDefinitionMap: $propDefMap
                     );
                 }
 
@@ -1186,7 +1186,7 @@ private function addObjectDirectlyToXmlWithProperties(
             $xmlData = $object['xml'];
             unset($xmlData['_essential_data']);
         } else {
-            $xmlData = $this->cleanObjectDataForXml(object: $object, propDefMap: $propDefMap);
+            $xmlData = $this->cleanObjectDataForXml(object: $object, propDefMap: $propertyDefinitionMap);
         }
 
         if (is_array($xmlData) === true && empty($xmlData) === false) {
@@ -1498,8 +1498,8 @@ private function formatXmlOutput(string $xmlString): string
     /**
      * Clean object data for XML export.
      *
-     * @param array $object                The object data to clean.
-     * @param array $propertyDefinitionMap Property definition map.
+     * @param array $object     The object data to clean.
+     * @param array $propDefMap Property definition map.
      *
      * @return array The cleaned object data.
      */
@@ -1652,17 +1652,17 @@ private function addCleanDataToXmlNode(
         }
 
         // Add properties from root fields using propertyDefinitionMap ONLY if no properties were already processed.
-        if (empty($propDefMap) === false && isset($data['properties']) === false) {
-            $this->addPropertiesFromRootFields(node: $node, object: $data, propDefMap: $propDefMap);
+        if (empty($propertyDefinitionMap) === false && isset($data['properties']) === false) {
+            $this->addPropertiesFromRootFields(node: $node, object: $data, propDefMap: $propertyDefinitionMap);
         }
     }//end addCleanDataToXmlNode()
 
     /**
      * Add properties to XML node using propertyDefinitionMap from model.
      *
-     * @param \SimpleXMLElement $node                  XML node to add properties to.
-     * @param array             $object                The object with root-level properties.
-     * @param array             $propertyDefinitionMap Map of property name to ref.
+     * @param \SimpleXMLElement $node       XML node to add properties to.
+     * @param array             $object     The object with root-level properties.
+     * @param array             $propDefMap Map of property name to ref.
      *
      * @return void
      */
@@ -2281,7 +2281,8 @@ private function validatePropertiesAreNotEmpty(\SimpleXMLElement $xml): void
                 throw new \InvalidArgumentException("Property missing value element: $propRef");
             }
 
-            $value = trim((string) $valueElements[0]);
+            $value   = trim((string) $valueElements[0]);
+            $propRef = (string) $attributes['propertyDefinitionRef'];
             if (empty($value) === true) {
                 throw new \InvalidArgumentException("Property has empty value: $propRef");
             }
@@ -3195,7 +3196,7 @@ private function assembleOrganizationXml(
                         folder: $elementsFolder,
                         object: $obj,
                         sectionName: 'elements',
-                        propertyDefinitionMap: $propertyDefinitionMap
+                        propertyDefinitionMap: $propDefMap
                     );
                 }
             }
@@ -3228,7 +3229,7 @@ private function assembleOrganizationXml(
                         folder: $relsFolder,
                         object: $obj,
                         sectionName: 'relationships',
-                        propertyDefinitionMap: $propertyDefinitionMap
+                        propertyDefinitionMap: $propDefMap
                     );
                 }
             }
@@ -3260,7 +3261,7 @@ private function assembleOrganizationXml(
                         folder: $propDefsFolder,
                         object: $obj,
                         sectionName: 'property_definitions',
-                        propertyDefinitionMap: $propertyDefinitionMap
+                        propertyDefinitionMap: $propDefMap
                     );
                 }
             }
@@ -3334,7 +3335,7 @@ private function assembleOrganizationXml(
                         folder: $diagramsFolder,
                         object: $obj,
                         sectionName: 'views',
-                        propertyDefinitionMap: $propertyDefinitionMap
+                        propertyDefinitionMap: $propDefMap
                     );
                 }
             }
diff --git a/lib/Service/ArchiMateImportService.php b/lib/Service/ArchiMateImportService.php
@@ -3284,7 +3284,10 @@ private function extractElementProperties(array $element): array
         foreach ($element as $key => $value) {
             if (in_array($key, $excludedKeys) === false && in_array($key, $basicProperties) === false) {
                 // Only include non-object values or simple arrays.
-                if (is_scalar($value) === true || (is_array($value) === true && $this->isComplexArray(array: $value) === false)) {
+                $isSimple = is_scalar($value) === true
+                    || (is_array($value) === true
+                    && $this->isComplexArray(array: $value) === false);
+                if ($isSimple === true) {
                     $properties[$key] = $value;
                 }
             }
diff --git a/lib/Service/OrganizationSyncService.php b/lib/Service/OrganizationSyncService.php
@@ -147,6 +147,8 @@ public function __construct(
      * @param string $path   The JSON path to extract (e.g., '$.status' or 'status')
      *
      * @return string The SQL expression for JSON extraction
+     *
+     * @psalm-suppress UndefinedClass
      */
     private function jsonExtract(string $column, string $path): string
     {
@@ -182,6 +184,8 @@ private function jsonExtract(string $column, string $path): string
      * @param string $value  The value to check for
      *
      * @return string The SQL expression for JSON contains check
+     *
+     * @psalm-suppress UndefinedClass
      */
     private function jsonContains(string $column, string $value): string
     {
@@ -468,6 +472,8 @@ public function performContactSync(int $batchSize=100, int $maxExecutionSeconds=
      * Perform synchronization of users.
      *
      * @return array The sync statistics.
+     *
+     * @psalm-suppress UndefinedClass
      */
     public function performUserSync(): array
     {
diff --git a/lib/Service/SettingsService.php b/lib/Service/SettingsService.php
@@ -508,11 +508,11 @@ public function autoConfigureAfterImport(): array
         try {
             // Check if auto-configuration has already been completed.
             $autoConfigCompleted = $this->config->getValueString(
-                $this->_appName,
+                $this->appName,
                     'auto_config_completed',
                     'false'
             ) === 'true';
-            if (empty($autoConfigCompleted) === false) {
+            if ($autoConfigCompleted === true) {
                 $this->logger->info('Auto-configuration already completed, skipping');
                 return [];
             }
@@ -1848,7 +1848,7 @@ public function getEmailSettings(): array
     {
         $this->logger->debug('SoftwareCatalog: Loading email settings from configuration');
 
-        $app      = $this->_appName;
+        $app      = $this->appName;
         $settings = [
             'enabled'                         => $this->config->getValueString(
                 $app,
@@ -2980,7 +2980,7 @@ public function getVersionInfo(): array
                 'versionComparison'     => $versionComparisonValue,
                 'isFullyConfigured'     => $this->isFullyConfigured(),
                 'autoConfigCompleted'   => $this->config->getValueString(
-                    $this->_appName,
+                    $this->appName,
                         'auto_config_completed',
                         'false'
                 ) === 'true',
@@ -3930,17 +3930,17 @@ public function getVoorzieningenConfig(): array
         if (is_array($decoded) === false) {
             $decoded = [
                 'register'              => $this->config->getValueString(
-                    $this->_appName,
+                    $this->appName,
                         'voorzieningen_register',
                         ''
                 ),
                 'organisatie_schema'    => $this->config->getValueString(
-                    $this->_appName,
+                    $this->appName,
                         'voorzieningen_organisatie_schema',
                         ''
                 ),
                 'contactpersoon_schema' => $this->config->getValueString(
-                    $this->_appName,
+                    $this->appName,
                         'voorzieningen_contactpersoon_schema',
                         ''
                 ),
@@ -4062,32 +4062,32 @@ public function getAmefConfig(): array
                 // Fallback to individual config values for backward compatibility.
                 $decoded = [
                     'register_id'          => $this->config->getValueString(
-                        $this->_appName,
+                        $this->appName,
                             'amef_register_id',
                             ''
                     ),
                     'organizations_schema' => $this->config->getValueString(
-                        $this->_appName,
+                        $this->appName,
                             'amef_organizations_schema',
                             ''
                     ),
                     'elements_schema'      => $this->config->getValueString(
-                        $this->_appName,
+                        $this->appName,
                             'amef_elements_schema',
                             ''
                     ),
                     'relationships_schema' => $this->config->getValueString(
-                        $this->_appName,
+                        $this->appName,
                             'amef_relationships_schema',
                             ''
                     ),
                     'views_schema'         => $this->config->getValueString(
-                        $this->_appName,
+                        $this->appName,
                             'amef_views_schema',
                             ''
                     ),
                     'models_schema'        => $this->config->getValueString(
-                        $this->_appName,
+                        $this->appName,
                             'amef_models_schema',
                             ''
                     ),
@@ -4631,7 +4631,7 @@ public function compactToJsonConfiguration(): array
 
         try {
             // 1. Migrate Voorzieningen configuration.
-            $an = $this->_appName;
+            $an = $this->appName;
             $voorzieningenConfig = [
                 'register'                => $this->config->getValueString(
                     $an,
diff --git a/lib/Service/SoftwareCatalogue/OrganizationHandler.php b/lib/Service/SoftwareCatalogue/OrganizationHandler.php
@@ -518,9 +518,9 @@ private function findExistingContactgegevens(
 
             $existingObjects = $objectService->findAll(
                 config: [
-                    'filters' => $searchFilters,
+                    'filters'   => $searchFilters,
                     '_register' => $registerId,
-                    '_schema' => $contactgegevensSchemaId,
+                    '_schema'   => $contactgegevensSchemaId,
                 ]
             );
 

Original file line number	Diff line number	Diff line change
`@@ -1096,7 +1096,7 @@ private function generateXmlDirectly(array $objects, array $schemaIdMap): string`
`1096`	`1096`	`folder: $sectionFolder,`
`1097`	`1097`	`object: $object,`
`1098`	`1098`	`sectionName: $sectionName,`
`1099`		`- propertyDefinitionMap: $propertyDefinitionMap`
	`1099`	`+ propertyDefinitionMap: $propDefMap`
`1100`	`1100`	`);`
`1101`	`1101`	`}`
`1102`	`1102`
`@@ -1186,7 +1186,7 @@ private function addObjectDirectlyToXmlWithProperties(`
`1186`	`1186`	`$xmlData = $object['xml'];`
`1187`	`1187`	`unset($xmlData['_essential_data']);`
`1188`	`1188`	`} else {`
`1189`		`- $xmlData = $this->cleanObjectDataForXml(object: $object, propDefMap: $propDefMap);`
	`1189`	`+ $xmlData = $this->cleanObjectDataForXml(object: $object, propDefMap: $propertyDefinitionMap);`
`1190`	`1190`	`}`
`1191`	`1191`
`1192`	`1192`	`if (is_array($xmlData) === true && empty($xmlData) === false) {`
`@@ -1498,8 +1498,8 @@ private function formatXmlOutput(string $xmlString): string`
`1498`	`1498`	`/**`
`1499`	`1499`	`* Clean object data for XML export.`
`1500`	`1500`	`*`
`1501`		`- * @param array $object The object data to clean.`
`1502`		`- * @param array $propertyDefinitionMap Property definition map.`
	`1501`	`+ * @param array $object The object data to clean.`
	`1502`	`+ * @param array $propDefMap Property definition map.`
`1503`	`1503`	`*`
`1504`	`1504`	`* @return array The cleaned object data.`
`1505`	`1505`	`*/`
`@@ -1652,17 +1652,17 @@ private function addCleanDataToXmlNode(`
`1652`	`1652`	`}`
`1653`	`1653`
`1654`	`1654`	`// Add properties from root fields using propertyDefinitionMap ONLY if no properties were already processed.`
`1655`		`- if (empty($propDefMap) === false && isset($data['properties']) === false) {`
`1656`		`- $this->addPropertiesFromRootFields(node: $node, object: $data, propDefMap: $propDefMap);`
	`1655`	`+ if (empty($propertyDefinitionMap) === false && isset($data['properties']) === false) {`
	`1656`	`+ $this->addPropertiesFromRootFields(node: $node, object: $data, propDefMap: $propertyDefinitionMap);`
`1657`	`1657`	`}`
`1658`	`1658`	`}//end addCleanDataToXmlNode()`
`1659`	`1659`
`1660`	`1660`	`/**`
`1661`	`1661`	`* Add properties to XML node using propertyDefinitionMap from model.`
`1662`	`1662`	`*`
`1663`		`- * @param \SimpleXMLElement $node XML node to add properties to.`
`1664`		`- * @param array $object The object with root-level properties.`
`1665`		`- * @param array $propertyDefinitionMap Map of property name to ref.`
	`1663`	`+ * @param \SimpleXMLElement $node XML node to add properties to.`
	`1664`	`+ * @param array $object The object with root-level properties.`
	`1665`	`+ * @param array $propDefMap Map of property name to ref.`
`1666`	`1666`	`*`
`1667`	`1667`	`* @return void`
`1668`	`1668`	`*/`
`@@ -2281,7 +2281,8 @@ private function validatePropertiesAreNotEmpty(\SimpleXMLElement $xml): void`
`2281`	`2281`	`throw new \InvalidArgumentException("Property missing value element: $propRef");`
`2282`	`2282`	`}`
`2283`	`2283`
`2284`		`- $value = trim((string) $valueElements[0]);`
	`2284`	`+ $value = trim((string) $valueElements[0]);`
	`2285`	`+ $propRef = (string) $attributes['propertyDefinitionRef'];`
`2285`	`2286`	`if (empty($value) === true) {`
`2286`	`2287`	`throw new \InvalidArgumentException("Property has empty value: $propRef");`
`2287`	`2288`	`}`
`@@ -3195,7 +3196,7 @@ private function assembleOrganizationXml(`
`3195`	`3196`	`folder: $elementsFolder,`
`3196`	`3197`	`object: $obj,`
`3197`	`3198`	`sectionName: 'elements',`
`3198`		`- propertyDefinitionMap: $propertyDefinitionMap`
	`3199`	`+ propertyDefinitionMap: $propDefMap`
`3199`	`3200`	`);`
`3200`	`3201`	`}`
`3201`	`3202`	`}`
`@@ -3228,7 +3229,7 @@ private function assembleOrganizationXml(`
`3228`	`3229`	`folder: $relsFolder,`
`3229`	`3230`	`object: $obj,`
`3230`	`3231`	`sectionName: 'relationships',`
`3231`		`- propertyDefinitionMap: $propertyDefinitionMap`
	`3232`	`+ propertyDefinitionMap: $propDefMap`
`3232`	`3233`	`);`
`3233`	`3234`	`}`
`3234`	`3235`	`}`
`@@ -3260,7 +3261,7 @@ private function assembleOrganizationXml(`
`3260`	`3261`	`folder: $propDefsFolder,`
`3261`	`3262`	`object: $obj,`
`3262`	`3263`	`sectionName: 'property_definitions',`
`3263`		`- propertyDefinitionMap: $propertyDefinitionMap`
	`3264`	`+ propertyDefinitionMap: $propDefMap`
`3264`	`3265`	`);`
`3265`	`3266`	`}`
`3266`	`3267`	`}`
`@@ -3334,7 +3335,7 @@ private function assembleOrganizationXml(`
`3334`	`3335`	`folder: $diagramsFolder,`
`3335`	`3336`	`object: $obj,`
`3336`	`3337`	`sectionName: 'views',`
`3337`		`- propertyDefinitionMap: $propertyDefinitionMap`
	`3338`	`+ propertyDefinitionMap: $propDefMap`
`3338`	`3339`	`);`
`3339`	`3340`	`}`
`3340`	`3341`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3284,7 +3284,10 @@ private function extractElementProperties(array $element): array`
`3284`	`3284`	`foreach ($element as $key => $value) {`
`3285`	`3285`	`if (in_array($key, $excludedKeys) === false && in_array($key, $basicProperties) === false) {`
`3286`	`3286`	`// Only include non-object values or simple arrays.`
`3287`		`- if (is_scalar($value) === true \|\| (is_array($value) === true && $this->isComplexArray(array: $value) === false)) {`
	`3287`	`+ $isSimple = is_scalar($value) === true`
	`3288`	`+ \|\| (is_array($value) === true`
	`3289`	`+ && $this->isComplexArray(array: $value) === false);`
	`3290`	`+ if ($isSimple === true) {`
`3288`	`3291`	`$properties[$key] = $value;`
`3289`	`3292`	`}`
`3290`	`3293`	`}`
Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,8 @@ public function __construct(`
`147`	`147`	`* @param string $path The JSON path to extract (e.g., '$.status' or 'status')`
`148`	`148`	`*`
`149`	`149`	`* @return string The SQL expression for JSON extraction`
	`150`	`+ *`
	`151`	`+ * @psalm-suppress UndefinedClass`
`150`	`152`	`*/`
`151`	`153`	`private function jsonExtract(string $column, string $path): string`
`152`	`154`	`{`
`@@ -182,6 +184,8 @@ private function jsonExtract(string $column, string $path): string`
`182`	`184`	`* @param string $value The value to check for`
`183`	`185`	`*`
`184`	`186`	`* @return string The SQL expression for JSON contains check`
	`187`	`+ *`
	`188`	`+ * @psalm-suppress UndefinedClass`
`185`	`189`	`*/`
`186`	`190`	`private function jsonContains(string $column, string $value): string`
`187`	`191`	`{`
`@@ -468,6 +472,8 @@ public function performContactSync(int $batchSize=100, int $maxExecutionSeconds=`
`468`	`472`	`* Perform synchronization of users.`
`469`	`473`	`*`
`470`	`474`	`* @return array The sync statistics.`
	`475`	`+ *`
	`476`	`+ * @psalm-suppress UndefinedClass`
`471`	`477`	`*/`
`472`	`478`	`public function performUserSync(): array`
`473`	`479`	`{`