Skip to content

Commit 5831044

Browse files
paulbalandanpaulbalandan
committed
refactor: fix the remaining fixable assign.propertyType and phpdoc.propertyType errors
1 parent 58fed05 commit 5831044

13 files changed

Lines changed: 132 additions & 148 deletions

File tree

‎app/Controllers/BaseController.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
namespace App\Controllers;
44

55
use CodeIgniter\Controller;
6+
use CodeIgniter\HTTP\CLIRequest;
7+
use CodeIgniter\HTTP\IncomingRequest;
68
use CodeIgniter\HTTP\RequestInterface;
79
use CodeIgniter\HTTP\ResponseInterface;
810
use Psr\Log\LoggerInterface;
@@ -28,6 +30,8 @@ abstract class BaseController extends Controller
2830
// protected $session;
2931

3032
/**
33+
* @param CLIRequest|IncomingRequest $request
34+
*
3135
* @return void
3236
*/
3337
public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger)

‎system/Controller.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ class Controller
7474
/**
7575
* Constructor.
7676
*
77+
* @param CLIRequest|IncomingRequest $request
78+
*
7779
* @return void
7880
*
7981
* @throws HTTPException|RedirectException

‎system/RESTful/BaseResource.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ abstract class BaseResource extends Controller
4242
/**
4343
* Constructor.
4444
*
45+
* @param CLIRequest|IncomingRequest $request
46+
*
4547
* @return void
4648
*/
4749
public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger)

