Skip to content

Commit

Permalink
Merge pull request #13 from jawira/update
Browse files Browse the repository at this point in the history
chore: Update dependencies
  • Loading branch information
jawira authored Mar 12, 2024
2 parents 5b75932 + a140840 commit 0814509
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 26 deletions.
23 changes: 15 additions & 8 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,18 +1,25 @@
/.github export-ignore
/resources export-ignore
/tests export-ignore

/.editorconfig export-ignore
/.gitattributes export-ignore
/.github export-ignore
/.gitignore export-ignore
/build.svg export-ignore
/build.xml export-ignore
/.idea export-ignore
/.phive export-ignore
/.psalm export-ignore
/CHANGELOG.md export-ignore
/README.md export-ignore
/build export-ignore
/build.png export-ignore
/docs export-ignore
/examples export-ignore
/phpstan export-ignore
/phpunit.xml export-ignore
/psalm.xml export-ignore
/phpunit.xml.dist export-ignore
/tests export-ignore

*.php text eol=lf diff=php
*.js text eol=lf
*.svg text eol=lf
*.xml text eol=lf
*.bat text eol=crlf
*.phar binary
*.png binary
*.jpg binary
4 changes: 2 additions & 2 deletions .github/workflows/qa.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
tests:
strategy:
matrix:
php: [ '7.4','8.0','8.1' ]
php: [ '7.4','8.0','8.1','8.2','8.3' ]
flags: [ '--prefer-lowest --no-interaction', '--no-interaction' ]
runs-on: ubuntu-22.04
timeout-minutes: 2
Expand All @@ -30,7 +30,7 @@ jobs:
run: sudo apt-get -y install graphviz

- name: Download phing
run: mkdir bin && curl -L -C - -s -S -o bin/phing https://github.com/phingofficial/phing/releases/download/3.0.0-RC3/phing-3.0.0-RC3.phar && chmod +x bin/phing
run: mkdir bin && curl -L -C - -s -S -o bin/phing https://github.com/phingofficial/phing/releases/download/3.0.0-rc6/phing-3.0.0-RC6.phar && chmod +x bin/phing

- name: Install Composer dependencies
run: composer update ${{ matrix.flags }}
Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@
],
"require": {
"php": "^7.4 || ^8.0",
"symfony/process": "^5.4 || ^6.0"
"symfony/process": "^5.4 || ^6.0 || ^7.0"
},
"require-dev": {
"ext-libxml": "*",
"ext-simplexml": "*",
"ergebnis/composer-normalize": "^2.28",
"jawira/plantuml": "^1.2022",
"jawira/skeleton": "^2.16",
"jawira/the-lost-functions": "^1.5",
"phpunit/phpunit": "^9.5.5",
"vimeo/psalm": "^4.29"
"jawira/the-lost-functions": "^1.5.0",
"phpunit/phpunit": "^9.6.17",
"vimeo/psalm": "^4.30.0"
},
"suggest": {
"jawira/plantuml": "Provides PlantUml (jar and executable)"
Expand Down
2 changes: 1 addition & 1 deletion phpunit.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
bootstrap="vendor/autoload.php"
cacheResultFile=".phpunit.cache/test-results"
executionOrder="depends,defects"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@startuml
help
help types
@enduml
20 changes: 10 additions & 10 deletions tests/ProcessTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,16 @@ function testSvgConversion($filePath, $needle, $size)
function svgConversionProvider(): array
{
return [
['resources/puml/colors.puml', 'BUSINESS', 40620],
['resources/puml/colors2.puml', 'Darkorange', 6830],
['resources/puml/help.puml', 'There are some other help command:', 3690],
['resources/puml/help-themes.puml', 'crt-amber', 11631],
['resources/puml/license.puml', 'PlantUML : a free UML diagram generator', 17010],
['resources/puml/listopeniconic.puml', 'useiconic.com', 141770],
['resources/puml/listsprite.puml', 'archimatetool.com', 52775],
['resources/puml/skinparameters.puml', 'BoundaryStereotypeFontColor', 71740],
['resources/puml/stdlib.puml', 'kubernetes', 12400],
['resources/puml/version.puml', 'Installation seems OK.', 5920],
['resources/puml/colors.puml', 'BUSINESS', 40_000],
['resources/puml/colors2.puml', 'Darkorange', 6_500],
['resources/puml/help-types.puml', 'The possible types are', 3_690],
['resources/puml/help-themes.puml', 'crt-amber', 11_300],
['resources/puml/license.puml', 'PlantUML : a free UML diagram generator', 13_000],
['resources/puml/listopeniconic.puml', 'useiconic.com', 141_500],
['resources/puml/listsprite.puml', 'archimatetool.com', 49_000],
['resources/puml/skinparameters.puml', 'BoundaryStereotypeFontColor', 71_500],
['resources/puml/stdlib.puml', 'kubernetes', 12_400],
['resources/puml/version.puml', 'Installation seems OK.', 5_500],
];
}

Expand Down

0 comments on commit 0814509

Please sign in to comment.