Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DEP Set minimum version of symfony/cache to 7.1.5 #11466

Merged
merged 2 commits into from
Nov 14, 2024
+8 −10
Merged

DEP Set minimum version of symfony/cache to 7.1.5 #11466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22177c0
DEP Set minimum version of symfony/cache to 7.1.5
emteknetnz Nov 14, 2024
a08a119
MNT Fix unit test
emteknetnz Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"silverstripe/template-engine": "^1",
"silverstripe/vendor-plugin": "^2",
"sminnee/callbacklist": "^0.1.1",
"symfony/cache": "^7.0",
"symfony/cache": "^7.1.5",
"symfony/config": "^7.0",
"symfony/console": "^7.0",
"symfony/dom-crawler": "^7.0",
Expand Down
16 changes: 7 additions & 9 deletions tests/php/ORM/DataObjectTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use InvalidArgumentException;
use LogicException;
use PHPUnit\Framework\Attributes\DataProvider;
use SilverStripe\Core\Config\Config;
use SilverStripe\Core\Injector\Injector;
use SilverStripe\Dev\SapphireTest;
Expand All @@ -27,7 +28,6 @@
use SilverStripe\Model\ModelData;
use ReflectionMethod;
use stdClass;
use PHPUnit\Framework\Attributes\DataProvider;

class DataObjectTest extends SapphireTest
{
Expand Down Expand Up @@ -1913,7 +1913,7 @@ public function testManyManyUnlimitedRowCount()
$this->assertEquals(2, $player->Teams()->dataQuery()->query()->unlimitedRowCount());
}

public function provideSingularName(): array
public static function provideSingularName(): array
{
return [
[
Expand All @@ -1933,8 +1933,8 @@ public function provideSingularName(): array

/**
* Tests that singular_name() generates sensible defaults.
* @dataProvider provideSingularName
*/
#[DataProvider('provideSingularName')]
public function testSingularName(string $class, string $expected): void
{
i18n::set_locale('en_NZ');
Expand All @@ -1952,7 +1952,7 @@ public function testSingularName(string $class, string $expected): void
);
}

public function providePluralName(): array
public static function providePluralName(): array
{
return [
[
Expand Down Expand Up @@ -1984,8 +1984,8 @@ public function providePluralName(): array

/**
* Tests that plural_name() generates sensible defaults.
* @dataProvider providePluralName
*/
#[DataProvider('providePluralName')]
public function testPluralName(string $class, string $expected): void
{
i18n::set_locale('en_NZ');
Expand All @@ -2003,7 +2003,7 @@ public function testPluralName(string $class, string $expected): void
);
}

public function provideClassDescription(): array
public static function provideClassDescription(): array
{
return [
'no description by default' => [
Expand All @@ -2021,9 +2021,7 @@ public function provideClassDescription(): array
];
}

/**
* @dataProvider provideClassDescription
*/
#[DataProvider('provideClassDescription')]
public function testClassDescription(string $class, ?string $expected): void
{
i18n::set_locale('en_NZ');
Expand Down