Skip to content

Commit

Permalink
Merge pull request #15 from byjg/5.0
Browse files Browse the repository at this point in the history
PHP 8.1 Implementation
  • Loading branch information
byjg authored Oct 27, 2024
2 parents b112382 + 7f14c9e commit 0f0490d
Show file tree
Hide file tree
Showing 31 changed files with 314 additions and 401 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/phpunit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,9 @@ jobs:
strategy:
matrix:
php-version:
- "8.3"
- "8.2"
- "8.1"
- "8.0"
- "7.4"

steps:
- uses: actions/checkout@v4
Expand Down
5 changes: 5 additions & 0 deletions .run/PSalm.run.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="PSalm" type="PhpLocalRunConfigurationType" factoryName="PHP Console" path="$PROJECT_DIR$/vendor/bin/psalm">
<method v="2" />
</configuration>
</component>
6 changes: 6 additions & 0 deletions .run/Test Project.run.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Test Project" type="PHPUnitRunConfigurationType" factoryName="PHPUnit">
<TestRunner configuration_file="$PROJECT_DIR$/phpunit.xml.dist" scope="XML" use_alternative_configuration_file="true" />
<method v="2" />
</configuration>
</component>
38 changes: 0 additions & 38 deletions .vscode/launch.json

This file was deleted.

13 changes: 9 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,20 @@
"ByJG\\AnyDataset\\Core\\": "src/"
}
},
"autoload-dev": {
"psr-4": {
"Tests\\": "tests/"
}
},
"prefer-stable": true,
"minimum-stability": "dev",
"require": {
"php": ">=7.4",
"byjg/xmlutil": "4.9.*",
"byjg/serializer": "4.9.*"
"php": ">=8.1 <8.4",
"ext-dom": "*",
"byjg/xmlutil": "^5.0",
"byjg/serializer": "^5.0"
},
"suggest": {
"ext-dom": "*"
},
"require-dev": {
"phpunit/phpunit": "^9.6",
Expand Down
2 changes: 1 addition & 1 deletion example.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@


$filter = new \ByJG\AnyDataset\Core\IteratorFilter();
$filter->addRelation("field1", \ByJG\AnyDataset\Core\Enum\Relation::EQUAL, 10);
$filter->and("field1", \ByJG\AnyDataset\Core\Enum\Relation::EQUAL, 10);
$iterator2 = $dataset->getIterator($filter);

$iterator->toArray();
Expand Down
Loading

0 comments on commit 0f0490d

Please sign in to comment.