Skip to content

Commit 64eee5e

Browse files
Merge branch 'master' into workflow-documentation
2 parents 9dfef16 + 2de7548 commit 64eee5e

File tree

140 files changed

+1243
-1194
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

140 files changed

+1243
-1194
lines changed

.platform/routes.yaml

Lines changed: 0 additions & 16 deletions
This file was deleted.
Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@
55
name: symfonydocs
66

77
# The toolstack used to build the application.
8-
type: "php"
9-
10-
build:
11-
flavor: "composer"
8+
type: "python:3.7"
129

1310
# The configuration of app when it is exposed to the web.
1411
web:
@@ -53,7 +50,7 @@ hooks:
5350
build: |
5451
virtualenv .virtualenv
5552
. .virtualenv/bin/activate
56-
# Platform.sh currently sets PIP_USER=1.
53+
# SymfonyCloud currently sets PIP_USER=1.
5754
export PIP_USER=
5855
pip install pip==9.0.1 wheel==0.29.0
5956
pip install -r _build/.requirements.txt

.symfony/routes.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
https://{default}/:
2+
cache:
3+
cookies:
4+
- '*'
5+
default_ttl: 0
6+
enabled: true
7+
headers:
8+
- Accept
9+
- Accept-Language
10+
type: upstream
11+
upstream: symfonydocs:http

README.markdown

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ We love contributors! For more information on how you can contribute to the
1515
Symfony documentation, please read
1616
[Contributing to the Documentation](https://symfony.com/doc/current/contributing/documentation/overview.html)
1717

18-
Platform.sh
19-
-----------
18+
SymfonyCloud
19+
------------
2020

21-
Pull requests are automatically built by [Platform.sh](https://platform.sh).
21+
Pull requests are automatically built by [SymfonyCloud](https://symfony.com/cloud).
2222

2323
Docker
2424
------

_build/redirection_map

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -400,3 +400,4 @@
400400
/security/password_encoding /security
401401
/weblink /web_link
402402
/components/weblink /components/web_link
403+
/frontend/encore/installation-no-flex /frontend/encore/installation
-90.9 KB
Binary file not shown.
152 KB
Loading

bundles/configuration.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ The ``Configuration`` class to handle the sample configuration looks like::
198198
}
199199

200200
.. versionadded:: 4.2
201+
201202
Not passing the root node name to ``TreeBuilder`` was deprecated in Symfony 4.2.
202203

203204
.. seealso::

components/asset.rst

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ that path over and over again::
215215
// result: /static/images/logo.png?v1
216216

217217
// Base path is ignored when using absolute paths
218-
echo $package->getUrl('/logo.png');
218+
echo $pathPackage->getUrl('/logo.png');
219219
// result: /logo.png?v1
220220

221221
Request Context Aware Assets
@@ -239,7 +239,7 @@ class can take into account the context of the current request::
239239
// result: /somewhere/static/images/logo.png?v1
240240

241241
// Both "base path" and "base url" are ignored when using absolute path for asset
242-
echo $package->getUrl('/logo.png');
242+
echo $pathPackage->getUrl('/logo.png');
243243
// result: /logo.png?v1
244244

245245
Now that the request context is set, the ``PathPackage`` will prepend the
@@ -375,9 +375,6 @@ document inside a template::
375375
Local Files and Other Protocols
376376
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
377377

378-
.. versionadded:: 4.2
379-
The support for other protocols was introduced in Symfony 4.2.
380-
381378
In addition to HTTP this component supports other protocols (such as ``file://``
382379
and ``ftp://``). This allows for example to serve local files in order to
383380
improve performance::

0 commit comments

Comments
 (0)