Deprecate and move public constants from old Sylius < 1.3 Kernel (Syl…

…ius#13524)
mmenozzi · Feb 4, 2022 · bfea0db · bfea0db
1 parent b477812
commit bfea0db
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 13 deletions.
diff --git a/src/Sylius/Bundle/AdminBundle/Controller/NotificationController.php b/src/Sylius/Bundle/AdminBundle/Controller/NotificationController.php
@@ -18,7 +18,7 @@
 use GuzzleHttp\Psr7\Uri;
 use Http\Message\MessageFactory;
 use Psr\Http\Message\UriInterface;
-use Sylius\Bundle\CoreBundle\Application\Kernel;
+use Sylius\Bundle\CoreBundle\SyliusCoreBundle;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -47,7 +47,7 @@ public function __construct(
     public function getVersionAction(Request $request): JsonResponse
     {
         $content = [
-            'version' => Kernel::VERSION,
+            'version' => SyliusCoreBundle::VERSION,
             'hostname' => $request->getHost(),
             'locale' => $request->getLocale(),
             'user_agent' => $request->headers->get('User-Agent'),

diff --git a/src/Sylius/Bundle/AdminBundle/Twig/NotificationWidgetExtension.php b/src/Sylius/Bundle/AdminBundle/Twig/NotificationWidgetExtension.php
@@ -13,7 +13,7 @@
 
 namespace Sylius\Bundle\AdminBundle\Twig;
 
-use Sylius\Bundle\CoreBundle\Application\Kernel;
+use Sylius\Bundle\CoreBundle\SyliusCoreBundle;
 use Twig\Environment;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFunction;
@@ -52,7 +52,7 @@ public function renderWidget(Environment $environment): string
 
         return $environment->render('@SyliusAdmin/_notification.html.twig', [
             'frequency' => $this->checkFrequency,
-            'currentVersion' => Kernel::VERSION,
+            'currentVersion' => SyliusCoreBundle::VERSION,
         ]);
     }
 }
diff --git a/src/Sylius/Bundle/CoreBundle/Application/Kernel.php b/src/Sylius/Bundle/CoreBundle/Application/Kernel.php
@@ -13,24 +13,36 @@
 
 namespace Sylius\Bundle\CoreBundle\Application;
 
+use Sylius\Bundle\CoreBundle\SyliusCoreBundle;
 use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
 use Symfony\Component\HttpKernel\Kernel as HttpKernel;
 
+/**
+ * @deprecated Using "Sylius\Bundle\CoreBundle\Application\Kernel" as Symfony kernel is deprecated since Sylius 1.3.
+ *             Please migrate to Symfony 4 directory structure.
+ *             Upgrade guide: https://github.com/Sylius/Sylius/blob/1.3/UPGRADE-1.3.md#directory-structure-change
+ */
 class Kernel extends HttpKernel
 {
     use MicroKernelTrait;
 
-    public const VERSION = '1.12.0-DEV';
+    /** @deprecated Use Sylius\Bundle\CoreBundle\SyliusCoreBundle::VERSION instead */
+    public const VERSION = SyliusCoreBundle::VERSION;
 
-    public const VERSION_ID = '11200';
+    /** @deprecated Use Sylius\Bundle\CoreBundle\SyliusCoreBundle::VERSION_ID instead */
+    public const VERSION_ID = SyliusCoreBundle::VERSION_ID;
 
-    public const MAJOR_VERSION = '1';
+    /** @deprecated Use Sylius\Bundle\CoreBundle\SyliusCoreBundle:MAJOR_VERSION instead */
+    public const MAJOR_VERSION = SyliusCoreBundle::MAJOR_VERSION;
 
-    public const MINOR_VERSION = '12';
+    /** @deprecated Use Sylius\Bundle\CoreBundle\SyliusCoreBundle:MINOR_VERSION instead */
+    public const MINOR_VERSION = SyliusCoreBundle::MINOR_VERSION;
 
-    public const RELEASE_VERSION = '0';
+    /** @deprecated Use Sylius\Bundle\CoreBundle\SyliusCoreBundle:RELEASE_VERSION instead */
+    public const RELEASE_VERSION = SyliusCoreBundle::RELEASE_VERSION;
 
-    public const EXTRA_VERSION = 'DEV';
+    /** @deprecated Use Sylius\Bundle\CoreBundle\SyliusCoreBundle:EXTRA_VERSION instead */
+    public const EXTRA_VERSION = SyliusCoreBundle::EXTRA_VERSION;
 
     public function __construct(string $environment, bool $debug)
     {

diff --git a/src/Sylius/Bundle/CoreBundle/Collector/SyliusCollector.php b/src/Sylius/Bundle/CoreBundle/Collector/SyliusCollector.php
@@ -13,7 +13,7 @@
 
 namespace Sylius\Bundle\CoreBundle\Collector;
 
-use Sylius\Bundle\CoreBundle\Application\Kernel;
+use Sylius\Bundle\CoreBundle\SyliusCoreBundle;
 use Sylius\Component\Channel\Context\ChannelNotFoundException;
 use Sylius\Component\Core\Context\ShopperContextInterface;
 use Sylius\Component\Core\Model\ChannelInterface;
@@ -35,7 +35,7 @@ public function __construct(
         $this->shopperContext = $shopperContext;
 
         $this->data = [
-            'version' => Kernel::VERSION,
+            'version' => SyliusCoreBundle::VERSION,
             'base_currency_code' => null,
             'currency_code' => null,
             'default_locale_code' => $defaultLocaleCode,

diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/app/config.yml b/src/Sylius/Bundle/CoreBundle/Resources/config/app/config.yml
@@ -108,7 +108,7 @@ twig:
         sylius: "@sylius.context.shopper"
         sylius_base_locale: "%locale%"
         sylius_meta:
-            version: !php/const Sylius\Bundle\CoreBundle\Application\Kernel::VERSION
+            version: !php/const Sylius\Bundle\CoreBundle\SyliusCoreBundle::VERSION
 
 sonata_block:
     blocks:

diff --git a/src/Sylius/Bundle/CoreBundle/SyliusCoreBundle.php b/src/Sylius/Bundle/CoreBundle/SyliusCoreBundle.php
@@ -36,6 +36,18 @@
 
 final class SyliusCoreBundle extends AbstractResourceBundle
 {
+    public const VERSION = '1.12.0-DEV';
+
+    public const VERSION_ID = '11200';
+
+    public const MAJOR_VERSION = '1';
+
+    public const MINOR_VERSION = '12';
+
+    public const RELEASE_VERSION = '0';
+
+    public const EXTRA_VERSION = 'DEV';
+
     public function getSupportedDrivers(): array
     {
         return [