Skip to content

Commit 898a6c1

Browse files
committed
Merge branch '4.2' into 4.3
* 4.2: Fix PHP-CS link Update serializer.rst Typo Fix usage of StaticJwtProvider added a note about testing newer versions of Symfony fix indention
2 parents daaf7b2 + 07f528f commit 898a6c1

File tree

6 files changed

+18
-7
lines changed

6 files changed

+18
-7
lines changed

cache.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ and use that when configuring the pool.
321321
factory: ['Symfony\Component\Cache\Adapter\RedisAdapter', 'createConnection']
322322
arguments:
323323
- 'redis://localhost'
324-
- [ retry_interval: 2, timeout: 10 ]
324+
- { retry_interval: 2, timeout: 10 }
325325
326326
.. code-block:: xml
327327

components/mercure.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ The following example shows the component in action::
3131
define('HUB_URL', 'https://demo.mercure.rocks/hub');
3232
define('JWT', 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJtZXJjdXJlIjp7InN1YnNjcmliZSI6WyJmb28iLCJiYXIiXSwicHVibGlzaCI6WyJmb28iXX19.LRLvirgONK13JgacQ_VbcjySbVhkSmHy3IznH3tA9PM');
3333

34-
use Symfony\Component\Mercure\Jwt\StaticJwtProvide;
34+
use Symfony\Component\Mercure\Jwt\StaticJwtProvider;
3535
use Symfony\Component\Mercure\Publisher;
3636
use Symfony\Component\Mercure\Update;
3737

38-
$publisher = new Publisher(HUB_URL, new StaticJwtProvide(JWT));
38+
$publisher = new Publisher(HUB_URL, new StaticJwtProvider(JWT));
3939
// Serialize the update, and dispatch it to the hub, that will broadcast it to the clients
4040
$id = $publisher(new Update('https://example.com/books/1.jsonld', 'Hi from Symfony!', ['target1', 'target2']));
4141

components/messenger.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,8 @@ do is to write your own CSV receiver::
272272

273273
public function __construct(SerializerInterface $serializer, string $filePath)
274274
{
275-
$this->serializer = $serializer;
276-
$this->filePath = $filePath;
275+
$this->serializer = $serializer;
276+
$this->filePath = $filePath;
277277
}
278278

279279
public function receive(callable $handler): void

components/serializer.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ key in the ``context`` parameter of the desired serializer method::
432432
$encoder = new JsonEncoder();
433433

434434
$serializer = new Serializer([$normalizer], [$encoder]);
435-
$serializer->serialize($person, 'json', ['ignored_attributes' => 'age']); // Output: {"name":"foo"}
435+
$serializer->serialize($person, 'json', ['ignored_attributes' => ['age']]); // Output: {"name":"foo"}
436436

437437
.. deprecated:: 4.2
438438

contributing/code/standards.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ License
276276
* Symfony is released under the MIT license, and the license block has to be
277277
present at the top of every PHP file, before the namespace.
278278

279-
.. _`PHP CS Fixer tool`: http://cs.sensiolabs.org/
279+
.. _`PHP CS Fixer tool`: https://cs.symfony.com/
280280
.. _`PSR-0`: https://www.php-fig.org/psr/psr-0/
281281
.. _`PSR-1`: https://www.php-fig.org/psr/psr-1/
282282
.. _`PSR-2`: https://www.php-fig.org/psr/psr-2/

setup/symfony_server.rst

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,17 @@ commands from the Symfony server:
348348
# creates a new project based on symfony/demo
349349
$ symfony new --demo my_project_name
350350
351+
You can create a project depending on a **development** version as well (note
352+
that Composer will also set the stability to ``dev`` for all root dependencies):
353+
354+
.. code-block:: terminal
355+
356+
# creates a new project based on Symfony's master branch
357+
$ symfony new --version=dev-master my_project_name
358+
359+
# creates a new project based on Symfony's 4.3 dev branch
360+
$ symfony new --version=4.3.x-dev my_project_name
361+
351362
.. _`symfony.com/download`: https://symfony.com/download
352363
.. _`different ways of installing Symfony`: https://symfony.com/download
353364
.. _`Docker`: https://en.wikipedia.org/wiki/Docker_(software)

0 commit comments

Comments
 (0)