Skip to content
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
2 changes: 1 addition & 1 deletion .github/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php-versions: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
php-versions: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
steps:
- name: Checkout
uses: actions/checkout@v2
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
/nbproject/private/
composer.lock
phpunit.xml
.*
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"traderinteractive/util": "^3.0||^4.0"
},
"require-dev": {
"phpunit/phpunit": ">=6.5",
"phpunit/phpunit": ">=6.5 <11.0",
"squizlabs/php_codesniffer": "^3.2"
},
"autoload": {
Expand Down
4 changes: 4 additions & 0 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<phpunit colors="true" forceCoversAnnotation="true">
<php>
<ini name="error_reporting" value="E_ALL"/>
<ini name="display_errors" value="On"/>
</php>
<testsuites>
<testsuite name="TraderInteractive Library Test Suite">
<directory suffix="Test.php">tests</directory>
Expand Down
2 changes: 1 addition & 1 deletion src/Image.php
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ public static function resizeMulti(\Imagick $source, array $boxSizes, array $opt

//put image in box
$canvas = self::getBackgroundCanvas($source, $color, $blurBackground, $blurValue, $boxWidth, $boxHeight);
if ($canvas->compositeImage($clone, \Imagick::COMPOSITE_ATOP, $targetX, $targetY) !== true) {
if ($canvas->compositeImage($clone, \Imagick::COMPOSITE_ATOP, (int)$targetX, (int)$targetY) !== true) {
//cumbersome to test
throw new \Exception('Imagick::compositeImage() did not return true');//@codeCoverageIgnore
}
Expand Down