Skip to content

Commit aff8c74

Browse files
emodricemodric
authored
Merge pull request #7 from netgen/NGSTACK-1002-upgrade-bundle-to-Ibexa-5
NGSTACK-1002 upgrade bundle to ibexa 5
2 parents f9be839 + 4da8364 commit aff8c74

11 files changed

Lines changed: 37 additions & 52 deletions

File tree

‎.github/workflows/tests.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
php: ['8.1']
18+
php: ['8.3']
1919
phpunit: ['phpunit.xml', 'phpunit-integration-legacy.xml']
2020

2121
steps:

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ composer.lock
33
.phpunit.result.cache
44
.php-cs-fixer.cache
55
var
6+
.phpunit.cache

‎bundle/Core/ScheduledVisibilityService.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ private function isValid(Content $content): bool
132132
}
133133

134134
if (
135-
($publishFromField->fieldTypeIdentifier !== 'ezdatetime' && $publishFromField->fieldTypeIdentifier !== 'ezdate')
136-
|| ($publishToField->fieldTypeIdentifier !== 'ezdatetime' && $publishToField->fieldTypeIdentifier !== 'ezdate')
135+
($publishFromField->fieldTypeIdentifier !== 'ibexa_datetime' && $publishFromField->fieldTypeIdentifier !== 'ibexa_date')
136+
|| ($publishToField->fieldTypeIdentifier !== 'ibexa_datetime' && $publishToField->fieldTypeIdentifier !== 'ibexa_date')
137137
) {
138138
return false;
139139
}

‎composer.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
}
1111
],
1212
"require": {
13-
"php": ">=8.1",
14-
"ibexa/core": "^4.5"
13+
"php": ">=8.3",
14+
"ibexa/core": "^5.0"
1515
},
1616
"require-dev": {
17-
"phpunit/phpunit": "^10",
18-
"matthiasnoback/symfony-dependency-injection-test": "^4.1"
17+
"phpunit/phpunit": "^12",
18+
"matthiasnoback/symfony-dependency-injection-test": "^6.0"
1919
},
2020
"minimum-stability": "dev",
2121
"prefer-stable": true,

‎tests/bundle/DependencyInjection/NetgenIbexaScheduledVisibilityTest.php‎

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractExtensionTestCase;
88
use Netgen\Bundle\IbexaScheduledVisibilityBundle\DependencyInjection\NetgenIbexaScheduledVisibilityExtension;
9+
use PHPUnit\Framework\Attributes\DataProvider;
910

1011
final class NetgenIbexaScheduledVisibilityTest extends AbstractExtensionTestCase
1112
{
@@ -277,9 +278,7 @@ public static function provideContentTypesConfigurationCases(): iterable
277278
];
278279
}
279280

280-
/**
281-
* @dataProvider provideDefaultConfigurationCases
282-
*/
281+
#[DataProvider('provideDefaultConfigurationCases')]
283282
public function testDefaultConfiguration(array $configuration): void
284283
{
285284
$this->load($configuration);
@@ -322,9 +321,7 @@ public function testDefaultConfiguration(array $configuration): void
322321
);
323322
}
324323

325-
/**
326-
* @dataProvider provideEnabledConfigurationCases
327-
*/
324+
#[DataProvider('provideEnabledConfigurationCases')]
328325
public function testEnabledConfiguration(array $configuration, bool $expectedParameterValue): void
329326
{
330327
$this->load($configuration);
@@ -335,9 +332,7 @@ public function testEnabledConfiguration(array $configuration, bool $expectedPar
335332
);
336333
}
337334

338-
/**
339-
* @dataProvider provideHandlerConfigurationCases
340-
*/
335+
#[DataProvider('provideHandlerConfigurationCases')]
341336
public function testHandlerConfiguration(array $configuration, string $expectedParameterValue): void
342337
{
343338
$this->load($configuration);
@@ -348,9 +343,7 @@ public function testHandlerConfiguration(array $configuration, string $expectedP
348343
);
349344
}
350345

