chore: update php-cs-fixer
Signed-off-by: Varun Patil <radialapps@gmail.com>pull/803/head
parent
5cffbf2197
commit
f1ed890480
|
@ -99,7 +99,7 @@ class AlbumsBackend extends Backend
|
||||||
|
|
||||||
// Remove elements with duplicate album_id
|
// Remove elements with duplicate album_id
|
||||||
$seenIds = [];
|
$seenIds = [];
|
||||||
$list = array_filter($list, function ($item) use (&$seenIds) {
|
$list = array_filter($list, static function ($item) use (&$seenIds) {
|
||||||
if (\in_array($item['album_id'], $seenIds, true)) {
|
if (\in_array($item['album_id'], $seenIds, true)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -110,7 +110,7 @@ class AlbumsBackend extends Backend
|
||||||
|
|
||||||
// Add display names for users
|
// Add display names for users
|
||||||
$userManager = \OC::$server->get(\OCP\IUserManager::class);
|
$userManager = \OC::$server->get(\OCP\IUserManager::class);
|
||||||
array_walk($list, function (&$item) use ($userManager) {
|
array_walk($list, static function (&$item) use ($userManager) {
|
||||||
$user = $userManager->get($item['user']);
|
$user = $userManager->get($item['user']);
|
||||||
$item['user_display'] = $user ? $user->getDisplayName() : null;
|
$item['user_display'] = $user ? $user->getDisplayName() : null;
|
||||||
});
|
});
|
||||||
|
|
|
@ -71,7 +71,7 @@ trait PeopleBackendUtils
|
||||||
}
|
}
|
||||||
|
|
||||||
// Sort previews by score descending
|
// Sort previews by score descending
|
||||||
usort($list, fn ($a, $b) => $b['score'] <=> $a['score']);
|
usort($list, static fn ($a, $b) => $b['score'] <=> $a['score']);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -201,7 +201,7 @@ class Index extends Command
|
||||||
$this->output->writeln("<error>User {$uid} not found</error>");
|
$this->output->writeln("<error>User {$uid} not found</error>");
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$this->userManager->callForSeenUsers(fn (IUser $user) => $closure($user));
|
$this->userManager->callForSeenUsers(static fn (IUser $user) => $closure($user));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -243,7 +243,7 @@ class MigrateGoogleTakeout extends Command
|
||||||
|
|
||||||
// Keep keys that are not in EXIF unless --override is specified
|
// Keep keys that are not in EXIF unless --override is specified
|
||||||
if (!((bool) $this->input->getOption('override'))) {
|
if (!((bool) $this->input->getOption('override'))) {
|
||||||
$txf = array_filter($txf, function ($value, $key) use ($exif) {
|
$txf = array_filter($txf, static function ($value, $key) use ($exif) {
|
||||||
return !isset($exif[$key]);
|
return !isset($exif[$key]);
|
||||||
}, ARRAY_FILTER_USE_BOTH);
|
}, ARRAY_FILTER_USE_BOTH);
|
||||||
|
|
||||||
|
@ -297,7 +297,7 @@ class MigrateGoogleTakeout extends Command
|
||||||
protected function takeoutToExiftoolJson(array $json)
|
protected function takeoutToExiftoolJson(array $json)
|
||||||
{
|
{
|
||||||
// Helper to get a value from nested JSON
|
// Helper to get a value from nested JSON
|
||||||
$get = function (string $source) use ($json) {
|
$get = static function (string $source) use ($json) {
|
||||||
$keys = array_reverse(explode('.', $source));
|
$keys = array_reverse(explode('.', $source));
|
||||||
while (\count($keys) > 0) {
|
while (\count($keys) > 0) {
|
||||||
$key = array_pop($keys);
|
$key = array_pop($keys);
|
||||||
|
@ -343,7 +343,7 @@ class MigrateGoogleTakeout extends Command
|
||||||
$txf['GPSAltitude'] = $get('geoData.altitude');
|
$txf['GPSAltitude'] = $get('geoData.altitude');
|
||||||
|
|
||||||
// Remove all null values
|
// Remove all null values
|
||||||
return array_filter($txf, function ($value) {
|
return array_filter($txf, static function ($value) {
|
||||||
return null !== $value;
|
return null !== $value;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -93,14 +93,14 @@ class AdminController extends GenericApiController
|
||||||
// Check exiftool version
|
// Check exiftool version
|
||||||
$exiftoolNoLocal = Util::getSystemConfig('memories.exiftool_no_local');
|
$exiftoolNoLocal = Util::getSystemConfig('memories.exiftool_no_local');
|
||||||
$status['exiftool'] = $this->getExecutableStatus(
|
$status['exiftool'] = $this->getExecutableStatus(
|
||||||
fn () => BinExt::getExiftoolPBin(),
|
static fn () => BinExt::getExiftoolPBin(),
|
||||||
fn ($p) => BinExt::testExiftool(),
|
static fn ($p) => BinExt::testExiftool(),
|
||||||
!$exiftoolNoLocal,
|
!$exiftoolNoLocal,
|
||||||
!$exiftoolNoLocal,
|
!$exiftoolNoLocal,
|
||||||
);
|
);
|
||||||
|
|
||||||
// Check for system perl
|
// Check for system perl
|
||||||
$status['perl'] = $this->getExecutableStatus(exec('which perl'), fn ($p) => BinExt::testSystemPerl($p));
|
$status['perl'] = $this->getExecutableStatus(exec('which perl'), static fn ($p) => BinExt::testSystemPerl($p));
|
||||||
|
|
||||||
// Check number of indexed files
|
// Check number of indexed files
|
||||||
$status['indexed_count'] = $index->getIndexedCount();
|
$status['indexed_count'] = $index->getIndexedCount();
|
||||||
|
@ -135,24 +135,24 @@ class AdminController extends GenericApiController
|
||||||
$status['ffmpeg_preview'] = $this->getExecutableStatus(
|
$status['ffmpeg_preview'] = $this->getExecutableStatus(
|
||||||
Util::getSystemConfig('preview_ffmpeg_path', null, true)
|
Util::getSystemConfig('preview_ffmpeg_path', null, true)
|
||||||
?: trim(shell_exec('which ffmpeg') ?: ''),
|
?: trim(shell_exec('which ffmpeg') ?: ''),
|
||||||
fn ($p) => BinExt::testFFmpeg($p, 'ffmpeg'),
|
static fn ($p) => BinExt::testFFmpeg($p, 'ffmpeg'),
|
||||||
);
|
);
|
||||||
|
|
||||||
// Check ffmpeg and ffprobe binaries for transcoding
|
// Check ffmpeg and ffprobe binaries for transcoding
|
||||||
$status['ffmpeg'] = $this->getExecutableStatus(
|
$status['ffmpeg'] = $this->getExecutableStatus(
|
||||||
Util::getSystemConfig('memories.vod.ffmpeg'),
|
Util::getSystemConfig('memories.vod.ffmpeg'),
|
||||||
fn ($p) => BinExt::testFFmpeg($p, 'ffmpeg'),
|
static fn ($p) => BinExt::testFFmpeg($p, 'ffmpeg'),
|
||||||
);
|
);
|
||||||
$status['ffprobe'] = $this->getExecutableStatus(
|
$status['ffprobe'] = $this->getExecutableStatus(
|
||||||
Util::getSystemConfig('memories.vod.ffprobe'),
|
Util::getSystemConfig('memories.vod.ffprobe'),
|
||||||
fn ($p) => BinExt::testFFmpeg($p, 'ffprobe'),
|
static fn ($p) => BinExt::testFFmpeg($p, 'ffprobe'),
|
||||||
);
|
);
|
||||||
|
|
||||||
// Check go-vod binary
|
// Check go-vod binary
|
||||||
$extGoVod = Util::getSystemConfig('memories.vod.external');
|
$extGoVod = Util::getSystemConfig('memories.vod.external');
|
||||||
$status['govod'] = $this->getExecutableStatus(
|
$status['govod'] = $this->getExecutableStatus(
|
||||||
fn () => BinExt::getGoVodBin(),
|
static fn () => BinExt::getGoVodBin(),
|
||||||
fn ($p) => BinExt::testStartGoVod(),
|
static fn ($p) => BinExt::testStartGoVod(),
|
||||||
!$extGoVod,
|
!$extGoVod,
|
||||||
!$extGoVod,
|
!$extGoVod,
|
||||||
);
|
);
|
||||||
|
@ -188,7 +188,7 @@ class AdminController extends GenericApiController
|
||||||
// Reset action token
|
// Reset action token
|
||||||
$this->actionToken(true);
|
$this->actionToken(true);
|
||||||
|
|
||||||
return Util::guardExDirect(function (Http\IOutput $out) {
|
return Util::guardExDirect(static function (Http\IOutput $out) {
|
||||||
try {
|
try {
|
||||||
// Set PHP timeout to infinite
|
// Set PHP timeout to infinite
|
||||||
set_time_limit(0);
|
set_time_limit(0);
|
||||||
|
|
|
@ -76,7 +76,7 @@ class DaysController extends GenericApiController
|
||||||
$dayIds = null;
|
$dayIds = null;
|
||||||
} else {
|
} else {
|
||||||
// Split at commas and convert all parts to int
|
// Split at commas and convert all parts to int
|
||||||
$dayIds = array_map(fn ($p) => (int) $p, explode(',', $id));
|
$dayIds = array_map(static fn ($p) => (int) $p, explode(',', $id));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check if $dayIds is empty
|
// Check if $dayIds is empty
|
||||||
|
|
|
@ -46,7 +46,7 @@ class DownloadController extends GenericApiController
|
||||||
*/
|
*/
|
||||||
public function request($files): Http\Response
|
public function request($files): Http\Response
|
||||||
{
|
{
|
||||||
return Util::guardEx(function () use ($files) {
|
return Util::guardEx(static function () use ($files) {
|
||||||
// Get ids from body
|
// Get ids from body
|
||||||
if (null === $files || !\is_array($files)) {
|
if (null === $files || !\is_array($files)) {
|
||||||
throw Exceptions::MissingParameter('files');
|
throw Exceptions::MissingParameter('files');
|
||||||
|
@ -105,7 +105,7 @@ class DownloadController extends GenericApiController
|
||||||
$fileIds = $info[1];
|
$fileIds = $info[1];
|
||||||
|
|
||||||
/** @var int[] $fileIds */
|
/** @var int[] $fileIds */
|
||||||
$fileIds = array_filter(array_map('intval', $fileIds), fn ($id) => $id > 0);
|
$fileIds = array_filter(array_map('intval', $fileIds), static fn ($id) => $id > 0);
|
||||||
|
|
||||||
// Check if we have any valid ids
|
// Check if we have any valid ids
|
||||||
if (0 === \count($fileIds)) {
|
if (0 === \count($fileIds)) {
|
||||||
|
|
|
@ -40,7 +40,7 @@ class FoldersController extends GenericApiController
|
||||||
$folders = $view->getDirectoryContent($node->getPath(), FileInfo::MIMETYPE_FOLDER, $node);
|
$folders = $view->getDirectoryContent($node->getPath(), FileInfo::MIMETYPE_FOLDER, $node);
|
||||||
|
|
||||||
// Sort by name
|
// Sort by name
|
||||||
usort($folders, fn ($a, $b) => strnatcmp($a->getName(), $b->getName()));
|
usort($folders, static fn ($a, $b) => strnatcmp($a->getName(), $b->getName()));
|
||||||
|
|
||||||
// Process to response type
|
// Process to response type
|
||||||
$list = array_map(fn ($node) => [
|
$list = array_map(fn ($node) => [
|
||||||
|
|
|
@ -84,7 +84,7 @@ class ImageController extends GenericApiController
|
||||||
$files = json_decode($body, true);
|
$files = json_decode($body, true);
|
||||||
|
|
||||||
// Filter files with valid parameters
|
// Filter files with valid parameters
|
||||||
$files = array_filter($files, function ($file) {
|
$files = array_filter($files, static function ($file) {
|
||||||
return isset($file['reqid'], $file['fileid'], $file['x'], $file['y'], $file['a'])
|
return isset($file['reqid'], $file['fileid'], $file['x'], $file['y'], $file['a'])
|
||||||
&& (int) $file['fileid'] > 0
|
&& (int) $file['fileid'] > 0
|
||||||
&& (int) $file['x'] > 0
|
&& (int) $file['x'] > 0
|
||||||
|
@ -92,7 +92,7 @@ class ImageController extends GenericApiController
|
||||||
});
|
});
|
||||||
|
|
||||||
// Sort files by size, ascending
|
// Sort files by size, ascending
|
||||||
usort($files, function ($a, $b) {
|
usort($files, static function ($a, $b) {
|
||||||
$aArea = (int) $a['x'] * (int) $a['y'];
|
$aArea = (int) $a['x'] * (int) $a['y'];
|
||||||
$bArea = (int) $b['x'] * (int) $b['y'];
|
$bArea = (int) $b['x'] * (int) $b['y'];
|
||||||
|
|
||||||
|
@ -453,9 +453,9 @@ class ImageController extends GenericApiController
|
||||||
/** @var \OCP\SystemTag\ISystemTag[] */
|
/** @var \OCP\SystemTag\ISystemTag[] */
|
||||||
$tags = $tagManager->getTagsByIds($tagIds);
|
$tags = $tagManager->getTagsByIds($tagIds);
|
||||||
|
|
||||||
$visible = array_filter($tags, fn ($t) => $t->isUserVisible());
|
$visible = array_filter($tags, static fn ($t) => $t->isUserVisible());
|
||||||
|
|
||||||
// Get the tag names
|
// Get the tag names
|
||||||
return array_map(fn ($t) => $t->getName(), $visible);
|
return array_map(static fn ($t) => $t->getName(), $visible);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -50,7 +50,7 @@ class MapController extends GenericApiController
|
||||||
$clusters = $this->timelineQuery->getMapClusters($gridLen, $bounds);
|
$clusters = $this->timelineQuery->getMapClusters($gridLen, $bounds);
|
||||||
|
|
||||||
// Get previews for each cluster
|
// Get previews for each cluster
|
||||||
$clusterIds = array_map(fn ($cluster) => (int) $cluster['id'], $clusters);
|
$clusterIds = array_map(static fn ($cluster) => (int) $cluster['id'], $clusters);
|
||||||
$previews = $this->timelineQuery->getMapClusterPreviews($clusterIds);
|
$previews = $this->timelineQuery->getMapClusterPreviews($clusterIds);
|
||||||
|
|
||||||
// Merge the responses
|
// Merge the responses
|
||||||
|
|
|
@ -125,7 +125,7 @@ class OtherController extends GenericApiController
|
||||||
*/
|
*/
|
||||||
public function describeApi(): JSONResponse
|
public function describeApi(): JSONResponse
|
||||||
{
|
{
|
||||||
return Util::guardEx(function () {
|
return Util::guardEx(static function () {
|
||||||
$appManager = \OC::$server->get(\OCP\App\IAppManager::class);
|
$appManager = \OC::$server->get(\OCP\App\IAppManager::class);
|
||||||
$urlGenerator = \OC::$server->get(\OCP\IURLGenerator::class);
|
$urlGenerator = \OC::$server->get(\OCP\IURLGenerator::class);
|
||||||
|
|
||||||
|
|
|
@ -69,7 +69,7 @@ class PageController extends Controller
|
||||||
{
|
{
|
||||||
// Image domains MUST be added to the connect domain list
|
// Image domains MUST be added to the connect domain list
|
||||||
// because of the service worker fetch() call
|
// because of the service worker fetch() call
|
||||||
$addImageDomain = function ($url) use (&$policy) {
|
$addImageDomain = static function ($url) use (&$policy) {
|
||||||
$policy->addAllowedImageDomain($url);
|
$policy->addAllowedImageDomain($url);
|
||||||
$policy->addAllowedConnectDomain($url);
|
$policy->addAllowedConnectDomain($url);
|
||||||
};
|
};
|
||||||
|
|
|
@ -129,7 +129,7 @@ class PublicAlbumController extends Controller
|
||||||
// Get list of files
|
// Get list of files
|
||||||
$albumId = (int) $album['album_id'];
|
$albumId = (int) $album['album_id'];
|
||||||
$files = $this->albumsQuery->getAlbumPhotos($albumId, null) ?? [];
|
$files = $this->albumsQuery->getAlbumPhotos($albumId, null) ?? [];
|
||||||
$fileIds = array_map(fn ($file) => (int) $file['file_id'], $files);
|
$fileIds = array_map(static fn ($file) => (int) $file['file_id'], $files);
|
||||||
|
|
||||||
// Get download handle
|
// Get download handle
|
||||||
$downloadController = \OC::$server->get(\OCA\Memories\Controller\DownloadController::class);
|
$downloadController = \OC::$server->get(\OCA\Memories\Controller\DownloadController::class);
|
||||||
|
|
|
@ -93,7 +93,7 @@ class ShareController extends GenericApiController
|
||||||
*/
|
*/
|
||||||
public function deleteShare(string $id): Http\Response
|
public function deleteShare(string $id): Http\Response
|
||||||
{
|
{
|
||||||
return Util::guardEx(function () use ($id) {
|
return Util::guardEx(static function () use ($id) {
|
||||||
$uid = Util::getUID();
|
$uid = Util::getUID();
|
||||||
|
|
||||||
/** @var \OCP\Share\IManager $shareManager */
|
/** @var \OCP\Share\IManager $shareManager */
|
||||||
|
|
|
@ -263,7 +263,7 @@ class VideoController extends GenericApiController
|
||||||
|
|
||||||
// Stream the response to the browser without reading it into memory
|
// Stream the response to the browser without reading it into memory
|
||||||
$headersWritten = false;
|
$headersWritten = false;
|
||||||
curl_setopt($ch, CURLOPT_WRITEFUNCTION, function ($curl, $data) use (&$headersWritten, $profile) {
|
curl_setopt($ch, CURLOPT_WRITEFUNCTION, static function ($curl, $data) use (&$headersWritten, $profile) {
|
||||||
$returnCode = (int) curl_getinfo($curl, CURLINFO_HTTP_CODE);
|
$returnCode = (int) curl_getinfo($curl, CURLINFO_HTTP_CODE);
|
||||||
|
|
||||||
if (200 === $returnCode) {
|
if (200 === $returnCode) {
|
||||||
|
@ -353,8 +353,8 @@ class VideoController extends GenericApiController
|
||||||
|
|
||||||
// Get file paths for all live photos
|
// Get file paths for all live photos
|
||||||
$liveFiles = array_map(fn ($r) => $this->rootFolder->getById((int) $r['fileid']), $liveRecords);
|
$liveFiles = array_map(fn ($r) => $this->rootFolder->getById((int) $r['fileid']), $liveRecords);
|
||||||
$liveFiles = array_filter($liveFiles, fn ($files) => \count($files) > 0 && $files[0] instanceof File);
|
$liveFiles = array_filter($liveFiles, static fn ($files) => \count($files) > 0 && $files[0] instanceof File);
|
||||||
$liveFiles = array_map(fn ($files) => $files[0], $liveFiles);
|
$liveFiles = array_map(static fn ($files) => $files[0], $liveFiles);
|
||||||
|
|
||||||
// Should be filtered enough by now
|
// Should be filtered enough by now
|
||||||
if (!\count($liveFiles)) {
|
if (!\count($liveFiles)) {
|
||||||
|
@ -362,7 +362,7 @@ class VideoController extends GenericApiController
|
||||||
}
|
}
|
||||||
|
|
||||||
// All paths including the image and videos need to be processed
|
// All paths including the image and videos need to be processed
|
||||||
$paths = array_map(function (File $file) {
|
$paths = array_map(static function (File $file) {
|
||||||
$path = $file->getPath();
|
$path = $file->getPath();
|
||||||
$filename = strtolower($file->getName());
|
$filename = strtolower($file->getName());
|
||||||
|
|
||||||
|
@ -382,7 +382,7 @@ class VideoController extends GenericApiController
|
||||||
|
|
||||||
// Find closest path match
|
// Find closest path match
|
||||||
$imagePath = array_pop($paths);
|
$imagePath = array_pop($paths);
|
||||||
$scores = array_map(function ($path) use ($imagePath) {
|
$scores = array_map(static function ($path) use ($imagePath) {
|
||||||
$score = 0;
|
$score = 0;
|
||||||
$length = min(\count($path), \count($imagePath));
|
$length = min(\count($path), \count($imagePath));
|
||||||
for ($i = 0; $i < $length; ++$i) {
|
for ($i = 0; $i < $length; ++$i) {
|
||||||
|
|
|
@ -52,7 +52,7 @@ class IndexJob extends TimedJob
|
||||||
|
|
||||||
// Run for a maximum of 5 minutes
|
// Run for a maximum of 5 minutes
|
||||||
$startTime = microtime(true);
|
$startTime = microtime(true);
|
||||||
$this->service->continueCheck = function () use ($startTime) {
|
$this->service->continueCheck = static function () use ($startTime) {
|
||||||
return (microtime(true) - $startTime) < MAX_RUN_TIME;
|
return (microtime(true) - $startTime) < MAX_RUN_TIME;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -170,7 +170,7 @@ class FsManager
|
||||||
]);
|
]);
|
||||||
$search = $root->search(new SearchQuery($comp, 0, 0, [], Util::getUser()));
|
$search = $root->search(new SearchQuery($comp, 0, 0, [], Util::getUser()));
|
||||||
|
|
||||||
$paths = array_unique(array_map(fn (Node $node) => \dirname($node->getPath()), $search));
|
$paths = array_unique(array_map(static fn (Node $node) => \dirname($node->getPath()), $search));
|
||||||
$this->nomediaCache->set($key, $paths, 60 * 60); // 1 hour
|
$this->nomediaCache->set($key, $paths, 60 * 60); // 1 hour
|
||||||
|
|
||||||
return $paths;
|
return $paths;
|
||||||
|
|
|
@ -92,7 +92,7 @@ trait TimelineQuerySingleItem
|
||||||
$places = $qb->executeQuery()->fetchAll();
|
$places = $qb->executeQuery()->fetchAll();
|
||||||
$lang = Util::getUserLang();
|
$lang = Util::getUserLang();
|
||||||
if (\count($places) > 0) {
|
if (\count($places) > 0) {
|
||||||
$places = array_map(fn ($p) => PlacesBackend::choosePlaceLang($p, $lang)['name'], $places);
|
$places = array_map(static fn ($p) => PlacesBackend::choosePlaceLang($p, $lang)['name'], $places);
|
||||||
$info['address'] = implode(', ', $places);
|
$info['address'] = implode(', ', $places);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -65,7 +65,7 @@ trait TimelineWriteOrphans
|
||||||
}
|
}
|
||||||
|
|
||||||
// Mark all files as not orphaned.
|
// Mark all files as not orphaned.
|
||||||
$fileIds = array_map(fn ($row) => $row['fileid'], $orphans);
|
$fileIds = array_map(static fn ($row) => $row['fileid'], $orphans);
|
||||||
$this->orphanAll(false, $fileIds, true);
|
$this->orphanAll(false, $fileIds, true);
|
||||||
|
|
||||||
$this->connection->commit();
|
$this->connection->commit();
|
||||||
|
|
|
@ -50,7 +50,7 @@ trait TimelineWritePlaces
|
||||||
$rows = \OC::$server->get(\OCA\Memories\Service\Places::class)->queryPoint($lat, $lon);
|
$rows = \OC::$server->get(\OCA\Memories\Service\Places::class)->queryPoint($lat, $lon);
|
||||||
|
|
||||||
// Get last ID, i.e. the ID with highest admin_level but <= 8
|
// Get last ID, i.e. the ID with highest admin_level but <= 8
|
||||||
$crows = array_filter($rows, fn ($row) => $row['admin_level'] <= 8);
|
$crows = array_filter($rows, static fn ($row) => $row['admin_level'] <= 8);
|
||||||
$markRow = array_pop($crows);
|
$markRow = array_pop($crows);
|
||||||
|
|
||||||
// Insert records in transaction
|
// Insert records in transaction
|
||||||
|
@ -74,7 +74,7 @@ trait TimelineWritePlaces
|
||||||
$this->connection->commit();
|
$this->connection->commit();
|
||||||
|
|
||||||
// Return list of osm_id
|
// Return list of osm_id
|
||||||
return array_map(fn ($row) => $row['osm_id'], $rows);
|
return array_map(static fn ($row) => $row['osm_id'], $rows);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -131,10 +131,10 @@ class Index
|
||||||
|
|
||||||
// Filter files that are supported
|
// Filter files that are supported
|
||||||
$mimes = self::getMimeList();
|
$mimes = self::getMimeList();
|
||||||
$files = array_filter($nodes, fn ($n) => $n instanceof File && \in_array($n->getMimeType(), $mimes, true));
|
$files = array_filter($nodes, static fn ($n) => $n instanceof File && \in_array($n->getMimeType(), $mimes, true));
|
||||||
|
|
||||||
// Create an associative array with file ID as key
|
// Create an associative array with file ID as key
|
||||||
$files = array_combine(array_map(fn ($n) => $n->getId(), $files), $files);
|
$files = array_combine(array_map(static fn ($n) => $n->getId(), $files), $files);
|
||||||
|
|
||||||
// Chunk array into some files each (DBs have limitations on IN clause)
|
// Chunk array into some files each (DBs have limitations on IN clause)
|
||||||
$chunks = array_chunk($files, 250, true);
|
$chunks = array_chunk($files, 250, true);
|
||||||
|
@ -151,7 +151,7 @@ class Index
|
||||||
;
|
;
|
||||||
|
|
||||||
// Filter out files that are already indexed
|
// Filter out files that are already indexed
|
||||||
$addFilter = function (string $table, string $alias) use (&$query) {
|
$addFilter = static function (string $table, string $alias) use (&$query) {
|
||||||
$query->leftJoin('f', $table, $alias, $query->expr()->andX(
|
$query->leftJoin('f', $table, $alias, $query->expr()->andX(
|
||||||
$query->expr()->eq('f.fileid', "{$alias}.fileid"),
|
$query->expr()->eq('f.fileid', "{$alias}.fileid"),
|
||||||
$query->expr()->eq('f.mtime', "{$alias}.mtime"),
|
$query->expr()->eq('f.mtime', "{$alias}.mtime"),
|
||||||
|
@ -174,7 +174,7 @@ class Index
|
||||||
}
|
}
|
||||||
|
|
||||||
// All folders
|
// All folders
|
||||||
$folders = array_filter($nodes, fn ($n) => $n instanceof Folder);
|
$folders = array_filter($nodes, static fn ($n) => $n instanceof Folder);
|
||||||
foreach ($folders as $folder) {
|
foreach ($folders as $folder) {
|
||||||
$this->ensureContinueOk();
|
$this->ensureContinueOk();
|
||||||
|
|
||||||
|
@ -250,7 +250,7 @@ class Index
|
||||||
{
|
{
|
||||||
$preview = \OC::$server->get(IPreview::class);
|
$preview = \OC::$server->get(IPreview::class);
|
||||||
|
|
||||||
return array_filter($source, fn ($m) => $preview->isMimeSupported($m));
|
return array_filter($source, static fn ($m) => $preview->isMimeSupported($m));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -315,7 +315,7 @@ class Places
|
||||||
}
|
}
|
||||||
|
|
||||||
if (GIS_TYPE_MYSQL === $gis) {
|
if (GIS_TYPE_MYSQL === $gis) {
|
||||||
$points = implode(',', array_map(function ($point) {
|
$points = implode(',', array_map(static function ($point) {
|
||||||
$x = $point[0];
|
$x = $point[0];
|
||||||
$y = $point[1];
|
$y = $point[1];
|
||||||
|
|
||||||
|
@ -324,7 +324,7 @@ class Places
|
||||||
|
|
||||||
$geometry = "POLYGON(({$points}))";
|
$geometry = "POLYGON(({$points}))";
|
||||||
} elseif (GIS_TYPE_POSTGRES === $gis) {
|
} elseif (GIS_TYPE_POSTGRES === $gis) {
|
||||||
$geometry = implode(',', array_map(function ($point) {
|
$geometry = implode(',', array_map(static function ($point) {
|
||||||
$x = $point[0];
|
$x = $point[0];
|
||||||
$y = $point[1];
|
$y = $point[1];
|
||||||
|
|
||||||
|
|
|
@ -318,7 +318,7 @@ class Util
|
||||||
$config = \OC::$server->get(IConfig::class);
|
$config = \OC::$server->get(IConfig::class);
|
||||||
$paths = $config->getUserValue($uid, Application::APPNAME, 'timelinePath', null) ?? 'Photos/';
|
$paths = $config->getUserValue($uid, Application::APPNAME, 'timelinePath', null) ?? 'Photos/';
|
||||||
|
|
||||||
return array_map(fn ($p) => self::sanitizePath(trim($p)), explode(';', $paths));
|
return array_map(static fn ($p) => self::sanitizePath(trim($p)), explode(';', $paths));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue