From d2c6b9f7903e0918bd4119e7d349a5544530689a Mon Sep 17 00:00:00 2001 From: Adrien Crivelli Date: Wed, 16 Nov 2022 22:27:10 +0100 Subject: [PATCH] `master` is the new default branch `master` is now the only permanent branch. Features and fixes should be merged into `master` when stable. Pull requests should be forked from `master`. `develop` branch disappear entirely in favor of temporary features/fixes branches. --- .github/ISSUE_TEMPLATE/how-to-use.md | 2 +- README.md | 15 ++++----------- composer.json | 5 ----- docs/installing.rst | 2 +- docs/intro.rst | 11 ++++------- 5 files changed, 10 insertions(+), 25 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/how-to-use.md b/.github/ISSUE_TEMPLATE/how-to-use.md index 0fef996b..85cc4707 100644 --- a/.github/ISSUE_TEMPLATE/how-to-use.md +++ b/.github/ISSUE_TEMPLATE/how-to-use.md @@ -9,6 +9,6 @@ labels: WontFix Documentation is available on [Read the Docs](https://phpword.readthedocs.io/en/latest/). -Sample code is in the [`/samples/` directory](https://github.com/PHPOffice/PHPWord/tree/develop/samples). +Sample code is in the [`/samples/` directory](https://github.com/PHPOffice/PHPWord/tree/master/samples). Usage questions belong on [Stack Overflow](https://stackoverflow.com/questions/tagged/phpword). diff --git a/README.md b/README.md index 6fb2e854..22d622d3 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ # ![PHPWord](https://rawgit.com/PHPOffice/PHPWord/develop/docs/images/phpword.svg "PHPWord") -Master: [![Latest Stable Version](https://poser.pugx.org/phpoffice/phpword/v/stable.png)](https://packagist.org/packages/phpoffice/phpword) [![Build Status](https://travis-ci.org/PHPOffice/PHPWord.svg?branch=master)](https://travis-ci.org/PHPOffice/PHPWord) [![Code Quality](https://scrutinizer-ci.com/g/PHPOffice/PHPWord/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/PHPOffice/PHPWord/) @@ -9,15 +8,9 @@ Master: [![License](https://poser.pugx.org/phpoffice/phpword/license.png)](https://packagist.org/packages/phpoffice/phpword) [![Join the chat at https://gitter.im/PHPOffice/PHPWord](https://img.shields.io/badge/GITTER-join%20chat-green.svg)](https://gitter.im/PHPOffice/PHPWord) -Develop: -[![Latest Development Version](https://img.shields.io/badge/unstable-dev--develop-orange.svg)](https://packagist.org/packages/phpoffice/phpword#dev-develop) -[![Build Status](https://travis-ci.org/PHPOffice/PHPWord.svg?branch=develop)](https://travis-ci.org/PHPOffice/PHPWord/branches) -[![Code Quality](https://scrutinizer-ci.com/g/PHPOffice/PHPWord/badges/quality-score.png?b=develop)](https://scrutinizer-ci.com/g/PHPOffice/PHPWord/?branch=develop) -[![Coverage Status](https://coveralls.io/repos/github/PHPOffice/PHPWord/badge.svg?branch=develop)](https://coveralls.io/github/PHPOffice/PHPWord?branch=develop) - PHPWord is a library written in pure PHP that provides a set of classes to write to and read from different document file formats. The current version of PHPWord supports Microsoft [Office Open XML](http://en.wikipedia.org/wiki/Office_Open_XML) (OOXML or OpenXML), OASIS [Open Document Format for Office Applications](http://en.wikipedia.org/wiki/OpenDocument) (OpenDocument or ODF), [Rich Text Format](http://en.wikipedia.org/wiki/Rich_Text_Format) (RTF), HTML, and PDF. -PHPWord is an open source project licensed under the terms of [LGPL version 3](COPYING.LESSER). PHPWord is aimed to be a high quality software product by incorporating [continuous integration](https://travis-ci.org/PHPOffice/PHPWord) and [unit testing](http://phpoffice.github.io/PHPWord/coverage/develop/). You can learn more about PHPWord by reading the [Developers' Documentation](http://phpword.readthedocs.org/). +PHPWord is an open source project licensed under the terms of [LGPL version 3](COPYING.LESSER). PHPWord is aimed to be a high quality software product by incorporating [continuous integration](https://github.com/PHPOffice/PHPWord/actions) and unit testing. You can learn more about PHPWord by reading the [Developers' Documentation](http://phpword.readthedocs.org/). If you have any questions, please ask on [StackOverFlow](https://stackoverflow.com/questions/tagged/phpword) @@ -78,9 +71,9 @@ Run the following to use the latest stable version ```sh composer require phpoffice/phpword ``` -or if you want the latest develop version +or if you want the latest unreleased version ```sh -composer require phpoffice/phpword:dev-develop +composer require phpoffice/phpword:dev-master ``` ## Getting started @@ -165,6 +158,6 @@ You can also read the [Developers' Documentation](http://phpword.readthedocs.org We welcome everyone to contribute to PHPWord. Below are some of the things that you can do to contribute. - Read [our contributing guide](CONTRIBUTING.md). -- [Fork us](https://github.com/PHPOffice/PHPWord/fork) and [request a pull](https://github.com/PHPOffice/PHPWord/pulls) to the [develop](https://github.com/PHPOffice/PHPWord/tree/develop) branch. +- [Fork us](https://github.com/PHPOffice/PHPWord/fork) and [request a pull](https://github.com/PHPOffice/PHPWord/pulls) to the [master](https://github.com/PHPOffice/PHPWord/tree/master) branch. - Submit [bug reports or feature requests](https://github.com/PHPOffice/PHPWord/issues) to GitHub. - Follow [@PHPWord](https://twitter.com/PHPWord) and [@PHPOffice](https://twitter.com/PHPOffice) on Twitter. diff --git a/composer.json b/composer.json index f95fbe73..ef511ffb 100644 --- a/composer.json +++ b/composer.json @@ -92,10 +92,5 @@ "psr-4": { "PhpOffice\\PhpWordTests\\": "tests/PhpWordTests" } - }, - "extra": { - "branch-alias": { - "dev-develop": "0.19-dev" - } } } diff --git a/docs/installing.rst b/docs/installing.rst index bed17719..fbdf1e2e 100644 --- a/docs/installing.rst +++ b/docs/installing.rst @@ -39,7 +39,7 @@ Example: .. code-block:: bash - composer require phpoffice/phpword:dev-develop + composer require phpoffice/phpword:dev-master Using samples ------------- diff --git a/docs/intro.rst b/docs/intro.rst index d88cd626..94cc48d1 100644 --- a/docs/intro.rst +++ b/docs/intro.rst @@ -13,13 +13,10 @@ Applications `__ Format `__ (RTF). PHPWord is an open source project licensed under the terms of `LGPL -version 3 `__. -PHPWord is aimed to be a high quality software product by incorporating -`continuous integration `__ and -`unit testing `__. +version 3 `__. +PHPWord is aimed to be a high quality software product. You can learn more about PHPWord by reading this Developers' -Documentation and the `API -Documentation `__. +Documentation. Features -------- @@ -191,7 +188,7 @@ things that you can do to contribute. guide `__. - `Fork us `__ and `request a pull `__ to the - `develop `__ + `master `__ branch. - Submit `bug reports or feature requests `__ to GitHub.