Skip to content

Commit ad6bd26

Browse files
norberttechnorberttech
committed
chore: updated nix shell
- drop 8.2 from nix shell - added 8.5 from nixpkgs PR - updated php extension in nix pkgs - added composer build:docker script - added missing extensions to Dockerfile installation
1 parent 4279787 commit ad6bd26

File tree

8 files changed

+114
-27
lines changed

8 files changed

+114
-27
lines changed

‎.nix/pkgs/php-brotli/package.nix‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55

66
php.buildPecl {
77
pname = "brotli";
8-
version = "0.13.1";
8+
version = "0.18.3";
99

1010
src = fetchFromGitHub {
1111
owner = "kjdev";
1212
repo = "php-ext-brotli";
13-
tag = "0.13.1";
14-
hash = "sha256-bdnTEEJUPe+VvXjncKbIi4wfnEn9UH7OBTKiUCET+qQ=";
13+
tag = "0.18.3";
14+
hash = "sha256-kIsQHgiCYcoa5+5wXjA+VCrMj7ZFLunOCOeG5DFD62k=";
1515
fetchSubmodules = true;
1616
};
1717
}

‎.nix/pkgs/php-lz4/package.nix‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
php.buildPecl {
44
pname = "lz4";
5-
version = "0.4.4";
5+
version = "0.6.0";
66

77
src = fetchFromGitHub {
88
owner = "kjdev";
99
repo = "php-ext-lz4";
10-
tag = "0.4.4";
11-
hash = "sha256-iKgMN77W5iR3jwOwKNwIpuLwkeDkQVTIppEp4fF1oZw=";
10+
tag = "0.6.0";
11+
hash = "sha256-F98nSyQG/je9Sggugb6wJbgHR3DPAG9r4Y4eQSDlntI=";
1212
fetchSubmodules = true;
1313
};
1414
}

