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

Small fixes to PlatformHelper.php #218

Closed
wants to merge 3 commits into from
Closed

Small fixes to PlatformHelper.php #218

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c6080c2
Update PlatformHelper.php
yivi Sep 10, 2024
3e27a78
fix getMariaDbMysqlVersionNumber(), because sometimes $versionString …
Sep 10, 2024
e4e46ad
Revert "fix getMariaDbMysqlVersionNumber(), because sometimes $versio…
Sep 10, 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
6 changes: 3 additions & 3 deletions src/Provider/Doctrine/Persistence/Helper/PlatformHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
return $connection->getWrappedConnection()->getServerVersion();
}
if (method_exists($connection, 'getNativeConnection')) {
return $connection->getServerVersion();
return $connection->getNativeConnection()->getServerVersion();

Check failure on line 49 in src/Provider/Doctrine/Persistence/Helper/PlatformHelper.php

View workflow job for this annotation

GitHub Actions / Tests PHP 8.2, Symfony 5.*, sqlite 

Cannot call method getServerVersion() on object|resource.

Check failure on line 49 in src/Provider/Doctrine/Persistence/Helper/PlatformHelper.php

View workflow job for this annotation

GitHub Actions / Tests PHP 8.2, Symfony 5.*, mysql 

Cannot call method getServerVersion() on object|resource.

Check failure on line 49 in src/Provider/Doctrine/Persistence/Helper/PlatformHelper.php

View workflow job for this annotation

GitHub Actions / Tests PHP 8.2, Symfony 5.*, pgsql 

Cannot call method getServerVersion() on object|resource.

Check failure on line 49 in src/Provider/Doctrine/Persistence/Helper/PlatformHelper.php

View workflow job for this annotation

GitHub Actions / Tests PHP 8.2, Symfony 6.*, sqlite 

Cannot call method getServerVersion() on object|resource.

Check failure on line 49 in src/Provider/Doctrine/Persistence/Helper/PlatformHelper.php

View workflow job for this annotation

GitHub Actions / Tests PHP 8.2, Symfony 6.*, mysql 

Cannot call method getServerVersion() on object|resource.

Check failure on line 49 in src/Provider/Doctrine/Persistence/Helper/PlatformHelper.php

View workflow job for this annotation

GitHub Actions / Tests PHP 8.2, Symfony 6.*, pgsql 

Cannot call method getServerVersion() on object|resource.

Check failure on line 49 in src/Provider/Doctrine/Persistence/Helper/PlatformHelper.php

View workflow job for this annotation

GitHub Actions / Tests PHP 8.2, Symfony 7.*, sqlite 

Cannot call method getServerVersion() on object|resource.

Check failure on line 49 in src/Provider/Doctrine/Persistence/Helper/PlatformHelper.php

View workflow job for this annotation

GitHub Actions / Tests PHP 8.2, Symfony 7.*, mysql 

Cannot call method getServerVersion() on object|resource.

Check failure on line 49 in src/Provider/Doctrine/Persistence/Helper/PlatformHelper.php

View workflow job for this annotation

GitHub Actions / Tests PHP 8.2, Symfony 7.*, pgsql 

Cannot call method getServerVersion() on object|resource.

Check failure on line 49 in src/Provider/Doctrine/Persistence/Helper/PlatformHelper.php

View workflow job for this annotation

GitHub Actions / Tests PHP 8.3, Symfony 5.*, sqlite 

Cannot call method getServerVersion() on object|resource.

Check failure on line 49 in src/Provider/Doctrine/Persistence/Helper/PlatformHelper.php

View workflow job for this annotation

GitHub Actions / Tests PHP 8.3, Symfony 5.*, mysql 

Cannot call method getServerVersion() on object|resource.

Check failure on line 49 in src/Provider/Doctrine/Persistence/Helper/PlatformHelper.php

View workflow job for this annotation

GitHub Actions / Tests PHP 8.3, Symfony 5.*, pgsql 

Cannot call method getServerVersion() on object|resource.

Check failure on line 49 in src/Provider/Doctrine/Persistence/Helper/PlatformHelper.php

View workflow job for this annotation

GitHub Actions / Tests PHP 8.3, Symfony 6.*, sqlite 

Cannot call method getServerVersion() on object|resource.

Check failure on line 49 in src/Provider/Doctrine/Persistence/Helper/PlatformHelper.php

View workflow job for this annotation

GitHub Actions / Tests PHP 8.3, Symfony 6.*, mysql 

Cannot call method getServerVersion() on object|resource.

Check failure on line 49 in src/Provider/Doctrine/Persistence/Helper/PlatformHelper.php

View workflow job for this annotation

GitHub Actions / Tests PHP 8.3, Symfony 6.*, pgsql 

Cannot call method getServerVersion() on object|resource.

Check failure on line 49 in src/Provider/Doctrine/Persistence/Helper/PlatformHelper.php

View workflow job for this annotation

GitHub Actions / Tests PHP 8.3, Symfony 7.*, sqlite 

Cannot call method getServerVersion() on object|resource.

Check failure on line 49 in src/Provider/Doctrine/Persistence/Helper/PlatformHelper.php

View workflow job for this annotation

GitHub Actions / Tests PHP 8.3, Symfony 7.*, mysql 

Cannot call method getServerVersion() on object|resource.

Check failure on line 49 in src/Provider/Doctrine/Persistence/Helper/PlatformHelper.php

View workflow job for this annotation

GitHub Actions / Tests PHP 8.3, Symfony 7.*, pgsql 

Cannot call method getServerVersion() on object|resource.
}

