Skip to content

Commit

Permalink
bump php version
Browse files Browse the repository at this point in the history
  • Loading branch information
fab2s committed Jan 4, 2023
1 parent e61a56b commit e2a605a
Show file tree
Hide file tree
Showing 9 changed files with 90 additions and 85 deletions.
16 changes: 12 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php-versions: [ '8.1', '8.0', '7.4', '7.3', '7.2' ]
console-versions: ['6.1', '6.0', '5.4', '5.3', '5.2', '5.1', '5.0', '4.4', '4.3', '4.2', '4.1', '4.0', '3.4']
php-versions: [ '8.2', '8.1', '8.0', '7.4', '7.3', '7.2' ]
console-versions: ['6.2', '6.0', '5.4', '5.3', '5.2', '5.1', '5.0', '4.4', '4.3', '4.2', '4.1', '4.0', '3.4']
exclude:
- php-versions: 8.1
console-versions: 4.3
Expand All @@ -19,6 +19,8 @@ jobs:
console-versions: 4.0
- php-versions: 8.1
console-versions: 3.4
- php-versions: 8.0
console-versions: 6.2
- php-versions: 8.0
console-versions: 6.1
- php-versions: 8.0
Expand All @@ -31,14 +33,20 @@ jobs:
console-versions: 4.0
- php-versions: 8.0
console-versions: 3.4
- php-versions: 7.4
console-versions: 6.2
- php-versions: 7.4
console-versions: 6.1
- php-versions: 7.4
console-versions: 6.0
- php-versions: 7.3
console-versions: 6.2
- php-versions: 7.3
console-versions: 6.1
- php-versions: 7.3
console-versions: 6.0
- php-versions: 7.2
console-versions: 6.2
- php-versions: 7.2
console-versions: 6.1
- php-versions: 7.2
Expand Down Expand Up @@ -75,8 +83,8 @@ jobs:
echo '::set-output name=compat::0'
exit 0
fi
if [[ " 8.0 8.1 " =~ " ${{ matrix.php-versions }} " ]]; then
if [[ " 4.4 " =~ " ${{ matrix.console-versions }} " ]]; then
if [[ " 8.0 8.1 8.2 " =~ " ${{ matrix.php-versions }} " ]]; then
if [[ " 4.4 4.3 " =~ " ${{ matrix.console-versions }} " ]]; then
echo '::set-output name=compat::0'
exit 0
fi
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ Please have a look at [NodalFlow documentation](https://github.com/fab2s/NodalFl

## Requirements

`YaEtl` is tested against php 7.2, 7.3, 7.4, 8.0 and 8.1
`YaEtl` is tested against php 7.2, 7.3, 7.4, 8.0, 8.1 and 8.2

## Contributing

Expand Down
5 changes: 1 addition & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
],
"require": {
"php": "^7.2|^8.0",
"fab2s/nodalflow": "^2.0.4",
"fab2s/nodalflow": "^2.0.5",
"fab2s/opinhelpers": "^1.0"
},
"require-dev": {
Expand Down Expand Up @@ -74,8 +74,5 @@
"rm -f .*.cache"
],
"fix": "php-cs-fixer fix --config=./.php-cs-fixer.dist.php -vvv"
},
"scripts": {
"fix": "php-cs-fixer fix --config=./.php-cs-fixer.dist.php -vvv"
}
}
8 changes: 4 additions & 4 deletions tests/Lib/Arrays/ArrayReplaceRecursiveTransformerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ public function arrayReplaceRecursiveProvider()
{
return [
[
'default' => [
'default' => [
'one' => 'onedefault',
42 => [1, 3, 3, 7],
],
'override' => [
'?' => ['no', 'maybe'],
],
'cases' => [
'cases' => [
[
'input' => [
'input' => [
'?' => 'yes',
42 => [7, 3, 3, 1],
],
Expand All @@ -39,7 +39,7 @@ public function arrayReplaceRecursiveProvider()
],
],
[
'input' => [
'input' => [
'?' => ['a', 'b', 'never'],
42 => null,
],
Expand Down
8 changes: 4 additions & 4 deletions tests/Lib/Arrays/ArrayReplaceTransformerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ public function arrayReplaceProvider()
{
return [
[
'default' => [
'default' => [
'one' => 'onedefault',
42 => 1337,
],
'override' => [
'?' => 'no',
],
'cases' => [
'cases' => [
[
'input' => [
'input' => [
'?' => 'yes',
'oh' => 'my',
],
Expand All @@ -40,7 +40,7 @@ public function arrayReplaceProvider()
],
],
[
'input' => [
'input' => [
'?' => ['a', 'b', 'c'],
42 => null,
],
Expand Down
8 changes: 4 additions & 4 deletions tests/Lib/JoinTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public function joinCasesProvider()
->from($fullFrom1)
->join(new PdoUniqueKeyExtractor($this->getPdo(), $joinQuery, 'id'), $fullFrom1, $joinOnClause)
->to($this->getLoaderMock()),
'isLeft' => false,
'isLeft' => false,
],
[
// test a left join : success means that the to table ends up
Expand All @@ -116,7 +116,7 @@ public function joinCasesProvider()
->from($fullFrom2)
->join(new PdoUniqueKeyExtractor($this->getPdo(), $joinQuery, 'id'), $fullFrom2, $leftJoinOnClause)
->to($this->getLoaderMock()),
'isLeft' => true,
'isLeft' => true,
],
[
// test left joined join = join
Expand All @@ -125,15 +125,15 @@ public function joinCasesProvider()
->join($joiner1, $fullFrom3, $joinOnClause)
->join(new PdoUniqueKeyExtractor($this->getPdo(), $joinQuery, 'id'), $joiner1, $leftJoinOnClause)
->to($this->getLoaderMock()),
'isLeft' => false,
'isLeft' => false,
],
[
// same as left join test with unbalanced batchSizes
'flow' => (new YaEtl)
->from($fullFrom4)
->join($joiner2, $fullFrom4, $leftJoinOnClause)
->to($this->getLoaderMock()),
'isLeft' => true,
'isLeft' => true,
],
];
}
Expand Down
4 changes: 2 additions & 2 deletions tests/Lib/LimitQualifierTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public function limitQualifierProvider(): array
$expected = range(1, 5);

return [
InterrupterInterface::TARGET_TOP => [
InterrupterInterface::TARGET_TOP => [
$expected,
InterrupterInterface::TARGET_TOP,
],
Expand Down Expand Up @@ -86,7 +86,7 @@ public function branchLimitQualifierProvider(): array
$expected = range(1, 10);

return [
InterrupterInterface::TARGET_TOP => [
InterrupterInterface::TARGET_TOP => [
$expectedBranch,
$expectedBranch,
InterrupterInterface::TARGET_TOP,
Expand Down
10 changes: 5 additions & 5 deletions tests/Lib/ProgressTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public function progressProvider(): array
{
return [
[
'flow' => (new YaEtl)->from(new CallableExtractor($this->getTraversableClosure(10)))
'flow' => (new YaEtl)->from(new CallableExtractor($this->getTraversableClosure(10)))
->qualify(new LimitQualifier(5))
->transform(new NoOpTransformer),
'num_records' => 15,
Expand All @@ -77,7 +77,7 @@ public function progressProvider(): array
],
],
[
'flow' => (new YaEtl)->from(new CallableExtractor($this->getTraversableClosure(100)))
'flow' => (new YaEtl)->from(new CallableExtractor($this->getTraversableClosure(100)))
->transform(new NoOpTransformer),
'num_records' => 100,
'progress_mod' => 10,
Expand All @@ -91,7 +91,7 @@ public function progressProvider(): array
],
],
[
'flow' => (new YaEtl)->from(new CallableExtractor($this->getTraversableClosure(100)))
'flow' => (new YaEtl)->from(new CallableExtractor($this->getTraversableClosure(100)))
->transform(new NoOpTransformer),
'num_records' => null,
'progress_mod' => 10,
Expand All @@ -105,7 +105,7 @@ public function progressProvider(): array
],
],
[
'flow' => (new YaEtl)->from(new CallableExtractor($this->getTraversableClosure(100)))
'flow' => (new YaEtl)->from(new CallableExtractor($this->getTraversableClosure(100)))
->transform(new NoOpTransformer),
'num_records' => 1337,
'progress_mod' => 1024,
Expand All @@ -119,7 +119,7 @@ public function progressProvider(): array
],
],
[
'flow' => (new YaEtl)->from(new CallableExtractor($this->getTraversableClosure(10)))
'flow' => (new YaEtl)->from(new CallableExtractor($this->getTraversableClosure(10)))
->transform(new NoOpTransformer),
'num_records' => 15,
'progress_mod' => 10,
Expand Down
Loading

0 comments on commit e2a605a

Please sign in to comment.