fix merge
This commit is contained in:
parent
047b2b7ebd
commit
2cee7f2b17
@ -15,7 +15,10 @@ use Predis\Client;
|
|||||||
|
|
||||||
class PredisClusterSessionHandlerTest extends AbstractRedisSessionHandlerTestCase
|
class PredisClusterSessionHandlerTest extends AbstractRedisSessionHandlerTestCase
|
||||||
{
|
{
|
||||||
protected function createRedisClient(string $host): Client
|
/**
|
||||||
|
* @return Client
|
||||||
|
*/
|
||||||
|
protected function createRedisClient(string $host): object
|
||||||
{
|
{
|
||||||
return new Client([['host' => $host]]);
|
return new Client([['host' => $host]]);
|
||||||
}
|
}
|
||||||
|
@ -15,7 +15,10 @@ use Predis\Client;
|
|||||||
|
|
||||||
class PredisSessionHandlerTest extends AbstractRedisSessionHandlerTestCase
|
class PredisSessionHandlerTest extends AbstractRedisSessionHandlerTestCase
|
||||||
{
|
{
|
||||||
protected function createRedisClient(string $host): Client
|
/**
|
||||||
|
* @return Client
|
||||||
|
*/
|
||||||
|
protected function createRedisClient(string $host): object
|
||||||
{
|
{
|
||||||
return new Client(['host' => $host]);
|
return new Client(['host' => $host]);
|
||||||
}
|
}
|
||||||
|
@ -56,5 +56,5 @@ abstract class AbstractCollatorTest extends TestCase
|
|||||||
/**
|
/**
|
||||||
* @return Collator|\Collator
|
* @return Collator|\Collator
|
||||||
*/
|
*/
|
||||||
abstract protected function getCollator(string $locale): object;
|
abstract protected function getCollator(string $locale);
|
||||||
}
|
}
|
||||||
|
@ -963,7 +963,7 @@ abstract class AbstractIntlDateFormatterTest extends TestCase
|
|||||||
/**
|
/**
|
||||||
* @return IntlDateFormatter|\IntlDateFormatter
|
* @return IntlDateFormatter|\IntlDateFormatter
|
||||||
*/
|
*/
|
||||||
abstract protected function getDateFormatter($locale, $datetype, $timetype, $timezone = null, $calendar = IntlDateFormatter::GREGORIAN, $pattern = null): object;
|
abstract protected function getDateFormatter($locale, $datetype, $timetype, $timezone = null, $calendar = IntlDateFormatter::GREGORIAN, $pattern = null);
|
||||||
|
|
||||||
abstract protected function getIntlErrorMessage(): string;
|
abstract protected function getIntlErrorMessage(): string;
|
||||||
|
|
||||||
|
@ -177,7 +177,7 @@ class IntlDateFormatterTest extends AbstractIntlDateFormatterTest
|
|||||||
$this->assertIsIntlSuccess($formatter, 'U_ZERO_ERROR', IntlGlobals::U_ZERO_ERROR);
|
$this->assertIsIntlSuccess($formatter, 'U_ZERO_ERROR', IntlGlobals::U_ZERO_ERROR);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function getDateFormatter($locale, $datetype, $timetype, $timezone = null, $calendar = IntlDateFormatter::GREGORIAN, $pattern = null): object
|
protected function getDateFormatter($locale, $datetype, $timetype, $timezone = null, $calendar = IntlDateFormatter::GREGORIAN, $pattern = null)
|
||||||
{
|
{
|
||||||
return new class($locale, $datetype, $timetype, $timezone, $calendar, $pattern) extends IntlDateFormatter {
|
return new class($locale, $datetype, $timetype, $timezone, $calendar, $pattern) extends IntlDateFormatter {
|
||||||
};
|
};
|
||||||
|
@ -57,7 +57,7 @@ class IntlDateFormatterTest extends AbstractIntlDateFormatterTest
|
|||||||
parent::testDateAndTimeType($timestamp, $datetype, $timetype, $expected);
|
parent::testDateAndTimeType($timestamp, $datetype, $timetype, $expected);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function getDateFormatter($locale, $datetype, $timetype, $timezone = null, $calendar = IntlDateFormatter::GREGORIAN, $pattern = null): object
|
protected function getDateFormatter($locale, $datetype, $timetype, $timezone = null, $calendar = IntlDateFormatter::GREGORIAN, $pattern = null)
|
||||||
{
|
{
|
||||||
IntlTestHelper::requireFullIntl($this, '55.1');
|
IntlTestHelper::requireFullIntl($this, '55.1');
|
||||||
|
|
||||||
|
@ -836,7 +836,7 @@ abstract class AbstractNumberFormatterTest extends TestCase
|
|||||||
/**
|
/**
|
||||||
* @return NumberFormatter|\NumberFormatter
|
* @return NumberFormatter|\NumberFormatter
|
||||||
*/
|
*/
|
||||||
abstract protected function getNumberFormatter(string $locale = 'en', string $style = null, string $pattern = null): object;
|
abstract protected function getNumberFormatter(string $locale = 'en', string $style = null, string $pattern = null);
|
||||||
|
|
||||||
abstract protected function getIntlErrorMessage(): string;
|
abstract protected function getIntlErrorMessage(): string;
|
||||||
|
|
||||||
|
@ -26,6 +26,9 @@ class PredisStoreTest extends AbstractRedisStoreTest
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return \Predis\Client
|
||||||
|
*/
|
||||||
protected function getRedisConnection(): object
|
protected function getRedisConnection(): object
|
||||||
{
|
{
|
||||||
$redis = new \Predis\Client('tcp://'.getenv('REDIS_HOST').':6379');
|
$redis = new \Predis\Client('tcp://'.getenv('REDIS_HOST').':6379');
|
||||||
|
@ -106,7 +106,7 @@ class TestObjectLoader extends ObjectLoader
|
|||||||
return 'service';
|
return 'service';
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function getObject(string $id): object
|
protected function getObject(string $id)
|
||||||
{
|
{
|
||||||
return $this->loaderMap[$id] ?? null;
|
return $this->loaderMap[$id] ?? null;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user