Merge pull request #4 from doctrine/1.0.2

Merge 1.0.2 into main

Author: paulinevos

.github/workflows/ci-shell-scripts.yml

@@ -4,12 +4,14 @@ name: "Continuous Integration for shell scripts"
 
 on:
   pull_request:
+    branches:
+      - "main"
     paths:
       - ".github/workflows/ci-shell-scripts.yml"
       - "bin/**"
   push:
     branches:
-      - "*.*.x"
+      - "main"
     paths:
       - ".github/workflows/ci-shell-scripts.yml"
       - "bin/**"

.github/workflows/composer-lint.yml

@@ -3,18 +3,18 @@ name: "Composer Lint"
 on:
   pull_request:
     branches:
-      - "*.x"
+      - "main"
     paths:
       - ".github/workflows/composer-lint.yml"
       - "composer.json"
   push:
     branches:
-      - "*.x"
+      - "main"
     paths:
       - ".github/workflows/composer-lint.yml"
       - "composer.json"
 
 jobs:
   composer-lint:
     name: "Composer Lint"
-    uses: "doctrine/.github/.github/workflows/composer-lint.yml@9cfa15f09ecce61912ae40b5befa8e920c4a98a4"
+    uses: "doctrine/.github/.github/workflows/composer-lint.yml@8.0.0"

README.md

@@ -6,7 +6,7 @@ the generating command. It assumes the input directory is in `docs/en` at the ro
 ## Usage:
 
 ```shell
-composer require --dev paulinevos/doctrine-docs-builder
+composer require --dev doctrine/docs-builder
 ./vendor/bin/build-docs.sh [<output>]
 ```
 

bin/build-docs.sh

@@ -26,6 +26,6 @@ defaultOutputDir="$rootDir/output"
 outputDir="${outputArg:-${defaultOutputDir:-default}}"
 
 baseDir=$(dirname "$(dirname "$0")")
-output=$(composer install -d "$baseDir" 2>&1) || printf "$output"
+output=$(composer install -d "$baseDir" 2>&1) || print "$output"
 
 "$baseDir/vendor/bin/guides" -vvv --no-progress --fail-on-log "$rootDir/$inputDir" --output="$outputDir"

composer.json

@@ -1,20 +1,27 @@
 {
     "name": "doctrine/docs-builder",
-    "description": "Helper package for easily building the docs in Doctrine repos",
+    "description": "Helper package for building the docs in Doctrine repos",
+    "license": "MIT",
     "type": "library",
+    "authors": [
+        {
+            "name": "Pauline Vos",
+            "email": "[email protected]"
+        }
+    ],
     "require": {
-        "phpdocumentor/guides-cli": "1.7.1",
-        "phpdocumentor/filesystem": "1.7.1"
+        "phpdocumentor/filesystem": "1.7.1",
+        "phpdocumentor/guides-cli": "1.7.1"
+    },
+    "require-dev": {
+        "ergebnis/composer-normalize": "^2.48"
     },
-    "version": "1.0.1",
-    "license": "MIT",
     "bin": [
         "bin/build-docs.sh"
     ],
-    "authors": [
-        {
-            "name": "Pauline Vos",
-            "email": "[email protected]"
+    "config": {
+        "allow-plugins": {
+            "ergebnis/composer-normalize": true
         }
-    ]
+    }
 }