Move stream context array in context parameter

[packbundle] / Controller.php

diff --git a/Controller.php b/Controller.php
index 523c9509a7da41f4dd3ba2729425d9a7c242f8db..77a3e14e5a10d1c4d1e2c64e9c89f062e96766a1 100644 (file)
--- a/Controller.php
+++ b/Controller.php
@@ -63,15 +63,7 @@ class Controller extends AbstractController implements ServiceSubscriberInterfac
                $this->config = $container->getParameter($this->alias = RapsysPackBundle::getAlias());
 
                //Set ctx
-               $this->ctx = stream_context_create(
-                       [
-                               'http' => [
-                                       '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 : $this->alias.'/'.($this->version = RapsysPackBundle::getVersion()))
-                               ]
-                       ]
-               );
+               $this->ctx = stream_context_create($this->config['context']);
        }
 
        /**
@@ -80,13 +72,13 @@ class Controller extends AbstractController implements ServiceSubscriberInterfac
         * @param Request $request The Request instance
         * @param string $hash The hash
         * @param string $equation The shorted equation
-        * @param int $width The width
         * @param int $height The height
+        * @param int $width The width
         * @return Response The rendered image
         */
-       public function captcha(Request $request, string $hash, string $equation, int $width, int $height, string $_format): Response {
+       public function captcha(Request $request, string $hash, string $equation, int $height, int $width, string $_format): Response {
                //Without matching hash
-               if ($hash !== $this->slugger->serialize([$equation, $width, $height])) {
+               if ($hash !== $this->slugger->serialize([$equation, $height, $width])) {
                        //Throw new exception
                        throw new NotFoundHttpException(sprintf('Unable to match captcha hash: %s', $hash));
                //Without valid format
@@ -234,13 +226,13 @@ class Controller extends AbstractController implements ServiceSubscriberInterfac
         * @param Request $request The Request instance
         * @param string $hash The hash
         * @param string $path The image path
-        * @param int $width The width
         * @param int $height The height
+        * @param int $width The width
         * @return Response The rendered image
         */
-       public function facebook(Request $request, string $hash, string $path, int $width, int $height, string $_format): Response {
+       public function facebook(Request $request, string $hash, string $path, int $height, int $width, string $_format): Response {
                //Without matching hash
-               if ($hash !== $this->slugger->serialize([$path, $width, $height])) {
+               if ($hash !== $this->slugger->serialize([$path, $height, $width])) {
                        //Throw new exception
                        throw new NotFoundHttpException(sprintf('Unable to match facebook hash: %s', $hash));
                //Without matching format
@@ -740,13 +732,13 @@ class Controller extends AbstractController implements ServiceSubscriberInterfac
         * @param Request $request The Request instance
         * @param string $hash The hash
         * @param string $path The image path
-        * @param int $width The width
         * @param int $height The height
+        * @param int $width The width
         * @return Response The rendered image
         */
-       public function thumb(Request $request, string $hash, string $path, int $width, int $height, string $_format): Response {
+       public function thumb(Request $request, string $hash, string $path, int $height, int $width, string $_format): Response {
                //Without matching hash
-               if ($hash !== $this->slugger->serialize([$path, $width, $height])) {
+               if ($hash !== $this->slugger->serialize([$path, $height, $width])) {
                        //Throw new exception
                        throw new NotFoundHttpException('Invalid thumb hash');
                //Without valid format