‎.nix/pkgs/php-snappy/package.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
php.buildPecl {
44
pname = "snappy";
5-
version = "0.2.1";
5+
version = "0.2.3";
66

77
src = fetchFromGitHub {
88
owner = "kjdev";
99
repo = "php-ext-snappy";
10-
tag = "0.2.1";
10+
tag = "0.2.3";
1111
hash = "sha256-PAKdIcpJKH6d74EulYQepP4XbQvccrj1nEuir47vro4=";
1212
fetchSubmodules = true;
1313
};

‎.nix/pkgs/php-zstd/package.nix‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
php.buildPecl {
44
pname = "zstd";
5-
version = "0.14.0";
5+
version = "0.15.2";
66

77
src = fetchFromGitHub {
88
owner = "kjdev";
99
repo = "php-ext-zstd";
10-
tag = "0.14.0";
11-
hash = "sha256-oIbvaLYQ6Tp20Y/UEN7i1dtMnxGdMNcIjv6xRCyVYdE=";
10+
tag = "0.15.2";
11+
hash = "sha256-AhEEHtETALgYkJxDfRA6/bx6yZKpsfL48MqO505FAFI=";
1212
fetchSubmodules = true;
1313
};
1414
}

‎composer.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -417,6 +417,7 @@
417417
"tools/phpbench/vendor/bin/phpbench run --report=flow-report --group=parquet-library"
418418
],
419419
"test:mutation": [
420+
"Composer\\Config::disableProcessTimeout",
420421
"tools/infection/vendor/bin/infection --threads=max"
421422
],
422423
"test:monorepo": "tools/monorepo/vendor/bin/monorepo-builder validate",
@@ -450,6 +451,9 @@
450451
"cd wasm && ./build.sh",
451452
"@build:phar"
452453
],
454+
"build:docker": [
455+
"docker buildx build -t flow-php/flow:latest . --progress=plain --load"
456+
],
453457
"build:docs": [
454458
"bin/docs.php dsl:dump web/landing/resources/dsl.json",
455459
"bin/docs.php api:dump web/landing/resources/api.json"

‎infection.json‎

Lines changed: 55 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"src/lib/parquet/src"
99
],
1010
"excludes": [
11-
"Flow/ETL/DSL",
11+
"{.*/DSL.*}",
1212
"Flow/ETL/Attribute",
1313
"Flow/Calculator/Exception",
1414
"Flow/Serializer/Exception",
@@ -70,6 +70,59 @@
7070
"ignore": [
7171
"Flow\\Doctrine\\Bulk\\BulkData"
7272
]
73+
},
74+
"UnwrapRtrim": {
75+
"ignore": [
76+
"Flow\\Calculator\\Calculator::*"
77+
]
78+
},
79+
"LogicalAnd": {
80+
"ignore": [
81+
"Flow\\ArrayComparison\\ArrayComparison::equals"
82+
]
83+
},
84+
"LogicalOr": {
85+
"ignore": [
86+
"Flow\\ArrayComparison\\ArrayComparison::equals"
87+
]
88+
},
89+
"AssignCoalesce": {
90+
"ignore": [
91+
"Flow\\ETL\\Config\\ConfigBuilder::build"
92+
]
93+
},
94+
"Coalesce": {
95+
"ignore": [
96+
"Flow\\ETL\\Cache\\Implementation\\FilesystemCache::__construct",
97+
"Flow\\ETL\\Config\\Cache\\CacheConfigBuilder::build"
98+
]
99+
},
100+
"CloneRemoval": {
101+
"ignore": [
102+
"Flow\\ETL\\DataFrame::count",
103+
"Flow\\ETL\\DataFrame::fetch",
104+
"Flow\\ETL\\DataFrame::run",
105+
"Flow\\ETL\\DataFrame::get*"
106+
]
107+
},
108+
"MethodCallRemoval": {
109+
"ignore": [
110+
"Flow\\ETL\\DataFrame::autoCast",
111+
"Flow\\ETL\\DataFrame::aggregate",
112+
"Flow\\ETL\\DataFrame::match"
113+
]
114+
},
115+
"BitwiseAnd": {
116+
"ignore": [
117+
"Flow\\Parquet\\Data\\*"
118+
]
119+
},
120+
"Assignment": {
121+
"ignore": [
122+
"Flow\\Parquet\\Writer\\*::addRow",
123+
"Flow\\Parquet\\Writer\\*::addBytes",
124+
"Flow\\Parquet\\Data\\*::*"
125+
]
73126
}
74127
},
75128
"bootstrap": "vendor/autoload.php",
@@ -79,5 +132,5 @@
79132
},
80133
"tmpDir": "var/infection/cache",
81134
"minMsi": 30,
82-
"minCoveredMsi": 75
135+
"minCoveredMsi": 70
83136
}

