Skip to content

Commit b3aa1ee

Browse files
committed
Merge remote-tracking branch 'upstream/main' into mongodb
2 parents 30fddd2 + 5923fcd commit b3aa1ee

Some content is hidden

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

54 files changed

+2225
-784
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"features": {
44
"ghcr.io/shyim/devcontainers-features/symfony-cli:0": {},
55
"ghcr.io/shyim/devcontainers-features/php:0": {
6-
"version": "8.1"
6+
"version": "8.2"
77
},
88
},
99
"updateContentCommand": {

.github/workflows/lint.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ubuntu-latest
1919
steps:
2020
- name: "Checkout code"
21-
uses: actions/checkout@v3
21+
uses: actions/checkout@v4
2222

2323
- name: PHP-CS-Fixer
2424
uses: docker://oskarstark/php-cs-fixer-ga
@@ -34,7 +34,7 @@ jobs:
3434

3535
steps:
3636
- name: "Checkout code"
37-
uses: actions/checkout@v3
37+
uses: actions/checkout@v4
3838

3939
- name: "Install PHP with extensions"
4040
uses: shivammathur/setup-php@v2
@@ -49,7 +49,7 @@ jobs:
4949
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
5050

5151
- name: "Cache composer"
52-
uses: actions/cache@v3
52+
uses: actions/cache@v4
5353
with:
5454
path: ${{ steps.composer-cache.outputs.dir }}
5555
key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}

.github/workflows/tests.yaml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,15 @@ jobs:
2626
operating-system: ['ubuntu-latest']
2727
php-version: ['8.2', '8.3']
2828
include:
29-
- operating-system: 'macos-latest'
29+
# TODO: change this to 'macos-latest' on June 2024, when '14' will become 'latest'
30+
- operating-system: 'macos-14'
3031
php-version: '8.2'
3132
- operating-system: 'windows-latest'
3233
php-version: '8.2'
3334

3435
steps:
3536
- name: "Checkout code"
36-
uses: actions/checkout@v3
37+
uses: actions/checkout@v4
3738

3839
- name: "Install PHP with extensions"
3940
uses: shivammathur/setup-php@v2
@@ -52,7 +53,7 @@ jobs:
5253
shell: bash
5354

5455
- name: "Cache composer"
55-
uses: actions/cache@v3
56+
uses: actions/cache@v4
5657
with:
5758
path: ${{ steps.composer-cache.outputs.dir }}
5859
key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
@@ -61,8 +62,11 @@ jobs:
6162
- name: "Install dependencies"
6263
run: composer install --ansi --no-interaction --no-progress
6364

64-
- name: "Build Sass"
65-
run: php bin/console sass:build
65+
- name: "Build and compile assets"
66+
run: |
67+
php bin/console importmap:install
68+
php bin/console sass:build
69+
php bin/console asset-map:compile
6670
6771
- name: "Install PHPUnit"
6872
run: vendor/bin/simple-phpunit install

README.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,20 @@ There are 3 different ways of installing this project depending on your needs:
2222
on your computer to run this command:
2323

2424
```bash
25-
$ symfony new --demo my_project
25+
symfony new --demo my_project
2626
```
2727

2828
**Option 2.** [Download Composer][6] and use the `composer` binary installed
2929
on your computer to run these commands:
3030

3131
```bash
3232
# you can create a new project based on the Symfony Demo project...
33-
$ composer create-project symfony/symfony-demo my_project
33+
composer create-project symfony/symfony-demo my_project
3434

3535
# ...or you can clone the code repository and install its dependencies
36-
$ git clone https://github.com/symfony/demo.git my_project
37-
$ cd my_project/
38-
$ composer install
36+
git clone https://github.com/symfony/demo.git my_project
37+
cd my_project/
38+
composer install
3939
```
4040

4141
**Option 3.** Click the following button to deploy this project on Platform.sh,
@@ -54,8 +54,8 @@ There's no need to configure anything before running the application. There are
5454
**Option 1.** [Download Symfony CLI][4] and run this command:
5555

5656
```bash
57-
$ cd my_project/
58-
$ symfony serve
57+
cd my_project/
58+
symfony serve
5959
```
6060

6161
Then access the application in your browser at the given URL (<https://localhost:8000> by default).
@@ -66,8 +66,8 @@ Then access the application in your browser at the given URL (<https://localhost
6666
On your local machine, you can run this command to use the built-in PHP web server:
6767

6868
```bash
69-
$ cd my_project/
70-
$ php -S localhost:8000 -t public/
69+
cd my_project/
70+
php -S localhost:8000 -t public/
7171
```
7272

7373
Tests
@@ -76,8 +76,8 @@ Tests
7676
Execute this command to run tests:
7777

7878
```bash
79-
$ cd my_project/
80-
$ ./bin/phpunit
79+
cd my_project/
80+
./bin/phpunit
8181
```
8282

8383
[1]: https://symfony.com/doc/current/best_practices.html

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"php": ">=8.2",
1717
"ext-pdo_sqlite": "*",
1818
"doctrine/data-fixtures": "^1.7",
19-
"doctrine/mongodb-odm-bundle": "^5@dev",
19+
"doctrine/mongodb-odm-bundle": "^5",
2020
"league/commonmark": "^2.1",
2121
"symfony/apache-pack": "^1.0",
2222
"symfony/asset": "^7.0",

0 commit comments

Comments
 (0)