4.8.1 (#971)

sonata-project · Aug 26, 2024 · 45aa1d9 · 45aa1d9
1 parent b9bf0ce
commit 45aa1d9
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [4.8.1](https://github.com/sonata-project/SonataClassificationBundle/compare/4.8.0...4.8.1) - 2024-08-26
+### Fixed
+- [[#968](https://github.com/sonata-project/SonataClassificationBundle/pull/968)] Symfony 7.1 deprecation about `Symfony\Component\HttpKernel\DependencyInjection\Extension` usage ([@VincentLanglet](https://github.com/VincentLanglet))
+
 ## [4.8.0](https://github.com/sonata-project/SonataClassificationBundle/compare/4.7.2...4.8.0) - 2023-12-14
 ### Added
 - [[#952](https://github.com/sonata-project/SonataClassificationBundle/pull/952)] Support for packages from `symfony/*` 7.x ([@phansys](https://github.com/phansys))

diff --git a/src/Admin/Filter/CategoryFilter.php b/src/Admin/Filter/CategoryFilter.php
@@ -35,7 +35,7 @@ public function filter(ProxyQueryInterface $query, string $alias, string $field,
 
         $query
             ->getQueryBuilder()
-            ->andWhere(sprintf('%s.%s = :category', $alias, $field))
+            ->andWhere(\sprintf('%s.%s = :category', $alias, $field))
             ->setParameter('category', $data->getValue());
 
         $this->setActive(true);
@@ -101,7 +101,7 @@ private function getChoices(): array
 
             \assert(null !== $catContext);
 
-            $choices[sprintf('%s (%s)', $category->getName() ?? '', $catContext->getId() ?? '')] = $category->getId();
+            $choices[\sprintf('%s (%s)', $category->getName() ?? '', $catContext->getId() ?? '')] = $category->getId();
 
             $this->visitChild($category, $choices);
         }
@@ -119,7 +119,7 @@ private function visitChild(CategoryInterface $category, array &$choices, int $l
         }
 
         foreach ($category->getChildren() as $child) {
-            $choices[sprintf('%s %s', str_repeat('-', 1 * $level), $child->__toString())] = $child->getId();
+            $choices[\sprintf('%s %s', str_repeat('-', 1 * $level), $child->__toString())] = $child->getId();
 
             $this->visitChild($child, $choices, $level + 1);
         }

diff --git a/src/Admin/Filter/CollectionFilter.php b/src/Admin/Filter/CollectionFilter.php
@@ -34,7 +34,7 @@ public function filter(ProxyQueryInterface $query, string $alias, string $field,
 
         $query
             ->getQueryBuilder()
-            ->andWhere(sprintf('%s.%s = :collection', $alias, $field))
+            ->andWhere(\sprintf('%s.%s = :collection', $alias, $field))
             ->setParameter('collection', $data->getValue());
 
         $this->setActive(true);

diff --git a/src/Command/FixContextCommand.php b/src/Command/FixContextCommand.php
@@ -65,7 +65,7 @@ public function execute(InputInterface $input, OutputInterface $output): int
             $tagId = $tag->getId();
             \assert(null !== $tagId);
 
-            $output->writeln(sprintf(' > attach default context to tag: %s (%s)', $tag->getSlug() ?? '', $tagId));
+            $output->writeln(\sprintf(' > attach default context to tag: %s (%s)', $tag->getSlug() ?? '', $tagId));
             $tag->setContext($defaultContext);
 
             $this->tagManager->save($tag);
@@ -81,7 +81,7 @@ public function execute(InputInterface $input, OutputInterface $output): int
             $collectionId = $collection->getId();
             \assert(null !== $collectionId);
 
-            $output->writeln(sprintf(' > attach default context to collection: %s (%s)', $collection->getSlug() ?? '', $collectionId));
+            $output->writeln(\sprintf(' > attach default context to collection: %s (%s)', $collection->getSlug() ?? '', $collectionId));
             $collection->setContext($defaultContext);
 
             $this->collectionManager->save($collection);
@@ -97,7 +97,7 @@ public function execute(InputInterface $input, OutputInterface $output): int
             $categoryId = $category->getId();
             \assert(null !== $categoryId);
 
-            $output->writeln(sprintf(' > attach default context to collection: %s (%s)', $category->getSlug() ?? '', $categoryId));
+            $output->writeln(\sprintf(' > attach default context to collection: %s (%s)', $category->getSlug() ?? '', $categoryId));
             $category->setContext($defaultContext);
 
             $this->categoryManager->save($category);

diff --git a/src/Document/CategoryManager.php b/src/Document/CategoryManager.php
@@ -46,15 +46,15 @@ public function getRootCategoryWithChildren(CategoryInterface $category): Catego
     {
         $context = $category->getContext();
         if (null === $context) {
-            throw new \InvalidArgumentException(sprintf(
+            throw new \InvalidArgumentException(\sprintf(
                 'Context of category "%s" cannot be null.',
                 $category->getId() ?? ''
             ));
         }
 
         $contextId = $context->getId();
         if (null === $contextId) {
-            throw new \InvalidArgumentException(sprintf(
+            throw new \InvalidArgumentException(\sprintf(
                 'Context of category "%s" must have an not null identifier.',
                 $category->getId() ?? ''
             ));
@@ -72,7 +72,7 @@ public function getRootCategoryWithChildren(CategoryInterface $category): Catego
             }
         }
 
-        throw new \InvalidArgumentException(sprintf('Category "%s" does not exist.', $category->getId() ?? ''));
+        throw new \InvalidArgumentException(\sprintf('Category "%s" does not exist.', $category->getId() ?? ''));
     }
 
     public function getRootCategoriesForContext(?ContextInterface $context = null): array
@@ -81,7 +81,7 @@ public function getRootCategoriesForContext(?ContextInterface $context = null):
 
         $contextId = $context->getId();
         if (null === $contextId) {
-            throw new \InvalidArgumentException(sprintf(
+            throw new \InvalidArgumentException(\sprintf(
                 'Context "%s" must have an not null identifier.',
                 $context->getName() ?? ''
             ));
@@ -110,7 +110,7 @@ public function getAllRootCategories(bool $loadChildren = true): array
 
         foreach ($rootCategories as $category) {
             if (null === $category->getContext()) {
-                throw new \LogicException(sprintf(
+                throw new \LogicException(\sprintf(
                     'Context of category "%s" cannot be null.',
                     $category->getId() ?? ''
                 ));

diff --git a/src/Entity/CategoryManager.php b/src/Entity/CategoryManager.php
@@ -46,15 +46,15 @@ public function getRootCategoryWithChildren(CategoryInterface $category): Catego
     {
         $context = $category->getContext();
         if (null === $context) {
-            throw new \InvalidArgumentException(sprintf(
+            throw new \InvalidArgumentException(\sprintf(
                 'Context of category "%s" cannot be null.',
                 $category->getId() ?? ''
             ));
         }
 
         $contextId = $context->getId();
         if (null === $contextId) {
-            throw new \InvalidArgumentException(sprintf(
+            throw new \InvalidArgumentException(\sprintf(
                 'Context of category "%s" must have an not null identifier.',
                 $category->getId() ?? ''
             ));
@@ -72,7 +72,7 @@ public function getRootCategoryWithChildren(CategoryInterface $category): Catego
             }
         }
 
-        throw new \InvalidArgumentException(sprintf('Category "%s" does not exist.', $category->getId() ?? ''));
+        throw new \InvalidArgumentException(\sprintf('Category "%s" does not exist.', $category->getId() ?? ''));
     }
 
     public function getRootCategoriesForContext(?ContextInterface $context = null): array
@@ -83,7 +83,7 @@ public function getRootCategoriesForContext(?ContextInterface $context = null):
 
         $contextId = $context->getId();
         if (null === $contextId) {
-            throw new \InvalidArgumentException(sprintf(
+            throw new \InvalidArgumentException(\sprintf(
                 'Context "%s" must have an not null identifier.',
                 $context->getName() ?? ''
             ));
@@ -111,7 +111,7 @@ public function getAllRootCategories(bool $loadChildren = true): array
 
         foreach ($rootCategories as $category) {
             if (null === $category->getContext()) {
-                throw new \LogicException(sprintf(
+                throw new \LogicException(\sprintf(
                     'Context of category "%s" cannot be null.',
                     $category->getId() ?? ''
                 ));

diff --git a/src/Form/Type/CategorySelectorType.php b/src/Form/Type/CategorySelectorType.php
@@ -75,7 +75,7 @@ public function getChoices(Options $options): array
             $rootCategoryId = $rootCategory->getId();
             \assert(null !== $context && null !== $rootCategoryId);
 
-            $choices[$rootCategoryId] = sprintf('%s (%s)', $rootCategory->getName() ?? '', $context->getId() ?? '');
+            $choices[$rootCategoryId] = \sprintf('%s (%s)', $rootCategory->getName() ?? '', $context->getId() ?? '');
 
             $this->childWalker($rootCategory, $category, $choices);
         }
@@ -110,7 +110,7 @@ private function childWalker(CategoryInterface $rootCategory, CategoryInterface
                 continue;
             }
 
-            $choices[$childCategoryId] = sprintf('%s %s', str_repeat('-', 1 * $level), $childCategory->getName() ?? '');
+            $choices[$childCategoryId] = \sprintf('%s %s', str_repeat('-', 1 * $level), $childCategory->getName() ?? '');
 
             $this->childWalker($childCategory, $category, $choices, $level + 1);
         }