adjust type-hints to be forward compatible

umpirsky · Nov 2, 2021 · 28e864a · 28e864a
1 parent 3fa756d
commit 28e864a
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 23 deletions.
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -7,18 +7,11 @@
 
 final class Configuration implements ConfigurationInterface
 {
-    public function getConfigTreeBuilder()
+    public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('umpirsky_i18n_routing');
 
-        if (method_exists($treeBuilder, 'getRootNode')) {
-            $rootNode = $treeBuilder->getRootNode();
-        } else {
-            // BC layer for symfony/config 4.1 and older
-            $rootNode = $treeBuilder->root('umpirsky_i18n_routing');
-        }
-
-        $rootNode
+        $treeBuilder->getRootNode()
             ->children()
                 ->scalarNode('route_name_suffix')->defaultValue('_i18n')->end()
                 ->scalarNode('default_locale')->isRequired()->end()

diff --git a/src/DependencyInjection/UmpirskyI18nRoutingExtension.php b/src/DependencyInjection/UmpirskyI18nRoutingExtension.php
@@ -11,7 +11,7 @@
 
 class UmpirskyI18nRoutingExtension extends Extension
 {
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         $processor = new Processor();
         $config = $processor->processConfiguration(new Configuration(), $configs);

diff --git a/src/Routing/Loader/I18nRouteLoader.php b/src/Routing/Loader/I18nRouteLoader.php
@@ -36,12 +36,12 @@ public function supports($resource, $type = null): bool
         return $this->loader->supports($resource, $type);
     }
 
-    public function getResolver()
+    public function getResolver(): LoaderResolverInterface
     {
         return $this->loader->getResolver();
     }
 
-    public function setResolver(LoaderResolverInterface $resolver)
+    public function setResolver(LoaderResolverInterface $resolver): void
     {
         $this->loader->setResolver($resolver);
     }

diff --git a/src/Routing/Router.php b/src/Routing/Router.php
@@ -7,6 +7,7 @@
 use Symfony\Component\Routing\Exception\RouteNotFoundException;
 use Symfony\Component\Routing\Matcher\RequestMatcherInterface;
 use Symfony\Component\Routing\RequestContext;
+use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\RouterInterface;
 
 /**
@@ -29,22 +30,22 @@ public function __construct(RouterInterface $router, string $routeNameSuffix, st
         $this->defaultLocale = $defaultLocale;
     }
 
-    public function setContext(RequestContext $context)
+    public function setContext(RequestContext $context): void
     {
         $this->router->setContext($context);
     }
 
-    public function getContext()
+    public function getContext(): RequestContext
     {
         return $this->router->getContext();
     }
 
-    public function getRouteCollection()
+    public function getRouteCollection(): RouteCollection
     {
         return $this->router->getRouteCollection();
     }
 
-    public function generate($name, $parameters = array(), $referenceType = self::ABSOLUTE_PATH)
+    public function generate($name, $parameters = array(), $referenceType = self::ABSOLUTE_PATH): string
     {
         if (array_key_exists('_locale', $parameters) && $parameters['_locale'] === $this->defaultLocale) {
             unset($parameters['_locale']);
@@ -59,27 +60,29 @@ public function generate($name, $parameters = array(), $referenceType = self::AB
         return $this->router->generate($name, $parameters, $referenceType);
     }
 
-    public function match($pathinfo)
+    public function match($pathinfo): array
     {
         return $this->normalizeI18nMatch($this->router->match($pathinfo));
     }
 
-    public function matchRequest(Request $request)
+    public function matchRequest(Request $request): array
     {
         return $this->normalizeI18nMatch($this->router->matchRequest($request));
     }
 
-    public function warmUp($cacheDir)
+    public function warmUp($cacheDir): array
     {
         if ($this->router instanceof WarmableInterface) {
-            $this->router->warmUp($cacheDir);
+            return $this->router->warmUp($cacheDir);
         }
+
+        return [];
     }
 
     /**
      * @todo Inject route name suffix
      */
-    private function generateI18n($name, $parameters = [], $referenceType = self::ABSOLUTE_PATH)
+    private function generateI18n($name, $parameters = [], $referenceType = self::ABSOLUTE_PATH): string
     {
         if (!array_key_exists('_locale', $parameters) && (!$this->getContext()->hasParameter('_locale') || $this->defaultLocale === $this->getContext()->getParameter('_locale'))) {
             return $this->router->generate($name, $parameters, $referenceType);
@@ -90,7 +93,7 @@ private function generateI18n($name, $parameters = [], $referenceType = self::AB
         return $this->router->generate($name.$this->routeNameSuffix, $parameters, $referenceType);
     }
 
-    private function normalizeI18nMatch(array $parameters)
+    private function normalizeI18nMatch(array $parameters): array
     {
         $i18nPosition = strlen($parameters['_route']) - strlen($this->routeNameSuffix);
 

diff --git a/src/Routing/Strategy/PrefixStrategy.php b/src/Routing/Strategy/PrefixStrategy.php
@@ -4,7 +4,6 @@
 
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
-use Umpirsky\I18nRoutingBundle\Routing\Generator\LocaleRequirementGeneratorInterface;
 
 class PrefixStrategy extends AbstractStrategy
 {