...

Pushword · Nov 12, 2021 · 14ac461 · 14ac461
1 parent 7d5c721
commit 14ac461
Show file tree

Hide file tree

Showing 51 changed files with 68 additions and 185 deletions.
diff --git a/packages/admin-block-editor/src/DependencyInjection/Configuration.php b/packages/admin-block-editor/src/DependencyInjection/Configuration.php
@@ -24,10 +24,7 @@ class Configuration implements ConfigurationInterface
      */
     public const DEFAULT_TYPE_TO_PROSE = ['paragraph', 'image', 'list', 'blockquote', 'code', 'delimiter', 'header'];
 
-    /**
-     * @return \Symfony\Component\Config\Definition\Builder\TreeBuilder
-     */
-    public function getConfigTreeBuilder()
+    public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('admin_block_editor');
         $treeBuilder->getRootNode()->children()

diff --git a/packages/admin-block-editor/src/EventSuscriber/AdminFormEventSuscriber.php b/packages/admin-block-editor/src/EventSuscriber/AdminFormEventSuscriber.php
@@ -62,10 +62,7 @@ public function replaceFields(FormEvent $formEvent): void
         $page->jsMainContent = $this->transformMainContent($page->getMainContent());
     }
 
-    /**
-     * @return string
-     */
-    private function transformMainContent(string $content)
+    private function transformMainContent(string $content): string
     {
         // We never come to false here because we ever checked before with mayUseEditorBlock
         /*

diff --git a/packages/admin-block-editor/src/Form/EditorjsType.php b/packages/admin-block-editor/src/Form/EditorjsType.php
@@ -8,10 +8,8 @@ class EditorjsType extends TextType
 {
     /**
      * {@inheritdoc}
-     *
-     * @return string
      */
-    public function getBlockPrefix()
+    public function getBlockPrefix(): string
     {
         return 'editorjs';
     }

diff --git a/packages/admin/src/DependencyInjection/Configuration.php b/packages/admin/src/DependencyInjection/Configuration.php
@@ -84,10 +84,7 @@ class Configuration implements ConfigurationInterface
         [MediaPreviewField::class],
     ];
 
-    /**
-     * @return \Symfony\Component\Config\Definition\Builder\TreeBuilder
-     */
-    public function getConfigTreeBuilder()
+    public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('pushword_admin');
         $treeBuilder