return null;
Expand Down Expand Up @@ -104,11 +104,11 @@
public static function getMariaDbMysqlVersionNumber(string $versionString): string
{
preg_match(
'#^(?:5\.5\.5-)?(mariadb-)?(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)#i',
'#^(?:5\.5\.5-)?(mariadb-)?(?P<major>\d+)\.(?P<minor>\d+)(\.(?P<patch>\d+))?#i',
Copy link
Owner

Choose a reason for hiding this comment

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

Well, I assume you're right even if this regex comes from doctrine/dbal itself: https://github.com/doctrine/dbal/blob/7a8252418689feb860ea8dfeab66d64a56a64df8/src/Driver/AbstractMySQLDriver.php#L96

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I just got the error when I was running tests.
CleanShot 2024-09-10 at 14 09 09@2x

$versionString, as reported by a local postrgres running in a container, was "13.16"

That string matches what I'd expect when checking postgres releases:
https://www.postgresql.org/docs/release/

Maybe the problem is that this function was called to parse a postgres version, and it should be reserved for a MariaDb version.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

When I changed the regex I was able to run my project's tests again.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, on further inspection, I think the problem is that this version-parsing is being called when not needed. I believe the problem may come from isJsonSupported().

Copy link
Owner

Choose a reason for hiding this comment

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

You're right, isJsonSupported() seems to be the culprit, will post a fix soon.
Would you mind dumping $version after

auditor/src/Provider/Doctrine/Persistence/Helper/PlatformHelper.php

Line 57 in 9e02fc6

$version = self::getServerVersion($connection);

Copy link
Owner

Choose a reason for hiding this comment

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

Thanks, I hadn't understood you got the version that way ;)

Copy link
Owner

Choose a reason for hiding this comment

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

#219 should fix your issues

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yes, that works. thx.

Copy link
Owner

Choose a reason for hiding this comment

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

Will release it asap

Copy link
Owner

Choose a reason for hiding this comment

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

https://github.com/DamienHarper/auditor/releases/tag/3.0.1

$versionString,
$versionParts
);

return $versionParts['major'].'.'.$versionParts['minor'].'.'.$versionParts['patch'];
return $versionParts['major'].'.'.$versionParts['minor'].'.'.($versionParts['patch'] ?? '0');
}
}
Loading