bug #13840 [GitHub Actions] Fix symfony/flex in workflows and invalid…

… EngineInterface namespace (coldic3) This PR was merged into the 1.11 branch. Discussion ---------- | Q | A | --------------- | ----- | Branch? | 1.11 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Related tickets | | License | MIT Commits ------- d58e0f5 [GitHub Actions] Upgrade symfony/flex version in workflows add43b6 Fix EngineInterface namespace
Sylius · Apr 7, 2022 · 865f5da · 865f5da
2 parents 3695a74 + add43b6
commit 865f5da
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/application.yml b/.github/workflows/application.yml
@@ -159,7 +159,7 @@ jobs:
             -   name: Restrict Symfony version
                 if: matrix.symfony != ''
                 run: |
-                    composer global require --no-progress --no-scripts --no-plugins "symfony/flex:1.13.4"
+                    composer global require --no-progress --no-scripts --no-plugins "symfony/flex:1.18.5"
                     composer config extra.symfony.require "${{ matrix.symfony }}"
             -   name: Get Composer cache directory
                 id: composer-cache
@@ -217,7 +217,7 @@ jobs:
                 name: Restrict Symfony version
                 if: matrix.symfony != ''
                 run: |
-                    composer global require --no-progress --no-scripts --no-plugins "symfony/flex:^1.10"
+                    composer global require --no-progress --no-scripts --no-plugins "symfony/flex:^1.18.5"
                     composer config extra.symfony.require "${{ matrix.symfony }}"
 
             -

diff --git a/src/Sylius/Bundle/AdminBundle/Controller/CustomerStatisticsController.php b/src/Sylius/Bundle/AdminBundle/Controller/CustomerStatisticsController.php
@@ -16,10 +16,10 @@
 use Sylius\Component\Core\Customer\Statistics\CustomerStatisticsProviderInterface;
 use Sylius\Component\Core\Model\CustomerInterface;
 use Sylius\Component\Resource\Repository\RepositoryInterface;
-use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\HttpException;
+use Symfony\Component\Templating\EngineInterface;
 use Twig\Environment;
 
 final class CustomerStatisticsController

diff --git a/src/Sylius/Bundle/AdminBundle/Controller/Dashboard/StatisticsController.php b/src/Sylius/Bundle/AdminBundle/Controller/Dashboard/StatisticsController.php
@@ -15,8 +15,8 @@
 
 use Sylius\Bundle\AdminBundle\Provider\StatisticsDataProviderInterface;
 use Sylius\Component\Core\Model\ChannelInterface;
-use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Templating\EngineInterface;
 use Twig\Environment;
 
 final class StatisticsController

diff --git a/src/Sylius/Bundle/AdminBundle/Controller/DashboardController.php b/src/Sylius/Bundle/AdminBundle/Controller/DashboardController.php
@@ -17,12 +17,12 @@
 use Sylius\Component\Channel\Repository\ChannelRepositoryInterface;
 use Sylius\Component\Core\Dashboard\SalesDataProviderInterface;
 use Sylius\Component\Core\Model\ChannelInterface;
-use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\RouterInterface;
+use Symfony\Component\Templating\EngineInterface;
 use Twig\Environment;
 
 final class DashboardController

diff --git a/src/Sylius/Bundle/ShopBundle/Controller/ContactController.php b/src/Sylius/Bundle/ShopBundle/Controller/ContactController.php
@@ -19,13 +19,13 @@
 use Sylius\Component\Core\Model\ChannelInterface;
 use Sylius\Component\Customer\Context\CustomerContextInterface;
 use Sylius\Component\Locale\Context\LocaleContextInterface;
-use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface;
 use Symfony\Component\Routing\RouterInterface;
+use Symfony\Component\Templating\EngineInterface;
 use Twig\Environment;
 use Webmozart\Assert\Assert;
 

diff --git a/src/Sylius/Bundle/ShopBundle/Controller/CurrencySwitchController.php b/src/Sylius/Bundle/ShopBundle/Controller/CurrencySwitchController.php
@@ -18,10 +18,10 @@
 use Sylius\Component\Core\Model\ChannelInterface;
 use Sylius\Component\Currency\Context\CurrencyContextInterface;
 use Sylius\Component\Currency\Model\CurrencyInterface;
-use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Templating\EngineInterface;
 use Twig\Environment;
 
 final class CurrencySwitchController

diff --git a/src/Sylius/Bundle/ShopBundle/Controller/HomepageController.php b/src/Sylius/Bundle/ShopBundle/Controller/HomepageController.php
@@ -13,9 +13,9 @@
 
 namespace Sylius\Bundle\ShopBundle\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Templating\EngineInterface;
 use Twig\Environment;
 
 final class HomepageController

diff --git a/src/Sylius/Bundle/ShopBundle/Controller/LocaleSwitchController.php b/src/Sylius/Bundle/ShopBundle/Controller/LocaleSwitchController.php
@@ -16,10 +16,10 @@
 use Sylius\Bundle\ShopBundle\Locale\LocaleSwitcherInterface;
 use Sylius\Component\Locale\Context\LocaleContextInterface;
 use Sylius\Component\Locale\Provider\LocaleProviderInterface;
-use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\HttpException;
+use Symfony\Component\Templating\EngineInterface;
 use Twig\Environment;
 
 final class LocaleSwitchController

diff --git a/src/Sylius/Bundle/ShopBundle/Controller/SecurityWidgetController.php b/src/Sylius/Bundle/ShopBundle/Controller/SecurityWidgetController.php
@@ -13,8 +13,8 @@
 
 namespace Sylius\Bundle\ShopBundle\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Templating\EngineInterface;
 use Twig\Environment;
 
 final class SecurityWidgetController

diff --git a/src/Sylius/Bundle/UiBundle/Controller/SecurityController.php b/src/Sylius/Bundle/UiBundle/Controller/SecurityController.php
@@ -14,14 +14,14 @@
 namespace Sylius\Bundle\UiBundle\Controller;
 
 use Sylius\Bundle\UiBundle\Form\Type\SecurityLoginType;
-use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\RouterInterface;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Symfony\Component\Security\Http\Authentication\AuthenticationUtils;
+use Symfony\Component\Templating\EngineInterface;
 use Twig\Environment;
 
 final class SecurityController