Skip to content

Commit

Permalink
Merge branch '3.3.x' into 3.4.x
Browse files Browse the repository at this point in the history
* 3.3.x:
  Switch to non-deprecated Extension class (#545)
  Bump doctrine/.github from 3.1.0 to 5.0.1
  Setup Dependabot for Github actions
  Upgrade CI workflow
  Use service name in the example
  Remove changelog
  Configure the documentation directory for each branch
  • Loading branch information
derrabus committed May 14, 2024
2 parents 3c5fbf9 + 715b62c commit 2609656
Show file tree
Hide file tree
Showing 10 changed files with 22 additions and 24 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@3.1.0"
uses: "doctrine/.github/.github/workflows/coding-standards.yml@5.0.1"
8 changes: 6 additions & 2 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,16 @@ on:
jobs:
phpunit:
name: "PHPUnit"
uses: "doctrine/.github/.github/workflows/continuous-integration.yml@3.1.0"
uses: "doctrine/.github/.github/workflows/continuous-integration.yml@5.0.1"
with:
php-versions: '["7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3"]'
secrets:
CODECOV_TOKEN: "${{ secrets.CODECOV_TOKEN }}"

phpunit-with-dev-deps:
name: "PHPUnit with dev dependencies"
uses: "doctrine/.github/.github/workflows/continuous-integration-symfony-unstable.yml@3.1.0"
uses: "doctrine/.github/.github/workflows/continuous-integration-symfony-unstable.yml@5.0.1"
with:
symfony-version-constraint: "^7"
secrets:
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@3.1.0"
uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@5.0.1"
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 @@ -12,4 +12,4 @@ on:
jobs:
static-analysis:
name: "Static Analysis"
uses: "doctrine/.github/.github/workflows/static-analysis.yml@3.1.0"
uses: "doctrine/.github/.github/workflows/static-analysis.yml@5.0.1"
2 changes: 1 addition & 1 deletion .symfony.bundle.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
branches: ["2.2.x", "3.0.x", "3.1.x", "3.2.x", "3.3.x", "3.4.x"]
maintained_branches: ["2.2.x", "3.3.x", "3.4.x"]
doc_dir: "Resources/doc/"
doc_dir: {"2.2.x": "Resources/doc/", "3.3.x": "Resources/doc/", "3.4.x": "docs/"}
dev_branch: "3.4.x"
13 changes: 0 additions & 13 deletions Changelog.md

This file was deleted.

5 changes: 2 additions & 3 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -251,10 +251,9 @@ Here is an example on how to inject the service container into your migrations:
# config/services.yaml
services:
Doctrine\Migrations\Version\DbalMigrationFactory: ~
App\Migrations\Factory\MigrationFactoryDecorator:
decorates: Doctrine\Migrations\Version\DbalMigrationFactory
arguments: ['@App\Migrations\Factory\MigrationFactoryDecorator.inner', '@service_container']
decorates: 'doctrine.migrations.migrations_factory'
arguments: ['@.inner', '@service_container']
.. code-block:: php
Expand Down
2 changes: 1 addition & 1 deletion psalm-baseline.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<files psalm-version="5.23.1@8471a896ccea3526b26d082f4461eeea467f10a4">
<files psalm-version="5.24.0@462c80e31c34e58cc4f750c656be3927e80e550e">
<file src="src/DependencyInjection/Configuration.php">
<UndefinedInterfaceMethod>
<code><![CDATA[end]]></code>
Expand Down
2 changes: 1 addition & 1 deletion src/DependencyInjection/DoctrineMigrationsExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
use Symfony\Component\DependencyInjection\ContainerAwareInterface;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Definition;
use Symfony\Component\DependencyInjection\Extension\Extension;
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
use Symfony\Component\DependencyInjection\Reference;
use Symfony\Component\HttpKernel\DependencyInjection\Extension;

use function array_keys;
use function assert;
Expand Down

0 comments on commit 2609656

Please sign in to comment.