diff --git a/composer.json b/composer.json index ea8dff878..245ac52e4 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ } ], "require": { - "justinrainbow/json-schema": "^6.0", + "justinrainbow/json-schema": "^6.5", "bamarni/composer-bin-plugin": "^1.8" }, "require-dev": { diff --git a/composer.lock b/composer.lock index b2d385960..28fd0c5ab 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "263f9ff9e6a13d50ab09bc9f4e06b749", + "content-hash": "381772900da2d4ccd327212035343550", "packages": [ { "name": "bamarni/composer-bin-plugin", @@ -65,26 +65,26 @@ }, { "name": "justinrainbow/json-schema", - "version": "6.4.2", + "version": "6.6.4", "source": { "type": "git", "url": "https://github.com/jsonrainbow/json-schema.git", - "reference": "ce1fd2d47799bb60668643bc6220f6278a4c1d02" + "reference": "2eeb75d21cf73211335888e7f5e6fd7440723ec7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/ce1fd2d47799bb60668643bc6220f6278a4c1d02", - "reference": "ce1fd2d47799bb60668643bc6220f6278a4c1d02", + "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/2eeb75d21cf73211335888e7f5e6fd7440723ec7", + "reference": "2eeb75d21cf73211335888e7f5e6fd7440723ec7", "shasum": "" }, "require": { "ext-json": "*", - "marc-mabe/php-enum": "^4.0", + "marc-mabe/php-enum": "^4.4", "php": "^7.2 || ^8.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "3.3.0", - "json-schema/json-schema-test-suite": "1.2.0", + "json-schema/json-schema-test-suite": "^23.2", "marc-mabe/php-enum-phpstan": "^2.0", "phpspec/prophecy": "^1.19", "phpstan/phpstan": "^1.12", @@ -134,9 +134,9 @@ ], "support": { "issues": "https://github.com/jsonrainbow/json-schema/issues", - "source": "https://github.com/jsonrainbow/json-schema/tree/6.4.2" + "source": "https://github.com/jsonrainbow/json-schema/tree/6.6.4" }, - "time": "2025-06-03T18:27:04+00:00" + "time": "2025-12-19T15:01:32+00:00" }, { "name": "marc-mabe/php-enum", @@ -3210,5 +3210,5 @@ "platform-overrides": { "php": "8.1" }, - "plugin-api-version": "2.9.0" + "plugin-api-version": "2.6.0" } diff --git a/lib/Db/Assignment.php b/lib/Db/Assignment.php index 6c273240a..4160aed12 100644 --- a/lib/Db/Assignment.php +++ b/lib/Db/Assignment.php @@ -10,7 +10,6 @@ use JsonSerializable; class Assignment extends RelationalEntity implements JsonSerializable { - public $id; protected $participant; protected $cardId; protected $type; diff --git a/lib/Db/Session.php b/lib/Db/Session.php index 7f65f8839..886fdfb4c 100644 --- a/lib/Db/Session.php +++ b/lib/Db/Session.php @@ -12,7 +12,6 @@ use OCP\AppFramework\Db\Entity; class Session extends Entity implements \JsonSerializable { - public $id; protected $userId; protected $token; protected $lastContact; diff --git a/tests/integration/features/decks.feature b/tests/integration/features/decks.feature index 0351f6269..c0d186ef3 100644 --- a/tests/integration/features/decks.feature +++ b/tests/integration/features/decks.feature @@ -104,7 +104,7 @@ Feature: decks And remember the last attachment as "my-attachment" And post a comment with content "My first comment" on the card When get the activities for the last card - Then the fetched activities should have 3 entries + Then the fetched activities should have 2 entries And delete the card When get the activities for the last card diff --git a/tests/integration/run.sh b/tests/integration/run.sh index 1dfe35b70..3b9fa2bf6 100755 --- a/tests/integration/run.sh +++ b/tests/integration/run.sh @@ -7,7 +7,7 @@ HIDE_OC_LOGS=$2 # Nextcloud integration tests composer ( - cd ${OC_PATH}build/integration + cd ${OC_PATH}vendor-bin/behat composer install ) INSTALLED=$($OCC status | grep installed: | cut -d " " -f 5)