‎system/Session/Handlers/FileHandler.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ class FileHandler extends BaseHandler
2424
{
2525
/**
2626
* Where to save the session files to.
27-
*
28-
* @var string
2927
*/
3028
protected $savePath;
3129

@@ -68,7 +66,7 @@ public function __construct(SessionConfig $config, string $ipAddress)
6866
{
6967
parent::__construct($config, $ipAddress);
7068

71-
if ($this->savePath !== '') {
69+
if (is_string($this->savePath) && $this->savePath !== '') {
7270
$this->savePath = rtrim($this->savePath, '/\\');
7371
ini_set('session.save_path', $this->savePath);
7472
} else {

‎tests/system/ControllerTest.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
use CodeIgniter\Config\Factories;
1717
use CodeIgniter\HTTP\Exceptions\RedirectException;
1818
use CodeIgniter\HTTP\IncomingRequest;
19-
use CodeIgniter\HTTP\Request;
2019
use CodeIgniter\HTTP\Response;
2120
use CodeIgniter\HTTP\SiteURI;
2221
use CodeIgniter\HTTP\UserAgent;
@@ -44,7 +43,7 @@ final class ControllerTest extends CIUnitTestCase
4443
/**
4544
* Current request.
4645
*/
47-
private Request $request;
46+
private IncomingRequest $request;
4847

4948
/**
5049
* Current response.

‎tests/system/Honeypot/HoneypotTest.php‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,11 @@ protected function setUp(): void
6161
$superglobals->setServer('REQUEST_METHOD', 'POST');
6262
$superglobals->setPost($this->config->name, 'hey');
6363

64-
$this->request = service('request', null, false);
65-
$this->response = service('response');
64+
$this->request = service('request', null, false);
65+
66+
$response = service('response');
67+
$this->assertInstanceOf(Response::class, $response);
68+
$this->response = $response;
6669
}
6770

6871
public function testAttachHoneypot(): void
@@ -106,7 +109,10 @@ public function testAttachHoneypotAndContainerWithCSP(): void
106109
$config = new App();
107110
$config->CSPEnabled = true;
108111
Factories::injectMock('config', 'App', $config);
109-
$this->response = service('response', $config, false);
112+
113+
$response = service('response', $config, false);
114+
$this->assertInstanceOf(Response::class, $response);
115+
$this->response = $response;
110116

111117
$this->config = new HoneypotConfig();
112118
$this->honeypot = new Honeypot($this->config);
@@ -125,7 +131,10 @@ public function testNotAttachHoneypotWithCSP(): void
125131
$config = new App();
126132
$config->CSPEnabled = true;
127133
Factories::injectMock('config', 'App', $config);
128-
$this->response = service('response', $config, false);
134+
135+
$response = service('response', $config, false);
136+
$this->assertInstanceOf(Response::class, $response);
137+
$this->response = $response;
129138

130139
$this->config = new HoneypotConfig();
131140
$this->honeypot = new Honeypot($this->config);
@@ -189,7 +198,11 @@ public function testHoneypotFilterAfter(): void
189198
$uri = 'admin/foo/bar';
190199

191200
$this->response->setBody('<form></form>');
192-
$this->response = $filters->run($uri, 'after');
201+
202+
$response = $filters->run($uri, 'after');
203+
$this->assertInstanceOf(Response::class, $response);
204+
$this->response = $response;
205+
193206
$this->assertStringContainsString($this->config->name, (string) $this->response->getBody());
194207
}
195208

‎tests/system/Models/EventsModelTest.php‎

Lines changed: 66 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,19 @@
2323
#[Group('DatabaseLive')]
2424
final class EventsModelTest extends LiveModelTestCase
2525
{
26-
/**
27-
* @var EventModel
28-
*/
29-
protected $model;
30-
3126
protected function setUp(): void
3227
{
3328
parent::setUp();
3429
$this->createModel(EventModel::class);
3530
}
3631

32+
private function model(): EventModel
33+
{
34+
$this->assertInstanceOf(EventModel::class, $this->model);
35+
36+
return $this->model;
37+
}
38+
3739
public function testInsertEvent(): void
3840
{
3941
$data = [
@@ -43,9 +45,9 @@ public function testInsertEvent(): void
4345
'deleted' => 0,
4446
];
4547

46-
$this->model->insert($data);
47-
$this->assertTrue($this->model->hasToken('beforeInsert'));
48-
$this->assertTrue($this->model->hasToken('afterInsert'));
48+
$this->model()->insert($data);
49+
$this->assertTrue($this->model()->hasToken('beforeInsert'));
50+
$this->assertTrue($this->model()->hasToken('afterInsert'));
4951
}
5052

5153
public function testUpdateEvent(): void
@@ -57,106 +59,106 @@ public function testUpdateEvent(): void
5759
'deleted' => 0,
5860
];
5961

60-
$id = $this->model->insert($data);
62+
$id = $this->model()->insert($data);
6163

62-
$this->model->update($id, $data);
63-
$this->assertTrue($this->model->hasToken('beforeUpdate'));
64-
$this->assertTrue($this->model->hasToken('afterUpdate'));
64+
$this->model()->update($id, $data);
65+
$this->assertTrue($this->model()->hasToken('beforeUpdate'));
66+
$this->assertTrue($this->model()->hasToken('afterUpdate'));
6567
}
6668

6769
public function testDeleteEvent(): void
6870
{
69-
$this->model->delete(1);
70-
$this->assertTrue($this->model->hasToken('beforeDelete'));
71-
$this->assertTrue($this->model->hasToken('afterDelete'));
71+
$this->model()->delete(1);
72+
$this->assertTrue($this->model()->hasToken('beforeDelete'));
73+
$this->assertTrue($this->model()->hasToken('afterDelete'));
7274
}
7375

7476
public function testFindEvent(): void
7577
{
76-
$this->model->find(1);
77-
$this->assertTrue($this->model->hasToken('beforeFind'));
78-
$this->assertTrue($this->model->hasToken('afterFind'));
78+
$this->model()->find(1);
79+
$this->assertTrue($this->model()->hasToken('beforeFind'));
80+
$this->assertTrue($this->model()->hasToken('afterFind'));
7981
}
8082

8183
public function testBeforeFindReturnsData(): void
8284
{
83-
$this->model->beforeFindReturnData = true;
85+
$this->model()->beforeFindReturnData = true;
8486

85-
$result = $this->model->find(1);
86-
$this->assertTrue($this->model->hasToken('beforeFind'));
87+
$result = $this->model()->find(1);
88+
$this->assertTrue($this->model()->hasToken('beforeFind'));
8789
$this->assertSame('foobar', $result);
8890
}
8991

9092
public function testBeforeFindReturnDataPreventsAfterFind(): void
9193
{
92-
$this->model->beforeFindReturnData = true;
93-
$this->model->find(1);
94-
$this->assertFalse($this->model->hasToken('afterFind'));
94+
$this->model()->beforeFindReturnData = true;
95+
$this->model()->find(1);
96+
$this->assertFalse($this->model()->hasToken('afterFind'));
9597
}
9698

9799
public function testFindEventSingletons(): void
98100
{
99101
// afterFind
100-
$this->model->first();
101-
$this->assertTrue($this->model->eventData['singleton']);
102+
$this->model()->first();
103+
$this->assertTrue($this->model()->eventData['singleton']);
102104

103-
$this->model->find(1);
104-
$this->assertTrue($this->model->eventData['singleton']);
105+
$this->model()->find(1);
106+
$this->assertTrue($this->model()->eventData['singleton']);
105107

106-
$this->model->find();
107-
$this->assertFalse($this->model->eventData['singleton']);
108+
$this->model()->find();
109+
$this->assertFalse($this->model()->eventData['singleton']);
108110

109-
$this->model->findAll();
110-
$this->assertFalse($this->model->eventData['singleton']);
111+
$this->model()->findAll();
112+
$this->assertFalse($this->model()->eventData['singleton']);
111113

112114
// beforeFind
113-
$this->model->beforeFindReturnData = true;
115+
$this->model()->beforeFindReturnData = true;
114116

115-
$this->model->first();
116-
$this->assertTrue($this->model->eventData['singleton']);
117+
$this->model()->first();
118+
$this->assertTrue($this->model()->eventData['singleton']);
117119

118-
$this->model->find(1);
119-
$this->assertTrue($this->model->eventData['singleton']);
120+
$this->model()->find(1);
121+
$this->assertTrue($this->model()->eventData['singleton']);
120122

121-
$this->model->find();
122-
$this->assertFalse($this->model->eventData['singleton']);
123+
$this->model()->find();
124+
$this->assertFalse($this->model()->eventData['singleton']);
123125

124-
$this->model->findAll();
125-
$this->assertFalse($this->model->eventData['singleton']);
126+
$this->model()->findAll();
127+
$this->assertFalse($this->model()->eventData['singleton']);
126128
}
127129

128130
public function testAllowCallbacksFalsePreventsTriggers(): void
129131
{
130-
$this->model->allowCallbacks(false)->find(1);
131-
$this->assertFalse($this->model->hasToken('afterFind'));
132+
$this->model()->allowCallbacks(false)->find(1);
133+
$this->assertFalse($this->model()->hasToken('afterFind'));
132134
}
133135

134136
public function testAllowCallbacksTrueFiresTriggers(): void
135137
{
136-
$this->setPrivateProperty($this->model, 'allowCallbacks', false);
137-
$this->model->allowCallbacks(true)->find(1);
138-
$this->assertTrue($this->model->hasToken('afterFind'));
138+
$this->setPrivateProperty($this->model(), 'allowCallbacks', false);
139+
$this->model()->allowCallbacks(true)->find(1);
140+
$this->assertTrue($this->model()->hasToken('afterFind'));
139141
}
140142

141143
public function testAllowCallbacksResetsAfterTrigger(): void
142144
{
143-
$this->model->allowCallbacks(false)->find(1);
144-
$this->model->delete(1);
145+
$this->model()->allowCallbacks(false)->find(1);
146+
$this->model()->delete(1);
145147

146-
$this->assertFalse($this->model->hasToken('afterFind'));
147-
$this->assertTrue($this->model->hasToken('afterDelete'));
148+
$this->assertFalse($this->model()->hasToken('afterFind'));
149+
$this->assertTrue($this->model()->hasToken('afterDelete'));
148150
}
149151

150152
public function testAllowCallbacksUsesModelProperty(): void
151153
{
152-
$this->setPrivateProperty($this->model, 'allowCallbacks', false);
153-
$this->setPrivateProperty($this->model, 'tempAllowCallbacks', false); // Was already set by the constructor
154+
$this->setPrivateProperty($this->model(), 'allowCallbacks', false);
155+
$this->setPrivateProperty($this->model(), 'tempAllowCallbacks', false); // Was already set by the constructor
154156

155-
$this->model->find(1);
156-
$this->model->delete(1);
157+
$this->model()->find(1);
158+
$this->model()->delete(1);
157159

158-
$this->assertFalse($this->model->hasToken('afterFind'));
159-
$this->assertFalse($this->model->hasToken('afterDelete'));
160+
$this->assertFalse($this->model()->hasToken('afterFind'));
161+
$this->assertFalse($this->model()->hasToken('afterDelete'));
160162
}
161163

162164
public function testInvalidEventException(): void
@@ -168,11 +170,11 @@ public function testInvalidEventException(): void
168170
'deleted' => 0,
169171
];
170172

171-
$this->setPrivateProperty($this->model, 'beforeInsert', ['anotherBeforeInsertMethod']);
173+
$this->setPrivateProperty($this->model(), 'beforeInsert', ['anotherBeforeInsertMethod']);
172174

173175
$this->expectException(DataException::class);
174176
$this->expectExceptionMessage('"anotherBeforeInsertMethod" is not a valid Model Event callback.');
175-
$this->model->insert($data);
177+
$this->model()->insert($data);
176178
}
177179

178180
public function testInsertBatchEvent(): void
@@ -192,9 +194,9 @@ public function testInsertBatchEvent(): void
192194
],
193195
];
194196

195-
$this->model->insertBatch($data);
196-
$this->assertTrue($this->model->hasToken('beforeInsertBatch'));
197-
$this->assertTrue($this->model->hasToken('afterInsertBatch'));
197+
$this->model()->insertBatch($data);
198+
$this->assertTrue($this->model()->hasToken('beforeInsertBatch'));
199+
$this->assertTrue($this->model()->hasToken('afterInsertBatch'));
198200
}
199201

200202
public function testUpdateBatchEvent(): void
@@ -210,8 +212,8 @@ public function testUpdateBatchEvent(): void
210212
],
211213
];
212214

213-
$this->model->updateBatch($data, 'name');
214-
$this->assertTrue($this->model->hasToken('beforeUpdateBatch'));
215-
$this->assertTrue($this->model->hasToken('afterUpdateBatch'));
215+
$this->model()->updateBatch($data, 'name');
216+
$this->assertTrue($this->model()->hasToken('beforeUpdateBatch'));
217+
$this->assertTrue($this->model()->hasToken('afterUpdateBatch'));
216218
}
217219
}

0 commit comments

Comments
 (0)