From a06eb7f388058b14e09d4c749d46e90d3f143f1e Mon Sep 17 00:00:00 2001 From: Paul Mehrer Date: Mon, 5 Aug 2024 12:34:25 +0200 Subject: [PATCH] tweak(php82) fixed tests, setup data, zf1 execute composer: composer update zendframework/zendframework1 --- tests/tine20/Addressbook/Import/CsvTest.php | 1 - .../Calendar/Frontend/CalDAV/PluginDefaultAlarmsTest.php | 1 + .../Frontend/CalDAV/PluginManagedAttachmentsTest.php | 6 +++--- .../Calendar/Frontend/CalDAV/SpeedUpPropfindPluginTest.php | 2 ++ tests/tine20/Tasks/ControllerTest.php | 4 +++- tine20/Admin/Controller/ImportExportDefinition.php | 3 +-- tine20/Calendar/Setup/DemoData.php | 2 ++ tine20/Timetracker/Model/TimesheetFilter.php | 4 +++- tine20/composer.lock | 6 +++--- 9 files changed, 18 insertions(+), 11 deletions(-) diff --git a/tests/tine20/Addressbook/Import/CsvTest.php b/tests/tine20/Addressbook/Import/CsvTest.php index 158ad2cde08..7cf8f446876 100644 --- a/tests/tine20/Addressbook/Import/CsvTest.php +++ b/tests/tine20/Addressbook/Import/CsvTest.php @@ -483,7 +483,6 @@ public function testImportDuplicateInImport() $definition = $this->_getDefinitionFromFile('adb_import_csv_split.xml'); $this->_filename = dirname(__FILE__) . '/files/import_split_duplicate.csv'; - $this->_deletePersonalContacts = TRUE; $this->_deleteImportFile = false; $result = $this->_doImport(array('dryrun' => false), $definition); diff --git a/tests/tine20/Calendar/Frontend/CalDAV/PluginDefaultAlarmsTest.php b/tests/tine20/Calendar/Frontend/CalDAV/PluginDefaultAlarmsTest.php index 6894a170c96..6034db284ae 100644 --- a/tests/tine20/Calendar/Frontend/CalDAV/PluginDefaultAlarmsTest.php +++ b/tests/tine20/Calendar/Frontend/CalDAV/PluginDefaultAlarmsTest.php @@ -25,6 +25,7 @@ class Calendar_Frontend_CalDAV_PluginDefaultAlarmsTest extends TestCase protected $server; protected $plugin; + protected $response; /** * Sets up the fixture. diff --git a/tests/tine20/Calendar/Frontend/CalDAV/PluginManagedAttachmentsTest.php b/tests/tine20/Calendar/Frontend/CalDAV/PluginManagedAttachmentsTest.php index 4d7d19658f8..68d48702e28 100644 --- a/tests/tine20/Calendar/Frontend/CalDAV/PluginManagedAttachmentsTest.php +++ b/tests/tine20/Calendar/Frontend/CalDAV/PluginManagedAttachmentsTest.php @@ -27,6 +27,7 @@ class Calendar_Frontend_CalDAV_PluginManagedAttachmentsTest extends TestCase protected $calDAVTests; protected $response; + protected $originalHostname; /** * Sets up the fixture. @@ -40,10 +41,9 @@ public function setUp(): void $this->calDAVTests->setup(); parent::setUp(); - - $this->hostname = 'tine.example.com'; + $this->originalHostname = isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : null; - $_SERVER['HTTP_HOST'] = $this->hostname; + $_SERVER['HTTP_HOST'] = 'tine.example.com'; $this->server = new \Sabre\DAV\Server(new Tinebase_WebDav_ObjectTree(new Tinebase_WebDav_Root()), new Tinebase_WebDav_Sabre_SapiMock()); diff --git a/tests/tine20/Calendar/Frontend/CalDAV/SpeedUpPropfindPluginTest.php b/tests/tine20/Calendar/Frontend/CalDAV/SpeedUpPropfindPluginTest.php index ed705716ec7..e3ebd5078bf 100644 --- a/tests/tine20/Calendar/Frontend/CalDAV/SpeedUpPropfindPluginTest.php +++ b/tests/tine20/Calendar/Frontend/CalDAV/SpeedUpPropfindPluginTest.php @@ -34,6 +34,8 @@ class Calendar_Frontend_CalDAV_SpeedUpPropfindPluginTest extends Calendar_TestCa */ protected $plugin; + protected $response; + /** * Sets up the fixture. * This method is called before a test is executed. diff --git a/tests/tine20/Tasks/ControllerTest.php b/tests/tine20/Tasks/ControllerTest.php index d992dd7f264..fdf84ac2c04 100644 --- a/tests/tine20/Tasks/ControllerTest.php +++ b/tests/tine20/Tasks/ControllerTest.php @@ -18,7 +18,7 @@ class Tasks_ControllerTest extends TestCase * @var array test Task 1 data */ protected $_testTask1; - + /** * @var Tasks_Model_Task persistant (readout from db after persistant creation) test Task 1 */ @@ -39,6 +39,8 @@ class Tasks_ControllerTest extends TestCase protected $_modelNames = array('Tasks_Model_Task' => 'Task'); protected Tasks_Controller_Task $_controller; + + protected $_minimalDatas = []; /** * Sets up the fixture, for example, opens a network connection. diff --git a/tine20/Admin/Controller/ImportExportDefinition.php b/tine20/Admin/Controller/ImportExportDefinition.php index 5f148f0e4ed..cc62d91a385 100644 --- a/tine20/Admin/Controller/ImportExportDefinition.php +++ b/tine20/Admin/Controller/ImportExportDefinition.php @@ -6,7 +6,7 @@ * @subpackage Controller * @license http://www.gnu.org/licenses/agpl.html AGPL Version 3 * @author Philipp Schüle - * @copyright Copyright (c) 2019 Metaways Infosystems GmbH (http://www.metaways.de) + * @copyright Copyright (c) 2019-2024 Metaways Infosystems GmbH (http://www.metaways.de) */ /** @@ -28,7 +28,6 @@ private function __construct() { $this->_applicationName = 'Admin'; $this->_modelName = 'Tinebase_Model_ImportExportDefinition'; - $this->_doImportExportDefinitionACLChecks = false; $this->_purgeRecords = false; diff --git a/tine20/Calendar/Setup/DemoData.php b/tine20/Calendar/Setup/DemoData.php index b41279f75b9..804a33e73ef 100644 --- a/tine20/Calendar/Setup/DemoData.php +++ b/tine20/Calendar/Setup/DemoData.php @@ -56,6 +56,8 @@ class Calendar_Setup_DemoData extends Tinebase_Setup_DemoData_Abstract */ protected ?Tinebase_Model_Container $sharedCalendar = null; + protected $_ressources = []; + /** * the constructor * diff --git a/tine20/Timetracker/Model/TimesheetFilter.php b/tine20/Timetracker/Model/TimesheetFilter.php index c10ec9d553b..f0bf996969b 100644 --- a/tine20/Timetracker/Model/TimesheetFilter.php +++ b/tine20/Timetracker/Model/TimesheetFilter.php @@ -5,7 +5,7 @@ * @package Tinebase * @subpackage Filter * @license http://www.gnu.org/licenses/agpl.html AGPL Version 3 - * @copyright Copyright (c) 2007-2012 Metaways Infosystems GmbH (http://www.metaways.de) + * @copyright Copyright (c) 2007-2024 Metaways Infosystems GmbH (http://www.metaways.de) * @author Cornelius Weiss */ @@ -41,6 +41,8 @@ class Timetracker_Model_TimesheetFilter extends Tinebase_Model_Filter_FilterGrou // NOTE: this is needed to make the search for other users timesheets work Timetracker_Model_TimeaccountGrants::VIEW_ALL, ); + + protected $_validTimeaccounts = []; /** * sets the grants this filter needs to assure diff --git a/tine20/composer.lock b/tine20/composer.lock index 624b2bcb252..4d3942ea396 100644 --- a/tine20/composer.lock +++ b/tine20/composer.lock @@ -13592,11 +13592,11 @@ }, { "name": "zendframework/zendframework1", - "version": "1.12.20.72", + "version": "1.12.20.73", "source": { "type": "git", "url": "https://github.com/tine-groupware/zendframework1.git", - "reference": "390b5ae77bd26a3c80046f7be8040286fc4ff15f" + "reference": "0f8c860823d40fb82aa7252d5d0ed7d70645b276" }, "require": { "php": ">=7.4.0" @@ -13613,7 +13613,7 @@ "New BSD License" ], "description": "Metaways Infosystems GmbH - Patched Zendframework1", - "time": "2024-03-26T09:14:34+00:00" + "time": "2024-08-05T10:27:59+00:00" } ], "packages-dev": [