Release: merge development into beta

appinfo/info.xml

@@ -50,25 +50,25 @@ Vrij en open source onder de EUPL-licentie.
 
 **Ondersteuning:** Voor ondersteuning, neem contact op via support@conduction.nl. Voor een Service Level Agreement (SLA), neem contact op via sales@conduction.nl.
     ]]></description>
-    <version>0.1.141-unstable.20260820125107</version>
+    <version>0.1.141-unstable.20260821053703</version>
     <licence>EUPL-1.2</licence>
     <author mail="info@conduction.nl" homepage="https://www.conduction.nl/">Conduction</author>
     <namespace>SoftwareCatalog</namespace>
     <documentation>
-        <user>https://codeberg.org/Conduction/softwarecatalog</user>
-        <admin>https://codeberg.org/Conduction/softwarecatalog</admin>
-        <developer>https://codeberg.org/Conduction/softwarecatalog</developer>
+        <user>https://github.com/ConductionNL/stackiq</user>
+        <admin>https://github.com/ConductionNL/stackiq</admin>
+        <developer>https://github.com/ConductionNL/stackiq</developer>
     </documentation>
     <category>organization</category>
     <category>tools</category>
     <category>integration</category>
-    <website>https://codeberg.org/Conduction/softwarecatalog</website>
-    <bugs>https://codeberg.org/Conduction/softwarecatalog/issues</bugs>
-    <repository>https://codeberg.org/Conduction/softwarecatalog</repository>
+    <website>https://github.com/ConductionNL/stackiq</website>
+    <bugs>https://github.com/ConductionNL/stackiq/issues</bugs>
+    <repository>https://github.com/ConductionNL/stackiq</repository>
 
-    <screenshot>https://codeberg.org/Conduction/softwarecatalog/raw/branch/main/img/screenshot-dashboard.png</screenshot>
-    <screenshot>https://codeberg.org/Conduction/softwarecatalog/raw/branch/main/img/screenshot-applications.png</screenshot>
-    <screenshot>https://codeberg.org/Conduction/softwarecatalog/raw/branch/main/img/screenshot-connections.png</screenshot>
+    <screenshot>https://raw.githubusercontent.com/ConductionNL/stackiq/main/img/screenshot-dashboard.png</screenshot>
+    <screenshot>https://raw.githubusercontent.com/ConductionNL/stackiq/main/img/screenshot-applications.png</screenshot>
+    <screenshot>https://raw.githubusercontent.com/ConductionNL/stackiq/main/img/screenshot-connections.png</screenshot>
 
     <dependencies>
         <!--

composer.json

