Skip to content

Commit

Permalink
Added laminas-diactoros (#276)
Browse files Browse the repository at this point in the history
* Added `laminas-diactoros`

- Moved zend-diactoros to the end of lists
- Changed installation example to `laminas-diactoros`
- Marked zend-diactoros as abandoned where possible
  • Loading branch information
boesing committed Jun 15, 2020
1 parent 101a22a commit d11d322
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 6 deletions.
5 changes: 3 additions & 2 deletions clients/includes/install-message-factory.inc
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@ to install one as well (for example `Guzzle PSR-7`_):

In order to provide full interoperability, message implementations are
accessed through :ref:`factories <message-factory>`. 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 </message>` component:

.. code-block:: bash

$ composer require php-http/message

.. _Diactoros: https://github.com/zendframework/zend-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
4 changes: 2 additions & 2 deletions httplug/users.rst
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ You can pick any of the clients or adapters :doc:`provided by PHP-HTTP </clients
Popular choices are ``php-http/curl-client`` and ``php-http/guzzle6-adapter``.

Many libraries also need a PSR-7 implementation and the PHP-HTTP message
factories to create messages. The PSR-7 implementations are Zend's Diactoros, Guzzle's PSR-7 and Slim Framework's PSR-7 messages. Do one of the following:
factories to create messages. The PSR-7 implementations are Laminas Diactoros (also still supports the abandoned Zend Diactoros), Guzzle's PSR-7 and Slim Framework's PSR-7 messages. Do one of the following:

.. code-block:: bash
$ composer require php-http/message zendframework/zend-diactoros
$ composer require php-http/message laminas/laminas-diactoros
.. code-block:: bash
Expand Down
5 changes: 3 additions & 2 deletions message/message-factory.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
-----
Expand Down Expand Up @@ -135,6 +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``.

.. _Diactoros: https://github.com/zendframework/zend-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
1 change: 1 addition & 0 deletions spelling_word_list.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Elasticsearch
fallback
GitHub
hotfix
Laminas
Liskov
Symfony
HTTPlug
Expand Down

0 comments on commit d11d322

Please sign in to comment.