Skip to content

Commit 47e7feb

Browse files
authored
Add generic list types. Bump min framework version to 5.2 (#20)
- silverstripe/framework 5.2 is required for working generics list types - silverstripe/framework 5.1 is EOL Oct 17, 2024
1 parent 362c220 commit 47e7feb

File tree

5 files changed

+12
-8
lines changed

5 files changed

+12
-8
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
],
2323
"require": {
2424
"php": "^8.1",
25-
"silverstripe/framework": "^5.1"
25+
"silverstripe/framework": "^5.2"
2626
},
2727
"require-dev": {
2828
"phpunit/phpunit": "^9.5",

src/Service/Results/Facet.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class Facet extends ViewableData
1010
{
1111

1212
/**
13-
* @var ArrayList|FacetData[]
13+
* @var ArrayList<FacetData>
1414
*/
1515
private ArrayList $data;
1616

@@ -32,6 +32,9 @@ public function forTemplate(): DBHTMLText
3232
return $this->renderWith(static::class);
3333
}
3434

35+
/**
36+
* @return ArrayList<FacetData>
37+
*/
3538
public function getData(): ArrayList
3639
{
3740
return $this->data;

src/Service/Results/Facets.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
use SilverStripe\ORM\ArrayList;
66
use SilverStripe\ORM\FieldType\DBHTMLText;
77

8+
/**
9+
* @extends ArrayList<Facet>
10+
*/
811
class Facets extends ArrayList
912
{
1013

src/Service/Results/Records.php

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

33
namespace SilverStripe\Discoverer\Service\Results;
44

5+
use SilverStripe\ORM\ArrayList;
56
use SilverStripe\ORM\FieldType\DBHTMLText;
67
use SilverStripe\ORM\PaginatedList;
78

9+
/**
10+
* @extends PaginatedList<ArrayList<Record>, Record>
11+
*/
812
class Records extends PaginatedList
913
{
1014

src/Service/Results/Results.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,8 @@ class Results extends ViewableData
1313

1414
use Injectable;
1515

16-
/**
17-
* @var Records|Record[]
18-
*/
1916
private Records $records;
2017

21-
/**
22-
* @var Facets|Facet[]
23-
*/
2418
private Facets $facets;
2519

2620
private ?string $indexName = null;

0 commit comments

Comments
 (0)