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

Add support for doctrine/dbal 4 #8

Merged
merged 3 commits into from
Nov 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 6 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ jobs:
- "ubuntu-latest"
- "windows-latest"
php-version:
- "8.0"
- "8.1"
- "8.2"
- "8.3"
dependencies:
- "lowest"
- "highest"
Expand Down Expand Up @@ -51,7 +52,7 @@ jobs:
operating-system:
- "ubuntu-latest"
php-version:
- "8.1"
- "8.3"
steps:
- name: "Checkout"
uses: "actions/checkout@v2"
Expand All @@ -77,7 +78,7 @@ jobs:
operating-system:
- "ubuntu-latest"
php-version:
- "8.1"
- "8.3"
steps:
- name: "Checkout"
uses: "actions/checkout@v2"
Expand All @@ -103,7 +104,7 @@ jobs:
operating-system:
- "ubuntu-latest"
php-version:
- "8.1"
- "8.3"
steps:
- name: "Checkout"
uses: "actions/checkout@v2"
Expand All @@ -129,7 +130,7 @@ jobs:
operating-system:
- "ubuntu-latest"
php-version:
- "8.1"
- "8.3"
steps:
- name: "Checkout"
uses: "actions/checkout@v2"
Expand Down
18 changes: 9 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,20 @@
}
],
"require": {
"php": "^8.0|^8.1",
"php": "^8.1",
"ext-bcmath": "*",
"doctrine/dbal": "^2|^3",
"doctrine/dbal": "^4",
"moneyphp/money": "^4.0.3",
"thecodingmachine/safe": "^1.3|^2"
},
"require-dev": {
"doctrine/coding-standard": "^9.0",
"phpstan/phpstan": "^1.4",
"phpunit/phpunit": "^9.5.5",
"roave/no-floaters": "^1.5",
"squizlabs/php_codesniffer": "^3.6",
"doctrine/coding-standard": "^12.0",
"phpstan/phpstan": "^1.12",
"phpunit/phpunit": "^10.5",
"roave/no-floaters": "^1.11",
"squizlabs/php_codesniffer": "^3.10",
"thecodingmachine/phpstan-safe-rule": "^1.1|^1.2",
"vimeo/psalm": "^4.20"
"vimeo/psalm": "^5.26"
},
"minimum-stability": "stable",
"config": {
Expand Down Expand Up @@ -59,7 +59,7 @@
"psalm": "psalm",
"stan": "phpstan analyze src -l 8 --memory-limit=512m",
"sec": "rm -f local-php-security-checker && curl -s https://api.github.com/repos/fabpot/local-php-security-checker/releases/latest | grep -E \"browser_download_url(.+)linux_amd64\" | cut -d : -f 2,3 | tr -d \\\" | xargs -I % curl % -L -o local-php-security-checker && chmod +x local-php-security-checker && ./local-php-security-checker",
"test": "phpunit",
"test": "phpunit --display-phpunit-deprecations",
"all": "composer psalm && composer stan && composer test && composer cs && composer sec"
}
}
1 change: 1 addition & 0 deletions phpcs.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,6 @@
</rule>

<file>src/</file>
<file>tests/</file>

</ruleset>
3 changes: 1 addition & 2 deletions phpstan.neon
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
parameters:
checkMissingIterableValueType: false
reportUnmatchedIgnoredErrors: false
includes:
- vendor/thecodingmachine/phpstan-safe-rule/phpstan-safe-rule.neon
- vendor/roave/no-floaters/rules.neon
- vendor/roave/no-floaters/rules.neon
16 changes: 10 additions & 6 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" colors="true" beStrictAboutOutputDuringTests="true" beStrictAboutTodoAnnotatedTests="true" bootstrap="./tests/bootstrap.php">
<coverage>
<include>
<directory>./src/</directory>
</include>
</coverage>
<phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/phpunit.xsd"
colors="true"
beStrictAboutOutputDuringTests="true"
bootstrap="./tests/bootstrap.php"
failOnRisky="true"
failOnWarning="true"
>
<coverage />
<testsuites>
<testsuite name="OnMoon Doctrine Money Test Suite">
<directory>./tests/</directory>
Expand Down
4 changes: 2 additions & 2 deletions psalm.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<psalm
totallyTyped="true"
resolveFromConfigFile="true"
useDocblockTypes="true"
findUnusedBaselineEntry="true"
findUnusedCode="false"
ignoreInternalFunctionFalseReturn="false"
ignoreInternalFunctionNullReturn="false"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Expand Down
Loading
Loading