Merge pull request #164 from MCMic/enh/release-1.6.0

Enh/release 1.6.0
MCMic · Jan 4, 2025 · a591fc5 · a591fc5
2 parents 5a3ca8f + 80de4d1
commit a591fc5
Show file tree

Hide file tree

Showing 8 changed files with 89 additions and 37 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v1.6.0
+
+* Bump dependencies
+* Support 30
+* Drop 25 and 26
+
 # v1.5.0
 
 * Bump dependencies

diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -5,7 +5,7 @@
 	<name>Automated kitinerary parsing</name>
 	<summary>Use kitinerary to parse travel documents into the calendar</summary>
 	<description>An app to trigger automatic conversion of travel documents to calendar events. It uses kitinerary to extract the information and is compatible with the KDE itinerary mobile application.</description>
-	<version>1.5.0</version>
+	<version>1.6.0</version>
 	<licence>agpl</licence>
 	<author mail="[email protected]">Côme Chilliet</author>
 	<namespace>WorkflowKitinerary</namespace>

diff --git a/composer.json b/composer.json
@@ -15,7 +15,8 @@
 		"vimeo/psalm": "^5.9",
 		"sabre/vobject": "^4.5",
 		"rector/rector": "^1.0",
-		"phpunit/phpunit": "^9.6"
+		"phpunit/phpunit": "^9.6",
+		"nextcloud/rector": "^0.2.1"
 	},
 	"require": {
 		"php": "^8.0.2",

diff --git a/composer.lock b/composer.lock
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "workflow_kitinerary",
 	"description": "Workflow for using kitinerary to parse travel documents into the calendar",
-	"version": "1.5.0",
+	"version": "1.6.0",
 	"author": "Côme Chilliet <[email protected]>",
 	"license": "agpl",
 	"private": true,

diff --git a/rector.php b/rector.php
@@ -2,30 +2,17 @@
 
 declare(strict_types=1);
 
-use Rector\CodeQuality\Rector\Empty_\SimplifyEmptyCheckOnEmptyArrayRector;
+use Nextcloud\Rector\Set\NextcloudSets;
 use Rector\Config\RectorConfig;
-use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPromotedPropertyRector;
-use Rector\Php54\Rector\Array_\LongArrayToShortArrayRector;
-use Rector\Set\ValueObject\LevelSetList;
-use Rector\Set\ValueObject\SetList;
 
-return static function (RectorConfig $rectorConfig): void {
-	$rectorConfig->paths([
+return RectorConfig::configure()
+	->withPaths([
+		__DIR__ . '/appinfo',
 		__DIR__ . '/lib',
 		__DIR__ . '/tests',
+	])
+	->withPhpSets(php81: true)
+	->withTypeCoverageLevel(1)
+	->withSets([
+		NextcloudSets::NEXTCLOUD_27,
 	]);
-
-	// register a single rule
-	$rectorConfig->rule(RemoveUnusedPromotedPropertyRector::class);
-	$rectorConfig->rule(SimplifyEmptyCheckOnEmptyArrayRector::class);
-	$rectorConfig->rule(LongArrayToShortArrayRector::class);
-
-	// define sets of rules
-	$rectorConfig->sets([
-		LevelSetList::UP_TO_PHP_80,
-		// SetList::CODE_QUALITY,
-		SetList::CODING_STYLE,
-		SetList::TYPE_DECLARATION,
-		// SetList::DEAD_CODE,
-	]);
-};
diff --git a/tests/OperationTest.php b/tests/OperationTest.php
@@ -44,15 +44,11 @@
 use Psr\Log\LoggerInterface;
 
 class OperationTest extends TestCase {
-	/** @var IL10N&MockObject */
-	private IL10N|MockObject $l;
-	/** @var IManager&MockObject */
-	private IManager|MockObject $calendarManager;
+	private IL10N&MockObject $l;
+	private IManager&MockObject $calendarManager;
 	private Operation $operation;
-	/** @var ICreateFromString&MockObject */
-	private ICreateFromString|MockObject $calendar;
-	/** @var FlatpakAdapter&MockObject */
-	private FlatpakAdapter|MockObject $flatpakAdapter;
+	private ICreateFromString&MockObject $calendar;
+	private FlatpakAdapter&MockObject $flatpakAdapter;
 
 	protected function setUp(): void {
 		parent::setUp();