351-
/**
352-
* @dataProvider provideSectionConfigurationCases
353-
*/
346+
#[DataProvider('provideSectionConfigurationCases')]
354347
public function testSectionConfiguration(array $configuration, array $expectedParameterValues): void
355348
{
356349
$this->load($configuration);
@@ -365,9 +358,7 @@ public function testSectionConfiguration(array $configuration, array $expectedPa
365358
);
366359
}
367360

368-
/**
369-
* @dataProvider provideObjectStateConfigurationCases
370-
*/
361+
#[DataProvider('provideObjectStateConfigurationCases')]
371362
public function testObjectStateConfiguration(array $configuration, array $expectedParameterValues): void
372363
{
373364
$this->load($configuration);
@@ -386,9 +377,7 @@ public function testObjectStateConfiguration(array $configuration, array $expect
386377
);
387378
}
388379

389-
/**
390-
* @dataProvider provideContentTypesConfigurationCases
391-
*/
380+
#[DataProvider('provideContentTypesConfigurationCases')]
392381
public function testContentTypesConfiguration(array $configuration, array $expectedParameterValues): void
393382
{
394383
$this->load($configuration);

‎tests/bundle/Integration/BaseTest.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use DateTime;
88
use Ibexa\Contracts\Core\Repository\Values\Content\Content;
99
use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
10-
use Ibexa\Tests\Integration\Core\Repository\BaseTest as APIBaseTest;
10+
use Ibexa\Tests\Integration\Core\Repository\BaseTestCase as APIBaseTest;
1111
use Netgen\Bundle\IbexaScheduledVisibilityBundle\Core\ScheduledVisibilityService;
1212

1313
abstract class BaseTest extends APIBaseTest
@@ -25,42 +25,42 @@ public static function provideCases(): iterable
2525
[
2626
[
2727
'publish_from' => null,
28-
'publish_to' => new DateTime('tomorrow'),
28+
'publish_to' => new DateTime('tomorrow', new \DateTimeZone('UTC')),
2929
],
3030
false,
3131
],
3232
[
3333
[
3434
'publish_from' => null,
35-
'publish_to' => new DateTime('yesterday'),
35+
'publish_to' => new DateTime('yesterday', new \DateTimeZone('UTC')),
3636
],
3737
true,
3838
],
3939
[
4040
[
41-
'publish_from' => new DateTime('2 days ago'),
42-
'publish_to' => new DateTime('yesterday'),
41+
'publish_from' => new DateTime('2 days ago', new \DateTimeZone('UTC')),
42+
'publish_to' => new DateTime('yesterday', new \DateTimeZone('UTC')),
4343
],
4444
true,
4545
],
4646
[
4747
[
48-
'publish_from' => new DateTime('yesterday'),
49-
'publish_to' => new DateTime('tomorrow'),
48+
'publish_from' => new DateTime('yesterday', new \DateTimeZone('UTC')),
49+
'publish_to' => new DateTime('tomorrow', new \DateTimeZone('UTC')),
5050
],
5151
false,
5252
],
5353
[
5454
[
55-
'publish_from' => new DateTime('tomorrow'),
55+
'publish_from' => new DateTime('tomorrow', new \DateTimeZone('UTC')),
5656
'publish_to' => null,
5757
],
5858
true,
5959
],
6060
[
6161
[
62-
'publish_from' => new DateTime('tomorrow'),
63-
'publish_to' => new DateTime('2 day'),
62+
'publish_from' => new DateTime('tomorrow', new \DateTimeZone('UTC')),
63+
'publish_to' => new DateTime('2 day', new \DateTimeZone('UTC')),
6464
],
6565
true,
6666
],
@@ -93,14 +93,14 @@ protected function createContentType(): ContentType
9393
$typeCreate->creatorId = $this->generateId('user', $permissionResolver->getCurrentUserReference()->getUserId());
9494
$typeCreate->creationDate = $this->createDateTime();
9595

96-
$publishFromFieldCreate = $contentTypeService->newFieldDefinitionCreateStruct('publish_from', 'ezdate');
96+
$publishFromFieldCreate = $contentTypeService->newFieldDefinitionCreateStruct('publish_from', 'ibexa_date');
9797
$publishFromFieldCreate->names = [
9898
'eng-GB' => 'Publish from',
9999
];
100100
$publishFromFieldCreate->position = 1;
101101
$typeCreate->addFieldDefinition($publishFromFieldCreate);
102102

103-
$publishToFieldCreate = $contentTypeService->newFieldDefinitionCreateStruct('publish_to', 'ezdatetime');
103+
$publishToFieldCreate = $contentTypeService->newFieldDefinitionCreateStruct('publish_to', 'ibexa_datetime');
104104
$publishToFieldCreate->names = [
105105
'eng-GB' => 'Publish to',
106106
];

‎tests/bundle/Integration/ContentAndLocationTest.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@
77
use Netgen\Bundle\IbexaScheduledVisibilityBundle\Core\VisibilityHandler\Content;
88
use Netgen\Bundle\IbexaScheduledVisibilityBundle\Core\VisibilityHandler\ContentAndLocation;
99
use Netgen\Bundle\IbexaScheduledVisibilityBundle\Core\VisibilityHandler\Location;
10+
use PHPUnit\Framework\Attributes\DataProvider;
1011

1112
final class ContentAndLocationTest extends BaseTest
1213
{
13-
/**
14-
* @dataProvider provideCases
15-
*/
14+
#[DataProvider('provideCases')]
1615
public function testUpdateVisibility(array $configuration, bool $expectedHidden)
1716
{
1817
$scheduledVisibilityService = $this->getScheduledVisibilityService();

‎tests/bundle/Integration/ContentTest.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@
55
namespace Netgen\IbexaScheduledVisibility\Tests\Integration;
66

77
use Netgen\Bundle\IbexaScheduledVisibilityBundle\Core\VisibilityHandler\Content;
8+
use PHPUnit\Framework\Attributes\DataProvider;
89

910
final class ContentTest extends BaseTest
1011
{
11-
/**
12-
* @dataProvider provideCases
13-
*/
12+
#[DataProvider('provideCases')]
1413
public function testUpdateVisibility(array $configuration, bool $expectedHidden)
1514
{
1615
$scheduledVisibilityService = $this->getScheduledVisibilityService();

‎tests/bundle/Integration/LocationTest.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@
55
namespace Netgen\IbexaScheduledVisibility\Tests\Integration;
66

77
use Netgen\Bundle\IbexaScheduledVisibilityBundle\Core\VisibilityHandler\Location;
8+
use PHPUnit\Framework\Attributes\DataProvider;
89

910
final class LocationTest extends BaseTest
1011
{
11-
/**
12-
* @dataProvider provideCases
13-
*/
12+
#[DataProvider('provideCases')]
1413
public function testUpdateVisibility(array $configuration, bool $expectedHidden)
1514
{
1615
$scheduledVisibilityService = $this->getScheduledVisibilityService();

‎tests/bundle/Integration/ObjectStateTest.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@
66

77
use Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectState as ObjectStateValue;
88
use Netgen\Bundle\IbexaScheduledVisibilityBundle\Core\VisibilityHandler\ObjectState;
9+
use PHPUnit\Framework\Attributes\DataProvider;
910

1011
final class ObjectStateTest extends BaseTest
1112
{
12-
/**
13-
* @dataProvider provideCases
14-
*/
13+
#[DataProvider('provideCases')]
1514
public function testUpdateVisibility(array $configuration, bool $expectedHidden)
1615
{
1716
$scheduledVisibilityService = $this->getScheduledVisibilityService();

0 commit comments

Comments
 (0)