Skip to content

Commit

Permalink
Merge pull request #63 from php-http/psr-notice
Browse files Browse the repository at this point in the history
Move PSR warning to Promise section and make note
  • Loading branch information
sagikazarmark committed Jan 3, 2016
2 parents 305abcc + 54ab9c4 commit ace1a8a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
7 changes: 7 additions & 0 deletions components/promise.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,10 @@ Promise
Promise used for asynchronous HTTP requests.

This will eventually be removed/deprecated and replaced with the upcoming Promise PSR.

.. note::

Contract for the ``Http\Promise\Promise`` is temporary until `PSR is released`_.
Once it is out, we will use this PSR in the main client and deprecate the old contract.

.. _`PSR is released`: https://groups.google.com/forum/?fromgroups#!topic/php-fig/wzQWpLvNSjs
8 changes: 1 addition & 7 deletions httplug.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,7 @@ There is also the ``Http\Client\HttpAsyncClient`` which provides the
The promise allows to specify handlers for a PSR-7 ``ResponseInterface``
or an exception that implements ``Http\Client\Exception``.

.. warning::

Contract for the ``Http\Promise\Promise`` is temporary until `PSR is released`_.
Once it is out, we will use this PSR in the main client and deprecate the old contract.

See the :doc:``tutorial`` for a concrete example.
See the :doc:`tutorial </httplug/tutorial>` for a concrete example.


.. toctree::
Expand All @@ -32,4 +27,3 @@ See the :doc:``tutorial`` for a concrete example.
Migrating <httplug/migrating>
Virtual Package <httplug/virtual-package>

.. _`PSR is released`: https://groups.google.com/forum/?fromgroups#!topic/php-fig/wzQWpLvNSjs

0 comments on commit ace1a8a

Please sign in to comment.