servers
/
ttrss
mirror of https://tt-rss.org/git/tt-rss.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'feature/composer-autoload-functions' into 'master' 

Move common 'include/functions.php' require into Composer autoloader.

See merge request tt-rss/tt-rss!28
This commit is contained in:
Andrew Dolgov 2024-04-21 16:16:50 +00:00
parent b1e3d660e4 16b89cc293
commit d832907125
13 changed files with 2718 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/index.php
View File

@ -11,7 +11,6 @@
define('NO_SESSION_AUTOSTART', true);
require_once "autoload.php";
require_once "functions.php";
require_once "sessions.php";
ini_set('session.use_cookies', "0");

1
backend.php
View File

@ -25,7 +25,6 @@
require_once "autoload.php";
require_once "sessions.php";
require_once "functions.php";
$op = (string)clean($op);
$method = (string)clean($method);

41
composer.json
View File

@ -6,30 +6,33 @@
}
},
"repositories": [
{
{
"name": "j4mie/idiorm",
"type": "vcs",
"url": "https://dev.tt-rss.org/fox/idiorm.git"
}
],
"autoload": {
"psr-4": {
"": "classes/"
}
"type": "vcs",
"url": "https://dev.tt-rss.org/fox/idiorm.git"
}
],
"autoload": {
"psr-4": {
"": "classes/"
},
"files": [
"include/functions.php"
]
},
"require": {
"spomky-labs/otphp": "^10.0",
"chillerlan/php-qrcode": "^4.3.3",
"mervick/material-design-icons": "^2.2",
"j4mie/idiorm": "dev-master",
"require": {
"spomky-labs/otphp": "^10.0",
"chillerlan/php-qrcode": "^4.3.3",
"mervick/material-design-icons": "^2.2",
"j4mie/idiorm": "dev-master",
"open-telemetry/exporter-otlp": "^1.0",
"php-http/guzzle7-adapter": "^1.0",
"soundasleep/html2text": "^2.1",
"guzzlehttp/guzzle": "^7.0"
},
"require-dev": {
"phpstan/phpstan": "1.10.3",
"phpunit/phpunit": "9.5.16",
},
"require-dev": {
"phpstan/phpstan": "1.10.3",
"phpunit/phpunit": "9.5.16",
"phpunit/php-code-coverage": "^9.2"
}
}
}

1
include/sessions.php
View File

@ -4,7 +4,6 @@
use UserHelper;
require_once "autoload.php";
require_once "functions.php";
require_once "errorhandler.php";
require_once "lib/gettext/gettext.inc.php";

1
index.php
View File

@ -12,7 +12,6 @@
require_once "autoload.php";
require_once "sessions.php";
require_once "functions.php";
Config::sanity_check();

1
prefs.php
View File

@ -11,7 +11,6 @@
require_once "autoload.php";
require_once "sessions.php";
require_once "functions.php";
Config::sanity_check();

1
public.php
View File

@ -4,7 +4,6 @@
require_once "autoload.php";
require_once "sessions.php";
require_once "functions.php";
Config::sanity_check();

1
tests/autoload.php
View File

@ -3,4 +3,3 @@
get_include_path());
require_once "autoload.php";
require_once "functions.php";

1
update.php
View File

@ -8,7 +8,6 @@
chdir(__DIR__);
require_once "autoload.php";
require_once "functions.php";
if (php_sapi_name() != "cli") {

1
update_daemon2.php
View File

@ -9,7 +9,6 @@
define('DISABLE_SESSIONS', true);
require_once "autoload.php";
require_once "functions.php";
Config::sanity_check();

1347
vendor/composer/autoload_classmap.php vendored
View File

File diff suppressed because it is too large Load Diff

1
vendor/composer/autoload_files.php vendored
View File

@ -114,4 +114,5 @@ return array(
'157bbd0180425c7142fbaf1b1646bec3' => $vendorDir . '/open-telemetry/exporter-otlp/_register.php',
'9b38cf48e83f5d8f60375221cd213eee' => $vendorDir . '/phpstan/phpstan/bootstrap.php',
'ec07570ca5a812141189b1fa81503674' => $vendorDir . '/phpunit/phpunit/src/Framework/Assert/Functions.php',
'1c27df0e838db1c8a6427db7c5db3db2' => $baseDir . '/include/functions.php',
);

1348
vendor/composer/autoload_static.php vendored
View File

File diff suppressed because it is too large Load Diff