mirror of
https://github.com/ad-aures/castopod.git
synced 2026-04-16 04:57:46 +02:00
refactor: add modules folder to phpstan paths + fix errors
This commit is contained in:
parent
7a6d9df6db
commit
bb628f355f
166 changed files with 452 additions and 526 deletions
|
|
@ -18,7 +18,7 @@ class ActorController extends FediverseActorController
|
|||
use AnalyticsTrait;
|
||||
|
||||
/**
|
||||
* @var string[]
|
||||
* @var list<string>
|
||||
*/
|
||||
protected $helpers = ['svg', 'components', 'misc', 'seo'];
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ namespace App\Controllers;
|
|||
|
||||
use CodeIgniter\Controller;
|
||||
use CodeIgniter\HTTP\Response;
|
||||
use Config\Colors;
|
||||
|
||||
class ColorsController extends Controller
|
||||
{
|
||||
|
|
@ -29,7 +28,7 @@ class ColorsController extends Controller
|
|||
if (
|
||||
! ($colorsCssBody = cache($cacheName))
|
||||
) {
|
||||
$colorThemes = config(Colors::class)
|
||||
$colorThemes = config('Colors')
|
||||
->themes;
|
||||
|
||||
$colorsCssBody = '';
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@ use App\Entities\Podcast;
|
|||
use App\Libraries\CommentObject;
|
||||
use App\Models\EpisodeCommentModel;
|
||||
use App\Models\EpisodeModel;
|
||||
use App\Models\LikeModel;
|
||||
use App\Models\PodcastModel;
|
||||
use CodeIgniter\Exceptions\PageNotFoundException;
|
||||
use CodeIgniter\HTTP\RedirectResponse;
|
||||
|
|
@ -170,7 +169,7 @@ class EpisodeCommentController extends BaseController
|
|||
return redirect()->back();
|
||||
}
|
||||
|
||||
model(LikeModel::class)
|
||||
model('LikeModel')
|
||||
->toggleLike($interactAsActor, $this->comment);
|
||||
|
||||
return redirect()->back();
|
||||
|
|
@ -182,7 +181,7 @@ class EpisodeCommentController extends BaseController
|
|||
return redirect()->back();
|
||||
}
|
||||
|
||||
model(LikeModel::class)
|
||||
model('LikeModel')
|
||||
->toggleLike($interactAsActor, $this->comment);
|
||||
|
||||
return redirect()->back();
|
||||
|
|
|
|||
|
|
@ -16,13 +16,11 @@ use App\Libraries\NoteObject;
|
|||
use App\Libraries\PodcastEpisode;
|
||||
use App\Models\EpisodeModel;
|
||||
use App\Models\PodcastModel;
|
||||
use App\Models\PostModel;
|
||||
use CodeIgniter\Database\BaseBuilder;
|
||||
use CodeIgniter\Exceptions\PageNotFoundException;
|
||||
use CodeIgniter\HTTP\Response;
|
||||
use CodeIgniter\HTTP\ResponseInterface;
|
||||
use Config\Embed;
|
||||
use Config\Images;
|
||||
use Config\Services;
|
||||
use Modules\Analytics\AnalyticsTrait;
|
||||
use Modules\Fediverse\Objects\OrderedCollectionObject;
|
||||
|
|
@ -351,15 +349,15 @@ class EpisodeController extends BaseController
|
|||
'author_url' => $this->podcast->link,
|
||||
'html' => '<iframe src="' .
|
||||
$this->episode->embed_url .
|
||||
'" width="100%" height="' . config(Embed::class)->height . '" frameborder="0" scrolling="no"></iframe>',
|
||||
'width' => config(Embed::class)
|
||||
'" width="100%" height="' . config('Embed')->height . '" frameborder="0" scrolling="no"></iframe>',
|
||||
'width' => config('Embed')
|
||||
->width,
|
||||
'height' => config(Embed::class)
|
||||
'height' => config('Embed')
|
||||
->height,
|
||||
'thumbnail_url' => $this->episode->cover->og_url,
|
||||
'thumbnail_width' => config(Images::class)
|
||||
'thumbnail_width' => config('Images')
|
||||
->podcastCoverSizes['og']['width'],
|
||||
'thumbnail_height' => config(Images::class)
|
||||
'thumbnail_height' => config('Images')
|
||||
->podcastCoverSizes['og']['height'],
|
||||
]);
|
||||
}
|
||||
|
|
@ -376,8 +374,8 @@ class EpisodeController extends BaseController
|
|||
$oembed->addChild('author_name', $this->podcast->title);
|
||||
$oembed->addChild('author_url', $this->podcast->link);
|
||||
$oembed->addChild('thumbnail', $this->episode->cover->og_url);
|
||||
$oembed->addChild('thumbnail_width', (string) config(Images::class)->podcastCoverSizes['og']['width']);
|
||||
$oembed->addChild('thumbnail_height', (string) config(Images::class)->podcastCoverSizes['og']['height']);
|
||||
$oembed->addChild('thumbnail_width', (string) config('Images')->podcastCoverSizes['og']['width']);
|
||||
$oembed->addChild('thumbnail_height', (string) config('Images')->podcastCoverSizes['og']['height']);
|
||||
$oembed->addChild(
|
||||
'html',
|
||||
htmlspecialchars(
|
||||
|
|
@ -388,8 +386,8 @@ class EpisodeController extends BaseController
|
|||
)->height . '" frameborder="0" scrolling="no"></iframe>',
|
||||
),
|
||||
);
|
||||
$oembed->addChild('width', (string) config(Embed::class)->width);
|
||||
$oembed->addChild('height', (string) config(Embed::class)->height);
|
||||
$oembed->addChild('width', (string) config('Embed')->width);
|
||||
$oembed->addChild('height', (string) config('Embed')->height);
|
||||
|
||||
// @phpstan-ignore-next-line
|
||||
return $this->response->setXML($oembed);
|
||||
|
|
@ -409,7 +407,7 @@ class EpisodeController extends BaseController
|
|||
/**
|
||||
* get comments: aggregated replies from posts referring to the episode
|
||||
*/
|
||||
$episodeComments = model(PostModel::class)
|
||||
$episodeComments = model('PostModel')
|
||||
->whereIn('in_reply_to_id', fn (BaseBuilder $builder): BaseBuilder => $builder->select('id')
|
||||
->from('fediverse_posts')
|
||||
->where('episode_id', $this->episode->id))
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@ use App\Models\PodcastModel;
|
|||
use CodeIgniter\Database\Exceptions\DatabaseException;
|
||||
use CodeIgniter\HTTP\RedirectResponse;
|
||||
use CodeIgniter\HTTP\ResponseInterface;
|
||||
use Config\Cache;
|
||||
use Modules\Media\FileManagers\FileManagerInterface;
|
||||
|
||||
class HomeController extends BaseController
|
||||
|
|
@ -54,7 +53,7 @@ class HomeController extends BaseController
|
|||
}
|
||||
|
||||
// --- Can Castopod connect to the cache handler
|
||||
if (config(Cache::class)->handler !== 'dummy' && cache()->getCacheInfo() === null) {
|
||||
if (config('Cache')->handler !== 'dummy' && cache()->getCacheInfo() === null) {
|
||||
$errors[] = 'Unable connect to the cache handler.';
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -278,11 +278,11 @@ class PodcastController extends BaseController
|
|||
{
|
||||
if ($this->podcast->type === 'serial') {
|
||||
// podcast is serial
|
||||
$episodes = model(EpisodeModel::class)
|
||||
$episodes = model('EpisodeModel')
|
||||
->where('`published_at` <= UTC_TIMESTAMP()', null, false)
|
||||
->orderBy('season_number DESC, number ASC');
|
||||
} else {
|
||||
$episodes = model(EpisodeModel::class)
|
||||
$episodes = model('EpisodeModel')
|
||||
->where('`published_at` <= UTC_TIMESTAMP()', null, false)
|
||||
->orderBy('published_at', 'DESC');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ class PostController extends FediversePostController
|
|||
protected $post;
|
||||
|
||||
/**
|
||||
* @var string[]
|
||||
* @var list<string>
|
||||
*/
|
||||
protected $helpers = ['auth', 'fediverse', 'svg', 'components', 'misc', 'seo', 'premium_podcasts'];
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue