Skip to content

Commit 2162dd6

Browse files
committed
Merge branch '4.4' into 5.2
* 4.4: Complete App\Handler\HandlerCollection namespace Update mime.rst
2 parents d29429c + eaf621f commit 2162dd6

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

components/mime.rst

+4-4
Original file line numberDiff line numberDiff line change
@@ -238,10 +238,10 @@ MIME types and file name extensions::
238238
$exts = $mimeTypes->getExtensions('image/jpeg');
239239
// $exts = ['jpeg', 'jpg', 'jpe']
240240

241-
$mimeTypes = $mimeTypes->getMimeTypes('js');
242-
// $mimeTypes = ['application/javascript', 'application/x-javascript', 'text/javascript']
243-
$mimeTypes = $mimeTypes->getMimeTypes('apk');
244-
// $mimeTypes = ['application/vnd.android.package-archive']
241+
$types = $mimeTypes->getMimeTypes('js');
242+
// $types = ['application/javascript', 'application/x-javascript', 'text/javascript']
243+
$types = $mimeTypes->getMimeTypes('apk');
244+
// $types = ['application/vnd.android.package-archive']
245245

246246
These methods return arrays with one or more elements. The element position
247247
indicates its priority, so the first returned extension is the preferred one.

service_container/service_subscribers_locators.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ of the ``key`` tag attribute (as defined in the ``index_by`` locator option):
485485
tags:
486486
- { name: 'app.handler', key: 'handler_two' }
487487
488-
App\HandlerCollection:
488+
App\Handler\HandlerCollection:
489489
# inject all services tagged with app.handler as first argument
490490
arguments: [!tagged_locator { tag: 'app.handler', index_by: 'key' }]
491491

0 commit comments

Comments
 (0)