Refactor with Rector

.github/workflows/test-repositories.yml

@@ -65,15 +65,15 @@ jobs:
       - name: Generate OpenAPI
         if: matrix.repositories != 'nextcloud/server'
         working-directory: temp-repository/
-        run: ../generate-spec
+        run: ../bin/generate-spec
 
       - name: Generate OpenAPI - Server
         if: matrix.repositories == 'nextcloud/server'
         working-directory: temp-repository/
         run: |
           for path in core apps/*; do
             if [ ! -f "$path/.noopenapi" ]; then
-              ../generate-spec "$path" "$path/openapi.json" || exit 1
+              ../bin/generate-spec "$path" "$path/openapi.json" || exit 1
             fi
           done
 

.github/workflows/test.yml

@@ -50,7 +50,7 @@ jobs:
 
       - name: Generate OpenAPI
         working-directory: tests/
-        run: ../generate-spec
+        run: ../bin/generate-spec
 
       - name: Check openapi changes
         run: |

.php-cs-fixer.dist.php

@@ -15,5 +15,5 @@
 	->ignoreVCSIgnored(true)
 	->notPath('vendor')
 	->in(__DIR__)
-	->append(['generate-spec', 'merge-specs']);
+	->append(['generate-spec.php', 'merge-specs.php']);
 return $config;

bin/generate-spec

@@ -0,0 +1,11 @@
+#!/usr/bin/env php
+<?php
+
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OpenAPIExtractor;
+
+include_once __DIR__ . '/../generate-spec.php';

bin/merge-specs

@@ -0,0 +1,11 @@
+#!/usr/bin/env php
+<?php
+
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OpenAPIExtractor;
+
+include_once __DIR__ . '/../generate-spec.php';

composer.json

@@ -3,8 +3,8 @@
 	"description": "A tool for extracting OpenAPI specifications from Nextcloud source code",
 	"license": "AGPL-3.0-or-later",
 	"bin": [
-		"generate-spec",
-		"merge-specs"
+		"bin/generate-spec",
+		"bin/merge-specs"
 	],
 	"config": {
 		"sort-packages": true
@@ -23,12 +23,14 @@
 	},
 	"require-dev": {
 		"nextcloud/coding-standard": "^1.2",
-		"nextcloud/ocp": "dev-master"
+		"nextcloud/ocp": "dev-master",
+		"rector/rector": "^1.2"
 	},
 	"scripts": {
-		"lint": "find . -name \\*.php -not -path './tests/*' -not -path './vendor/*' -not -path './build/*' -print0 | xargs -0 -n1 php -l && php -l generate-spec && php -l merge-specs",
+		"lint": "find . -name \\*.php -not -path './tests/*' -not -path './vendor/*' -not -path './build/*' -print0 | xargs -0 -n1 php -l",
 		"cs:check": "php-cs-fixer fix --dry-run --diff",
 		"cs:fix": "php-cs-fixer fix",
-		"test:unit": "cd tests && ../generate-spec"
+		"test:unit": "cd tests && ../bin/generate-spec",
+		"rector": "rector && composer cs:fix"
 	}
 }