Skip to content

Commit 93dd70d

Browse files
committed
Merge branch '4.4' into 5.0
* 4.4: Explain why the env var is in lowercase Update symfony_server.rst - proxy env lowercase Use non-deprecated options key
2 parents 97ebacf + d4fa8c0 commit 93dd70d

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

frontend/encore/babel.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ Need to extend the Babel configuration further? The easiest way is via
2525
}, {
2626
// node_modules is not processed through Babel by default
2727
// but you can whitelist specific modules to process
28-
include_node_modules: ['foundation-sites'],
28+
includeNodeModules: ['foundation-sites'],
2929
3030
// or completely control the exclude rule (note that you
31-
// can't use both "include_node_modules" and "exclude" at
31+
// can't use both "includeNodeModules" and "exclude" at
3232
// the same time)
3333
exclude: /bower_components/
3434
})

setup/symfony_server.rst

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@ Enabling PHP-FPM
6363
When the server starts it will check for common patterns like ``web/app.php``,
6464
``web/app_dev.php`` or ``public/index.php``. If a file like this is found the
6565
server will automatically start with PHP-FPM enabled. Otherwise the server will
66-
start without PHP-FPM and will show a ``Page not found`` page when trying to
66+
start without PHP-FPM and will show a ``Page not found`` page when trying to
6767
access a ``.php`` file in the browser.
6868

6969
.. tip::
7070

7171
When an ``index.html`` and a front controller like e.g. ``index.php`` are
72-
both present the server will still start with PHP-FPM enabled but the
72+
both present the server will still start with PHP-FPM enabled but the
7373
``index.html`` will take precedence over the front controller. This means
7474
when an ``index.html`` file is present in ``public`` or ``web``, it will be
7575
displayed instead of the ``index.php`` which would show e.g. the Symfony
@@ -215,12 +215,18 @@ new custom domain.
215215
Browse the http://127.0.0.1:7080 URL to get the full list of local project
216216
directories, their custom domains, and port numbers.
217217

218-
When running console commands, add the ``HTTPS_PROXY`` env var to make custom
218+
When running console commands, add the ``https_proxy`` env var to make custom
219219
domains work:
220220

221221
.. code-block:: terminal
222222
223-
$ HTTPS_PROXY=http://127.0.0.1:7080 curl https://my-domain.wip
223+
$ https_proxy=http://127.0.0.1:7080 curl https://my-domain.wip
224+
225+
.. note::
226+
227+
Although env var names are always defined in uppercase, the ``https_proxy``
228+
env var `is treated differently`_ than other env vars and its name must be
229+
spelled in lowercase.
224230

225231
.. tip::
226232

@@ -359,3 +365,4 @@ debug any issues.
359365
.. _`proxy settings in Windows`: https://www.dummies.com/computers/operating-systems/windows-10/how-to-set-up-a-proxy-in-windows-10/
360366
.. _`proxy settings in macOS`: https://support.apple.com/guide/mac-help/enter-proxy-server-settings-on-mac-mchlp2591/mac
361367
.. _`proxy settings in Ubuntu`: https://help.ubuntu.com/stable/ubuntu-help/net-proxy.html.en
368+
.. `is treated differently`: https://ec.haxx.se/usingcurl/usingcurl-proxies#http_proxy-in-lower-case-only

0 commit comments

Comments
 (0)