Cleanup

[packbundle] / Controller / MapController.php

diff --git a/Controller/MapController.php b/Controller/MapController.php
index 193d336efab3c2a771475eac3552ce0c0aa12369..8d38aa644fa2a7236ad29706c52244ced22b1dcd 100644 (file)
--- a/Controller/MapController.php
+++ b/Controller/MapController.php
@@ -11,22 +11,22 @@
 
 namespace Rapsys\PackBundle\Controller;
 
 
 namespace Rapsys\PackBundle\Controller;
 

+use Rapsys\PackBundle\Util\MapUtil;
+use Rapsys\PackBundle\Util\SluggerUtil;
+

 use Psr\Container\ContainerInterface;
 
 use Psr\Container\ContainerInterface;
 

-use Symfony\Component\HttpFoundation\HeaderUtils;

 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Filesystem\Exception\IOExceptionInterface;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Filesystem\Exception\IOExceptionInterface;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;

+use Symfony\Component\HttpFoundation\HeaderUtils;

 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\Routing\RequestContext;
 use Symfony\Contracts\Service\ServiceSubscriberInterface;
 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\Routing\RequestContext;
 use Symfony\Contracts\Service\ServiceSubscriberInterface;
 

-use Rapsys\PackBundle\Util\MapUtil;
-use Rapsys\PackBundle\Util\SluggerUtil;
-

 /**
  * {@inheritdoc}
  */
 /**
  * {@inheritdoc}
  */


@@ -53,12 +53,9 @@ class MapController extends AbstractController implements ServiceSubscriberInter
                        [
                                'http' => [
                                        #'header' => ['Referer: https://www.openstreetmap.org/'],
                        [
                                'http' => [
                                        #'header' => ['Referer: https://www.openstreetmap.org/'],

-                                       'max_redirects' => 5,
-                                       //TODO: set as bundle env config
-                                       'timeout' => (int)ini_get('default_socket_timeout'),
-                                       #'user_agent' => 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/93.0.4577.63 Safari/537.36',
-                                       //TODO: set as bundle env config
-                                       'user_agent' => (string)ini_get('user_agent')?:'rapsys_pack/2.0.0',
+                                       'max_redirects' => $_ENV['RAPSYSPACK_REDIRECT'] ?? 20,
+                                       'timeout' => $_ENV['RAPSYSPACK_TIMEOUT'] ?? (($timeout = ini_get('default_socket_timeout')) !== false && $timeout !== "" ? (float)$timeout : 60),
+                                       'user_agent' => $_ENV['RAPSYSPACK_AGENT'] ?? (($agent = ini_get('user_agent')) !== false && $agent !== "" ? (string)$agent : RapsysPackBundle::getAlias().'/'.RapsysPackBundle::getVersion())

                                ]
                        ]
                );
                                ]
                        ]
                );