diff --git a/packages/admin/src/FormField/PageSlugField.php b/packages/admin/src/FormField/PageSlugField.php
@@ -8,10 +8,7 @@
 
 class PageSlugField extends AbstractField
 {
-    /**
-     * @return string
-     */
-    protected function getSlugHelp()
+    protected function getSlugHelp(): string
     {
         if ('' === $this->admin->getSubject()->getSlug()) {
             return 'admin.page.slug.help';

diff --git a/packages/advanced-main-image/src/DependencyInjection/Configuration.php b/packages/advanced-main-image/src/DependencyInjection/Configuration.php
@@ -14,10 +14,7 @@ class Configuration implements ConfigurationInterface
         'advanced_main_image',
     ];
 
-    /**
-     * @return \Symfony\Component\Config\Definition\Builder\TreeBuilder
-     */
-    public function getConfigTreeBuilder()
+    public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('admin_block_editor');
         $treeBuilder->getRootNode()->children()

diff --git a/packages/advanced-main-image/src/Twig/AppExtension.php b/packages/advanced-main-image/src/Twig/AppExtension.php
@@ -11,7 +11,7 @@ class AppExtension extends AbstractExtension
     /**
      * @return \Twig\TwigFunction[]
      */
-    public function getFunctions()
+    public function getFunctions(): array
     {
         return [
             new TwigFunction('heroSize', [PageAdvancedMainImageFormField::class, 'formatToRatio']),

diff --git a/packages/conversation/src/Command/NotificationCommand.php b/packages/conversation/src/Command/NotificationCommand.php
@@ -29,10 +29,7 @@ protected function configure(): void
         ;
     }
 
-    /**
-     * @return int
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         if (true === $this->notifier->send()) {
             $output->writeln('Notification sent with success.');

diff --git a/packages/conversation/src/Controller/ConversationFormController.php b/packages/conversation/src/Controller/ConversationFormController.php
@@ -77,10 +77,8 @@ private function getFormManagerClass(string $type)
 
     /**
      * Return current form manager depending on `type` (request).
-     *
-     * @return object
      */
-    private function getFormManager(string $type, Request $request)
+    private function getFormManager(string $type, Request $request): object
     {
         if (null !== $this->form) {
             return $this->form;

diff --git a/packages/conversation/src/DependencyInjection/Configuration.php b/packages/conversation/src/DependencyInjection/Configuration.php
@@ -25,10 +25,7 @@ class Configuration implements ConfigurationInterface
         'possible_origins',
     ];
 
-    /**
-     * @return \Symfony\Component\Config\Definition\Builder\TreeBuilder
-     */
-    public function getConfigTreeBuilder()
+    public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('conversation');
         $treeBuilder

diff --git a/packages/conversation/src/DependencyInjection/PushwordConversationExtension.php b/packages/conversation/src/DependencyInjection/PushwordConversationExtension.php
@@ -12,10 +12,7 @@ class PushwordConversationExtension extends ConfigurableExtension implements Pre
 
     private $configFolder = __DIR__.'/../Resources/config';
 
-    /**
-     * @return string
-     */
-    public function getAlias()
+    public function getAlias(): string
     {
         return 'conversation';
     }

diff --git a/packages/conversation/src/Entity/Message.php b/packages/conversation/src/Entity/Message.php
@@ -107,10 +107,8 @@ public function getAuthorName(): ?string
 
     /**
      * Set the value of authorName.
-     *
-     * @return self
      */
-    public function setAuthorName(?string $authorName)
+    public function setAuthorName(?string $authorName): self
     {
         $this->authorName = $authorName;
 
@@ -129,10 +127,8 @@ public function getAuthorEmail(): ?string
 
     /**
      * Set the value of authorEmail.
-     *
-     * @return self
      */
-    public function setAuthorEmail(?string $authorEmail)
+    public function setAuthorEmail(?string $authorEmail): self
     {
         $this->authorEmail = $authorEmail;
 
@@ -153,10 +149,8 @@ public function getReferring(): ?string
      * Set identifier referring.
      *
      * @param string $from Identifier referring
-     *
-     * @return self
      */
-    public function setReferring(string $referring)
+    public function setReferring(string $referring): self
     {
         $this->referring = $referring;
 
@@ -173,10 +167,8 @@ public function getAuthorIp(): ?int
 
     /**
      * Set the value of authorIp.
-     *
-     * @return self
      */
-    public function setAuthorIp(?int $authorIp)
+    public function setAuthorIp(?int $authorIp): self
     {
         if (null !== $authorIp) {
             $this->authorIp = $authorIp;

diff --git a/packages/conversation/src/PushwordConversationBundle.php b/packages/conversation/src/PushwordConversationBundle.php
@@ -7,10 +7,7 @@
 
 class PushwordConversationBundle extends Bundle
 {
-    /**
-     * @return \Pushword\Conversation\DependencyInjection\PushwordConversationExtension|null
-     */
-    public function getContainerExtension()
+    public function getContainerExtension(): ?PushwordConversationExtension
     {
         if (null === $this->extension) {
             $this->extension = new PushwordConversationExtension();

diff --git a/packages/conversation/src/Twig/AppExtension.php b/packages/conversation/src/Twig/AppExtension.php
@@ -35,7 +35,7 @@ public function __construct(EntityManagerInterface $entityManager, string $messa
     /**
      * @return \Twig\TwigFunction[]
      */
-    public function getFunctions()
+    public function getFunctions(): array
     {
         return [
             new TwigFunction('showConversation', function (Twig $twig, string $referring, string $orderBy, $limit, string $view): string {

diff --git a/packages/core/src/Command/ImageManagerCommand.php b/packages/core/src/Command/ImageManagerCommand.php
@@ -20,10 +20,7 @@ protected function configure(): void
             ->addArgument('media', InputArgument::OPTIONAL, 'Image name (eg: filename.jpg).');
     }
 
-    /**
-     * @return int
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $medias = $this->getMedias($input);
 

diff --git a/packages/core/src/Command/ImageOptimizerCommand.php b/packages/core/src/Command/ImageOptimizerCommand.php
@@ -20,10 +20,7 @@ protected function configure(): void
             ->addArgument('media', InputArgument::OPTIONAL, 'Image name (eg: filename.jpg).');
     }
 
-    /**
-     * @return int
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $medias = $this->getMedias($input);
 

diff --git a/packages/core/src/Command/NewCommand.php b/packages/core/src/Command/NewCommand.php
@@ -27,10 +27,7 @@ protected function configure(): void
         $this->setDescription('Add a new website into your config file (config/packages/pushword.yaml).');
     }
 
-    /**
-     * @return int
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $configFile = $this->projectDir.'/config/packages/pushword.yaml';
 

diff --git a/packages/core/src/Command/UserCreateCommand.php b/packages/core/src/Command/UserCreateCommand.php
@@ -61,10 +61,7 @@ protected function createUser(string $email, string $password, string $role): vo
         $this->em->flush();
     }
 
-    /**
-     * @return int
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $email = $this->getOrAskIfNotSetted($input, $output, 'email');
         $password = $this->getOrAskIfNotSetted($input, $output, 'password');

diff --git a/packages/core/src/Component/App/AppConfig.php b/packages/core/src/Component/App/AppConfig.php
@@ -86,10 +86,8 @@ public function getMainHost(): string
 
     /**
      * Used in Router Extension.
-     *
-     * @return bool
      */
-    public function isMainHost(?string $host)
+    public function isMainHost(?string $host): bool
     {
         return $this->getMainHost() === $host;
     }

diff --git a/packages/core/src/Component/EntityFilter/Filter/ElseH1.php b/packages/core/src/Component/EntityFilter/Filter/ElseH1.php
@@ -11,7 +11,7 @@ class ElseH1 extends AbstractFilter
     use RequiredManagerTrait;
 
     /** @return ?string */
-    public function apply($propertyValue)
+    public function apply($propertyValue): ?string
     {
         return '' !== \strval($propertyValue) ? $propertyValue : $this->entityFilterManager->getEntity()->getH1();
     }

diff --git a/packages/core/src/Component/EntityFilter/Filter/MainContentSplitter.php b/packages/core/src/Component/EntityFilter/Filter/MainContentSplitter.php
@@ -27,10 +27,7 @@ class MainContentSplitter extends AbstractFilter
     /** @var string[] */
     private array $contentParts = [];
 
-    /**
-     * @return self
-     */
-    public function apply($propertyValue)
+    public function apply($propertyValue): self
     {
         $this->split(\strval($propertyValue));
 

diff --git a/packages/core/src/Component/EntityFilter/Filter/Name.php b/packages/core/src/Component/EntityFilter/Filter/Name.php
@@ -11,7 +11,7 @@ class Name extends AbstractFilter
     use RequiredManagerTrait;
 
     /** @return ?string */
-    public function apply($propertyValue)
+    public function apply($propertyValue): ?string
     {
         $names = explode("\n", \strval($propertyValue));
 

diff --git a/packages/core/src/Component/EntityFilter/Filter/Unprose.php b/packages/core/src/Component/EntityFilter/Filter/Unprose.php
@@ -22,10 +22,7 @@ class Unprose extends AbstractFilter
     use RequiredEntityTrait;
     use UnproseTwigTrait;
 
-    /**
-     * @return string
-     */
-    public function apply($propertyValue)
+    public function apply($propertyValue): string
     {
         $closeEncryptedTag = $this->encryptTag('div');
         $openEncryptedTag = $this->encryptTag('/div');

diff --git a/packages/core/src/Component/EntityFilter/Manager.php b/packages/core/src/Component/EntityFilter/Manager.php
@@ -82,11 +82,11 @@ private function filter(string $property, $propertyValue)
     {
         $filters = $this->getFilters($this->camelCaseToSnakeCase($property));
 
-        if (null === $filters && \is_string($propertyValue)) {
+        if ([] === $filters && \is_string($propertyValue)) {
             $filters = $this->getFilters('string');
         }
 
-        return null !== $filters
+        return [] !== $filters
             ? $this->applyFilters($property,  '' !== \strval($propertyValue) ? $propertyValue : '', $filters)
             : $propertyValue;
     }
@@ -97,7 +97,7 @@ private function camelCaseToSnakeCase(string $string): string
     }
 
     /** @return string[] */
-    private function getFilters(string $label): ?array
+    private function getFilters(string $label): array
     {
         if ($this->app->entityCanOverrideFilters() && $this->entity instanceof CustomPropertiesInterface) {
             $filters = $this->entity->getCustomProperty($label.'_filters');
@@ -110,11 +110,11 @@ private function getFilters(string $label): ?array
 
         $filters = \is_string($filters) ? explode(',', $filters) : $filters;
 
-        return $filters ? $filters : null; // @phpstan-ignore-line
+        return $filters ? $filters : []; // @phpstan-ignore-line
     }
 
     /**
-     * @return false|class-string<FilterInterface>
+     * @return false|class-string
      */
     private function isFilter(string $className)
     {

diff --git a/packages/core/src/Controller/PageController.php b/packages/core/src/Controller/PageController.php
@@ -209,7 +209,7 @@ public function setApp($host): void
      * @psalm-suppress NullableReturnStatement
      * @psalm-suppress InvalidNullableReturnType
      */
-    private function getPageElse404(Request $request, ?string &$slug, string $host, bool $extractPager = false): Page
+    private function getPageElse404(Request $request, ?string &$slug, string $host, bool $extractPager = false): ?PageInterface
     {
         return $this->getPage($request, $slug, $host, true, $extractPager); // @phpstan-ignore-line
     }

diff --git a/packages/core/src/DependencyInjection/Configuration.php b/packages/core/src/DependencyInjection/Configuration.php
@@ -131,10 +131,7 @@ final class Configuration implements ConfigurationInterface
         ],
     ];
 
-    /**
-     * @return \Symfony\Component\Config\Definition\Builder\TreeBuilder
-     */
-    public function getConfigTreeBuilder()
+    public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('pushword');
         $treeBuilder->getRootNode()->children()

diff --git a/packages/core/src/DependencyInjection/PushwordCoreExtension.php b/packages/core/src/DependencyInjection/PushwordCoreExtension.php
@@ -40,10 +40,7 @@ private function setPathParameters(ContainerBuilder $containerBuilder): void
         $containerBuilder->setParameter('pw.package_dir', '%kernel.project_dir%/..');
     }
 
-    /**
-     * @return string
-     */
-    public function getAlias()
+    public function getAlias(): string
     {
         return 'pushword';
     }

diff --git a/packages/core/src/PushwordCoreBundle.php b/packages/core/src/PushwordCoreBundle.php
@@ -7,10 +7,7 @@
 
 final class PushwordCoreBundle extends Bundle
 {
-    /**
-     * @return \Pushword\Core\DependencyInjection\PushwordCoreExtension|null
-     */
-    public function getContainerExtension()
+    public function getContainerExtension(): ?PushwordCoreExtension
     {
         if (null === $this->extension) {
             $this->extension = new PushwordCoreExtension();

diff --git a/packages/core/src/Router/Router.php b/packages/core/src/Router/Router.php
@@ -90,10 +90,7 @@ public function generate($slug = 'homepage', bool $canonical = false, $pager = n
         return $url;
     }
 
-    /**
-     * @return bool
-     */
-    private function mayUseCustomPath()
+    private function mayUseCustomPath(): bool
     {
         return $this->useCustomHostPath
             && $this->currentHost // we have a request