Skip to content

Commit fbdf9b3

Browse files
greg0iregreg0ire
authored
Merge pull request #2179 from doctrine/2.18.x-merge-up-into-2.19.x_VDlg2vxG
Merge release 2.18.2 into 2.19.x
2 parents 1552798 + 0ff098b commit fbdf9b3

File tree

14 files changed

+130
-14
lines changed

14 files changed

+130
-14
lines changed

‎.github/workflows/coding-standards.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ on:
2626
jobs:
2727
coding-standards:
2828
name: "Coding Standards"
29-
uses: "doctrine/.github/.github/workflows/coding-standards.yml@v12.2.0"
29+
uses: "doctrine/.github/.github/workflows/coding-standards.yml@13.1.0"
3030
with:
3131
composer-options: "--prefer-dist --prefer-stable"

‎.github/workflows/composer-lint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ on:
1717
jobs:
1818
composer-lint:
1919
name: "Composer Lint"
20-
uses: "doctrine/.github/.github/workflows/composer-lint.yml@v12.2.0"
20+
uses: "doctrine/.github/.github/workflows/composer-lint.yml@13.1.0"

‎.github/workflows/continuous-integration.yml‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
2-
name: "Continuous Integration"
1+
name: "CI: PHPUnit"
32

43
on:
54
pull_request:
@@ -27,7 +26,15 @@ on:
2726

2827
jobs:
2928
phpunit:
30-
name: "PHPUnit"
29+
name: >
30+
${{ format('PHP {0} - Sf {1} - deps {2} - stab. {3}',
31+
matrix.php-version || 'Ø',
32+
matrix.symfony-require || 'Ø',
33+
matrix.dependencies || 'Ø',
34+
matrix.stability || 'Ø'
35+
) }}
36+
${{ matrix.remove-orm && ' - remove ORM' }}
37+
${{ matrix.remove-doctrine-messenger && ' - remove Messenger' }}
3138
runs-on: "ubuntu-latest"
3239
env:
3340
SYMFONY_REQUIRE: ${{matrix.symfony-require}}
@@ -80,7 +87,7 @@ jobs:
8087

8188
steps:
8289
- name: "Checkout"
83-
uses: "actions/checkout@v5"
90+
uses: "actions/checkout@v6"
8491
with:
8592
fetch-depth: 2
8693

@@ -115,7 +122,7 @@ jobs:
115122
run: "vendor/bin/phpunit --coverage-clover=coverage.xml"
116123

117124
- name: "Upload coverage file"
118-
uses: "actions/upload-artifact@v5"
125+
uses: "actions/upload-artifact@v6"
119126
with:
120127
name: "phpunit-${{ matrix.php-version }}-${{ matrix.dependencies }}-${{ hashFiles('composer.lock') }}.coverage"
121128
path: "coverage.xml"
@@ -130,12 +137,12 @@ jobs:
130137

131138
steps:
132139
- name: "Checkout"
133-
uses: "actions/checkout@v5"
140+
uses: "actions/checkout@v6"
134141
with:
135142
fetch-depth: 2
136143

137144
- name: "Download coverage files"
138-
uses: "actions/download-artifact@v6"
145+
uses: "actions/download-artifact@v7"
139146
with:
140147
path: "reports"
141148

‎.github/workflows/documentation.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ on:
1717
jobs:
1818
documentation:
1919
name: "Documentation"
20-
uses: "doctrine/.github/.github/workflows/documentation.yml@v12.2.0"
20+
uses: "doctrine/.github/.github/workflows/documentation.yml@13.1.0"

‎.github/workflows/release-on-milestone-closed.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
jobs:
99
release:
1010
name: "Git tag, release & create merge-up PR"
11-
uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@v12.2.0"
11+
uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@13.1.0"
1212
secrets:
1313
GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
1414
GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}

‎.github/workflows/static-analysis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ on:
2626
jobs:
2727
static-analysis:
2828
name: "Static Analysis"
29-
uses: "doctrine/.github/.github/workflows/phpstan.yml@v12.2.0"
29+
uses: "doctrine/.github/.github/workflows/phpstan.yml@13.1.0"

‎.github/workflows/test-dev-stability.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
steps:
2929
- name: "Checkout"
30-
uses: "actions/checkout@v5"
30+
uses: "actions/checkout@v6"
3131
with:
3232
fetch-depth: 2
3333

