Merge pull request #59 from AntePrkacin/NGSTACK-1006-upgrade-bundle-to-Ibexa-5

Upgrade bundle to ibexa 5

Author: emodric

.github/workflows/tests.yml

@@ -14,13 +14,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.4', '8.0', '8.1']
-        symfony: ['~5.4.0']
+        php: ['8.3']
+        symfony: ['~7.3.0']
         deps: ['normal']
-        include:
-          - php: '7.4'
-            symfony: '~5.4.0'
-            deps: 'low'
 
     steps:
       - uses: actions/checkout@v2
@@ -34,6 +30,7 @@ jobs:
 
       # Install Flex as a global dependency to enable usage of extra.symfony.require
       # while keeping Flex recipes from applying
+      - run: composer global config --no-plugins allow-plugins.symfony/flex true
       - run: composer global require --no-scripts symfony/flex
 
       - run: composer config extra.symfony.require ${{ matrix.symfony }}

DependencyInjection/Compiler/ParameterProviderPass.php

@@ -11,7 +11,6 @@
 
 namespace Lolautruche\EzCoreExtraBundle\DependencyInjection\Compiler;
 
-use LogicException;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
@@ -21,7 +20,7 @@
  */
 class ParameterProviderPass implements CompilerPassInterface
 {
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         if (!$container->hasDefinition('ez_core_extra.view_template_listener')) {
             return;
@@ -34,7 +33,7 @@ public function process(ContainerBuilder $container)
                     'addParameterProvider',
                     [
                         new Reference($id),
-                        isset($attribute['alias']) ? $attribute['alias'] : $id,
+                        $attribute['alias'] ?? $id,
                     ]
                 );
             }

DependencyInjection/Configuration.php

@@ -16,7 +16,7 @@
 
 class Configuration extends SiteAccessConfiguration
 {
-    public function getConfigTreeBuilder()
+    public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('ez_core_extra');
 

DependencyInjection/EzCoreExtraExtension.php

@@ -20,7 +20,7 @@
 
 class EzCoreExtraExtension extends Extension
 {
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.yml');
@@ -38,7 +38,7 @@ public function load(array $configs, ContainerBuilder $container)
         }
     }
 
-    private function configureDesigns(array $config, ConfigurationProcessor $processor, ContainerBuilder $container)
+    private function configureDesigns(array $config, ConfigurationProcessor $processor, ContainerBuilder $container): void
     {
         $processor->mapConfigArray('twig_globals', $config);
     }

EventListener/ViewTemplateListener.php

@@ -16,71 +16,43 @@
 use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
 use Ibexa\Core\MVC\Symfony\Event\PreContentViewEvent;
 use Ibexa\Core\MVC\Symfony\MVCEvents;
-use Ibexa\Core\MVC\Symfony\View\ContentValueView;
 use Ibexa\Core\MVC\Symfony\View\ContentView;
-use Ibexa\Core\MVC\Symfony\View\LocationValueView;
 use Lolautruche\EzCoreExtraBundle\Exception\MissingParameterProviderException;
 use Lolautruche\EzCoreExtraBundle\View\ConfigurableView;
 use Lolautruche\EzCoreExtraBundle\View\ExpressionLanguage;
 use Lolautruche\EzCoreExtraBundle\View\ViewParameterProviderInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\ExpressionLanguage\Expression;
 
 /**
  * Listener that will inject pre-configured parameters into matched view.
  */
 class ViewTemplateListener implements EventSubscriberInterface
 {
-    /**
-     * @var ConfigResolverInterface
-     */
-    private $configResolver;
-
-    /**
-     * @var DynamicSettingParserInterface
-     */
-    private $settingParser;
-
     /**
      * @var \Lolautruche\EzCoreExtraBundle\View\ViewParameterProviderInterface[]
      */
-    private $parameterProviders = [];
-
-    /**
-     * @var Repository
-     */
-    private $repository;
-
-    /**
-     * @var ExpressionLanguage
-     */
-    private $expressionLanguage;
+    private array $parameterProviders = [];
 
     public function __construct(
-        ConfigResolverInterface $configResolver,
-        DynamicSettingParserInterface $settingParser,
-        Repository $repository,
-        ExpressionLanguage $expressionLanguage
-    ){
-        $this->configResolver = $configResolver;
-        $this->settingParser = $settingParser;
-        $this->repository = $repository;
-        $this->expressionLanguage = $expressionLanguage;
-    }
+        private ConfigResolverInterface $configResolver,
+        private DynamicSettingParserInterface $settingParser,
+        private Repository $repository,
+        private ExpressionLanguage $expressionLanguage,
+    ){}
 
