Skip to content

Commit

Permalink
tweak(php82) fixed tests, setup data, zf1
Browse files Browse the repository at this point in the history
execute composer:
composer update zendframework/zendframework1
  • Loading branch information
paulmhh committed Aug 5, 2024
1 parent 73d278d commit a06eb7f
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 11 deletions.
1 change: 0 additions & 1 deletion tests/tine20/Addressbook/Import/CsvTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ class Calendar_Frontend_CalDAV_PluginDefaultAlarmsTest extends TestCase
protected $server;

protected $plugin;
protected $response;

/**
* Sets up the fixture.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ class Calendar_Frontend_CalDAV_PluginManagedAttachmentsTest extends TestCase
protected $calDAVTests;

protected $response;
protected $originalHostname;

/**
* Sets up the fixture.
Expand All @@ -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());

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 3 additions & 1 deletion tests/tine20/Tasks/ControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand All @@ -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.
Expand Down
3 changes: 1 addition & 2 deletions tine20/Admin/Controller/ImportExportDefinition.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* @subpackage Controller
* @license http://www.gnu.org/licenses/agpl.html AGPL Version 3
* @author Philipp Schüle <p.schuele@metaways.de>
* @copyright Copyright (c) 2019 Metaways Infosystems GmbH (http://www.metaways.de)
* @copyright Copyright (c) 2019-2024 Metaways Infosystems GmbH (http://www.metaways.de)
*/

/**
Expand All @@ -28,7 +28,6 @@ private function __construct()
{
$this->_applicationName = 'Admin';
$this->_modelName = 'Tinebase_Model_ImportExportDefinition';
$this->_doImportExportDefinitionACLChecks = false;
$this->_purgeRecords = false;


Expand Down
2 changes: 2 additions & 0 deletions tine20/Calendar/Setup/DemoData.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ class Calendar_Setup_DemoData extends Tinebase_Setup_DemoData_Abstract
*/
protected ?Tinebase_Model_Container $sharedCalendar = null;

protected $_ressources = [];

/**
* the constructor
*
Expand Down
4 changes: 3 additions & 1 deletion tine20/Timetracker/Model/TimesheetFilter.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 <c.weiss@metaways.de>
*/

Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions tine20/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit a06eb7f

Please sign in to comment.