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

Update dependencies #260

Merged
merged 4 commits into from
Mar 23, 2022
Merged

Update dependencies #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
74da708
mark 3.2 as unmaintained
driehle Mar 22, 2022
021bb43
updated dependencies
driehle Mar 22, 2022
66f5dc6
fixed cs issues
driehle Mar 22, 2022
fb3ee4f
updated branch names
driehle Mar 23, 2022
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
15 changes: 6 additions & 9 deletions .doctrine-project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,23 @@
"branchName": "4.1.x",
"slug": "4.1",
"aliases": [
"latest"
"latest",
"current",
"stable"
],
"upcoming": true
"current": true
},
{
"name": "4.0",
"branchName": "4.0.x",
"slug": "4.0",
"aliases":[
"current",
"stable"
],
"current": true,
"maintained": true
"maintained": false
},
{
"name": "3.2",
"branchName": "3.2.x",
"slug": "3.2",
"maintained": true
"maintained": false
},
{
"name": "3.1",
Expand Down
28 changes: 14 additions & 14 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,34 +53,34 @@
"php": "^7.4 || ~8.0.0 || ~8.1.0",
"ext-mongodb": "*",
"container-interop/container-interop": "^1.2.0",
"doctrine/doctrine-module": "^5.0.0",
"doctrine/doctrine-laminas-hydrator": "^2.2.1 || ^3.0.0",
"doctrine/doctrine-module": "^5.1.0",
"doctrine/doctrine-laminas-hydrator": "^3.0.1",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the point in dropping ^2.2.1? That's really drastic for a bugfix release

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2.2 series will soon be unmaintained

"doctrine/event-manager": "^1.1.1",
"doctrine/mongodb-odm": "^2.3.0",
"doctrine/persistence": "^2.2.3",
"doctrine/mongodb-odm": "^2.3.2",
"doctrine/persistence": "^2.4.0",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the point in bumping doctrine/persistence? ODM itself is fine with ^2.2

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not? Since it is the same major there shouldn't be any issues in upgrading.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably best done in a minor release, rather than a patch release

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I changed the base

"laminas/laminas-eventmanager": "^3.4.0",
"laminas/laminas-modulemanager": "^2.11.0",
"laminas/laminas-mvc": "^3.3.0",
"laminas/laminas-mvc": "^3.3.3",
"laminas/laminas-servicemanager": "^3.10.0",
"laminas/laminas-stdlib": "^3.6.4",
"symfony/console": "^5.4.2 || ^6.0.0",
"symfony/var-dumper": "^5.4.2 || ^6.0.0"
"laminas/laminas-stdlib": "^3.7.1",
"symfony/console": "^5.4.5 || ^6.0.5",
"symfony/var-dumper": "^5.4.6 || ^6.0.6"
},
"require-dev": {
"doctrine/coding-standard": "^9.0.0",
"jangregor/phpstan-prophecy": "^1.0.0",
"laminas/laminas-db": "^2.13.4",
"laminas/laminas-developer-tools": "^2.3.0",
"laminas/laminas-hydrator": "^4.3.1",
"laminas/laminas-i18n": "^2.13.0",
"laminas/laminas-i18n": "^2.14.0",
"laminas/laminas-log": "^2.15.0",
"laminas/laminas-serializer": "^2.12.0",
"laminas/laminas-session": "^2.12.0",
"laminas/laminas-view": "^2.16.0",
"laminas/laminas-session": "^2.12.1",
"laminas/laminas-view": "^2.19.1",
"phpspec/prophecy-phpunit": "^2.0.1",
"phpstan/phpstan": "^1.3.0",
"phpunit/phpunit": "^9.5.11",
"vimeo/psalm": "^4.17.0"
"phpstan/phpstan": "^1.4.10",
"phpunit/phpunit": "^9.5.19",
"vimeo/psalm": "^4.22.0"
},
"suggest": {
"laminas/laminas-form": "if you want to use form elements backed by Doctrine",
Expand Down
2 changes: 1 addition & 1 deletion psalm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<psalm
errorLevel="4"
phpVersion="8.0"
phpVersion="8.1"
resolveFromConfigFile="true"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="https://getpsalm.org/schema/config"
Expand Down
3 changes: 3 additions & 0 deletions tests/Assets/CustomRepositoryFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ public function findOneBy(array $criteria): ?object
return null;
}

/**
* @psalm-return string
*/
public function getClassName(): string
{
return '';
Expand Down