Skip to content

Commit 63f68a8

Browse files
fix: extend Services class with CodeIgniter's BaseService (#198)
* fix: extend Services class with CodeIgniter's BaseService * chore: remove BooleanInIfConditionRuleFixerRector rector rule + run cs-fix
1 parent e53249d commit 63f68a8

File tree

4 files changed

+4
-6
lines changed

4 files changed

+4
-6
lines changed

rector.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
use Rector\Set\ValueObject\LevelSetList;
4949
use Rector\Set\ValueObject\SetList;
5050
use Rector\Strict\Rector\Empty_\DisallowedEmptyRuleFixerRector;
51-
use Rector\Strict\Rector\If_\BooleanInIfConditionRuleFixerRector;
5251
use Rector\TypeDeclaration\Rector\Empty_\EmptyOnNullableObjectToInstanceOfRector;
5352
use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromAssignsRector;
5453
use Rector\ValueObject\PhpVersion;
@@ -161,7 +160,6 @@
161160
$rectorConfig->rule(StringClassNameToClassConstantRector::class);
162161
$rectorConfig->rule(PrivatizeFinalClassPropertyRector::class);
163162
$rectorConfig->rule(CompleteDynamicPropertiesRector::class);
164-
$rectorConfig->rule(BooleanInIfConditionRuleFixerRector::class);
165163
$rectorConfig->rule(SingleInArrayToCompareRector::class);
166164
$rectorConfig->rule(VersionCompareFuncCallToConstantRector::class);
167165
$rectorConfig->rule(ExplicitBoolCompareRector::class);

src/Config/Services.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313

1414
namespace CodeIgniter\Tasks\Config;
1515

16+
use CodeIgniter\Config\BaseService;
1617
use CodeIgniter\Tasks\CronExpression;
1718
use CodeIgniter\Tasks\Scheduler;
18-
use Config\Services as BaseServices;
1919

20-
class Services extends BaseServices
20+
class Services extends BaseService
2121
{
2222
/**
2323
* Returns the Task Scheduler

src/RunResolver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ protected function isInList($value, string $list): bool
151151
{
152152
$list = explode(',', $list);
153153

154-
return in_array(trim($value), $list, true);
154+
return in_array(trim((string) $value), $list, true);
155155
}
156156

157157
/**

src/Task.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ protected function buildName()
365365
*/
366366
public function __get(string $key)
367367
{
368-
if ($key === 'name' && empty($this->name)) {
368+
if ($key === 'name' && (! isset($this->name) || ($this->name === ''))) {
369369
return $this->buildName();
370370
}
371371

0 commit comments

Comments
 (0)