Merge pull request #896 from phpDocumentor/prepare-release

jaapio · web-flow · commit 17a1cef20cb1 · 2024-03-03T21:57:20.000+01:00
[TASK] prepare for 1.0 release
diff --git a/composer.json b/composer.json
@@ -77,10 +77,5 @@
             "url": "./packages/*",
             "type": "path"
         }
-    ],
-    "extra": {
-        "branch-alias": {
-            "dev-main": "1.x-dev"
-        }
-    }
+    ]
 }
diff --git a/composer.lock b/composer.lock
diff --git a/packages/guides-cli/composer.json b/packages/guides-cli/composer.json
@@ -27,19 +27,14 @@
     "require": {
         "php": "^8.1",
         "monolog/monolog": "^2.9 || ^3.0",
-        "phpdocumentor/guides": "^1.0 || ^0.3",
-        "phpdocumentor/guides-restructured-text": "^1.0 || ^0.3",
+        "phpdocumentor/guides": "^1.0",
+        "phpdocumentor/guides-restructured-text": "^1.0",
         "symfony/config": "^5.4 || ^6.3 || ^7.0",
         "symfony/console": "^5.4 || ^6.3 || ^7.0",
         "symfony/dependency-injection": "^5.4 || ^6.3 || ^7.0",
         "symfony/event-dispatcher": "^5.4 || ^6.3 || ^7.0"
     },
     "bin": [
         "bin/guides"
-    ],
-    "extra": {
-        "branch-alias": {
-            "dev-main": "1.x-dev"
-        }
-    }
+    ]
 }
diff --git a/packages/guides-code/composer.json b/packages/guides-code/composer.json
@@ -22,10 +22,5 @@
     "require": {
         "php": "^8.1",
         "scrivo/highlight.php": "^9.18.0"
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-main": "1.x-dev"
-        }
     }
 }
diff --git a/packages/guides-graphs/composer.json b/packages/guides-graphs/composer.json
@@ -22,18 +22,13 @@
     "minimum-stability": "stable",
     "require": {
         "php": "^8.1",
-        "phpdocumentor/guides": "^1.0 || ^0.3",
-        "phpdocumentor/guides-restructured-text": "^1.0 || ^0.3",
+        "phpdocumentor/guides": "^1.0",
+        "phpdocumentor/guides-restructured-text": "^1.0",
         "jawira/plantuml-encoding": "^1.0",
         "symfony/process": "^5.4 || ^6.3 || ^7.0",
         "twig/twig": "~2.0 || ^3.0"
     },
     "suggest": {
         "jawira/plantuml": "To render graphs locally using plant uml"
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-main": "1.x-dev"
-        }
     }
 }
diff --git a/packages/guides-markdown/composer.json b/packages/guides-markdown/composer.json
@@ -23,11 +23,6 @@
     "require": {
         "php": "^8.1",
         "league/commonmark": "^2.4",
-        "phpdocumentor/guides": "^1.0 || ^0.3"
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-main": "1.x-dev"
-        }
+        "phpdocumentor/guides": "^1.0"
     }
 }
diff --git a/packages/guides-restructured-text/composer.json b/packages/guides-restructured-text/composer.json
@@ -23,13 +23,8 @@
     "require": {
         "php": "^8.1",
         "doctrine/lexer": "^3.0",
-        "phpdocumentor/guides": "^1.0 || ^0.3",
+        "phpdocumentor/guides": "^1.0",
         "webmozart/assert": "^1.11",
         "league/csv": "^9.10.0"
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-main": "1.x-dev"
-        }
     }
 }
diff --git a/packages/guides-theme-bootstrap/composer.json b/packages/guides-theme-bootstrap/composer.json
@@ -14,12 +14,7 @@
     },
     "require": {
         "php": "^8.1",
-        "phpdocumentor/guides": "^1.0 || ^0.3",
-        "phpdocumentor/guides-restructured-text": "^1.0 || ^0.3"
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-main": "1.x-dev"
-        }
+        "phpdocumentor/guides": "^1.0",
+        "phpdocumentor/guides-restructured-text": "^1.0"
     }
 }
diff --git a/packages/guides/composer.json b/packages/guides/composer.json
@@ -38,10 +38,5 @@
     },
     "require-dev": {
         "psr/log": "^2.0 || ^3.0"
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-main": "1.x-dev"
-        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -77,10 +77,5 @@`
`77`	`77`	`"url": "./packages/*",`
`78`	`78`	`"type": "path"`
`79`	`79`	`}`
`80`		`- ],`
`81`		`- "extra": {`
`82`		`- "branch-alias": {`
`83`		`- "dev-main": "1.x-dev"`
`84`		`- }`
`85`		`- }`
	`80`	`+ ]`
`86`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,5 @@`
`22`	`22`	`"require": {`
`23`	`23`	`"php": "^8.1",`
`24`	`24`	`"scrivo/highlight.php": "^9.18.0"`
`25`		`- },`
`26`		`- "extra": {`
`27`		`- "branch-alias": {`
`28`		`- "dev-main": "1.x-dev"`
`29`		`- }`
`30`	`25`	`}`
`31`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,11 +23,6 @@`
`23`	`23`	`"require": {`
`24`	`24`	`"php": "^8.1",`
`25`	`25`	`"league/commonmark": "^2.4",`
`26`		`- "phpdocumentor/guides": "^1.0 \|\| ^0.3"`
`27`		`- },`
`28`		`- "extra": {`
`29`		`- "branch-alias": {`
`30`		`- "dev-main": "1.x-dev"`
`31`		`- }`
	`26`	`+ "phpdocumentor/guides": "^1.0"`
`32`	`27`	`}`
`33`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,10 +38,5 @@`
`38`	`38`	`},`
`39`	`39`	`"require-dev": {`
`40`	`40`	`"psr/log": "^2.0 \|\| ^3.0"`
`41`		`- },`
`42`		`- "extra": {`
`43`		`- "branch-alias": {`
`44`		`- "dev-main": "1.x-dev"`
`45`		`- }`
`46`	`41`	`}`
`47`	`42`	`}`