Merge development: the truncated @SPEC anchor landed upstream as c130aa2

The anchor commit on this branch is now redundant. Merging development in makes
it a no-op, so the PR diff shows only the metadata change this PR is about.

Author: Conduction Release Bot

lib/AppInfo/Application.php

@@ -222,6 +222,7 @@
 use OCA\OpenRegister\Service\ObjectSource\FederatedObjectSourceProvider;
 use OCA\OpenRegister\Service\ObjectSource\FilesObjectSourceProvider;
 use OCA\OpenRegister\Service\ObjectSource\GroupObjectSourceProvider;
+use OCA\OpenRegister\Service\ObjectSource\OrganisationObjectSourceProvider;
 use OCA\OpenRegister\Service\ObjectSource\ObjectSourceRegistry;
 use OCA\OpenRegister\Service\ObjectSource\TablesColumnMapper;
 use OCA\OpenRegister\Service\ObjectSource\TablesObjectSourceProvider;
@@ -1474,6 +1475,18 @@ function (ContainerInterface $container) {
 			}
 		);
 
+		$context->registerService(
+			OrganisationObjectSourceProvider::class,
+			function (ContainerInterface $container) {
+				return new OrganisationObjectSourceProvider(
+					organisationMapper: $container->get('OCA\OpenRegister\Db\OrganisationMapper'),
+					userSession: $container->get('OCP\IUserSession'),
+					groupManager: $container->get('OCP\IGroupManager'),
+					logger: $container->get('Psr\Log\LoggerInterface')
+				);
+			}
+		);
+
 		$context->registerService(
 			ContactsObjectSourceProvider::class,
 			function (ContainerInterface $container) {
@@ -4436,6 +4449,7 @@ private function bootObjectSourceProviders($server): void {
 			CalDavVtodoObjectSourceProvider::class,
 			UserDirectoryObjectSourceProvider::class,
 			GroupObjectSourceProvider::class,
+			OrganisationObjectSourceProvider::class,
 			ContactsObjectSourceProvider::class,
 			CalendarEventObjectSourceProvider::class,
 			FilesObjectSourceProvider::class,

lib/Repair/SeedDirectoryVirtualSchemas.php

@@ -67,6 +67,30 @@ class SeedDirectoryVirtualSchemas implements IRepairStep {
 			'id' => ['type' => 'string', 'title' => 'Group ID', 'description' => 'The Nextcloud group id (gid).'],
 			'displayName' => ['type' => 'string', 'title' => 'Display name', 'description' => 'The group display name.'],
 		],
+		// The identity facet of an OpenRegister organisation, and nothing else.
+		// This set MUST stay in step with
+		// {@see \OCA\OpenRegister\Service\ObjectSource\OrganisationObjectSourceProvider}'s
+		// projection: a property declared here and not projected reads as
+		// permanently empty, and one projected but not declared is discarded by
+		// the store without a word.
+		//
+		// Tenancy administration (quota, users, groups, authorization) is
+		// deliberately absent. This schema exists so another record can REFERENCE
+		// an organisation, not so anyone can configure one through the object API.
+		'nc-organisation' => [
+			'id' => ['type' => 'string', 'title' => 'Organisation ID', 'description' => 'The organisation uuid.'],
+			'name' => ['type' => 'string', 'title' => 'Name', 'description' => 'The organisation name.'],
+			'description' => ['type' => 'string', 'title' => 'Description', 'description' => 'A description of the organisation.'],
+			'summary' => ['type' => 'string', 'title' => 'Summary', 'description' => 'A short summary.'],
+			'oin' => ['type' => 'string', 'title' => 'OIN', 'description' => 'Organisatie-identificatienummer.'],
+			'tooi' => ['type' => 'string', 'title' => 'TOOI', 'description' => 'TOOI register identifier.'],
+			'rsin' => ['type' => 'string', 'title' => 'RSIN', 'description' => 'Rechtspersonen en Samenwerkingsverbanden Informatienummer.'],
+			'kvk' => ['type' => 'string', 'title' => 'KVK', 'description' => 'Chamber of Commerce number.'],
+			'pki' => ['type' => 'string', 'title' => 'PKI', 'description' => 'PKIoverheid certificate identifier.'],
+			'image' => ['type' => 'string', 'title' => 'Image', 'description' => 'A logo or image URL.'],
+			'type' => ['type' => 'string', 'title' => 'Type', 'description' => 'What kind of organisation this row describes.'],
+			'registrationStatus' => ['type' => 'string', 'title' => 'Registration status', 'description' => 'Registration lifecycle state.'],
+		],
 	];
 
 	/**

lib/Service/Deferral/ListenerDeferralService.php

@@ -311,6 +311,14 @@ private function captureActor(): void {
 	/**
 	 * Register the shutdown flush exactly once per request.
 	 *
+	 * The callback is a closure calling `flushAll()` rather than the
+	 * `[$this, 'flushAll']` array form it replaced. A string method name is
+	 * invisible to every static tool: a rename of `flushAll()` leaves the
+	 * array callable pointing at nothing and fails only at shutdown, where
+	 * nothing observes it — the deferred jobs would simply stop being
+	 * enqueued, silently. The closure makes the call site greppable and
+	 * rename-safe, and matches ObjectEventProxyListener::traceEnabled().
+	 *
 	 * @return void
 	 */
 	private function hookShutdown(): void {
@@ -319,6 +327,10 @@ private function hookShutdown(): void {
 		}
 
 		$this->shutdownHooked = true;
-		register_shutdown_function([$this, 'flushAll']);
+		register_shutdown_function(
+			function (): void {
+				$this->flushAll();
+			}
+		);
 	}//end hookShutdown()
 }//end class

lib/Service/Object/SearchQueryHandler.php

@@ -664,9 +664,17 @@ public function logSearchTrail(
 
 		// Register the deferred flush once per request; it runs after the
 		// response has been generated so the write cost is off the hot path.
+		// The callback is a closure rather than the `[$this, 'flushSearchTrails']`
+		// array form it replaced: a string method name is invisible to every
+		// static tool, so renaming the flush would break the registration with
+		// no error anywhere — trails would just stop being written.
 		if ($this->trailFlushRegistered === false) {
 			$this->trailFlushRegistered = true;
-			register_shutdown_function([$this, 'flushSearchTrails']);
+			register_shutdown_function(
+				function (): void {
+					$this->flushSearchTrails();
+				}
+			);
 		}
 	}//end logSearchTrail()
 

lib/Service/ObjectSource/NcEntitySemanticMap.php

@@ -84,6 +84,22 @@ final class NcEntitySemanticMap {
 			'requiredApp' => null,
 			'application' => 'openregister',
 		],
+		// OpenRegister's own organisation, projected so a leaf schema can point a
+		// `{"$ref": ...}` at it. Several apps declared their own `organization`
+		// SCHEMA precisely because there was nothing here to reference, and a
+		// schema slug is global per organisation, so those copies collide.
+		//
+		// `nc-`-prefixed for the reason the app-gated rows below are: it must not
+		// collide with the leaf-app `organization` schemas it exists to replace,
+		// which have to keep working until each app has migrated off them.
+		'organisation' => [
+			'register' => self::DIRECTORY_REGISTER,
+			'schema' => 'nc-organisation',
+			'schemaOrg' => 'schema:Organization',
+			'provider' => 'organisation-source',
+			'requiredApp' => null,
+			'application' => 'openregister',
+		],
 		// App-gated rows — each lives on its OWN app-named register (application =
 		// register slug) so the ADR-048 app-enabled gate degrades the projection
 		// when the backing app is uninstalled. Schemas are `nc-`-prefixed to avoid