Skip to content

Commit df636fc

Browse files
NiklanNiklan
committed
Fix tests
1 parent 27d712a commit df636fc

File tree

3 files changed

+114
-104
lines changed

3 files changed

+114
-104
lines changed

‎composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@
4747
},
4848
"classmap": [
4949
"tests/src/Type/data",
50-
"tests/src/Rules/data"
50+
"tests/src/Rules/data",
51+
"tests/src/Generics/data"
5152
]
5253
},
5354
"extra": {

‎tests/src/Generics/data/formatter-base.php

Lines changed: 86 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -2,84 +2,94 @@
22

33
namespace DrupalFormatterBaseGeneric;
44

5+
use Drupal\Core\Field\FieldItemList;
56
use Drupal\Core\Field\FieldItemListInterface;
67
use Drupal\Core\Field\FormatterBase;
8+
use Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem;
9+
use Drupal\Core\Field\Plugin\Field\FieldType\StringItem;
710
use function PHPStan\Testing\assertType;
811

9-
///**
10-
// * @extends FormatterBase<FakeBooleanFieldItemList>
11-
// */
12-
//class ExtendsBooleanItemFormatter extends FormatterBase {
13-
//
14-
// public function prepareView(array $entities_items): void {
15-
// assertType('array<DrupalFormatterInterfaceGeneric\FakeBooleanFieldItemList>', $entities_items);
16-
// $items = $entities_items[0];
17-
// assertType('DrupalFormatterInterfaceGeneric\FakeBooleanFieldItemList', $items);
18-
// assertType('Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem|null', $items->first());
19-
// assertType('Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem|null', $items->get(0));
20-
// assertType('Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem|null', $items->offsetGet(0));
21-
// foreach ($items as $item) {
22-
// assertType('Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem', $item);
23-
// }
24-
// }
25-
//
26-
// public function view(FieldItemListInterface $items, $langcode = NULL) {
27-
// assertType('DrupalFormatterInterfaceGeneric\FakeBooleanFieldItemList', $items);
28-
// assertType('Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem|null', $items->first());
29-
// assertType('Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem|null', $items->get(0));
30-
// assertType('Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem|null', $items->offsetGet(0));
31-
// foreach ($items as $item) {
32-
// assertType('Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem', $item);
33-
// }
34-
// }
35-
//
36-
// public function viewElements(FieldItemListInterface $items, $langcode) {
37-
// assertType('DrupalFormatterInterfaceGeneric\FakeBooleanFieldItemList', $items);
38-
// assertType('Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem|null', $items->first());
39-
// assertType('Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem|null', $items->get(0));
40-
// assertType('Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem|null', $items->offsetGet(0));
41-
// foreach ($items as $item) {
42-
// assertType('Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem', $item);
43-
// }
44-
// }
45-
//
46-
//}
12+
/**
13+
* Provides a custom field item list with concrete FieldItemListInterface<T>.
14+
*
15+
* @extends FieldItemList<BooleanItem>
16+
*/
17+
class BooleanFieldItemList extends FieldItemList {}
4718

48-
///**
49-
// * @extends FormatterBase<FieldItemList<StringItem>>
50-
// */
51-
//class ExtendedDeepFormatter extends FormatterBase {
52-
//
53-
// public function prepareView(array $entities_items): void {
54-
// assertType('array<Drupal\Core\Field\FieldItemList<Drupal\Core\Field\Plugin\Field\FieldType\StringItem>>', $entities_items);
55-
// $items = $entities_items[0];
56-
// assertType('Drupal\Core\Field\FieldItemList<Drupal\Core\Field\Plugin\Field\FieldType\StringItem>', $items);
57-
// assertType('Drupal\Core\Field\Plugin\Field\FieldType\StringItem|null', $items->first());
58-
// assertType('Drupal\Core\Field\Plugin\Field\FieldType\StringItem|null', $items->get(0));
59-
// assertType('Drupal\Core\Field\Plugin\Field\FieldType\StringItem|null', $items->offsetGet(0));
60-
// foreach ($items as $item) {
61-
// assertType('Drupal\Core\Field\Plugin\Field\FieldType\StringItem', $item);
62-
// }
63-
// }
64-
//
65-
// public function view(FieldItemListInterface $items, $langcode = NULL) {
66-
// assertType('Drupal\Core\Field\FieldItemList<Drupal\Core\Field\Plugin\Field\FieldType\StringItem>', $items);
67-
// assertType('Drupal\Core\Field\Plugin\Field\FieldType\StringItem|null', $items->first());
68-
// assertType('Drupal\Core\Field\Plugin\Field\FieldType\StringItem|null', $items->get(0));
69-
// assertType('Drupal\Core\Field\Plugin\Field\FieldType\StringItem|null', $items->offsetGet(0));
70-
// foreach ($items as $item) {
71-
// assertType('Drupal\Core\Field\Plugin\Field\FieldType\StringItem', $item);
72-
// }
73-
// }
74-
//
75-
// public function viewElements(FieldItemListInterface $items, $langcode) {
76-
// assertType('Drupal\Core\Field\FieldItemList<Drupal\Core\Field\Plugin\Field\FieldType\StringItem>', $items);
77-
// assertType('Drupal\Core\Field\Plugin\Field\FieldType\StringItem|null', $items->first());
78-
// assertType('Drupal\Core\Field\Plugin\Field\FieldType\StringItem|null', $items->get(0));
79-
// assertType('Drupal\Core\Field\Plugin\Field\FieldType\StringItem|null', $items->offsetGet(0));
80-
// foreach ($items as $item) {
81-
// assertType('Drupal\Core\Field\Plugin\Field\FieldType\StringItem', $item);
82-
// }
83-
// }
84-
//
85-
//}
19+
/**
20+
* @extends FormatterBase<BooleanFieldItemList>
21+
*/
22+
class ExtendsBooleanItemFormatter extends FormatterBase {
23+
24+
public function prepareView(array $entities_items): void {
25+
assertType('array<DrupalFormatterInterfaceGeneric\BooleanFieldItemList>', $entities_items);
26+
$items = $entities_items[0];
27+
assertType('DrupalFormatterInterfaceGeneric\BooleanFieldItemList', $items);
28+
assertType('Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem|null', $items->first());
29+
assertType('Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem|null', $items->get(0));
30+
assertType('Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem|null', $items->offsetGet(0));
31+
foreach ($items as $item) {
32+
assertType('Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem', $item);
33+
}
34+
}
35+
36+
public function view(FieldItemListInterface $items, $langcode = NULL) {
37+
assertType('DrupalFormatterInterfaceGeneric\BooleanFieldItemList', $items);
38+
assertType('Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem|null', $items->first());
39+
assertType('Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem|null', $items->get(0));
40+
assertType('Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem|null', $items->offsetGet(0));
41+
foreach ($items as $item) {
42+
assertType('Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem', $item);
43+
}
44+
}
45+
46+
public function viewElements(FieldItemListInterface $items, $langcode) {
47+
assertType('DrupalFormatterInterfaceGeneric\BooleanFieldItemList', $items);
48+
assertType('Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem|null', $items->first());
49+
assertType('Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem|null', $items->get(0));
50+
assertType('Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem|null', $items->offsetGet(0));
51+
foreach ($items as $item) {
52+
assertType('Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem', $item);
53+
}
54+
}
55+
56+
}
57+
58+
/**
59+
* @extends FormatterBase<FieldItemList<StringItem>>
60+
*/
61+
class ExtendedDeepFormatter extends FormatterBase {
62+
63+
public function prepareView(array $entities_items): void {
64+
assertType('array<Drupal\Core\Field\FieldItemList<Drupal\Core\Field\Plugin\Field\FieldType\StringItem>>', $entities_items);
65+
$items = $entities_items[0];
66+
assertType('Drupal\Core\Field\FieldItemList<Drupal\Core\Field\Plugin\Field\FieldType\StringItem>', $items);
67+
assertType('Drupal\Core\Field\Plugin\Field\FieldType\StringItem|null', $items->first());
68+
assertType('Drupal\Core\Field\Plugin\Field\FieldType\StringItem|null', $items->get(0));
69+
assertType('Drupal\Core\Field\Plugin\Field\FieldType\StringItem|null', $items->offsetGet(0));
70+
foreach ($items as $item) {
71+
assertType('Drupal\Core\Field\Plugin\Field\FieldType\StringItem', $item);
72+
}
73+
}
74+
75+
public function view(FieldItemListInterface $items, $langcode = NULL) {
76+
assertType('Drupal\Core\Field\FieldItemList<Drupal\Core\Field\Plugin\Field\FieldType\StringItem>', $items);
77+
assertType('Drupal\Core\Field\Plugin\Field\FieldType\StringItem|null', $items->first());
78+
assertType('Drupal\Core\Field\Plugin\Field\FieldType\StringItem|null', $items->get(0));
79+
assertType('Drupal\Core\Field\Plugin\Field\FieldType\StringItem|null', $items->offsetGet(0));
80+
foreach ($items as $item) {
81+
assertType('Drupal\Core\Field\Plugin\Field\FieldType\StringItem', $item);
82+
}
83+
}
84+
85+
public function viewElements(FieldItemListInterface $items, $langcode) {
86+
assertType('Drupal\Core\Field\FieldItemList<Drupal\Core\Field\Plugin\Field\FieldType\StringItem>', $items);
87+
assertType('Drupal\Core\Field\Plugin\Field\FieldType\StringItem|null', $items->first());
88+
assertType('Drupal\Core\Field\Plugin\Field\FieldType\StringItem|null', $items->get(0));
89+
assertType('Drupal\Core\Field\Plugin\Field\FieldType\StringItem|null', $items->offsetGet(0));
90+
foreach ($items as $item) {
91+
assertType('Drupal\Core\Field\Plugin\Field\FieldType\StringItem', $item);
92+
}
93+
}
94+
95+
}

‎tests/src/Generics/data/formatter-interface.php

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,7 @@ public function viewElements(FieldItemListInterface $items, $langcode) {
178178
*
179179
* @extends FieldItemList<BooleanItem>
180180
*/
181-
class BooleanFieldItemList extends FieldItemList {
182-
}
181+
class BooleanFieldItemList extends FieldItemList {}
183182

184183
/**
185184
* @implements FormatterInterface<BooleanFieldItemList>
@@ -191,31 +190,31 @@ public function prepareView(array $entities_items): void {
191190
$items = $entities_items[0];
192191
assertType('DrupalFormatterInterfaceGeneric\BooleanFieldItemList', $items);
193192
assertType('Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem|null', $items->first());
194-
// assertType('Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem|null', $items->get(0));
195-
// assertType('Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem|null', $items->offsetGet(0));
196-
// foreach ($items as $item) {
197-
// assertType('Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem', $item);
198-
// }
193+
assertType('Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem|null', $items->get(0));
194+
assertType('Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem|null', $items->offsetGet(0));
195+
foreach ($items as $item) {
196+
assertType('Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem', $item);
197+
}
198+
}
199+
200+
public function view(FieldItemListInterface $items, $langcode = NULL) {
201+
assertType('DrupalFormatterInterfaceGeneric\BooleanFieldItemList', $items);
202+
assertType('Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem|null', $items->first());
203+
assertType('Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem|null', $items->get(0));
204+
assertType('Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem|null', $items->offsetGet(0));
205+
foreach ($items as $item) {
206+
assertType('Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem', $item);
207+
}
208+
}
209+
210+
public function viewElements(FieldItemListInterface $items, $langcode) {
211+
assertType('DrupalFormatterInterfaceGeneric\BooleanFieldItemList', $items);
212+
assertType('Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem|null', $items->first());
213+
assertType('Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem|null', $items->get(0));
214+
assertType('Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem|null', $items->offsetGet(0));
215+
foreach ($items as $item) {
216+
assertType('Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem', $item);
217+
}
199218
}
200-
//
201-
// public function view(FieldItemListInterface $items, $langcode = NULL) {
202-
// assertType('DrupalFormatterInterfaceGeneric\FakeBooleanFieldItemList', $items);
203-
// assertType('Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem|null', $items->first());
204-
// assertType('Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem|null', $items->get(0));
205-
// assertType('Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem|null', $items->offsetGet(0));
206-
// foreach ($items as $item) {
207-
// assertType('Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem', $item);
208-
// }
209-
// }
210-
//
211-
// public function viewElements(FieldItemListInterface $items, $langcode) {
212-
// assertType('DrupalFormatterInterfaceGeneric\FakeBooleanFieldItemList', $items);
213-
// assertType('Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem|null', $items->first());
214-
// assertType('Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem|null', $items->get(0));
215-
// assertType('Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem|null', $items->offsetGet(0));
216-
// foreach ($items as $item) {
217-
// assertType('Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem', $item);
218-
// }
219-
// }
220219

221220
}

0 commit comments

Comments
 (0)