Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

feat(legacy): consolidate constants (#1558)

Browse source 
* remove unused file

* fix paths leading slash

* remove useless imports

* refactor(legacy): use constants everywhere

* fix path leading slash

* remove useless import

* consolidate legacy contants

* format code

* reuse LIBRETIME_CONFIG_DIR

* fix test config path

* remove ci legacy log dir creation

* some logs improvements
This commit is contained in:
Jonas L 2022-02-04 11:00:41 +01:00 • committed by GitHub
parent e106858fd8
commit 729a7b99e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
34 changed files with 133 additions and 257 deletions
Download patch file Download diff file Expand all files Collapse all files

20
legacy/tests/application/bootstrap.php
View file

@ -2,19 +2,7 @@
error_reporting(E_ALL | E_STRICT);
// load composer autoloader
require_once __DIR__ . '/../../vendor/autoload.php';
// Define path to application directory
defined('APPLICATION_PATH')
|| define('APPLICATION_PATH', realpath(dirname(__FILE__) . '/../../application/'));
// Define path to configs directory
define('CONFIG_PATH', APPLICATION_PATH . '/configs/');
// Define application environment
defined('APPLICATION_ENV')
|| define('APPLICATION_ENV', (getenv('APPLICATION_ENV') ? getenv('APPLICATION_ENV') : 'testing'));
require_once dirname(__DIR__, 2) . '/application/preload.php';
// Ensure library/ is on include_path
set_include_path(implode(PATH_SEPARATOR, [
@ -46,9 +34,7 @@ set_include_path(implode(PATH_SEPARATOR, [
realpath(APPLICATION_PATH . '/../../install_minimal/include'),
]));
require_once CONFIG_PATH . '/constants.php';
Logging::setLogPath(LIBRETIME_LOG_DIR . '/legacy.log');
Logging::setLogPath(LIBRETIME_LOG_FILEPATH);
set_include_path(APPLICATION_PATH . '/common' . PATH_SEPARATOR . get_include_path());
@ -76,8 +62,6 @@ set_include_path(APPLICATION_PATH . '/../tests/application/helpers' . PATH_SEPAR
//cloud storage files
set_include_path(APPLICATION_PATH . '/cloud_storage' . PATH_SEPARATOR . get_include_path());
require_once APPLICATION_PATH . '/configs/conf.php';
require_once 'jooola/propel1/runtime/lib/Propel.php';
Propel::init('../application/configs/airtime-conf-production.php');

2
legacy/tests/application/configs/ConfigTest.php
View file

@ -1,7 +1,5 @@
<?php
require_once '../application/configs/conf.php';
/**
* @internal
* @coversNothing

2
legacy/tests/application/helpers/TestHelper.php
View file

@ -130,7 +130,7 @@ class TestHelper
public static function setupZendBootstrap()
{
$application = new Zend_Application(APPLICATION_ENV, CONFIG_PATH . 'application.ini');
$application = new Zend_Application(APPLICATION_ENV, CONFIG_PATH . '/application.ini');
$application->bootstrap();
return $application;

2
legacy/tests/application/models/database/BlockDbTest.php
View file

@ -1,7 +1,5 @@
<?php
//require_once "../application/configs/conf.php";
/**
* @internal
* @coversNothing

2
legacy/tests/application/models/database/ScheduleDbTest.php
View file

@ -1,7 +1,5 @@
<?php
require_once '../application/configs/conf.php';
/**
* @internal
* @coversNothing

2
legacy/tests/application/models/unit/ScheduleUnitTest.php
View file

@ -1,7 +1,5 @@
<?php
//require_once "../application/configs/conf.php";
/**
* @internal
* @coversNothing