Skip to content

Commit 3d9061f

Browse files
authored
chore: string class name to class constant in extension (#742)
1 parent e5aaa36 commit 3d9061f

File tree

2 files changed

+22
-14
lines changed

2 files changed

+22
-14
lines changed

src/DependencyInjection/SncRedisExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ private function loadPredisClient(array $client, ContainerBuilder $container): v
142142
if (is_string($client['options']['connection_persistent'])) {
143143
$client['options']['persistent'] = true;
144144
// For predis, use the string value as conn_uid (requires predis >= 2.4.0)
145-
if (class_exists('Predis\Client')) {
145+
if (class_exists(Client::class)) {
146146
if (!version_compare(Client::VERSION, '2.4.0', '>=')) {
147147
throw new InvalidConfigurationException(
148148
'Using connection_persistent as string for Predis requires predis/predis version 2.4.0 or higher. ' .

tests/DependencyInjection/SncRedisExtensionTest.php

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,21 @@
1414
namespace Snc\RedisBundle\Tests\DependencyInjection;
1515

1616
use InvalidArgumentException;
17+
use Monolog\Formatter\LogstashFormatter;
18+
use Monolog\Handler\RedisHandler;
1719
use PHPUnit\Framework\TestCase;
1820
use Predis\Client;
21+
use Predis\Configuration\Options;
22+
use Predis\Connection\Parameters;
1923
use Redis;
2024
use RedisException;
2125
use Relay\Relay;
26+
use Snc\RedisBundle\Client\Predis\Connection\ConnectionFactory;
27+
use Snc\RedisBundle\Client\Predis\Connection\ConnectionWrapper;
28+
use Snc\RedisBundle\DataCollector\RedisDataCollector;
2229
use Snc\RedisBundle\DependencyInjection\Configuration\Configuration;
2330
use Snc\RedisBundle\DependencyInjection\SncRedisExtension;
31+
use Snc\RedisBundle\Logger\RedisLogger;
2432
use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
2533
use Symfony\Component\Config\Definition\Processor;
2634
use Symfony\Component\Config\FileLocator;
@@ -46,15 +54,15 @@ class SncRedisExtensionTest extends TestCase
4654
public static function parameterValues(): array
4755
{
4856
return [
49-
['snc_redis.client.class', 'Predis\Client'],
57+
['snc_redis.client.class', Client::class],
5058
['snc_redis.relay_client.class', Relay::class],
51-
['snc_redis.client_options.class', 'Predis\Configuration\Options'],
52-
['snc_redis.connection_parameters.class', 'Predis\Connection\Parameters'],
53-
['snc_redis.connection_factory.class', 'Snc\RedisBundle\Client\Predis\Connection\ConnectionFactory'],
54-
['snc_redis.connection_wrapper.class', 'Snc\RedisBundle\Client\Predis\Connection\ConnectionWrapper'],
55-
['snc_redis.logger.class', 'Snc\RedisBundle\Logger\RedisLogger'],
56-
['snc_redis.data_collector.class', 'Snc\RedisBundle\DataCollector\RedisDataCollector'],
57-
['snc_redis.monolog_handler.class', 'Monolog\Handler\RedisHandler'],
59+
['snc_redis.client_options.class', Options::class],
60+
['snc_redis.connection_parameters.class', Parameters::class],
61+
['snc_redis.connection_factory.class', ConnectionFactory::class],
62+
['snc_redis.connection_wrapper.class', ConnectionWrapper::class],
63+
['snc_redis.logger.class', RedisLogger::class],
64+
['snc_redis.data_collector.class', RedisDataCollector::class],
65+
['snc_redis.monolog_handler.class', RedisHandler::class],
5866
];
5967
}
6068

@@ -193,7 +201,7 @@ public function testMonologFormatterOption(): void
193201
{
194202
$container = $this->getContainer();
195203
//Create a fake formatter definition
196-
$container->setDefinition('my_monolog_formatter', new Definition('Monolog\\Formatter\\LogstashFormatter', ['symfony']));
204+
$container->setDefinition('my_monolog_formatter', new Definition(LogstashFormatter::class, ['symfony']));
197205
$extension = new SncRedisExtension();
198206
$config = $this->parseYaml($this->getMonologFormatterOptionYamlConfig());
199207
$extension->load([$config], $container);
@@ -763,7 +771,7 @@ private function getPhpRedisWithInvalidACLYamlMinimalConfig(): string
763771

764772
public function testPredisWithConnectionPersistentBool(): void
765773
{
766-
if (!class_exists('Predis\Client')) {
774+
if (!class_exists(Client::class)) {
767775
$this->markTestSkipped('Predis not available');
768776
}
769777

@@ -783,7 +791,7 @@ public function testPredisWithConnectionPersistentBool(): void
783791

784792
public function testPredisWithConnectionPersistentString(): void
785793
{
786-
if (!class_exists('Predis\Client')) {
794+
if (!class_exists(Client::class)) {
787795
$this->markTestSkipped('Predis not available');
788796
}
789797

@@ -803,7 +811,7 @@ public function testPredisWithConnectionPersistentString(): void
803811

804812
public function testPredisWithConnectionPersistentVersionTooOld(): void
805813
{
806-
if (!class_exists('Predis\Client')) {
814+
if (!class_exists(Client::class)) {
807815
$this->markTestSkipped('Predis not available');
808816
}
809817

@@ -849,7 +857,7 @@ private function getPredisWithConnectionPersistentStringYamlConfig(): string
849857

850858
public function testPredisWithConnectionPersistentFalse(): void
851859
{
852-
if (!class_exists('Predis\Client')) {
860+
if (!class_exists(Client::class)) {
853861
$this->markTestSkipped('Predis not available');
854862
}
855863

0 commit comments

Comments
 (0)