‎.github/workflows/website-schema.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ on:
1818
jobs:
1919
json-validate:
2020
name: "Validate JSON schema"
21-
uses: "doctrine/.github/.github/workflows/website-schema.yml@v12.2.0"
21+
uses: "doctrine/.github/.github/workflows/website-schema.yml@13.1.0"

‎docs/en/doctrine-console.rst‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
Doctrine Console
2+
================
3+
4+
Some Doctrine packages such as ``doctrine/dbal`` and ``doctrine/orm``
5+
provide useful console commands to interact with your database and your
6+
entities:
7+
8+
- `Doctrine DBAL Commands
9+
<https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/cli-tools.html#cli-tools>`_
10+
- `Doctrine ORM Commands
11+
<https://www.doctrine-project.org/projects/doctrine-orm/en/latest/reference/tools.html#doctrine-console>`_
12+
13+
This bundle automatically registers those commands, but it renames them
14+
in the process so as to group them under the ``doctrine:`` namespace.
15+
16+
Note that the bundle also provide some additional commands that are not
17+
part of the aforementioned packages.
18+
19+
Command Name Mapping
20+
--------------------
21+
22+
The following table shows the mapping between the original Doctrine command
23+
names and the names used by this bundle:
24+
25+
+--------------------------------------------+---------------------------------------+
26+
| Bundle Command Name | Original Doctrine Command Name |
27+
+============================================+=======================================+
28+
| ``doctrine:query:sql`` | ``dbal:run-sql`` |
29+
+--------------------------------------------+---------------------------------------+
30+
| ``doctrine:cache:clear-metadata`` | ``orm:clear-cache:metadata`` |
31+
+--------------------------------------------+---------------------------------------+
32+
| ``doctrine:cache:clear-query`` | ``orm:clear-cache:query`` |
33+
+--------------------------------------------+---------------------------------------+
34+
| ``doctrine:cache:clear-result`` | ``orm:clear-cache:result`` |
35+
+--------------------------------------------+---------------------------------------+
36+
| ``doctrine:cache:clear-collection-region`` | ``orm:clear-cache:region:collection`` |
37+
+--------------------------------------------+---------------------------------------+
38+
| ``doctrine:cache:clear-entity-region`` | ``orm:clear-cache:region:entity`` |
39+
+--------------------------------------------+---------------------------------------+
40+
| ``doctrine:cache:clear-query-region`` | ``orm:clear-cache:region:query`` |
41+
+--------------------------------------------+---------------------------------------+
42+
| ``doctrine:mapping:convert`` | ``orm:convert-mapping`` |
43+
+--------------------------------------------+---------------------------------------+
44+
| ``doctrine:schema:create`` | ``orm:schema-tool:create`` |
45+
+--------------------------------------------+---------------------------------------+
46+
| ``doctrine:schema:drop`` | ``orm:schema-tool:drop`` |
47+
+--------------------------------------------+---------------------------------------+
48+
| ``doctrine:schema:update`` | ``orm:schema-tool:update`` |
49+
+--------------------------------------------+---------------------------------------+
50+
| ``doctrine:ensure-production-settings`` | ``orm:ensure-production-settings`` |
51+
+--------------------------------------------+---------------------------------------+
52+
| ``doctrine:mapping:info`` | ``orm:info`` |
53+
+--------------------------------------------+---------------------------------------+
54+
| ``doctrine:mapping:describe`` | ``orm:mapping:describe`` |
55+
+--------------------------------------------+---------------------------------------+
56+
| ``doctrine:query:dql`` | ``orm:run-dql`` |
57+
+--------------------------------------------+---------------------------------------+
58+
| ``doctrine:schema:validate`` | ``orm:validate-schema`` |
59+
+--------------------------------------------+---------------------------------------+
60+
61+
Additionally, the bundle provides the following commands:
62+
63+
- ``doctrine:database:create``
64+
- ``doctrine:database:drop``
65+
- ``doctrine:mapping:import``
66+
67+
To get a list of all available Doctrine commands, run:
68+
69+
.. code-block:: console
70+
71+
php bin/console list doctrine
72+
73+
It is possible to get help on any specific command. For example,
74+
to get help on the ``doctrine:schema:update`` command, run:
75+
76+
.. code-block:: console
77+
78+
php bin/console doctrine:schema:update --help

‎docs/en/index.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ configuration options, console commands and even a web debug toolbar collector.
77
.. toctree::
88

99
installation
10+
doctrine-console
1011
entity-listeners
1112
event-listeners
1213
custom-id-generators

0 commit comments

Comments
 (0)