Skip to content

Commit 0f0490d

Browse files
authored
Merge pull request #15 from byjg/5.0
PHP 8.1 Implementation
2 parents b112382 + 7f14c9e commit 0f0490d

31 files changed

+314
-401
lines changed

.github/workflows/phpunit.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,9 @@ jobs:
1616
strategy:
1717
matrix:
1818
php-version:
19+
- "8.3"
1920
- "8.2"
2021
- "8.1"
21-
- "8.0"
22-
- "7.4"
2322

2423
steps:
2524
- uses: actions/checkout@v4

.run/PSalm.run.xml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="PSalm" type="PhpLocalRunConfigurationType" factoryName="PHP Console" path="$PROJECT_DIR$/vendor/bin/psalm">
3+
<method v="2" />
4+
</configuration>
5+
</component>

.run/Test Project.run.xml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Test Project" type="PHPUnitRunConfigurationType" factoryName="PHPUnit">
3+
<TestRunner configuration_file="$PROJECT_DIR$/phpunit.xml.dist" scope="XML" use_alternative_configuration_file="true" />
4+
<method v="2" />
5+
</configuration>
6+
</component>

.vscode/launch.json

-38
This file was deleted.

composer.json

+9-4
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,20 @@
66
"ByJG\\AnyDataset\\Core\\": "src/"
77
}
88
},
9+
"autoload-dev": {
10+
"psr-4": {
11+
"Tests\\": "tests/"
12+
}
13+
},
914
"prefer-stable": true,
1015
"minimum-stability": "dev",
1116
"require": {
12-
"php": ">=7.4",
13-
"byjg/xmlutil": "4.9.*",
14-
"byjg/serializer": "4.9.*"
17+
"php": ">=8.1 <8.4",
18+
"ext-dom": "*",
19+
"byjg/xmlutil": "^5.0",
20+
"byjg/serializer": "^5.0"
1521
},
1622
"suggest": {
17-
"ext-dom": "*"
1823
},
1924
"require-dev": {
2025
"phpunit/phpunit": "^9.6",

example.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111

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

1616
$iterator->toArray();

0 commit comments

Comments
 (0)