From 59ca54b3a9ad20f672cc8cb4239e29004a98ed24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20B=C3=B6sing?= <2189546+boesing@users.noreply.github.com> Date: Mon, 8 Jun 2020 19:53:43 +0200 Subject: [PATCH 1/6] Added `laminas-diactoros` - Moved zend-diactoros to the end of lists - Changed installation example to `laminas-diactoros` - Marked zend-diactoros as abandoned where possible --- clients/includes/install-message-factory.inc | 3 ++- httplug/users.rst | 4 ++-- message/message-factory.rst | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/clients/includes/install-message-factory.inc b/clients/includes/install-message-factory.inc index 22fb8a2..1accb69 100644 --- a/clients/includes/install-message-factory.inc +++ b/clients/includes/install-message-factory.inc @@ -14,6 +14,7 @@ accessed through :ref:`factories `. Message factories for $ composer require php-http/message -.. _Diactoros: https://github.com/zendframework/zend-diactoros +.. _Laminas Diactoros: https://github.com/laminas/laminas-diactoros .. _Guzzle PSR-7: https://github.com/guzzle/psr7 .. _Slim Framework: https://github.com/slimphp/Slim +.. _Zend Diactoros: https://github.com/zendframework/zend-diactoros diff --git a/httplug/users.rst b/httplug/users.rst index f0ef522..1acdda6 100644 --- a/httplug/users.rst +++ b/httplug/users.rst @@ -36,11 +36,11 @@ You can pick any of the clients or adapters :doc:`provided by PHP-HTTP Date: Mon, 8 Jun 2020 19:59:19 +0200 Subject: [PATCH 2/6] Re-order packages --- clients/includes/install-message-factory.inc | 2 +- message/message-factory.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/clients/includes/install-message-factory.inc b/clients/includes/install-message-factory.inc index 1accb69..19f17dc 100644 --- a/clients/includes/install-message-factory.inc +++ b/clients/includes/install-message-factory.inc @@ -14,7 +14,7 @@ accessed through :ref:`factories `. Message factories for $ composer require php-http/message -.. _Laminas Diactoros: https://github.com/laminas/laminas-diactoros .. _Guzzle PSR-7: https://github.com/guzzle/psr7 +.. _Laminas Diactoros: https://github.com/laminas/laminas-diactoros .. _Slim Framework: https://github.com/slimphp/Slim .. _Zend Diactoros: https://github.com/zendframework/zend-diactoros diff --git a/message/message-factory.rst b/message/message-factory.rst index a830303..fd398fe 100644 --- a/message/message-factory.rst +++ b/message/message-factory.rst @@ -135,7 +135,7 @@ It would make sense to also provide factories for the server side constructs to do that yet. Contributions are welcome if you want to define the ``ServerRequestFactory`` and ``UploadedFileFactory``. -.. _Laminas Diactoros: https://github.com/laminas/laminas-diactoros .. _Guzzle PSR-7: https://github.com/guzzle/psr7 +.. _Laminas Diactoros: https://github.com/laminas/laminas-diactoros .. _Slim Framework: https://github.com/slimphp/Slim .. _Zend Diactoros: https://github.com/zendframework/zend-diactoros From c89c3c683994233dab19937c2b8364d4184edf6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20B=C3=B6sing?= <2189546+boesing@users.noreply.github.com> Date: Sun, 14 Jun 2020 13:12:59 +0200 Subject: [PATCH 3/6] Add `Laminas` to the spelling word list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maximilian Bösing <2189546+boesing@users.noreply.github.com> --- spelling_word_list.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/spelling_word_list.txt b/spelling_word_list.txt index 8762e72..fbfcf7a 100644 --- a/spelling_word_list.txt +++ b/spelling_word_list.txt @@ -14,6 +14,7 @@ Elasticsearch fallback GitHub hotfix +Laminas Liskov Symfony HTTPlug From 2596990bd100ba2a88945c505c432284e015f4cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20B=C3=B6sing?= <2189546+boesing@users.noreply.github.com> Date: Sun, 14 Jun 2020 14:11:37 +0200 Subject: [PATCH 4/6] Fix reference to the documentation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maximilian Bösing <2189546+boesing@users.noreply.github.com> --- clients/includes/install-message-factory.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clients/includes/install-message-factory.inc b/clients/includes/install-message-factory.inc index 19f17dc..3c4c368 100644 --- a/clients/includes/install-message-factory.inc +++ b/clients/includes/install-message-factory.inc @@ -7,7 +7,7 @@ to install one as well (for example `Guzzle PSR-7`_): In order to provide full interoperability, message implementations are accessed through :ref:`factories `. Message factories for -`Diactoros`_, `Guzzle PSR-7`_ and `Slim Framework`_ are available in the +`Laminas Diactoros`_ (and its abandoned predecessor `Zend Diactoros`_), `Guzzle PSR-7`_ and `Slim Framework`_ are available in the :doc:`message ` component: .. code-block:: bash From 195fbb1be505e0d1e9ba8004c19b58fac4cacebf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20B=C3=B6sing?= <2189546+boesing@users.noreply.github.com> Date: Sun, 14 Jun 2020 14:19:21 +0200 Subject: [PATCH 5/6] Fix message factory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maximilian Bösing <2189546+boesing@users.noreply.github.com> --- message/message-factory.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/message/message-factory.rst b/message/message-factory.rst index fd398fe..161ff45 100644 --- a/message/message-factory.rst +++ b/message/message-factory.rst @@ -30,7 +30,7 @@ The `php-http/message-factory` package defines interfaces for PSR-7 factories in - ``StreamFactory`` - ``UriFactory`` -Implementations of the interfaces above for `Diactoros`_, `Guzzle PSR-7`_ and the `Slim Framework`_ can be found in ``php-http/message``. +Implementations of the interfaces above for `Laminas Diactoros`_ (and its abandoned predecessor `Zend Diactoros`_), `Guzzle PSR-7`_ and the `Slim Framework`_ can be found in ``php-http/message``. Usage ----- From 184d364bac77a45ea0f549076911f0b6335e9040 Mon Sep 17 00:00:00 2001 From: David Buchmann Date: Mon, 15 Jun 2020 07:57:50 +0200 Subject: [PATCH 6/6] Update httplug/users.rst --- httplug/users.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/httplug/users.rst b/httplug/users.rst index 1acdda6..19d5eb8 100644 --- a/httplug/users.rst +++ b/httplug/users.rst @@ -36,7 +36,7 @@ You can pick any of the clients or adapters :doc:`provided by PHP-HTTP