remove dependency on stack/run

joebordes · Apr 11, 2023 · 6b7c125 · 6b7c125
1 parent 0604367
commit 6b7c125
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 90 deletions.
diff --git a/app/assets/scaffold/files/index.php b/app/assets/scaffold/files/index.php
@@ -1,13 +1,5 @@
 <?php
 
-/*
- * @copyright   2014 Mautic Contributors. All rights reserved
- * @author      Mautic
- *
- * @link        http://mautic.org
- *
- * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
- */
 define('MAUTIC_ROOT_DIR', __DIR__);
 
 // Fix for hosts that do not have date.timezone set, it will be reset based on users settings
@@ -17,8 +9,12 @@
 
 use Mautic\CoreBundle\ErrorHandler\ErrorHandler;
 use Mautic\Middleware\MiddlewareBuilder;
-use function Stack\run;
+use Symfony\Component\HttpFoundation\Request;
 
 ErrorHandler::register('prod');
 
-run((new MiddlewareBuilder(new AppKernel('prod', false)))->resolve());
+$kernel   = (new MiddlewareBuilder(new AppKernel('prod', false)))->resolve();
+$request  = Request::createFromGlobals();
+$response = $kernel->handle($request);
+$response->send();
+$kernel->terminate($request, $response);
diff --git a/app/assets/scaffold/files/index_dev.php b/app/assets/scaffold/files/index_dev.php
@@ -1,10 +1,5 @@
 <?php
 
-/*
- * @copyright   2014 Mautic, NP
- * @author      Mautic
- * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
- */
 define('MAUTIC_ROOT_DIR', __DIR__);
 
 // Fix for hosts that do not have date.timezone set, it will be reset based on users settings
@@ -14,12 +9,16 @@
 
 use Mautic\CoreBundle\ErrorHandler\ErrorHandler;
 use Mautic\Middleware\MiddlewareBuilder;
-use function Stack\run;
+use Symfony\Component\HttpFoundation\Request;
 
 if (extension_loaded('apcu') && in_array(@$_SERVER['REMOTE_ADDR'], ['127.0.0.1', '::1', '172.17.0.1'])) {
     @apcu_clear_cache();
 }
 
 ErrorHandler::register('dev');
 
-run((new MiddlewareBuilder(new AppKernel('dev', true)))->resolve());
+$kernel   = (new MiddlewareBuilder(new AppKernel('dev', false)))->resolve();
+$request  = Request::createFromGlobals();
+$response = $kernel->handle($request);
+$response->send();
+$kernel->terminate($request, $response);
diff --git a/app/composer.json b/app/composer.json
@@ -78,7 +78,6 @@
     "ip2location/ip2location-php": "^7.2",
     "guzzlehttp/guzzle": "^7.2",
     "twilio/sdk": "^5.25",
-    "stack/run": "^1.0",
     "stack/builder": "^1.0",
     "php-http/guzzle7-adapter": "^1.0",
     "sparkpost/sparkpost": "^2.3",

diff --git a/composer.lock b/composer.lock
diff --git a/index.php b/index.php
@@ -1,13 +1,5 @@
 <?php
 
-/*
- * @copyright   2014 Mautic Contributors. All rights reserved
- * @author      Mautic
- *
- * @link        http://mautic.org
- *
- * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
- */
 define('MAUTIC_ROOT_DIR', __DIR__);
 
 // Fix for hosts that do not have date.timezone set, it will be reset based on users settings
@@ -17,8 +9,12 @@
 
 use Mautic\CoreBundle\ErrorHandler\ErrorHandler;
 use Mautic\Middleware\MiddlewareBuilder;
-use function Stack\run;
+use Symfony\Component\HttpFoundation\Request;
 
 ErrorHandler::register('prod');
 
-run((new MiddlewareBuilder(new AppKernel('prod', false)))->resolve());
+$kernel   = (new MiddlewareBuilder(new AppKernel('prod', false)))->resolve();
+$request  = Request::createFromGlobals();
+$response = $kernel->handle($request);
+$response->send();
+$kernel->terminate($request, $response);
diff --git a/index_dev.php b/index_dev.php
@@ -1,10 +1,5 @@
 <?php
 
-/*
- * @copyright   2014 Mautic, NP
- * @author      Mautic
- * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
- */
 define('MAUTIC_ROOT_DIR', __DIR__);
 
 // Fix for hosts that do not have date.timezone set, it will be reset based on users settings
@@ -14,12 +9,16 @@
 
 use Mautic\CoreBundle\ErrorHandler\ErrorHandler;
 use Mautic\Middleware\MiddlewareBuilder;
-use function Stack\run;
+use Symfony\Component\HttpFoundation\Request;
 
 if (extension_loaded('apcu') && in_array(@$_SERVER['REMOTE_ADDR'], ['127.0.0.1', '::1', '172.17.0.1'])) {
     @apcu_clear_cache();
 }
 
 ErrorHandler::register('dev');
 
-run((new MiddlewareBuilder(new AppKernel('dev', true)))->resolve());
+$kernel   = (new MiddlewareBuilder(new AppKernel('dev', true)))->resolve();
+$request  = Request::createFromGlobals();
+$response = $kernel->handle($request);
+$response->send();
+$kernel->terminate($request, $response);