Skip to content

Commit 3feca27

Browse files
committed
Merge branch '8.0' into 8.1
* 8.0: Update references from Platform.sh to Upsun in documentation Update actions/checkout to v6
2 parents b538d03 + 65d7467 commit 3feca27

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

.github/workflows/ci.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121

2222
steps:
2323
- name: "Checkout"
24-
uses: actions/checkout@v4
24+
uses: actions/checkout@v6
2525

2626
- name: "Set-up PHP"
2727
uses: shivammathur/setup-php@v2
@@ -56,7 +56,7 @@ jobs:
5656

5757
steps:
5858
- name: "Checkout"
59-
uses: actions/checkout@v4
59+
uses: actions/checkout@v6
6060

6161
- name: "Create cache dir"
6262
run: mkdir .cache
@@ -85,7 +85,7 @@ jobs:
8585

8686
steps:
8787
- name: Checkout code
88-
uses: actions/checkout@v4
88+
uses: actions/checkout@v6
8989
with:
9090
path: 'docs'
9191

configuration.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ To do so, define a parameter with the same name as the env var using this syntax
541541
542542
.. tip::
543543

544-
Some hosts - like Platform.sh - offer easy `utilities to manage env vars`_
544+
Some hosts - like Upsun - offer easy `utilities to manage env vars`_
545545
in production.
546546

547547
.. note::

deployment.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Using Platforms as a Service
6161
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
6262

6363
Using a Platform as a Service (PaaS) can be a great way to deploy your Symfony
64-
app quickly. There are many PaaS, but we recommend `Platform.sh`_ as it
64+
app quickly. There are many PaaS, but we recommend `Upsun`_ as it
6565
provides a dedicated Symfony integration and helps fund the Symfony development.
6666

6767
Using Build Scripts and other Tools
@@ -268,6 +268,6 @@ Learn More
268268
.. _`Symfony plugin`: https://github.com/capistrano/symfony/
269269
.. _`Deployer`: https://deployer.org/
270270
.. _`Git Tagging`: https://git-scm.com/book/en/v2/Git-Basics-Tagging
271-
.. _`Platform.sh`: https://symfony.com/cloud
271+
.. _`Upsun`: https://symfony.com/cloud
272272
.. _`Symfony CLI`: https://symfony.com/download
273273
.. _`symfony/apache-pack`: https://packagist.org/packages/symfony/apache-pack

setup/bundles.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ as a starting point for your own GitHub CI configuration:
126126
runs-on: ubuntu-latest
127127
continue-on-error: ${{ matrix.stability == 'dev' }}
128128
steps:
129-
- uses: actions/checkout@v5
129+
- uses: actions/checkout@v6
130130
131131
- name: Setup PHP, with composer and extensions
132132
uses: shivammathur/setup-php@v2

setup/symfony_cli.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -598,11 +598,11 @@ Symfony Cloud Integration
598598
-------------------------
599599

600600
The Symfony CLI provides seamless integration with `Symfony Cloud`_ (powered by
601-
`Platform.sh`_):
601+
`Upsun`_):
602602

603603
.. code-block:: terminal
604604
605-
# open Platform.sh web UI
605+
# open Upsun web UI
606606
$ symfony cloud:web
607607
608608
# deploy your project to production
@@ -647,8 +647,8 @@ variables are properly exposed:
647647
.. _`symfony.com/download`: https://symfony.com/download
648648
.. _`Docker`: https://en.wikipedia.org/wiki/Docker_(software)
649649
.. _`Symfony Cloud`: https://symfony.com/cloud/
650-
.. _`Platform.sh`: https://platform.sh/
651-
.. _`Symfony Cloud documentation`: https://docs.platform.sh/frameworks/symfony.html
650+
.. _`Upsun`: https://upsun.com/
651+
.. _`Symfony Cloud documentation`: https://docs.upsun.com/get-started/stacks/symfony/integration.html
652652
.. _`Proxy settings in Windows`: https://www.dummies.com/computers/operating-systems/windows-10/how-to-set-up-a-proxy-in-windows-10/
653653
.. _`Proxy settings in macOS`: https://support.apple.com/guide/mac-help/enter-proxy-server-settings-on-mac-mchlp2591/mac
654654
.. _`Proxy settings in Ubuntu`: https://help.ubuntu.com/stable/ubuntu-help/net-proxy.html.en

testing/end_to_end.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -733,7 +733,7 @@ Here is a minimal ``.github/workflows/panther.yaml`` file to run Panther tests:
733733
runs-on: ubuntu-latest
734734
735735
steps:
736-
- uses: actions/checkout@v4
736+
- uses: actions/checkout@v6
737737
- uses: "ramsey/composer-install@v2"
738738
739739
- name: Install dependencies

0 commit comments

Comments
 (0)