-    public static function getSubscribedEvents()
+    public static function getSubscribedEvents(): array
     {
         return [
             MVCEvents::PRE_CONTENT_VIEW => ['onPreContentView', 15],
         ];
     }
 
-    public function addParameterProvider(ViewParameterProviderInterface $provider, $alias)
+    public function addParameterProvider(ViewParameterProviderInterface $provider, $alias): void
     {
         $this->parameterProviders[$alias] = $provider;
     }
 
-    public function onPreContentView(PreContentViewEvent $event)
+    public function onPreContentView(PreContentViewEvent $event): void
     {
         /** @var \Ibexa\Core\MVC\Symfony\View\ContentView $view */
         $view = $event->getContentView();
@@ -137,7 +109,7 @@ public function onPreContentView(PreContentViewEvent $event)
      * @param \Ibexa\Core\MVC\Symfony\View\ContentView $view
      * @return ConfigurableView
      */
-    private function generateConfigurableView(ContentView $view)
+    private function generateConfigurableView(ContentView $view): ConfigurableView
     {
         $configurableView = new ConfigurableView($view);
         $configurableView->addParameters([

EzCoreExtraBundle.php

@@ -17,7 +17,7 @@
 
 class EzCoreExtraBundle extends Bundle
 {
-    public function build(ContainerBuilder $container)
+    public function build(ContainerBuilder $container): void
     {
         parent::build($container);
         $container->addCompilerPass(new ParameterProviderPass());

Security/Voter/SimplifiedCoreVoter.php

@@ -19,51 +19,40 @@
 
 class SimplifiedCoreVoter implements VoterInterface
 {
-    const IBEXA_ROLE_PREFIX = 'ibexa:';
+    const string IBEXA_ROLE_PREFIX = 'ibexa:';
 
-    /**
-     * @var VoterInterface
-     */
-    private $coreVoter;
+    public function __construct(
+        private VoterInterface $coreVoter,
+        private VoterInterface $valueObjectVoter,
+    ) {}
 
-    /**
-     * @var VoterInterface
-     */
-    private $valueObjectVoter;
-
-    public function __construct(VoterInterface $coreVoter, VoterInterface $valueObjectVoter)
-    {
-        $this->coreVoter = $coreVoter;
-        $this->valueObjectVoter = $valueObjectVoter;
-    }
-
-    public function supportsAttribute($attribute)
+    public function supportsAttribute($attribute): bool
     {
         return is_string($attribute) && stripos($attribute, static::IBEXA_ROLE_PREFIX) === 0;
     }
 
-    public function supportsClass($class)
+    public function supportsClass($class): bool
     {
         return true;
     }
 
-    public function vote(TokenInterface $token, $object, array $attributes)
+    public function vote(TokenInterface $token, mixed $subject, array $attributes): int
     {
         foreach ($attributes as $attribute) {
             if (!$this->supportsAttribute($attribute)) {
                 continue;
             }
 
             $attribute = substr($attribute, strlen(static::IBEXA_ROLE_PREFIX));
-            list($module, $function) = explode(':', $attribute);
+            [$module, $function] = explode(':', $attribute);
             $attributeObject = new AuthorizationAttribute($module, $function);
             try {
-                if ($object instanceof ValueObject) {
-                    $attributeObject->limitations = ['valueObject' => $object];
-                    return $this->valueObjectVoter->vote($token, $object, [$attributeObject]);
-                } else {
-                    return $this->coreVoter->vote($token, $object, [$attributeObject]);
+                if ($subject instanceof ValueObject) {
+                    $attributeObject->limitations = ['valueObject' => $subject];
+                    return $this->valueObjectVoter->vote($token, $subject, [$attributeObject]);
                 }
+
+                return $this->coreVoter->vote($token, $subject, [$attributeObject]);
             } catch (InvalidArgumentException $e) {
                 continue;
             }

Templating/Twig/TwigGlobalsExtension.php

@@ -20,15 +20,9 @@
  */
 class TwigGlobalsExtension extends AbstractExtension implements GlobalsInterface
 {
-    /**
-     * @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface
-     */
-    private $configResolver;
-
-    public function __construct(ConfigResolverInterface $configResolver)
-    {
-        $this->configResolver = $configResolver;
-    }
+    public function __construct(
+        private ConfigResolverInterface $configResolver,
+    ) {}
 
     public function getGlobals(): array
     {