‎phpunit.xml.dist‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,34 @@
195195
<directory suffix=".php">src/lib/parquet/src/Flow/Parquet/Thrift</directory>
196196
<directory suffix=".php">src/lib/postgresql/src/Flow/PostgreSql/Protobuf</directory>
197197
<file>src/core/etl/src/Flow/ETL/DSL/functions.php</file>
198+
<file>src/lib/postgresql/src/Flow/PostgreSql/DSL/functions.php</file>
199+
<file>src/functions.php</file>
200+
<file>src/tools/documentation/tests/Flow/Documentation/Tests/Integration/functions.php</file>
201+
<file>src/core/etl/src/Flow/ETL/DSL/functions.php</file>
202+
<file>src/bridge/filesystem/async-aws/src/Flow/Filesystem/Bridge/AsyncAWS/DSL/functions.php</file>
203+
<file>src/bridge/filesystem/azure/src/Flow/Filesystem/Bridge/Azure/DSL/functions.php</file>
204+
<file>src/bridge/openapi/specification/src/Flow/Bridge/OpenAPI/Specification/DSL/functions.php</file>
205+
<file>src/bridge/monolog/http/src/Flow/Bridge/Monolog/Http/DSL/functions.php</file>
206+
<file>src/bridge/symfony/http-foundation/src/Flow/Bridge/Symfony/HttpFoundation/functions.php</file>
207+
<file>src/adapter/etl-adapter-avro/src/Flow/ETL/Adapter/Avro/functions.php</file>
208+
<file>src/adapter/etl-adapter-elasticsearch/src/Flow/ETL/Adapter/Elasticsearch/functions.php</file>
209+
<file>src/adapter/etl-adapter-json/src/Flow/ETL/Adapter/JSON/functions.php</file>
210+
<file>src/adapter/etl-adapter-http/src/Flow/ETL/Adapter/Http/DSL/functions.php</file>
211+
<file>src/adapter/etl-adapter-text/src/Flow/ETL/Adapter/Text/functions.php</file>
212+
<file>src/adapter/etl-adapter-csv/src/Flow/ETL/Adapter/CSV/functions.php</file>
213+
<file>src/adapter/etl-adapter-parquet/src/Flow/ETL/Adapter/Parquet/functions.php</file>
214+
<file>src/adapter/etl-adapter-meilisearch/src/Flow/ETL/Adapter/Meilisearch/functions.php</file>
215+
<file>src/adapter/etl-adapter-google-sheet/src/Flow/ETL/Adapter/GoogleSheet/functions.php</file>
216+
<file>src/adapter/etl-adapter-chartjs/src/Flow/ETL/Adapter/ChartJS/functions.php</file>
217+
<file>src/adapter/etl-adapter-excel/src/Flow/ETL/Adapter/Excel/DSL/functions.php</file>
218+
<file>src/adapter/etl-adapter-xml/src/Flow/ETL/Adapter/XML/functions.php</file>
219+
<file>src/adapter/etl-adapter-doctrine/src/Flow/ETL/Adapter/Doctrine/functions.php</file>
220+
<file>src/cli/src/Flow/CLI/DSL/functions.php</file>
221+
<file>src/lib/postgresql/src/Flow/PostgreSql/DSL/functions.php</file>
222+
<file>src/lib/types/src/Flow/Types/DSL/functions.php</file>
223+
<file>src/lib/filesystem/src/Flow/Filesystem/DSL/functions.php</file>
224+
<file>src/lib/parquet/src/Flow/Parquet/functions.php</file>
225+
<file>src/lib/azure-sdk/src/Flow/Azure/SDK/DSL/functions.php</file>
198226
</exclude>
199227
</source>
200228
</phpunit>

‎shell.nix‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,33 @@
1-
let
2-
nixpkgs = fetchTarball {
3-
# Oct 31, 2025
4-
url = "https://github.com/NixOS/nixpkgs/archive/66a437ebcf6160152336e801a7ec289ba2aba3c5.tar.gz";
5-
};
6-
7-
lockedPkgs = import nixpkgs {
8-
config = {
9-
allowUnfree = true;
10-
};
11-
};
12-
in
131
{
14-
pkgs ? lockedPkgs,
152
php-version ? 8.3,
163
with-blackfire ? false,
174
with-xdebug ? false,
185
with-pcov ? !with-blackfire,
19-
with-pg-query-ext ? false,
6+
with-pg-query-ext ? true,
207
with-terraform ? false,
218
with-wasm ? false,
229
}:
2310

2411
let
12+
nixpkgs = fetchTarball {
13+
url = if php-version == 8.5 then
14+
"https://github.com/NixOS/nixpkgs/archive/refs/pull/422308/head.tar.gz"
15+
else
16+
"https://github.com/NixOS/nixpkgs/archive/66a437ebcf6160152336e801a7ec289ba2aba3c5.tar.gz";
17+
};
18+
19+
pkgs = import nixpkgs {
20+
config = {
21+
allowUnfree = true;
22+
};
23+
};
24+
2525
base-php = if php-version == 8.3 then
2626
pkgs.php83
2727
else if php-version == 8.4 then
2828
pkgs.php84
29+
else if php-version == 8.5 then
30+
pkgs.php85
2931
else
3032
throw "Unknown php version ${php-version}";
3133

0 commit comments

Comments
 (0)