Skip to content

Commit

Permalink
Bump phpunit/phpunit from 10.5.40 to 11.5.3 in /tools/phpunit (#1377)
Browse files Browse the repository at this point in the history
* Update PHPUnit to v11.5.3

* Constructor of TestCase is now final

* In PHPUnit11 providers need to be static

* In PHPUnit11 providers need to be static

* Fix styling

* CacheResultFile is removed. See sebastianbergmann/phpunit#4600

* PHPStan complain that readonly properties must be handled inside the constructor

* Fix cache issues

* Invalidate cache

* Remove composer cache

* Revert changed environment variable

* Call parent to initialise variables

* Revert changes in Github Action

* Bump symfonycasts/tailwind-bundle from 0.5.3 to 0.6.1 in /web/landing (#1376)

Bumps [symfonycasts/tailwind-bundle](https://github.com/SymfonyCasts/tailwind-bundle) from 0.5.3 to 0.6.1.
- [Release notes](https://github.com/SymfonyCasts/tailwind-bundle/releases)
- [Commits](SymfonyCasts/tailwind-bundle@v0.5.3...v0.6.1)

---
updated-dependencies:
- dependency-name: symfonycasts/tailwind-bundle
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Updated CHANGELOG.md

* Added and/or/andNot/orNot to ScalarFunctionsChain (#1378)

* Bump coduo/php-humanizer from 4.0.3 to 5.0.0 in /web/landing (#1373)

Bumps [coduo/php-humanizer](https://github.com/coduo/php-humanizer) from 4.0.3 to 5.0.0.
- [Release notes](https://github.com/coduo/php-humanizer/releases)
- [Changelog](https://github.com/coduo/php-humanizer/blob/5.x/CHANGELOG.md)
- [Upgrade guide](https://github.com/coduo/php-humanizer/blob/5.x/UPGRADE.md)
- [Commits](coduo/php-humanizer@4.0.3...5.0.0)

---
updated-dependencies:
- dependency-name: coduo/php-humanizer
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Updated CHANGELOG.md

* Fix conflicts

* Updated CHANGELOG.md

* Bump async-aws/s3 from 2.6.0 to 2.7.0 (#1381)

Bumps [async-aws/s3](https://github.com/async-aws/s3) from 2.6.0 to 2.7.0.
- [Release notes](https://github.com/async-aws/s3/releases)
- [Changelog](https://github.com/async-aws/s3/blob/master/CHANGELOG.md)
- [Commits](async-aws/s3@2.6.0...2.7.0)

---
updated-dependencies:
- dependency-name: async-aws/s3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Added elasticsearch examples (#1384)

* Updated CHANGELOG.md

* Fix dependencies

* Fix styling

* Remove duplicated path

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: aeon-automation <[email protected]>
Co-authored-by: Norbert Orzechowicz <[email protected]>
  • Loading branch information
4 people authored Jan 17, 2025
1 parent 0b8ee64 commit e0000ff
Show file tree
Hide file tree
Showing 8 changed files with 304 additions and 238 deletions.
2 changes: 0 additions & 2 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
xsi:noNamespaceSchemaLocation="tools/phpunit/vendor/phpunit/phpunit/phpunit.xsd"
bootstrap="vendor/autoload.php"
colors="true"
cacheResultFile="./var/phpunit/cache/phpunit.cache"
displayDetailsOnTestsThatTriggerWarnings="true"
displayDetailsOnTestsThatTriggerErrors="true"
>
Expand Down Expand Up @@ -159,7 +158,6 @@
<directory>src/core/etl/tests/Flow/ETL/Tests/Unit</directory>
<directory>src/lib/array-dot/tests/Flow/ArrayDot/Tests/Unit</directory>
<directory>src/lib/doctrine-dbal-bulk/tests/Flow/Doctrine/Bulk/Tests/Unit</directory>
<directory>src/lib/doctrine-dbal-bulk/tests/Flow/Doctrine/Bulk/Tests/Unit</directory>
<directory>src/lib/filesystem/tests/Flow/Filesystem/Tests/Unit</directory>
<directory>src/lib/parquet/tests/Flow/Parquet/Tests/Unit</directory>
<directory>src/lib/rdsl/tests/Flow/RDSL/Tests/Unit</directory>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

final class ArrayComparisonTest extends TestCase
{
public function equal_arrays() : \Generator
public static function equal_arrays() : \Generator
{
yield 'simple arrays' => [
['id' => 1, 'name' => 'one', 'color' => 'red'],
Expand Down Expand Up @@ -96,7 +96,7 @@ public function equal_arrays() : \Generator
];
}

public function not_equal_arrays() : \Generator
public static function not_equal_arrays() : \Generator
{
yield 'simple arrays' => [
['id' => 1, 'name' => 'one', 'color' => 'red'],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

final class ArraySortByKeyTest extends TestCase
{
public function arrays() : \Generator
public static function arrays() : \Generator
{
yield 'simple array' => [
['name' => 'one', 'priority' => 'high', 'id' => 1, 'color' => 'red', 'active' => true],
Expand Down
9 changes: 2 additions & 7 deletions src/core/etl/tests/Flow/ETL/Tests/FlowIntegrationTestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,22 +22,17 @@ abstract class FlowIntegrationTestCase extends FlowTestCase

protected Serializer $serializer;

private readonly string $baseMemoryLimit;
private string $baseMemoryLimit;

public function __construct(string $name)
protected function setUp() : void
{
parent::__construct($name);

$this->baseMemoryLimit = (\ini_get('memory_limit')) ?: '-1';

$this->cacheDir = Path::realpath(\getenv(CacheConfig::CACHE_DIR_ENV));
$this->fs = new NativeLocalFilesystem();
$this->fstab = new FilesystemTable($this->fs, new StdOutFilesystem());
$this->serializer = new Base64Serializer(new NativePHPSerializer());
}

protected function setUp() : void
{
$this->cleanupCacheDir($this->cacheDir);
\mkdir($this->cacheDir->path(), recursive: true);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@

final class ConfigBuilderTest extends FlowIntegrationTestCase
{
protected function tearDown() : void
{
putenv(CacheConfig::CACHE_DIR_ENV . '=' . $this->cacheDir->path());

parent::tearDown();
}

public function test_creating_custom_cache_dir() : void
{
putenv(CacheConfig::CACHE_DIR_ENV . '=' . __DIR__ . '/var/cache');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ final class SynchronousPipelineTest extends FlowIntegrationTestCase
{
protected function setUp() : void
{
parent::setUp();

if (!\file_exists(__DIR__ . '/var')) {
\mkdir(__DIR__ . '/var');
}
Expand Down
2 changes: 1 addition & 1 deletion tools/phpunit/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "flow-php/flow-tools",
"description": "Flow PHP ETL - Tools",
"require-dev": {
"phpunit/phpunit": "^10"
"phpunit/phpunit": "^11"
},
"config": {
"allow-plugins": false
Expand Down
Loading

0 comments on commit e0000ff

Please sign in to comment.