diff --git a/lib/Db/ListingMapper.php b/lib/Db/ListingMapper.php index c3337af4..93314025 100644 --- a/lib/Db/ListingMapper.php +++ b/lib/Db/ListingMapper.php @@ -131,7 +131,7 @@ public function findAll(?int $limit = null, ?int $offset = null, ?array $filters 'o.pki AS organisation_pki' ) ->from('listings', 'l') - ->leftJoin('l', 'organizations', 'o', 'l.organisation = o.id') + ->leftJoin('l', 'organizations', 'o', 'l.organisation = o.id') ->setMaxResults($limit) ->setFirstResult($offset); diff --git a/lib/Db/Organisation.php b/lib/Db/Organisation.php index 1978591f..fd168a89 100644 --- a/lib/Db/Organisation.php +++ b/lib/Db/Organisation.php @@ -52,7 +52,7 @@ public function hydrate(array $object): self try { $this->$method($value); - } catch (\Exception $exception) { + } catch (\Exception $exception) {} } return $this; diff --git a/lib/Migration/Version6Date20240815105059.php b/lib/Migration/Version6Date20240815105059.php index 44c909a4..b1cee3bb 100644 --- a/lib/Migration/Version6Date20240815105059.php +++ b/lib/Migration/Version6Date20240815105059.php @@ -61,14 +61,10 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt $table->addColumn( name: 'metadata', - typeName: Types::JSON, - options: [ - 'notNull' => false, - 'default' => 'a:0:{}' - ]); + typeName: Types::JSON)->setNotnull(notnull: false)->setDefault(default:'{}'); $output->info("Added 'metadata' column as JSON type with a default value of an empty array."); - + return $schema; } diff --git a/lib/Service/DirectoryService.php b/lib/Service/DirectoryService.php index a525ae40..ea6f8a5a 100644 --- a/lib/Service/DirectoryService.php +++ b/lib/Service/DirectoryService.php @@ -252,6 +252,8 @@ public function listCatalog (array $catalog): array $listing = $this->getDirectoryEntry(catalogId: $catalogId); $listing['title'] = $catalog['title']; + $listing['description'] = $catalog['description']; + $listing['summary'] = $catalog['summary']; $listing['organisation'] = $catalog['organisation']; $listing['metadata'] = $catalog['metadata'];