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

Bumped version of the components and dropped old versions. #29

Open
wants to merge 15 commits into
base: 2.5.x
Choose a base branch
from
Open

Bumped version of the components and dropped old versions. #29

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
f89adfb
#13 Updated base class.
tasselchof Oct 4, 2021
fd08a75
Improvements to work with API-Skeletons/doctrine-orm-hydration-module.
tasselchof Oct 4, 2021
0e5bd1c
Fixed component version.
tasselchof Oct 4, 2021
df6c8c9
Merge branch 'laminas-api-tools:2.5.x' into 2.5.x
tasselchof Mar 9, 2022
514f121
Updated a version of the doctrine module.
tasselchof Mar 9, 2022
63c83ec
Merge remote-tracking branch 'origin/2.5.x' into 2.5.x
Mar 9, 2022
30452bb
#28 Updated a version of the doctrine module.
tasselchof Mar 9, 2022
831b12d
#28 Updated a versions in composer.json and added return types.
tasselchof Mar 15, 2022
37a292a
#28 Removed ODM support, fixed dependencies and PHPUnit tests.
tasselchof Apr 20, 2022
bfadae4
#28 Fixed composer.json file.
tasselchof Apr 20, 2022
41484ce
#29 Fixed cs-fix and psalm issues.
tasselchof May 14, 2022
96367b5
#29 Fixed legacy aliases.
tasselchof May 14, 2022
5760ca9
Apply review changes
javabudd Jul 29, 2022
001b8d0
Merge pull request #1 from javabudd/2.5.x
tasselchof Jul 30, 2022
5381ab8
Added PHP versions.
tasselchof Jul 15, 2024
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
13 changes: 8 additions & 5 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@
"forum": "https://discourse.laminas.dev"
},
"config": {
"sort-packages": true
"sort-packages": true,
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true
}
},
"extra": {
"laminas": {
Expand All @@ -32,16 +35,16 @@
"php": "^7.3 || ~8.0.0",
"laminas-api-tools/api-tools": "^1.3",
"laminas-api-tools/api-tools-rest": "^1.3.2",
"laminas/laminas-hydrator": "^2.4.2 || ^3.0",
"laminas/laminas-hydrator": "^2.4.2 || ^3.0 || ^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.

Let's drop ^2 here - keeping only two majors, which is sufficient for a migration

"laminas/laminas-stdlib": "^3.3",
"laminas/laminas-view": "^2.11.3",
"laminas/laminas-zendframework-bridge": "^1.0",
"phpro/zf-doctrine-hydration-module": "^2.0.1 || ^3.0 || ^4.1"
"api-skeletons/doctrine-orm-hydration-module": "^1.0"
},
"require-dev": {
"doctrine/doctrine-module": "^1.2.0 || ^2.1.7",
"doctrine/doctrine-module": "^4.0 || ^5.1",
Copy link
Member

Choose a reason for hiding this comment

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

We should test only ^5.1, and add <5.1 to conflict:

Copy link
Author

Choose a reason for hiding this comment

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

@Ocramius I didn't dropped 4.0 because we have this dependency:

https://github.com/API-Skeletons/doctrine-orm-hydration-module/blob/master/composer.json#L28

And this external module won't allow us to use only 5.1 version.

Copy link
Member

Choose a reason for hiding this comment

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

So we aren't testing ^5.1? Then we shouldn't include ^5.1 in our supported dependency range.

Copy link
Author

@tasselchof tasselchof Mar 15, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

Maybe I should do fix there? I forked this module and it works well with ^5.1. The problem is that to do this I forked 3 modules, that have a dependencies, this is why I committed here ^5.1. I think it makes sense to make PR there and after to finish this one. Right?

Copy link
Member

Choose a reason for hiding this comment

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

Ok, so here's what is not clear to me:

  • is ^4.0 required by laminas-api-tools/api-tools-doctrine? If not, it should be dropped
  • if ^5.1 works, we should use that, and only that, and drop all older versions. Introducing support for older versions should be discussed in a separate patch.

Copy link
Contributor

Choose a reason for hiding this comment

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

@tasselchof API Skeletons is my org. If you need an update on the hydration module in support of your changes here, that can be arranged.

Copy link
Author

@tasselchof tasselchof Mar 15, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

@TomHAnderson hi! I already made PR to add this module, locally tests are passing: API-Skeletons/doctrine-orm-hydration-module#4. If you merge it I can resume here.

Copy link
Author

@tasselchof tasselchof Mar 17, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

@Ocramius what is the best way further? Now it works fine with ORM, but here is the deal:

 Problem 1
    - doctrine/doctrine-mongo-odm-module[0.11.0, 1.0.0] require doctrine/doctrine-module ^1.2 -> found doctrine/doctrine-module[1.2.0] but it conflicts with your root composer.json require (^5.1).
    - doctrine/doctrine-mongo-odm-module 1.1.0 requires doctrine/doctrine-module ^1.2 || 2.1.7 -> found doctrine/doctrine-module[1.2.0, 2.1.7] but it conflicts with your root composer.json require (^5.1).
    - doctrine/doctrine-mongo-odm-module 1.1.1 requires doctrine/doctrine-module ^1.2 || ^2.1.7 -> found doctrine/doctrine-module[1.2.0, 2.1.7, 2.1.8, 2.1.9, 2.1.10] but it conflicts with your root composer.json require (^5.1).
    - doctrine/doctrine-mongo-odm-module[2.0.0, ..., 2.0.2] require doctrine/doctrine-module ^4.0 -> found doctrine/doctrine-module[4.0.0, ..., 4.4.1] but it conflicts with your root composer.json require (^5.1).
    - Root composer.json requires doctrine/doctrine-mongo-odm-module ^0.11.0 || ^1.0.0 || ^2.0.0 -> satisfiable by doctrine/doctrine-mongo-odm-module[0.11.0, 1.0.0, 1.1.0, 1.1.1, 2.0.0, 2.0.1, 2.0.2].

And I never used ODM module and we don't have hydration module as phpro/zf-doctrine-hydration-module is abandoned and as I know API-Skeletons/doctrine-orm-hydration-module does not support odm.

Copy link
Author

Choose a reason for hiding this comment

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

@TomHAnderson hydration module is tested on php 8.0?

Copy link
Author

Choose a reason for hiding this comment

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

@TomHAnderson I've did it: API-Skeletons/doctrine-orm-hydration-module#6.

"doctrine/doctrine-mongo-odm-module": "^0.11.0 || ^1.0.0 || ^2.0.0",
"doctrine/doctrine-orm-module": "^1.1.8 || ^2.1.3",
"doctrine/doctrine-orm-module": "^4.0 || ^5.1",
Copy link
Member

Choose a reason for hiding this comment

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

We should test only ^5.1, and declare that <5.1 is in conflict: (because we no longer test it)

"doctrine/mongodb-odm": "^1.1.0",
"laminas-api-tools/api-tools-admin": "^1.5.7",
"laminas-api-tools/api-tools-hal": "^1.6.1",
Expand Down
Loading