Perform the waiting for lock file earlier in the process, this prevents the kernel from being created AT ALL while the cache is being cleared

Author: jolelievre

admin-api/index.php

@@ -23,6 +23,8 @@
  * @copyright Since 2007 PrestaShop SA and Contributors
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
+
+use PrestaShop\PrestaShop\Core\Util\CacheClearLocker;
 use Symfony\Component\Dotenv\Dotenv;
 use Symfony\Component\ErrorHandler\Debug;
 use Symfony\Component\HttpFoundation\Request;
@@ -60,6 +62,10 @@
     ->loadEnv($dotEnvFile)
 ;
 
+// Block the process until the cache clear is in progress, this must be done before the kernel is created so it doesn't
+// try to use the old container
+CacheClearLocker::waitUntilUnlocked(_PS_ENV_, _PS_APP_ID_);
+
 $kernel = new AdminAPIKernel(_PS_ENV_, _PS_MODE_DEV_);
 // When using the HttpCache, you need to call the method in your front controller instead of relying on the configuration parameter
 //Request::enableHttpMethodParameterOverride();

admin-dev/index.php

@@ -23,11 +23,11 @@
  * @copyright Since 2007 PrestaShop SA and Contributors
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
+
+use PrestaShop\PrestaShop\Core\Util\CacheClearLocker;
 use Symfony\Component\Dotenv\Dotenv;
 use Symfony\Component\ErrorHandler\Debug;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 
 if (!defined('_PS_ADMIN_DIR_')) {
@@ -70,6 +70,10 @@
     ->loadEnv($dotEnvFile)
 ;
 
+// Block the process until the cache clear is in progress, this must be done before the kernel is created so it doesn't
+// try to use the old container
+CacheClearLocker::waitUntilUnlocked(_PS_ENV_, _PS_APP_ID_);
+
 $kernel = new AdminKernel(_PS_ENV_, _PS_MODE_DEV_);
 // When using the HttpCache, you need to call the method in your front controller instead of relying on the configuration parameter
 Request::enableHttpMethodParameterOverride();

app/AppKernel.php

@@ -27,7 +27,6 @@
 use PrestaShop\PrestaShop\Adapter\Module\Repository\ModuleRepository;
 use PrestaShop\PrestaShop\Adapter\SymfonyContainer;
 use PrestaShop\PrestaShop\Core\Exception\CoreException;
-use PrestaShop\PrestaShop\Core\Util\CacheClearLocker;
 use PrestaShop\PrestaShop\Core\Version;
 use PrestaShop\TranslationToolsBundle\TranslationToolsBundle;
 use Symfony\Component\Config\Loader\LoaderInterface;
@@ -94,7 +93,6 @@ public function registerBundles(): iterable
      */
     public function boot()
     {
-        CacheClearLocker::waitUntilUnlocked($this->environment, $this->getAppId());
         parent::boot();
         $this->cleanKernelReferences();
     }

index.php

@@ -24,6 +24,7 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
 
+use PrestaShop\PrestaShop\Core\Util\CacheClearLocker;
 use Symfony\Component\Dotenv\Dotenv;
 use Symfony\Component\ErrorHandler\Debug;
 use Symfony\Component\HttpFoundation\Request;
@@ -50,6 +51,10 @@
         Debug::enable();
     }
 
+    // Block the process until the cache clear is in progress, this must be done before the kernel is created so it doesn't
+    // try to use the old container
+    CacheClearLocker::waitUntilUnlocked(_PS_ENV_, _PS_APP_ID_);
+
     // Starting Kernel
     $kernel = new FrontKernel(_PS_ENV_, _PS_MODE_DEV_);
     $request = Request::createFromGlobals();