Merge remote-tracking branch 'origin/master' into feature/IBOC-99/obj…

…ects-controller
ConductionNL · Jan 16, 2025 · ba459f1 · ba459f1
2 parents e52193e + d3953ca
commit ba459f1
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -22,7 +22,7 @@ Create a [bug report](https://github.com/OpenCatalogi/.github/issues/new/choose)
 
 Create a [feature request](https://github.com/OpenCatalogi/.github/issues/new/choose)
     ]]></description>
-	<version>0.6.53</version>
+	<version>0.6.56</version>
 	<licence>agpl</licence>
 	<author mail="[email protected]" homepage="https://www.conduction.nl/">Conduction</author>
 	<author mail="[email protected]" homepage="https://acato.nl/">Acato</author>

diff --git a/lib/Controller/AttachmentsController.php b/lib/Controller/AttachmentsController.php
@@ -2,6 +2,8 @@
 
 namespace OCA\OpenCatalogi\Controller;
 
+ini_set('memory_limit', '2048M');
+
 use Exception;
 use GuzzleHttp\Exception\GuzzleException;
 use OCA\OpenCatalogi\Db\AttachmentMapper;

diff --git a/lib/Service/DirectoryService.php b/lib/Service/DirectoryService.php
@@ -8,13 +8,15 @@
 use GuzzleHttp\Exception\GuzzleException;
 use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\Exception\ServerException;
+use JsonSerializable;
 use OCA\OpenCatalogi\Db\Catalog;
 use OCA\OpenCatalogi\Db\CatalogMapper;
 use OCA\OpenCatalogi\Db\Listing;
 use OCA\OpenCatalogi\Db\ListingMapper;
 use OCA\OpenCatalogi\Service\BroadcastService;
 use OCA\OpenCatalogi\Exception\DirectoryUrlException;
 use OCP\AppFramework\Db\DoesNotExistException;
+use OCP\AppFramework\Db\Entity;
 use OCP\AppFramework\Db\MultipleObjectsReturnedException;
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\IAppConfig;
@@ -105,7 +107,7 @@ private function getDirectoryFromListing(Listing|array $listing): array
 		if (isset($listing['publicationTypes']) && is_array($listing['publicationTypes'])) {
 			foreach ($listing['publicationTypes'] as &$publicationType) {
 				// Convert publicationType to array if it's an object
-				if ($publicationType instanceof \JsonSerializable) {
+				if ($publicationType instanceof JsonSerializable) {
 					$publicationType = $publicationType->jsonSerialize();
 				}
 
@@ -169,7 +171,7 @@ private function getDirectoryFromCatalog(Catalog|array $catalog): array
 		if (isset($catalog['publicationTypes']) && is_array($catalog['publicationTypes'])) {
 			foreach ($catalog['publicationTypes'] as &$publicationType) {
 				// Convert publicationType to array if it's an object
-				if ($publicationType instanceof \JsonSerializable) {
+				if ($publicationType instanceof JsonSerializable) {
 					$publicationType = $publicationType->jsonSerialize();
 				}
 				$publicationType['listed'] = true;
@@ -295,7 +297,7 @@ public function updateListing(array $newListing, array $oldListing): array{
 		// Do not update version, because we copy the version from the source
 		$newListing = $this->objectService->saveObject('listing', $oldListing, false);
 
-		return $newListing->jsonSerialize();
+		return $newListing instanceof Listing === true ? $newListing->jsonSerialize() : $newListing;
 	}
 
 	/**
@@ -442,7 +444,11 @@ public function syncExternalDirectory(string $url): array
 
 			// Save the new listing
 			$listingObject = $this->objectService->saveObject('listing', $listing);
-			$listing = $listingObject->jsonSerialize();
+			if ($listing instanceof Entity) {
+				$listing = $listing->jsonSerialize();
+			} else {
+				$listing = $listingObject;
+			}
 			$foundDirectories[] = $listing['directory'];
 			$addedListings[] = $listing['directory'].'/'.$listing['id'];
 		}

diff --git a/lib/Service/FileService.php b/lib/Service/FileService.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace OCA\OpenCatalogi\Service;
+ini_set('memory_limit', '2048M');
 
 use DateTime;
 use Exception;