Skip to content
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

Jump to bottom

Merge release 6.0.1 into 6.1.x #746

Merged
merged 2 commits into from
Oct 31, 2023
Merged

Merge release 6.0.1 into 6.1.x #746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f02e850
added @template-implements to solve Psalm issues
driehle Oct 15, 2023
bb23630
Merge pull request #745 from driehle/fix/psalm
driehle Oct 31, 2023
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
2 changes: 2 additions & 0 deletions src/Options/DBALConfiguration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

/**
* Configuration options for a DBAL Connection
*
* @template-extends AbstractOptions<mixed>
*/
class DBALConfiguration extends AbstractOptions
{
Expand Down
2 changes: 2 additions & 0 deletions src/Options/DBALConnection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@

/**
* DBAL Connection options
*
* @template-extends AbstractOptions<mixed>
*/
final class DBALConnection extends AbstractOptions
{
Expand Down
3 changes: 3 additions & 0 deletions src/Options/EntityManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@

use Laminas\Stdlib\AbstractOptions;

/**
* @template-extends AbstractOptions<mixed>
*/
final class EntityManager extends AbstractOptions
{
/**
Expand Down
3 changes: 3 additions & 0 deletions src/Options/EntityResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
use function class_exists;
use function sprintf;

/**
* @template-extends AbstractOptions<mixed>
*/
final class EntityResolver extends AbstractOptions
{
/**
Expand Down
4 changes: 3 additions & 1 deletion src/Options/SQLLoggerCollectorOptions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
use Laminas\Stdlib\AbstractOptions;

/**
* Configuration options for an collector
* Configuration options for a collector
*
* @template-extends AbstractOptions<mixed>
*/
final class SQLLoggerCollectorOptions extends AbstractOptions
{
Expand Down
2 changes: 2 additions & 0 deletions src/Options/SecondLevelCacheConfiguration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

/**
* Configuration options for Second Level Cache
*
* @template-extends AbstractOptions<mixed>
*/
final class SecondLevelCacheConfiguration extends AbstractOptions
{
Expand Down
Loading