From 9346bbd16d0fdb6c9d821bfa6e8b41bd8f5581c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Fri, 25 Sep 2020 23:40:56 +0200 Subject: [PATCH 1/4] Increase indent in definition lists Although the official docs [1] show examples of definition list with an indent of 2 spaces, it seems that doctrine/rst-parser has been written with an indent of 4 spaces in mind. [2] This should ensure the definition lists are properly parsed as such, right now they are parsed as paragraphs. [1] https://docutils.sourceforge.io/docs/user/rst/quickref.html#definition-lists [2] https://github.com/doctrine/rst-parser/blob/d97da75a8a2cab33453711f01b90303f5c3845db/lib/Parser/LineDataParser.php#L154 --- docs/en/explanation/implicit-indexes.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/en/explanation/implicit-indexes.rst b/docs/en/explanation/implicit-indexes.rst index f68edbe3ffb..9f96e8a34cb 100644 --- a/docs/en/explanation/implicit-indexes.rst +++ b/docs/en/explanation/implicit-indexes.rst @@ -6,13 +6,13 @@ with names such as ``IDX_885DBAFAA76ED395``? In this document, we will distinguish three types of indexes: user-defined indexes - indexes you did ask for + indexes you did ask for DBAL-defined indexes - indexes you did not ask for, created on your behalf by the DBAL + indexes you did not ask for, created on your behalf by the DBAL RDBMS-defined indexes - indexes you did not ask for, created on your behalf by the RDBMS + indexes you did not ask for, created on your behalf by the RDBMS RDBMS-defined indexes can be created by some database platforms when you create a foreign key: they will create an index on the referencing From 2cb3417138cd6476f97d7635084101b8e25ee290 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Sat, 26 Sep 2020 13:51:31 +0200 Subject: [PATCH 2/4] Link to contributing guide --- CONTRIBUTING.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 00000000000..c2555ebbd46 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,4 @@ +Doctrine has [general contributing guidelines][contributor workflow], make +sure you follow them. + +[contributor workflow]: https://www.doctrine-project.org/contribute/index.html From 6e6903cd5e3a5be60a79439e3ee8fe126f78fe86 Mon Sep 17 00:00:00 2001 From: Sergei Morozov Date: Sat, 26 Sep 2020 21:09:41 -0700 Subject: [PATCH 3/4] Release 2.11.1 --- lib/Doctrine/DBAL/Version.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/DBAL/Version.php b/lib/Doctrine/DBAL/Version.php index 0acc959aeaf..044b85e54aa 100644 --- a/lib/Doctrine/DBAL/Version.php +++ b/lib/Doctrine/DBAL/Version.php @@ -17,7 +17,7 @@ class Version /** * Current Doctrine Version. */ - public const VERSION = '2.11.1-DEV'; + public const VERSION = '2.11.1'; /** * Compares a Doctrine version with the current one. From 16878650d79934c31e27a13618ed6f3effee80d8 Mon Sep 17 00:00:00 2001 From: Sergei Morozov Date: Sat, 26 Sep 2020 21:44:00 -0700 Subject: [PATCH 4/4] Bump version to 2.11.2-DEV --- lib/Doctrine/DBAL/Version.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/DBAL/Version.php b/lib/Doctrine/DBAL/Version.php index 044b85e54aa..a592257a602 100644 --- a/lib/Doctrine/DBAL/Version.php +++ b/lib/Doctrine/DBAL/Version.php @@ -17,7 +17,7 @@ class Version /** * Current Doctrine Version. */ - public const VERSION = '2.11.1'; + public const VERSION = '2.11.2-DEV'; /** * Compares a Doctrine version with the current one.