Merge branch 'refacto/syndication' into doryphore-dev

Author: mrflos

.php-cs-fixer.dist.php

@@ -67,6 +67,7 @@
     'no_whitespace_before_comma_in_array' => true,
     'no_whitespace_in_blank_line' => true,
     'normalize_index_brace' => true,
+    'nullable_type_declaration_for_default_null_value' => true,
     'object_operator_without_whitespace' => true,
     'ordered_imports' => ['sort_algorithm' => 'alpha'],
     'semicolon_after_instruction' => true,

docs/actions/lang/actionsbuilder_en.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 return [
     'AB_advanced' => 'Advanced',
     'AB_bazar_label' => "Display form's data",
@@ -241,6 +242,7 @@
     'AB_buttons_action_button_color_danger' => 'Hazard',
     'AB_buttons_action_button_size_label' => 'Size',
     'AB_syndication_action_title_label' => 'Title',
+    'AB_syndication_action_show_image' => 'Show pictures from RSS feed entry',
     'AB_bazar_commons2_ordre_label' => 'Order',
     'AB_bazarcarto_provider_label' => 'Map Layout',
     'AB_bazarcarto_barregestion_label' => 'Entry management bar',
@@ -427,15 +429,15 @@
     'AB_buttons_action_button_size_big' => 'Big',
     'AB_buttons_action_button_modal_hint' => 'Works to a page of this wiki',
     'AB_syndication_action_source_hint' => 'Flow Title1, Flow Title2... indicates in case of multiple sources the Flow Title',
-    'AB_syndication_action_nb_label' => "Number of information to display",
+    'AB_syndication_action_nb_label' => 'Number of information to display',
     'AB_syndication_action_template_label' => 'Visualization Template',
     'AB_syndication_action_template_acordion' => 'Flux in the form of accordions',
     'AB_syndication_action_nouvellefenetre_label' => 'The links open in a new tab',
     'AB_syndication_action_formatdate_label' => 'Displays publication dates',
     'AB_syndication_action_formatdate_option_jm' => 'Day month',
     'AB_syndication_action_formatdate_option_jmh' => 'Day month hour',
     'AB_syndication_action_formatdate_option_jmah' => 'Day Month day',
-    'AB_bazar_sort_dynamique' => "Dynamic sorting",
+    'AB_bazar_sort_dynamique' => 'Dynamic sorting',
     'AB_bazar_sort' => 'Sort data',
     'AB_bazar_sort_add_field' => 'Add dynamic sort',
 ];

docs/actions/lang/actionsbuilder_fr.inc.php

@@ -55,7 +55,7 @@
     'AB_bazar_bf_date_debut_evenement_label' => 'Champ pour la date de début',
     'AB_bazar_bf_date_fin_evenement_label' => 'Champ pour la date de fin',
     'AB_bazar_sort' => 'Trier les données',
-    'AB_bazar_sort_dynamique' => "Tri dynamique",
+    'AB_bazar_sort_dynamique' => 'Tri dynamique',
     'AB_bazar_sort_add_field' => 'Ajouter un tri dynamique',
     'AB_bazarcarto_label' => 'Cartographie',
     'AB_bazarcarto_description' => 'Les fiches seront sous forme de marqueur.',
@@ -419,6 +419,7 @@
     'AB_syndication_action_formatdate_option_jma' => 'Jour Mois année',
     'AB_syndication_action_formatdate_option_jmh' => 'Jour mois heure',
     'AB_syndication_action_formatdate_option_jmah' => 'Jour mois année heure',
+    'AB_syndication_action_show_image' => 'Afficher les images descriptives du flux RSS',
     'AB_bazartableau_label' => 'Tableau',
     'AB_bazartableau_description' => 'Afficher sous forme de tableau',
     'AB_bazartableau_columnfieldsids_label' => 'Champs à afficher',

docs/actions/syndication.yaml

@@ -9,27 +9,34 @@ actions:
       url:
         label: _t(AB_syndication_action_url_label)
         hint: _t(AB_syndication_action_url_hint)
-        value: yeswiki.net, lemonde.fr
+        value: https://forum.yeswiki.net/c/annonces/8.rss, https://www.mediapart.fr/articles/feed
         type: url
         required: true
-      #      title:
-      #       label: _t(AB_syndication_action_title_label)
-      #       type: text
       source:
         label: _t(AB_syndication_action_source_label)
         hint: _t(AB_syndication_action_source_hint)
         type: text
-        value: Yeswiki, le Monde
+        value: Annonces forum YesWiki, Articles mediapart
       nb:
         label: _t(AB_syndication_action_nb_label)
         type: number
       template:
         type: list
         label: _t(AB_syndication_action_template_label)
         options:
-          accordeon.tpl.html: _t(AB_syndication_action_template_acordion)
-          liste.tpl.html: _t(AB_syndication_action_template_list)
-          liste_description.tpl.html: _t(AB_syndication_action_template_list_and_description)
+          accordeon.twig: _t(AB_syndication_action_template_acordion)
+          liste.twig: _t(AB_syndication_action_template_list)
+          liste_description.twig: _t(AB_syndication_action_template_list_and_description)
+      showimage:
+        type: checkbox
+        label: _t(AB_syndication_action_show_image)
+        default: '0'
+        checkedvalue: '1'
+        uncheckedvalue: '0'
+      title:
+        advanced: true
+        label: _t(AB_syndication_action_title_label)
+        type: text
       nouvellefenetre:
         advanced: true
         label: _t(AB_syndication_action_nouvellefenetre_label)

includes/objects/MD5PasswordHasher.php

@@ -23,7 +23,7 @@ public function __construct(bool $needRehash)
      *
      * @throws InvalidPasswordException If the plain password is invalid, e.g. excessively long
      */
-    public function hash(string $plainPassword, string $salt = null): string
+    public function hash(string $plainPassword, ?string $salt = null): string
     {
         if ($this->isPasswordTooLong($plainPassword)) {
             throw new InvalidPasswordException();
@@ -35,7 +35,7 @@ public function hash(string $plainPassword, string $salt = null): string
     /**
      * Checks that a plain password and a salt match a password hash.
      */
-    public function verify(string $hashedPassword, string $plainPassword, string $salt = null): bool
+    public function verify(string $hashedPassword, string $plainPassword, ?string $salt = null): bool
     {
         return $hashedPassword === $this->hash($plainPassword);
     }

includes/services/HtmlPurifierService.php

@@ -71,7 +71,7 @@ public function cleanXSS(string $dirtyContent): string
             return $dirtyContent;
         }
         if (is_null($this->antixss)) {
-            $this->antiXss = new AntiXSS();
+            $this->antixss = new AntiXSS();
         }
 
         return $this->antiXss->xss_clean($dirtyContent);