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

Fix paths after composer.* files move

Browse source
This commit is contained in:
jo 2021-09-11 04:20:50 +02:00
parent f784f483a8
commit 03b109dcb5
12 changed files with 24 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
airtime_mvc/composer.json
View file

@ -1,12 +1,12 @@
{
"autoload": {
"classmap": [
"airtime_mvc/application/"
"application/"
]
},
"autoload-dev": {
"classmap": [
"airtime_mvc/tests/application/",
"tests/application/",
"vendor/phpunit/dbunit/src/"
]
},

2
airtime_mvc/public/index.php
View file

@ -28,7 +28,7 @@ define('BUILD_PATH', ROOT_PATH . 'build/');
define('SETUP_PATH', BUILD_PATH . 'airtime-setup/');
define('APPLICATION_PATH', ROOT_PATH . 'application/');
define('CONFIG_PATH', APPLICATION_PATH . 'configs/');
define('VENDOR_PATH', ROOT_PATH . '../vendor/');
define('VENDOR_PATH', ROOT_PATH . 'vendor/');
define('REST_MODULE_CONTROLLER_PATH', APPLICATION_PATH . 'modules/rest/controllers/');
define("AIRTIME_CONFIG_STOR", "/etc/airtime/");

2
airtime_mvc/public/setup/general-setup.php
View file

@ -2,7 +2,7 @@
define("CONFIG_PATH", dirname(dirname( __DIR__)) . "/application/configs/");
require_once(dirname(dirname( __DIR__)) . "/../vendor/propel/propel1/runtime/lib/Propel.php");
require_once(dirname(dirname( __DIR__)) . "/vendor/propel/propel1/runtime/lib/Propel.php");
require_once(CONFIG_PATH . 'conf.php');
require_once(dirname(dirname( __DIR__)) . "/application/models/airtime/CcPref.php");
require_once(dirname(dirname( __DIR__)) . "/application/models/airtime/CcPrefPeer.php");

2
airtime_mvc/public/setup/media-setup.php
View file

@ -3,7 +3,7 @@
define("CONFIG_PATH", dirname(dirname( __DIR__)) . "/application/configs/");
define("DEFAULT_STOR_DIR", "/srv/airtime/stor/");
require_once(dirname(dirname( __DIR__)) . "/../vendor/propel/propel1/runtime/lib/Propel.php");
require_once(dirname(dirname( __DIR__)) . "/vendor/propel/propel1/runtime/lib/Propel.php");
require_once(CONFIG_PATH . 'conf.php');
require_once(dirname(dirname( __DIR__)) . "/application/models/airtime/map/CcMusicDirsTableMap.php");

2
airtime_mvc/public/setup/setup-functions.php
View file

@ -6,7 +6,7 @@ define("RMQ_INI_TEMP_PATH", "/tmp/rabbitmq.ini.tmp");
// load autoloader since this files is an entry path see
// the end of the file for the "server" that is being
// executed.
require_once __DIR__ . '/../../../vendor/autoload.php';
require_once __DIR__ . '/../../vendor/autoload.php';
/**
* Class Setup

8
airtime_mvc/tests/application/bootstrap.php
View file

@ -2,7 +2,7 @@
error_reporting(E_ALL | E_STRICT);
// load composer autoloader
require_once __DIR__.'/../../../vendor/autoload.php';
require_once __DIR__ . '/../../vendor/autoload.php';
// Define path to application directory
defined('APPLICATION_PATH')
@ -30,13 +30,13 @@ set_include_path(implode(PATH_SEPARATOR, array(
// Ensure vendor/ is on the include path
set_include_path(implode(PATH_SEPARATOR, array(
get_include_path(),
realpath(APPLICATION_PATH . '/../../vendor'),
realpath(APPLICATION_PATH . '/../../vendor/zf1s/zend-loader/library')
realpath(APPLICATION_PATH . '/../vendor'),
realpath(APPLICATION_PATH . '/../vendor/zf1s/zend-loader/library')
)));
set_include_path(implode(PATH_SEPARATOR, array(
get_include_path(),
realpath(APPLICATION_PATH . '/../../vendor/propel/propel1/runtime/lib')
realpath(APPLICATION_PATH . '/../vendor/propel/propel1/runtime/lib')
)));
// Ensure library/ is on include_path