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.

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

Cake5 #112

Merged
merged 21 commits into from
May 11, 2024
Merged

Cake5 #112

merged 21 commits into from
May 11, 2024

Conversation

JustinRuiter
Copy link

An updated version of MolbioUnige's PR, to fix the pipeline and fix various typing issues.

PR into MolbioUnigue's repo: MolbioUnige#1

This was referenced Mar 28, 2024
Copy link

codecov bot commented Mar 28, 2024

Codecov Report

Attention: Patch coverage is 68.14815% with 86 lines in your changes are missing coverage. Please review.

❗ No coverage uploaded for pull request base (cake5@e425ff6). Click here to learn what that means.

Files Patch % Lines
src/Datasource/Query.php 61.41% 49 Missing ⚠️
src/Model/Endpoint.php 74.02% 20 Missing ⚠️
src/Datasource/Connection.php 43.75% 9 Missing ⚠️
src/Datasource/ResultSet.php 71.42% 2 Missing ⚠️
src/Model/EndpointLocator.php 66.66% 2 Missing ⚠️
src/Webservice/Driver/AbstractDriver.php 80.00% 2 Missing ⚠️
src/Datasource/Schema.php 80.00% 1 Missing ⚠️
src/Model/ResourceBasedEntityTrait.php 0.00% 1 Missing ⚠️
Additional details and impacted files
@@           Coverage Diff            @@
##             cake5     #112   +/-   ##
========================================
  Coverage         ?   81.51%           
  Complexity       ?      394           
========================================
  Files            ?       13           
  Lines            ?     1098           
  Branches         ?        0           
========================================
  Hits             ?      895           
  Misses           ?      203           
  Partials         ?        0           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@ADmad
Copy link
Member

ADmad commented Mar 28, 2024

As I mentioned on the related issue your PR needs to target the cake5 branch not master, so please rebase your branch onto upstream master cake5 and re-target the PR.

@JustinRuiter JustinRuiter changed the base branch from master to cake5 March 28, 2024 11:20
@ADmad
Copy link
Member

ADmad commented Mar 28, 2024

You just changed the branch target without rebasing and fixing merge conflicts 🙂

@ADmad
Copy link
Member

ADmad commented Mar 28, 2024

Sorry, I made a typo in my previous comment, you need to rebase upon cake5 not master.

@JustinRuiter
Copy link
Author

Sorry, I made a typo in my previous comment, you need to rebase upon cake5 not master.

Rebased

phpunit.xml.dist Outdated Show resolved Hide resolved
src/Datasource/Connection.php Outdated Show resolved Hide resolved
.github/workflows/ci.yml Outdated Show resolved Hide resolved
.github/workflows/ci.yml Outdated Show resolved Hide resolved
composer.json Outdated Show resolved Hide resolved
@@ -659,6 +661,9 @@ public function findAll(Query $query, array $options): Query
*/
public function findList(Query $query, array $options): Query
Copy link
Member

Choose a reason for hiding this comment

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

This method needs to be updated similar to core's Table::findList()

Copy link
Author

Choose a reason for hiding this comment

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

Right, will change that. I asumed (but that turns out to be wrong) that the first PR fixed most of these issues.

Copy link
Author

Choose a reason for hiding this comment

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

Seeing that the findList method in core returns a SelectQuery. Do you want me to implement the different query types core has here as well? Or just the way this method works? @ADmad

Copy link
Member

@ADmad ADmad Apr 17, 2024

Choose a reason for hiding this comment

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

Yes eventually do I want to use separate query classes for this plugin too. That would allow us to clean up the types for the Query::$_results property. Currently it can be of multiple different types which makes the code messy as we have to add type checks wherever it's used, as evident from your changes.

src/Model/EndpointLocator.php Outdated Show resolved Hide resolved
src/Model/EndpointLocator.php Outdated Show resolved Hide resolved
src/Model/Resource.php Outdated Show resolved Hide resolved
src/Plugin.php Show resolved Hide resolved
Justin Ruiter added 2 commits April 4, 2024 16:08
… psalm constraint. Added cache files and diff file for phpcs to gitignore.
src/Datasource/Query.php Outdated Show resolved Hide resolved
src/Datasource/Query.php Outdated Show resolved Hide resolved
src/Datasource/Query.php Outdated Show resolved Hide resolved
src/Datasource/Query.php Outdated Show resolved Hide resolved
@@ -659,6 +661,9 @@ public function findAll(Query $query, array $options): Query
*/
public function findList(Query $query, array $options): Query
Copy link
Member

@ADmad ADmad Apr 17, 2024

Choose a reason for hiding this comment

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

Yes eventually do I want to use separate query classes for this plugin too. That would allow us to clean up the types for the Query::$_results property. Currently it can be of multiple different types which makes the code messy as we have to add type checks wherever it's used, as evident from your changes.

@JustinRuiter
Copy link
Author

I don't really have the time or expertise to implement the seperate query classes from core. Could this be picked up in a seperate issue?

@ADmad
Copy link
Member

ADmad commented May 6, 2024

Could this be picked up in a seperate issue?

Yup

@ADmad ADmad merged commit c22b04a into UseMuffin:cake5 May 11, 2024
9 of 10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants