Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/3.6.x' into 4.0.x
Browse files Browse the repository at this point in the history
  • Loading branch information
greg0ire committed Nov 4, 2024
2 parents eef884e + a345e6c commit 431d2b1
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 28 deletions.
8 changes: 8 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
labels:
- "CI"
2 changes: 1 addition & 1 deletion .github/workflows/coding-standards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ on:
jobs:
coding-standards:
name: "Coding Standards"
uses: "doctrine/.github/.github/workflows/coding-standards.yml@4.0.0"
uses: "doctrine/.github/.github/workflows/coding-standards.yml@5.2.0"
10 changes: 6 additions & 4 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
if: "${{ matrix.stability == 'dev' }}"

- name: "Install dependencies with Composer"
uses: "ramsey/composer-install@v2"
uses: "ramsey/composer-install@v3"
with:
dependency-versions: "${{ matrix.dependencies }}"
composer-options: "--prefer-dist"
Expand All @@ -68,7 +68,7 @@ jobs:
run: "vendor/bin/phpunit --coverage-clover=coverage.xml"

- name: "Upload coverage file"
uses: "actions/upload-artifact@v3"
uses: "actions/upload-artifact@v4"
with:
name: "phpunit-${{ matrix.dependencies }}-${{ matrix.stability }}-${{ matrix.php-version }}.coverage"
path: "coverage.xml"
Expand All @@ -86,11 +86,13 @@ jobs:
fetch-depth: 2

- name: "Download coverage files"
uses: "actions/download-artifact@v3"
uses: "actions/download-artifact@v4"
with:
path: "reports"

- name: "Upload to Codecov"
uses: "codecov/codecov-action@v3"
uses: "codecov/codecov-action@v4"
with:
directory: reports
env:
CODECOV_TOKEN: "${{ secrets.CODECOV_TOKEN }}"
2 changes: 1 addition & 1 deletion .github/workflows/release-on-milestone-closed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
release:
name: "Git tag, release & create merge-up PR"
uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@4.0.0"
uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@5.2.0"
secrets:
GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ on:

jobs:
static-analysis:
uses: "doctrine/.github/.github/workflows/static-analysis.yml@4.0.0"
uses: "doctrine/.github/.github/workflows/static-analysis.yml@5.2.0"
1 change: 0 additions & 1 deletion .symfony.bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ branches:
- "3.6.x"
- "3.7.x"
maintained_branches:
- "3.5.x"
- "3.6.x"
- "3.7.x"
doc_dir: "docs/"
Expand Down
22 changes: 2 additions & 20 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,36 +12,18 @@ This bundle is compatible with any database supported by `Doctrine ORM`_
Installation
------------

In Symfony 4 or higher applications that use `Symfony Flex`_, open a command
console, enter your project directory and run the following command:
If you're using `Symfony Flex`_, run this command and you're done:

.. code-block:: terminal
$ composer require --dev orm-fixtures
Starting from Symfony 4.0, Flex should be used by default and register the
bundle for you, and in that case you can skip to the next section and start
writing fixtures.

In Symfony 3 applications (or when not using Symfony Flex), run this other
command instead:
If you're not using Flex, run this other command instead:

.. code-block:: terminal
$ composer require --dev doctrine/doctrine-fixtures-bundle
You will also need to enable the bundle. In Symfony 3 and earlier applications,
update the ``AppKernel`` class::

// app/AppKernel.php

// ...
// registerBundles()
if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {
// ...
$bundles[] = new Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle();
}

Writing Fixtures
----------------

Expand Down

0 comments on commit 431d2b1

Please sign in to comment.