Backport for SonataCoreBundle

.travis.yml

@@ -6,6 +6,7 @@ branches:
   only:
     - master
     - 1.x
+    - 0.x
 
 language: php
 

composer.json

@@ -29,7 +29,7 @@
         "twig/twig": "^2.0 || ^3.0"
     },
     "conflict": {
-        "sonata-project/core-bundle": ">=3.13"
+        "sonata-project/core-bundle": "<3.19"
     },
     "require-dev": {
         "jms/serializer-bundle": "^3.3",
@@ -48,7 +48,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.x-dev"
+            "dev-master": "0.x-dev"
         }
     },
     "autoload": {

phpstan.neon.dist

@@ -7,10 +7,10 @@ parameters:
 #        - tests
 
     excludes_analyse:
-        - src/Test/AbstractWidgetTestCase.php
         - tests/bootstrap.php
 
     autoload_files:
         - vendor/autoload.php
 
     ignoreErrors:
+        - '#Class Symfony\\Component\\Translation\\TranslatorInterface not found.#'

src/Bridge/Symfony/DependencyInjection/SonataTwigExtension.php

@@ -41,7 +41,7 @@ public function load(array $configs, ContainerBuilder $container): void
     /**
      * Registers flash message types defined in configuration to flash manager.
      */
-    public function registerFlashTypes(ContainerBuilder $container, array $config): void
+    private function registerFlashTypes(ContainerBuilder $container, array $config): void
     {
         $mergedConfig = array_merge_recursive($config['flashmessage'], [
             'success' => ['types' => [

src/Extension/DeprecatedTemplateExtension.php

@@ -18,13 +18,15 @@
 
 /**
  * @author Marko Kunic <[email protected]>
+ *
+ * @final since sonata-project/twig-extensions 0.x
  */
-final class DeprecatedTemplateExtension extends AbstractExtension
+class DeprecatedTemplateExtension extends AbstractExtension
 {
     /**
-     * {@inheritdoc}
+     * @return array
      */
-    public function getTokenParsers(): array
+    public function getTokenParsers()
     {
         return [
             new DeprecatedTemplateTokenParser(),

src/Extension/FlashMessageExtension.php

@@ -21,18 +21,26 @@
  *
  * @author Vincent Composieux <[email protected]>
  * @author Titouan Galopin <[email protected]>
+ *
+ * @final since sonata-project/twig-extensions 0.x
  */
-final class FlashMessageExtension extends AbstractExtension
+class FlashMessageExtension extends AbstractExtension
 {
-    public function getFunctions(): array
+    /**
+     * @return TwigFunction[]
+     */
+    public function getFunctions()
     {
         return [
             new TwigFunction('sonata_flashmessages_get', [FlashMessageRuntime::class, 'getFlashMessages']),
             new TwigFunction('sonata_flashmessages_types', [FlashMessageRuntime::class, 'getFlashMessagesTypes']),
         ];
     }
 
-    public function getName(): string
+    /**
+     * @return string
+     */
+    public function getName()
     {
         return 'sonata_twig_flashmessage';
     }

src/Extension/FlashMessageRuntime.php

@@ -20,8 +20,10 @@
  *
  * @author Vincent Composieux <[email protected]>
  * @author Titouan Galopin <[email protected]>
+ *
+ * @final since sonata-project/twig-extensions 0.x
  */
-final class FlashMessageRuntime
+class FlashMessageRuntime
 {
     /**
      * @var FlashManager
@@ -36,17 +38,22 @@ public function __construct(FlashManager $flashManager)
     /**
      * Returns flash messages handled by Sonata flash manager.
      *
-     * @param string $type Type of flash message
+     * @param string      $type             Type of flash message
+     * @param string|null $deprecatedDomain Translation domain to use
+     *
+     * @return array
      */
-    public function getFlashMessages(string $type): array
+    public function getFlashMessages($type, $deprecatedDomain = null)
     {
-        return $this->flashManager->get($type);
+        return $this->flashManager->get($type, $deprecatedDomain);
     }
 
     /**
      * Returns flash messages types handled by Sonata flash manager.
+     *
+     * @return array
      */
-    public function getFlashMessagesTypes(): array
+    public function getFlashMessagesTypes()
     {
         return $this->flashManager->getHandledTypes();
     }

src/Extension/FormTypeExtension.php

@@ -16,27 +16,69 @@
 use Twig\Extension\AbstractExtension;
 use Twig\Extension\GlobalsInterface;
 
-final class FormTypeExtension extends AbstractExtension implements GlobalsInterface
-{
+if (class_exists('Twig_Extension_GlobalsInterface')) {
     /**
-     * @var bool
+     * @final since sonata-project/twig-extensions 0.x
      */
-    private $wrapFieldsWithAddons;
-
-    public function __construct($formType)
+    class FormTypeExtension extends AbstractExtension implements GlobalsInterface
     {
-        $this->wrapFieldsWithAddons = (true === $formType || 'standard' === $formType);
-    }
+        /**
+         * @var bool
+         */
+        private $wrapFieldsWithAddons;
 
-    public function getGlobals(): array
-    {
-        return [
-            'wrap_fields_with_addons' => $this->wrapFieldsWithAddons,
-        ];
-    }
+        public function __construct($formType)
+        {
+            $this->wrapFieldsWithAddons = (true === $formType || 'standard' === $formType);
+        }
+
+        /**
+         * @return array
+         */
+        public function getGlobals()
+        {
+            return [
+                'wrap_fields_with_addons' => $this->wrapFieldsWithAddons,
+            ];
+        }
 
-    public function getName(): string
+        /**
+         * @return string
+         */
+        public function getName()
+        {
+            return 'sonata_twig_wrapping';
+        }
+    }
+} else {
+    /**
+     * @final since sonata-project/twig-extensions 0.x
+     */
+    class FormTypeExtension extends AbstractExtension implements GlobalsInterface
     {
-        return 'sonata_twig_wrapping';
+        /**
+         * @var bool
+         */
+        private $wrapFieldsWithAddons;
+
+        public function __construct($formType)
+        {
+            $this->wrapFieldsWithAddons = (true === $formType || 'standard' === $formType);
+        }
+
+        public function getGlobals(): array
+        {
+            return [
+                'wrap_fields_with_addons' => $this->wrapFieldsWithAddons,
+            ];
+        }
+
+        /**
+         * @return string
+         */
+        public function getName()
+        {
+            return 'sonata_twig_wrapping';
+        }
     }
 }

src/Extension/StatusExtension.php

@@ -19,8 +19,10 @@
 /**
  * @author Hugo Briand <[email protected]>
  * @author Titouan Galopin <[email protected]>
+ *
+ * @final since sonata-project/twig-extensions 0.x
  */
-final class StatusExtension extends AbstractExtension
+class StatusExtension extends AbstractExtension
 {
     public function getFilters(): array
     {

src/Extension/StatusRuntime.php

@@ -18,8 +18,10 @@
 /**
  * @author Hugo Briand <[email protected]>
  * @author Titouan Galopin <[email protected]>
+ *
+ * @final since sonata-project/twig-extensions 0.x
  */
-final class StatusRuntime
+class StatusRuntime
 {
     /**
      * @var StatusClassRendererInterface[]
@@ -29,15 +31,19 @@ final class StatusRuntime
     /**
      * Adds a renderer to the status services list.
      */
-    public function addStatusService(StatusClassRendererInterface $renderer): void
+    public function addStatusService(StatusClassRendererInterface $renderer)
     {
         $this->statusServices[] = $renderer;
     }
 
     /**
-     * @param mixed $statusType
+     * @param object     $object
+     * @param mixed|null $statusType
+     * @param string     $default
+     *
+     * @return string
      */
-    public function statusClass(object $object, $statusType = null, string $default = ''): string
+    public function statusClass($object, $statusType = null, $default = '')
     {
         foreach ($this->statusServices as $statusService) {
             \assert($statusService instanceof StatusClassRendererInterface);