@@ -80,15 +80,15 @@
     },
     "require-dev": {
         "conduction/coding-standard": "^1.0",
-        "conduction/hydra-gates": "^1.0",
+        "conduction/hydra-gates": "^1.8.2",
         "cyclonedx/cyclonedx-php-composer": "^6.2",
         "edgedesign/phpqa": "^1.27",
         "guzzlehttp/guzzle": "^7.8",
         "nextcloud/ocp": "^34.0",
         "phpcsstandards/phpcsextra": "^1.4",
         "phpmd/phpmd": "^2.15",
         "phpmetrics/phpmetrics": "^2.8",
-        "phpstan/phpstan": "^1.10",
+        "phpstan/phpstan": "^2.0",
         "phpunit/phpunit": "^10.5",
         "roave/security-advisories": "dev-latest",
         "squizlabs/php_codesniffer": "^3.9",

lib/Controller/OrganisationMembersController.php

@@ -261,7 +261,9 @@ private function authorizeMaintainer(string $organisationUuid): ?JSONResponse {
 	 *
 	 * @return \OCA\OpenRegister\Service\OrganisationService The service instance.
 	 *
-	 * @throws \Throwable When OpenRegister is unavailable.
+	 * No `@throws`: the body is a plain property read. If OpenRegister is
+	 * unavailable the failure happens in the container while CONSTRUCTING this
+	 * controller, not here.
 	 */
 	private function getOrganisationService(): \OCA\OpenRegister\Service\OrganisationService {
 		return $this->organisationService;

lib/Controller/SettingsController.php

@@ -264,7 +264,7 @@ public function index(): JSONResponse {
 
 		try {
 			$user = $this->userSession->getUser();
-			$isAdmin = $user !== null && $this->groupManager->isAdmin($user->getUID());
+			$isAdmin = $this->groupManager->isAdmin($user->getUID());
 
 			// Delegate all business logic to service.
 			$data = $this->settingsService->getAllSettings();
@@ -1577,10 +1577,12 @@ private function parseArchiMateFileUpload(): ?array {
 	 * @spec openspec/changes/method-decomposition/tasks.md#task-3
 	 */
 	private function resolveArchiMateMethod(array $options): array {
+		// No method_exists() probe: ArchiMateService declares
+		// importArchiMateFileFromPathOptimized(), so only the request parameter
+		// decides which path runs.
 		$useOptimized = $this->request->getParam('useOptimized', 'true') === 'true';
-		$hasOptimized = method_exists($this->archiMateService, 'importArchiMateFileFromPathOptimized');
 
-		if ($useOptimized === true && $hasOptimized === true) {
+		if ($useOptimized === true) {
 			$this->logger->info('Using OPTIMIZED ArchiMate import method.');
 			return $this->archiMateService->importArchiMateFileFromPathOptimized($options);
 		}

lib/Service/ArchiMateExportService.php

@@ -1209,7 +1209,7 @@ private function addObjectDirectlyToXmlWithProperties(
 			$xmlData = $this->cleanObjectDataForXml(object: $object, propDefMap: $propertyDefinitionMap);
 		}
 
-		if (is_array($xmlData) === true && empty($xmlData) === false) {
+		if (empty($xmlData) === false) {
 			if ($sectionName === 'views') {
 				$this->addViewDataToXmlNode(viewNode: $objectNode, viewData: $xmlData);
 			} else {

lib/Service/ArchiMateImportService.php

@@ -368,11 +368,11 @@ public function importArchiMateFileFromPathOptimized(array $options = []): array
 
 			// PERFORMANCE OPTIMIZATION: Clean up memory after XML parsing.
 			$memoryCleanupTime = 0;
-			if (self::PERFORMANCE_OPTIMIZATIONS['memory_cleanup'] !== false) {
-				$memCleanupStart = microtime(true);
-				$this->cleanupMemory();
-				$memoryCleanupTime = microtime(true) - $memCleanupStart;
-			}
+			// PERFORMANCE_OPTIMIZATIONS['memory_cleanup'] is a class constant set
+			// to true, so this was never conditional.
+			$memCleanupStart = microtime(true);
+			$this->cleanupMemory();
+			$memoryCleanupTime = microtime(true) - $memCleanupStart;
 
 			// STEP 2: Extract model identifier.
 			$modelIdStartTime = microtime(true);
@@ -1254,7 +1254,7 @@ private function createSectionObject(string $section, string $identifier, array
 			// Fallback: Use AMEF identifier as both ID and extract clean UUID for slug.
 			$objectId = $identifier;
 			// Extract clean UUID from AMEF identifier (remove "id-" prefix if present).
-			if ($identifier !== false && str_starts_with($identifier, 'id-') === true) {
+			if (str_starts_with($identifier, 'id-') === true) {
 				$slug = substr($identifier, 3);
 				// Remove "id-" prefix.
 			} else {
@@ -1735,9 +1735,10 @@ private function saveObjectsInParallelBatches(array $objects, ObjectServiceInter
 			}//end try
 
 			// Memory cleanup between chunks.
-			if (self::PERFORMANCE_OPTIMIZATIONS['memory_cleanup'] !== false) {
-				$this->cleanupMemory();
-			}
+			// PERFORMANCE_OPTIMIZATIONS['memory_cleanup'] is a class constant set
+			// to true, so this was never conditional. Flip the constant and the
+			// compiler will point you back here.
+			$this->cleanupMemory();
 		}//end foreach
 
 		// Store the aggregated result for statistics calculation.
@@ -2047,7 +2048,7 @@ private function getAmefRegisterId(): ?int {
 		}
 
 		// Validate and normalize to positive int.
-		if ($rawRegisterId !== null && $rawRegisterId !== '' && is_numeric((string)$rawRegisterId) === true) {
+		if ($rawRegisterId !== '' && is_numeric((string)$rawRegisterId) === true) {
 			$registerId = (int)$rawRegisterId;
 			if ($registerId > 0) {
 				return $registerId;
@@ -2549,10 +2550,8 @@ private function findItemsInSection(array $sectionData, string $sectionName): ar
 		// OPTIMIZATION: Removed debug logging from section processing.
 		$items = [];
 
-		// Safety check: ensure sectionData is an array.
-		if (is_array($sectionData) === false) {
-			return [];
-		}
+		// No is_array() safety check: $sectionData is declared array, so PHP
+		// rejects anything else at the call boundary before this could run.
 
 		// Get section structure configuration from AMEF config.
 		$config = $this->getSectionStructureConfig(sectionName: $sectionName);
@@ -4033,7 +4032,7 @@ private function processStandardVersionRelationship(
 			$standardId = $source;
 		}
 
-		if ($versionId !== false && $standardId === true) {
+		if ($standardId === true) {
 			$stdVersionRelMap[$versionId] = $standardId;
 		}
 	}//end processStandaardVersieRelationship()
@@ -4084,7 +4083,7 @@ private function processRelationshipImmediate(
 			$standardId = $source;
 		}
 
-		if ($refCompId !== false && $standardId === true) {
+		if ($standardId === true) {
 			// Initialize arrays if not exists.
 			if (isset($gemmaRelationshipMap[$refCompId]) === false) {
 				$gemmaRelationshipMap[$refCompId] = [
@@ -4800,7 +4799,7 @@ private function transformSectionObjectsBatch(
 					// AMEF identifier becomes slug.
 				} else {
 					// Fallback: extract clean UUID from AMEF identifier for slug.
-					if ($identifier !== false && str_starts_with($identifier, 'id-') === true) {
+					if (str_starts_with($identifier, 'id-') === true) {
 						$object['@self']['slug'] = substr($identifier, 3);
 						// Remove "id-" prefix.
 					} else {
@@ -4809,7 +4808,7 @@ private function transformSectionObjectsBatch(
 				}
 			} else {
 				// No properties to flatten, use AMEF identifier logic.
-				if ($identifier !== false && str_starts_with($identifier, 'id-') === true) {
+				if (str_starts_with($identifier, 'id-') === true) {
 					$object['@self']['slug'] = substr($identifier, 3);
 					// Remove "id-" prefix.
 				} else {
@@ -4988,7 +4987,9 @@ private function flattenPropertiesBatch(array &$object, array $properties, array
 				continue;
 			}
 
-			if ($value !== null && isset($propDefMap[$defRef]) === true) {
+			// No isset($propDefMap[$defRef]) re-check: the loop above only
+			// reaches here for a $defRef the map already has.
+			if ($value !== null) {
 				$propertyName = $propDefMap[$defRef];
 				$camelCaseName = $this->convertToCamelCase(propertyName: $propertyName);
 				$object[$camelCaseName] = $value;
@@ -5022,13 +5023,14 @@ private function flattenPropertiesBatch(array &$object, array $properties, array
 					);
 				}
 			} else {
+				// 'mapping_exists' is always true here — the map lookup already
+				// succeeded, so a null $value is the only way into this branch.
 				$this->logger->warning(
-					'Property value is null or mapping missing',
+					'Property value is null',
 					[
 						'object_id' => $object['identifier'] ?? 'unknown',
 						'property_def_ref' => $defRef,
 						'value' => $value,
-						'mapping_exists' => isset($propDefMap[$defRef]) === true,
 					]
 				);
 			}//end if
@@ -5720,10 +5722,8 @@ private function calculateObjectStatistics(array $normalizedData): array {
 					$sectionKey = 'elements';
 				}//end if
 
-				if (isset($statistics[$sectionKey]) === false) {
-					continue;
-					// Skip unknown section types.
-				}
+				// No "skip unknown section types" guard: the branch above pins
+				// $sectionKey to a key $statistics always has, so it never fired.
 
 				// Determine if this object was created, updated, or had errors.
 				$objectId = $object['@self']['id'] ?? $object['identifier'] ?? null;
@@ -5809,14 +5809,13 @@ private function calculateObjectStatistics(array $normalizedData): array {
 			'total_errors' => 0,
 		];
 
-		foreach ($statistics as $section => $sectionStats) {
-			if ($section !== 'omschrijving') {
-				// Skip summary section itself.
-				$summary['total_objects_created'] += $sectionStats['created'];
-				$summary['total_objects_updated'] += $sectionStats['updated'];
-				$summary['total_objects_unchanged'] += $sectionStats['unchanged'];
-				$summary['total_errors'] += count($sectionStats['errors']);
-			}
+		// No "skip the summary section" guard: `omschrijving` is written into
+		// $statistics on the line AFTER this loop, so the loop can never see it.
+		foreach ($statistics as $sectionStats) {
+			$summary['total_objects_created'] += $sectionStats['created'];
+			$summary['total_objects_updated'] += $sectionStats['updated'];
+			$summary['total_objects_unchanged'] += $sectionStats['unchanged'];
+			$summary['total_errors'] += count($sectionStats['errors']);
 		}
 
 		$statistics['omschrijving'] = $summary;