Skip to content

Commit 6501742

Browse files
committed
PHP5 Compliance
1 parent 199f608 commit 6501742

File tree

4 files changed

+34
-14
lines changed

4 files changed

+34
-14
lines changed

src/Name/Generator/DefaultNameGenerator.php

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
<?php
2-
declare(strict_types=1);
3-
42
namespace Jaeger\Symfony\Name\Generator;
53

64
use Symfony\Component\Console\ConsoleEvents;
@@ -24,13 +22,23 @@ public static function getSubscribedEvents()
2422
];
2523
}
2624

25+
/**
26+
* @param ConsoleCommandEvent $event
27+
*
28+
* @return DefaultNameGenerator
29+
*/
2730
public function onCommand(ConsoleCommandEvent $event)
2831
{
2932
$this->name = $event->getCommand()->getName();
3033

3134
return $this;
3235
}
3336

37+
/**
38+
* @param GetResponseEvent $event
39+
*
40+
* @return DefaultNameGenerator
41+
*/
3442
public function onRequest(GetResponseEvent $event)
3543
{
3644
$request = $event->getRequest();
@@ -53,14 +61,20 @@ public function onRequest(GetResponseEvent $event)
5361
return $this;
5462
}
5563

64+
/**
65+
* @return DefaultNameGenerator
66+
*/
5667
public function onTerminate()
5768
{
5869
$this->name = '';
5970

6071
return $this;
6172
}
6273

63-
public function generate(): string
74+
/**
75+
* @return string
76+
*/
77+
public function generate()
6478
{
6579
return $this->name;
6680
}

src/Name/Generator/NameGeneratorChain.php

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
<?php
2-
declare(strict_types=1);
3-
42
namespace Jaeger\Symfony\Name\Generator;
53

64
class NameGeneratorChain implements NameGeneratorInterface
@@ -12,14 +10,23 @@ public function __construct(\SplPriorityQueue $queue)
1210
$this->queue = $queue;
1311
}
1412

15-
public function add(NameGeneratorInterface $extractor, int $priority = 0): NameGeneratorChain
13+
/**
14+
* @param NameGeneratorInterface $extractor
15+
* @param int $priority
16+
*
17+
* @return NameGeneratorChain
18+
*/
19+
public function add(NameGeneratorInterface $extractor, $priority = 0)
1620
{
17-
$this->queue->insert($extractor, $priority);
21+
$this->queue->insert($extractor, (int)$priority);
1822

1923
return $this;
2024
}
2125

22-
public function generate(): string
26+
/**
27+
* @return string
28+
*/
29+
public function generate()
2330
{
2431
$queue = clone $this->queue;
2532
while (false === $queue->isEmpty()) {
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<?php
2-
declare(strict_types=1);
3-
42
namespace Jaeger\Symfony\Name\Generator;
53

64
interface NameGeneratorInterface
75
{
8-
public function generate() : string;
6+
/**
7+
* @return string
8+
*/
9+
public function generate();
910
}

src/Resources/DependencyInjection/NameGeneratorChainCompilerPass.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
<?php
2-
declare(strict_types=1);
3-
42
namespace Jaeger\Symfony\Resources\DependencyInjection;
53

64
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
@@ -20,7 +18,7 @@ public function process(ContainerBuilder $container)
2018
$definition = $container->getDefinition('jaeger.name.generator.chain');
2119
foreach ($container->findTaggedServiceIds('jaeger.name.generator') as $id => $tags) {
2220
foreach ($tags as $tag) {
23-
$priority = $tag['priority'] ?? 0;
21+
$priority = array_key_exists('priority', $tag) ? $tag['priority'] : 0;
2422
$definition->addMethodCall('add', [new Reference($id), $priority]);
2523
}
2624
}

0 commit comments

Comments
 (0)