Merge branch 'rdfInterface'

acdh-oeaw · Feb 13, 2024 · a69f427 · a69f427
2 parents 78cf09c + d5c8e2f
commit a69f427
Show file tree

Hide file tree

Showing 24 changed files with 563 additions and 502 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -37,6 +37,7 @@ jobs:
       run: |
         export COVERALLS_RUN_LOCALLY=1
         export COVERALLS_REPO_TOKEN=${{ secrets.coverallsToken }}
-        composer require "psr/log:^2"
-        composer require "php-coveralls/php-coveralls"
+        rm -fR composer.json composer.lock vendor
+        composer require php-coveralls/php-coveralls
         php vendor/bin/php-coveralls -v
+
diff --git a/composer.json b/composer.json
@@ -12,12 +12,13 @@
         }
     ],
     "require": {
-        "php": ">=8.0 <8.3",
-        "guzzlehttp/guzzle": "^7 | ^6",
-        "acdh-oeaw/easyrdf": ">=0.13.5",
+        "php": ">=8.1 <8.3",
+        "guzzlehttp/guzzle": "^7",
         "zozlak/rdf-constants": "^1",
         "zozlak/query-part": "^2",
-        "psr/log": "*"
+        "psr/log": "^3",
+        "sweetrdf/quick-rdf": "^2",
+        "sweetrdf/quick-rdf-io": "^1.0.6"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/acdhOeaw/arche/lib/BinaryPayload.php b/src/acdhOeaw/arche/lib/BinaryPayload.php
@@ -38,13 +38,8 @@
  */
 class BinaryPayload {
 
-    static private int $guzzleVersion;
-
     static public function guzzleMimetype(string $fileName): ?string {
-        if (!isset(self::$guzzleVersion)) {
-            self::$guzzleVersion = (int) InstalledVersions::getVersion('guzzlehttp/psr7');
-        }
-        return self::$guzzleVersion >= 2 || self::$guzzleVersion === 0 ? \GuzzleHttp\Psr7\MimeType::fromFilename($fileName) : \GuzzleHttp\Psr7\mimetype_from_filename($fileName);
+        return \GuzzleHttp\Psr7\MimeType::fromFilename($fileName);
     }
 
     /**

diff --git a/src/acdhOeaw/arche/lib/Config.php b/src/acdhOeaw/arche/lib/Config.php
@@ -26,7 +26,6 @@
 
 namespace acdhOeaw\arche\lib;
 
-use acdhOeaw\arche\lib\exception\RepoLibException;
 use function GuzzleHttp\json_decode;
 use function GuzzleHttp\json_encode;
 
@@ -36,26 +35,43 @@
  *
  * @author zozlak
  * @property Config $accessControl
+ * @property string $accessRestriction
+ * @property string $accessRestrictionAgg
+ * @property string $accessRole
+ * @property string $binarySizeCumulative
  * @property array<string>  $addNamespaces
  * @property string $address
  * @property string $admin
  * @property array<string> $adminRoles
  * @property array<string> $allowedRoles
- * @property array<string, string> $assignRoles
+ * @property array<string, array<string>> $assignRoles
  * @property Config $autoAddIds
  * @property Config $auth
  * @property array<Config> $authMethods
  * @property string $binaryModificationDate
  * @property string $binaryModificationUser
  * @property string $binarySize
+ * @property string $binarySizeCumulative
  * @property string $class
+ * @property Config $classes
  * @property int    $checkInterval
+ * @property bool   $checkAutoCreatedResources
+ * @property Config $checkRanges
+ * @property bool   $checkUnknownProperties
+ * @property bool   $checkVocabularyValues
+ * @property string $clarinSet
+ * @property string $clarinSetProperty
  * @property array<string, string> $classLoader
+ * @property string $cmdi
+ * @property string $cmdiPid
+ * @property string $collection
  * @property int    $configDate
  * @property string $connStr
  * @property string $cors
+ * @property string $countCumulative
  * @property array<string> $copying
  * @property Config $create
+ * @property string $createValue
  * @property string $creationDate
  * @property string $creationUser
  * @property array<string> $creatorRights
@@ -73,8 +89,10 @@
  * @property string $delete
  * @property array<string> $denyNamespaces
  * @property string $dir
+ * @property Config $doorkeeper
  * @property bool   $enforceCompleteness
  * @property bool   $enforceOnMetadata
+ * @property Config $epicPid
  * @property bool   $exceptionOnTimeout
  * @property string $file
  * @property string $fileName
@@ -86,17 +104,22 @@
  * @property Config $handlers
  * @property string $hash
  * @property string $hashAlgorithm
- * @property Config $headers
+ * @property object $headers
  * @property string $highlighting
  * @property string $host
  * @property Config $httpBasic
  * @property object $httpHeader
  * @property string $id
  * @property string $indexing
+ * @property string $isNewVersionOf
  * @property string $label
  * @property string $lang
+ * @property string $latitude
+ * @property string $longitude
  * @property string $level
  * @property int    $levels
+ * @property string $license
+ * @property string $licenseAgg
  * @property Config $logging
  * @property quickRdf\DatasetNode $meta
  * @property string $metadata
@@ -113,23 +136,33 @@
  * @property string $modeDir
  * @property string $modificationDate
  * @property string $modificationUser
- * @property array<string, string>  $namespaces
+ * @property Config $namespaces
  * @property array<string> $nonRelationProperties
+ * @property string $licenseAgg
+ * @property string $ontology
  * @property array<string> $options
  * @property int    $outputTriplesCache
  * @property array  $parameters
  * @property string $parent
  * @property string $path
  * @property string $pathBase
  * @property string $password
+ * @property string $pid
  * @property int    $port
+ * @property string $prefix
+ * @property array<string> $properties
+ * @property string $pswd
  * @property string $publicRole
  * @property string $queue
  * @property Config|null $rabbitMq
  * @property string $read
  * @property array<string> $relativesProperties
+ * @property string $resolver
+ * @property string $resource
  * @property array<string> $resourceProperties
  * @property Config $rest
+ * @property string $rolePublic
+ * @property string $roleAcademic
  * @property Config $schema
  * @property string $searchCount
  * @property string $searchOrder
@@ -147,18 +180,26 @@
  * @property string $tikaLocation
  * @property int    $timeout
  * @property int    $lockTimeout
+ * @property string $searchFts
+ * @property string $searchFtsProperty
+ * @property string $searchFtsQuery
  * @property int    $statementTimeout
  * @property string $tmpDir
+ * @property string $topCollection
  * @property Config $transactionController
  * @property string $transactionId
  * @property string $type
  * @property string $uri
+ * @property string $url
  * @property string $urlBase
  * @property string $user
  * @property string $userCol
  * @property string $value
  * @property bool   $verifyCert
  * @property float  $version
+ * @property string $vid
+ * @property string $withReferences
+ * @property string $wkt
  */
 class Config {