Merge branch 'develop-3.3.x' into prep-release-3.0.2

CHANGELOG.md

@@ -1,4 +1,9 @@
 # Changelog
+## 3.0.2 - 2021-01-08
+ - Fix: Class 'ResourceBundle' not found
+ - Fix: Travis-ci reported issues
+ - Code changes following phpBB Customisation Team reports
+
 ## 3.0.1 - 2020-12-12
  - Add: Position of donation stats can be defined
  - Add: Add options to set guest permissions from PDDE settings

actions/core.php

@@ -70,7 +70,7 @@ class core
  * @param compare $ppde_operator_compare Compare operator object
  * @param \skouat\ppde\operators\transactions $ppde_operator_transaction Transaction operator object
  * @param dispatcher_interface $dispatcher Dispatcher object
- * @param \phpbb\user $user User object
+ * @param user  $user User object
  * @param string $php_ext phpEx
  *
  * @access public

actions/vars.php

@@ -28,9 +28,9 @@ class vars
  *
  * @param \skouat\ppde\actions\core $actions_core PPDE actions core object
  * @param \skouat\ppde\actions\currency $actions_currency PPDE actions currency object
- * @param \phpbb\config\config $config Config object
- * @param \phpbb\language\language $language Language object
- * @param \phpbb\user $user User object
+ * @param config  $config Config object
+ * @param language  $language Language object
+ * @param user  $user User object
  *
  * @access public
  */

controller/admin/admin_main.php

@@ -11,7 +11,6 @@
 namespace skouat\ppde\controller\admin;
 
 use skouat\ppde\controller\ipn_paypal;
-use skouat\ppde\entity\main;
 
 abstract class admin_main
 {
@@ -259,7 +258,7 @@ protected function set_settings()
  *
  * @access protected
  */
- protected function trigger_error_data_already_exists(main $entity)
+ protected function trigger_error_data_already_exists(\skouat\ppde\entity\main $entity)
  {
  if ($this->is_added_data_exists($entity))
  {
@@ -277,7 +276,7 @@ protected function trigger_error_data_already_exists(main $entity)
  * @return bool
  * @access protected
  */
- protected function is_added_data_exists(main $entity)
+ protected function is_added_data_exists(\skouat\ppde\entity\main $entity)
  {
  return $entity->data_exists($entity->build_sql_data_exists()) && $this->request->variable('action', '') === 'add';
  }
@@ -293,7 +292,7 @@ protected function is_added_data_exists(main $entity)
  * @return array $errors
  * @access protected
  */
- protected function is_empty_data(main $entity, $field_name, $value_cmp, $submit_or_preview = false)
+ protected function is_empty_data(\skouat\ppde\entity\main $entity, $field_name, $value_cmp, $submit_or_preview = false)
  {
  $errors = [];
 

controller/admin/donation_pages_controller.php

@@ -15,8 +15,6 @@
 use phpbb\request\request;
 use phpbb\template\template;
 use phpbb\user;
-use skouat\ppde\actions\vars;
-use skouat\ppde\operators\donation_pages;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -44,27 +42,27 @@ class donation_pages_controller extends admin_main
  /**
  * Constructor
  *
- * @param ContainerInterface $container Service container interface
- * @param language $language Language user object
- * @param log $log The phpBB log system
- * @param \skouat\ppde\actions\vars $ppde_actions_vars PPDE Actions vars object
- * @param \skouat\ppde\entity\donation_pages $ppde_entity_donation_pages PPDE Entity object
- * @param donation_pages  $ppde_operator_donation_pages Operator object
- * @param request $request Request object
- * @param template $template Template object
- * @param user $user User object
- * @param string $phpbb_root_path phpBB root path
- * @param string $php_ext phpEx
+ * @param ContainerInterface  $container Service container interface
+ * @param language  $language Language user object
+ * @param log  $log The phpBB log system
+ * @param \skouat\ppde\actions\vars  $ppde_actions_vars PPDE Actions vars object
+ * @param \skouat\ppde\entity\donation_pages  $ppde_entity_donation_pages PPDE Entity object
+ * @param \skouat\ppde\operators\donation_pages $ppde_operator_donation_pages Operator object
+ * @param request  $request Request object
+ * @param template  $template Template object
+ * @param user  $user User object
+ * @param string  $phpbb_root_path phpBB root path
+ * @param string  $php_ext phpEx
  *
  * @access public
  */
  public function __construct(
  ContainerInterface $container,
  language $language,
  log $log,
- vars $ppde_actions_vars,
+ \skouat\ppde\actions\vars $ppde_actions_vars,
  \skouat\ppde\entity\donation_pages $ppde_entity_donation_pages,
- donation_pages $ppde_operator_donation_pages,
+ \skouat\ppde\operators\donation_pages $ppde_operator_donation_pages,
  request $request,
  template $template,
  user $user,

controller/admin/transactions_controller.php

@@ -387,7 +387,7 @@ public function change()
  * @param int $donor_id
  *
  * @return int
- * @throws \skouat\ppde\exception\transaction_exception
+ * @throws transaction_exception
  * @access private
  */
  private function validate_user_id($username, $donor_id = 0)
@@ -527,7 +527,7 @@ private function request_transaction_vars()
  * @param array $transaction_data
  *
  * @return array
- * @throws \skouat\ppde\exception\transaction_exception
+ * @throws transaction_exception
  * @access private
  */
  private function build_data_ary($transaction_data)

controller/main_controller.php

@@ -47,7 +47,7 @@ class main_controller
  * @param request $request Request object
  * @param template $template Template object
  * @param user $user User object
- * @param \phpbb\user_loader $user_loader User loader object
+ * @param user_loader  $user_loader User loader object
  * @param string $root_path phpBB root path
  * @param string $php_ext phpEx
  *

notification/core.php

@@ -25,10 +25,10 @@ class core
  /**
  * Constructor
  *
- * @param ContainerInterface  $container Service container interface
- * @param manager  $notification Notification object
- * @param \skouat\ppde\actions\currency $ppde_actions_currency Currency actions object
- * @param \skouat\ppde\entity\transactions $ppde_entity_transaction Transaction entity object
+ * @param ContainerInterface $container Service container interface
+ * @param manager $notification Notification object
+ * @param currency  $ppde_actions_currency Currency actions object
+ * @param transactions  $ppde_entity_transaction Transaction entity object
  * @access public
  */
  public function __construct(