Skip to content

Merge 4.3.x up into 4.4.x #7121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 29, 2025
Merged

Merge 4.3.x up into 4.4.x #7121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c812ffd
fix: see PrimaryKeyConstraint annotation
simPod Aug 22, 2025
1432ec6
Merge pull request #7099 from simPod/prim-anno
morozov Aug 22, 2025
7a6b616
Remove integration with AppVeyor
morozov Aug 29, 2025
1a3c76a
Merge pull request #7118 from morozov/remove-appveyor
morozov Aug 29, 2025
d5a5a21
Merge branch '3.10.x' into 4.3.x
morozov Aug 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
127 changes: 0 additions & 127 deletions .appveyor.yml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/.appveyor.yml export-ignore
/ci export-ignore
/docs export-ignore
/.doctrine-project.json export-ignore
Expand Down
9 changes: 0 additions & 9 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
| [5.0-dev][5.0] | [4.4-dev][4.4] | [4.3][4.3] | [3.10][3.10] |
|:---------------------------------------------------:|:---------------------------------------------------:|:---------------------------------------------------:|:-----------------------------------------------------:|
| [![GitHub Actions][GA 5.0 image]][GA 5.0] | [![GitHub Actions][GA 4.4 image]][GA 4.4] | [![GitHub Actions][GA 4.3 image]][GA 4.3] | [![GitHub Actions][GA 3.10 image]][GA 3.10] |
| [![AppVeyor][AppVeyor 5.0 image]][AppVeyor 5.0] | [![AppVeyor][AppVeyor 4.4 image]][AppVeyor 4.4] | [![AppVeyor][AppVeyor 4.3 image]][AppVeyor 4.3] | [![AppVeyor][AppVeyor 3.10 image]][AppVeyor 3.10] |
| [![Code Coverage][Coverage 5.0 image]][CodeCov 5.0] | [![Code Coverage][Coverage 4.4 image]][CodeCov 4.4] | [![Code Coverage][Coverage 4.3 image]][CodeCov 4.3] | [![Code Coverage][Coverage 3.10 image]][CodeCov 3.10] |

Powerful ***D***ata***B***ase ***A***bstraction ***L***ayer with many features for database schema introspection and schema management.
Expand All @@ -17,31 +16,23 @@ Powerful ***D***ata***B***ase ***A***bstraction ***L***ayer with many features f
[Coverage 5.0 image]: https://codecov.io/gh/doctrine/dbal/branch/5.0.x/graph/badge.svg
[5.0]: https://github.com/doctrine/dbal/tree/5.0.x
[CodeCov 5.0]: https://codecov.io/gh/doctrine/dbal/branch/5.0.x
[AppVeyor 5.0]: https://ci.appveyor.com/project/doctrine/dbal/branch/5.0.x
[AppVeyor 5.0 image]: https://ci.appveyor.com/api/projects/status/i88kitq8qpbm0vie/branch/5.0.x?svg=true
[GA 5.0]: https://github.com/doctrine/dbal/actions?query=workflow%3A%22Continuous+Integration%22+branch%3A5.0.x
[GA 5.0 image]: https://github.com/doctrine/dbal/actions/workflows/continuous-integration.yml/badge.svg?branch=5.0.x

[Coverage 4.4 image]: https://codecov.io/gh/doctrine/dbal/branch/4.4.x/graph/badge.svg
[4.4]: https://github.com/doctrine/dbal/tree/4.4.x
[CodeCov 4.4]: https://codecov.io/gh/doctrine/dbal/branch/4.4.x
[AppVeyor 4.4]: https://ci.appveyor.com/project/doctrine/dbal/branch/4.4.x
[AppVeyor 4.4 image]: https://ci.appveyor.com/api/projects/status/i88kitq8qpbm0vie/branch/4.4.x?svg=true
[GA 4.4]: https://github.com/doctrine/dbal/actions?query=workflow%3A%22Continuous+Integration%22+branch%3A4.4.x
[GA 4.4 image]: https://github.com/doctrine/dbal/actions/workflows/continuous-integration.yml/badge.svg?branch=4.4.x

[Coverage 4.3 image]: https://codecov.io/gh/doctrine/dbal/branch/4.3.x/graph/badge.svg
[4.3]: https://github.com/doctrine/dbal/tree/4.3.x
[CodeCov 4.3]: https://codecov.io/gh/doctrine/dbal/branch/4.3.x
[AppVeyor 4.3]: https://ci.appveyor.com/project/doctrine/dbal/branch/4.3.x
[AppVeyor 4.3 image]: https://ci.appveyor.com/api/projects/status/i88kitq8qpbm0vie/branch/4.3.x?svg=true
[GA 4.3]: https://github.com/doctrine/dbal/actions?query=workflow%3A%22Continuous+Integration%22+branch%3A4.3.x
[GA 4.3 image]: https://github.com/doctrine/dbal/actions/workflows/continuous-integration.yml/badge.svg?branch=4.3.x

[Coverage 3.10 image]: https://codecov.io/gh/doctrine/dbal/branch/3.10.x/graph/badge.svg
[3.10]: https://github.com/doctrine/dbal/tree/3.10.x
[CodeCov 3.10]: https://codecov.io/gh/doctrine/dbal/branch/3.10.x
[AppVeyor 3.10]: https://ci.appveyor.com/project/doctrine/dbal/branch/3.10.x
[AppVeyor 3.10 image]: https://ci.appveyor.com/api/projects/status/i88kitq8qpbm0vie/branch/3.10.x?svg=true
[GA 3.10]: https://github.com/doctrine/dbal/actions?query=workflow%3A%22Continuous+Integration%22+branch%3A3.10.x
[GA 3.10 image]: https://github.com/doctrine/dbal/actions/workflows/continuous-integration.yml/badge.svg?branch=3.10.x
4 changes: 2 additions & 2 deletions src/Schema/Index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class Index extends AbstractNamedObject
/** @deprecated Use {@see getType()} and compare with {@see IndexType::UNIQUE} instead. */
protected bool $_isUnique = false;

/** @deprecated Use {@see PrimaryKeyConstraint()} instead. */
/** @deprecated Use {@see PrimaryKeyConstraint} instead. */
protected bool $_isPrimary = false;

/**
Expand Down Expand Up @@ -311,7 +311,7 @@ public function isUnique(): bool
return $this->_isUnique;
}

/** @deprecated Use {@see PrimaryKeyConstraint()} instead. */
/** @deprecated Use {@see PrimaryKeyConstraint} instead. */
public function isPrimary(): bool
{
Deprecation::triggerIfCalledFromOutside(
Expand Down
Loading