Merge pull request #25086 from nextcloud/dependabot/composer/nextcloud/coding-standard-0.5.0
Bump nextcloud/coding-standard from 0.3.0 to 0.5.0
This commit is contained in:
commit
5026d2cca1
|
@ -9,12 +9,12 @@ use Nextcloud\CodingStandard\Config;
|
||||||
$config = new Config();
|
$config = new Config();
|
||||||
$config
|
$config
|
||||||
->getFinder()
|
->getFinder()
|
||||||
->ignoreVCSIgnored(true)
|
|
||||||
->exclude('config')
|
->exclude('config')
|
||||||
->exclude('data')
|
->exclude('data')
|
||||||
->notPath('3rdparty')
|
->notPath('3rdparty')
|
||||||
->notPath('build/stubs')
|
->notPath('build/stubs')
|
||||||
->notPath('composer')
|
->notPath('composer')
|
||||||
|
->notPath('node_modules')
|
||||||
->notPath('vendor')
|
->notPath('vendor')
|
||||||
->in(__DIR__);
|
->in(__DIR__);
|
||||||
return $config;
|
return $config;
|
||||||
|
|
|
@ -133,7 +133,7 @@ class Notifier implements INotifier {
|
||||||
if (strpos($path, '/' . $notification->getUser() . '/files/') === 0) {
|
if (strpos($path, '/' . $notification->getUser() . '/files/') === 0) {
|
||||||
// Remove /user/files/...
|
// Remove /user/files/...
|
||||||
$fullPath = $path;
|
$fullPath = $path;
|
||||||
list(,,, $path) = explode('/', $fullPath, 4);
|
[,,, $path] = explode('/', $fullPath, 4);
|
||||||
}
|
}
|
||||||
$subjectParameters = [
|
$subjectParameters = [
|
||||||
'file' => [
|
'file' => [
|
||||||
|
@ -155,7 +155,7 @@ class Notifier implements INotifier {
|
||||||
'name' => $displayName,
|
'name' => $displayName,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
list($message, $messageParameters) = $this->commentToRichMessage($comment);
|
[$message, $messageParameters] = $this->commentToRichMessage($comment);
|
||||||
$notification->setRichSubject($subject, $subjectParameters)
|
$notification->setRichSubject($subject, $subjectParameters)
|
||||||
->setParsedSubject($this->richToParsed($subject, $subjectParameters))
|
->setParsedSubject($this->richToParsed($subject, $subjectParameters))
|
||||||
->setRichMessage($message, $messageParameters)
|
->setRichMessage($message, $messageParameters)
|
||||||
|
|
|
@ -170,7 +170,7 @@ class AddressBook extends ExternalAddressBook implements IACL {
|
||||||
}
|
}
|
||||||
|
|
||||||
private function getUid(): string {
|
private function getUid(): string {
|
||||||
list(, $uid) = \Sabre\Uri\split($this->principalUri);
|
[, $uid] = \Sabre\Uri\split($this->principalUri);
|
||||||
return $uid;
|
return $uid;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -277,7 +277,7 @@ class Application extends App implements IBootstrap {
|
||||||
$config = $serverContainer->getConfig();
|
$config = $serverContainer->getConfig();
|
||||||
$principalUri = $event->getArgument('calendarData')['principaluri'];
|
$principalUri = $event->getArgument('calendarData')['principaluri'];
|
||||||
if (strpos($principalUri, 'principals/users') === 0) {
|
if (strpos($principalUri, 'principals/users') === 0) {
|
||||||
list(, $UID) = \Sabre\Uri\split($principalUri);
|
[, $UID] = \Sabre\Uri\split($principalUri);
|
||||||
$uri = $event->getArgument('calendarData')['uri'];
|
$uri = $event->getArgument('calendarData')['uri'];
|
||||||
if ($config->getUserValue($UID, 'dav', 'defaultCalendar') === $uri) {
|
if ($config->getUserValue($UID, 'dav', 'defaultCalendar') === $uri) {
|
||||||
$config->deleteUserValue($UID, 'dav', 'defaultCalendar');
|
$config->deleteUserValue($UID, 'dav', 'defaultCalendar');
|
||||||
|
|
|
@ -101,7 +101,7 @@ class AvatarHome implements ICollection {
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getName() {
|
public function getName() {
|
||||||
list(,$name) = Uri\split($this->principalInfo['uri']);
|
[,$name] = Uri\split($this->principalInfo['uri']);
|
||||||
return $name;
|
return $name;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -387,7 +387,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
list(, $name) = Uri\split($row['principaluri']);
|
[, $name] = Uri\split($row['principaluri']);
|
||||||
$uri = $row['uri'] . '_shared_by_' . $name;
|
$uri = $row['uri'] . '_shared_by_' . $name;
|
||||||
$row['displayname'] = $row['displayname'] . ' (' . $this->getUserDisplayName($name) . ')';
|
$row['displayname'] = $row['displayname'] . ' (' . $this->getUserDisplayName($name) . ')';
|
||||||
$components = [];
|
$components = [];
|
||||||
|
@ -511,7 +511,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
|
||||||
|
|
||||||
while ($row = $result->fetch()) {
|
while ($row = $result->fetch()) {
|
||||||
$row['principaluri'] = (string) $row['principaluri'];
|
$row['principaluri'] = (string) $row['principaluri'];
|
||||||
list(, $name) = Uri\split($row['principaluri']);
|
[, $name] = Uri\split($row['principaluri']);
|
||||||
$row['displayname'] = $row['displayname'] . "($name)";
|
$row['displayname'] = $row['displayname'] . "($name)";
|
||||||
$components = [];
|
$components = [];
|
||||||
if ($row['components']) {
|
if ($row['components']) {
|
||||||
|
@ -578,7 +578,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
|
||||||
}
|
}
|
||||||
|
|
||||||
$row['principaluri'] = (string) $row['principaluri'];
|
$row['principaluri'] = (string) $row['principaluri'];
|
||||||
list(, $name) = Uri\split($row['principaluri']);
|
[, $name] = Uri\split($row['principaluri']);
|
||||||
$row['displayname'] = $row['displayname'] . ' ' . "($name)";
|
$row['displayname'] = $row['displayname'] . ' ' . "($name)";
|
||||||
$components = [];
|
$components = [];
|
||||||
if ($row['components']) {
|
if ($row['components']) {
|
||||||
|
@ -2837,7 +2837,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
|
||||||
*/
|
*/
|
||||||
private function convertPrincipal($principalUri, $toV2) {
|
private function convertPrincipal($principalUri, $toV2) {
|
||||||
if ($this->principalBackend->getPrincipalPrefix() === 'principals') {
|
if ($this->principalBackend->getPrincipalPrefix() === 'principals') {
|
||||||
list(, $name) = Uri\split($principalUri);
|
[, $name] = Uri\split($principalUri);
|
||||||
if ($toV2 === true) {
|
if ($toV2 === true) {
|
||||||
return "principals/users/$name";
|
return "principals/users/$name";
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,15 +40,15 @@ class Plugin extends \Sabre\CalDAV\Plugin {
|
||||||
*/
|
*/
|
||||||
public function getCalendarHomeForPrincipal($principalUrl) {
|
public function getCalendarHomeForPrincipal($principalUrl) {
|
||||||
if (strrpos($principalUrl, 'principals/users', -strlen($principalUrl)) !== false) {
|
if (strrpos($principalUrl, 'principals/users', -strlen($principalUrl)) !== false) {
|
||||||
list(, $principalId) = \Sabre\Uri\split($principalUrl);
|
[, $principalId] = \Sabre\Uri\split($principalUrl);
|
||||||
return self::CALENDAR_ROOT . '/' . $principalId;
|
return self::CALENDAR_ROOT . '/' . $principalId;
|
||||||
}
|
}
|
||||||
if (strrpos($principalUrl, 'principals/calendar-resources', -strlen($principalUrl)) !== false) {
|
if (strrpos($principalUrl, 'principals/calendar-resources', -strlen($principalUrl)) !== false) {
|
||||||
list(, $principalId) = \Sabre\Uri\split($principalUrl);
|
[, $principalId] = \Sabre\Uri\split($principalUrl);
|
||||||
return self::SYSTEM_CALENDAR_ROOT . '/calendar-resources/' . $principalId;
|
return self::SYSTEM_CALENDAR_ROOT . '/calendar-resources/' . $principalId;
|
||||||
}
|
}
|
||||||
if (strrpos($principalUrl, 'principals/calendar-rooms', -strlen($principalUrl)) !== false) {
|
if (strrpos($principalUrl, 'principals/calendar-rooms', -strlen($principalUrl)) !== false) {
|
||||||
list(, $principalId) = \Sabre\Uri\split($principalUrl);
|
[, $principalId] = \Sabre\Uri\split($principalUrl);
|
||||||
return self::SYSTEM_CALENDAR_ROOT . '/calendar-rooms/' . $principalId;
|
return self::SYSTEM_CALENDAR_ROOT . '/calendar-rooms/' . $principalId;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -163,9 +163,9 @@ abstract class AbstractPrincipalBackend implements BackendInterface {
|
||||||
if (strpos($path, $this->principalPrefix) !== 0) {
|
if (strpos($path, $this->principalPrefix) !== 0) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
list(, $name) = \Sabre\Uri\split($path);
|
[, $name] = \Sabre\Uri\split($path);
|
||||||
|
|
||||||
list($backendId, $resourceId) = explode('-', $name, 2);
|
[$backendId, $resourceId] = explode('-', $name, 2);
|
||||||
|
|
||||||
$query = $this->db->getQueryBuilder();
|
$query = $this->db->getQueryBuilder();
|
||||||
$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname'])
|
$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname'])
|
||||||
|
@ -404,8 +404,8 @@ abstract class AbstractPrincipalBackend implements BackendInterface {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
list(, $name) = \Sabre\Uri\split($path);
|
[, $name] = \Sabre\Uri\split($path);
|
||||||
list($backendId, $resourceId) = explode('-', $name, 2);
|
[$backendId, $resourceId] = explode('-', $name, 2);
|
||||||
|
|
||||||
$query = $this->db->getQueryBuilder();
|
$query = $this->db->getQueryBuilder();
|
||||||
$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
|
$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
|
||||||
|
|
|
@ -590,7 +590,7 @@ class IMipPlugin extends SabreIMipPlugin {
|
||||||
/** @var Property\ICalendar\CalAddress $organizer */
|
/** @var Property\ICalendar\CalAddress $organizer */
|
||||||
$organizer = $vevent->ORGANIZER;
|
$organizer = $vevent->ORGANIZER;
|
||||||
$organizerURI = $organizer->getNormalizedValue();
|
$organizerURI = $organizer->getNormalizedValue();
|
||||||
list($scheme,$organizerEmail) = explode(':',$organizerURI,2); # strip off scheme mailto:
|
[$scheme,$organizerEmail] = explode(':',$organizerURI,2); # strip off scheme mailto:
|
||||||
/** @var string|null $organizerName */
|
/** @var string|null $organizerName */
|
||||||
$organizerName = isset($organizer['CN']) ? $organizer['CN'] : null;
|
$organizerName = isset($organizer['CN']) ? $organizer['CN'] : null;
|
||||||
$organizerHTML = sprintf('<a href="%s">%s</a>',
|
$organizerHTML = sprintf('<a href="%s">%s</a>',
|
||||||
|
@ -619,7 +619,7 @@ class IMipPlugin extends SabreIMipPlugin {
|
||||||
$attendeesText = [];
|
$attendeesText = [];
|
||||||
foreach ($attendees as $attendee) {
|
foreach ($attendees as $attendee) {
|
||||||
$attendeeURI = $attendee->getNormalizedValue();
|
$attendeeURI = $attendee->getNormalizedValue();
|
||||||
list($scheme,$attendeeEmail) = explode(':',$attendeeURI,2); # strip off scheme mailto:
|
[$scheme,$attendeeEmail] = explode(':',$attendeeURI,2); # strip off scheme mailto:
|
||||||
$attendeeName = isset($attendee['CN']) ? $attendee['CN'] : null;
|
$attendeeName = isset($attendee['CN']) ? $attendee['CN'] : null;
|
||||||
$attendeeHTML = sprintf('<a href="%s">%s</a>',
|
$attendeeHTML = sprintf('<a href="%s">%s</a>',
|
||||||
htmlspecialchars($attendeeURI),
|
htmlspecialchars($attendeeURI),
|
||||||
|
|
|
@ -291,7 +291,7 @@ EOF;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (strpos($principalUrl, 'principals/users') === 0) {
|
if (strpos($principalUrl, 'principals/users') === 0) {
|
||||||
list(, $userId) = split($principalUrl);
|
[, $userId] = split($principalUrl);
|
||||||
$uri = $this->config->getUserValue($userId, 'dav', 'defaultCalendar', CalDavBackend::PERSONAL_CALENDAR_URI);
|
$uri = $this->config->getUserValue($userId, 'dav', 'defaultCalendar', CalDavBackend::PERSONAL_CALENDAR_URI);
|
||||||
$displayName = CalDavBackend::PERSONAL_CALENDAR_NAME;
|
$displayName = CalDavBackend::PERSONAL_CALENDAR_NAME;
|
||||||
} elseif (strpos($principalUrl, 'principals/calendar-resources') === 0 ||
|
} elseif (strpos($principalUrl, 'principals/calendar-resources') === 0 ||
|
||||||
|
|
|
@ -146,7 +146,7 @@ class SearchPlugin extends ServerPlugin {
|
||||||
$nodePaths = $node->calendarSearch($report->filters, $report->limit, $report->offset);
|
$nodePaths = $node->calendarSearch($report->filters, $report->limit, $report->offset);
|
||||||
|
|
||||||
foreach ($nodePaths as $path) {
|
foreach ($nodePaths as $path) {
|
||||||
list($properties) = $this->server->getPropertiesForPath(
|
[$properties] = $this->server->getPropertiesForPath(
|
||||||
$this->server->getRequestUri() . '/' . $path,
|
$this->server->getRequestUri() . '/' . $path,
|
||||||
$report->properties);
|
$report->properties);
|
||||||
$result[] = $properties;
|
$result[] = $properties;
|
||||||
|
|
|
@ -223,7 +223,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
list(, $name) = \Sabre\Uri\split($row['principaluri']);
|
[, $name] = \Sabre\Uri\split($row['principaluri']);
|
||||||
$uri = $row['uri'] . '_shared_by_' . $name;
|
$uri = $row['uri'] . '_shared_by_' . $name;
|
||||||
$displayName = $row['displayname'] . ' (' . $this->getUserDisplayName($name) . ')';
|
$displayName = $row['displayname'] . ' (' . $this->getUserDisplayName($name) . ')';
|
||||||
|
|
||||||
|
@ -1338,7 +1338,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
|
||||||
|
|
||||||
private function convertPrincipal($principalUri, $toV2) {
|
private function convertPrincipal($principalUri, $toV2) {
|
||||||
if ($this->principalBackend->getPrincipalPrefix() === 'principals') {
|
if ($this->principalBackend->getPrincipalPrefix() === 'principals') {
|
||||||
list(, $name) = \Sabre\Uri\split($principalUri);
|
[, $name] = \Sabre\Uri\split($principalUri);
|
||||||
if ($toV2 === true) {
|
if ($toV2 === true) {
|
||||||
return "principals/users/$name";
|
return "principals/users/$name";
|
||||||
}
|
}
|
||||||
|
|
|
@ -226,7 +226,7 @@ class PhotoCache {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (substr_count($parsed['path'], ';') === 1) {
|
if (substr_count($parsed['path'], ';') === 1) {
|
||||||
list($type) = explode(';', $parsed['path']);
|
[$type] = explode(';', $parsed['path']);
|
||||||
}
|
}
|
||||||
$val = file_get_contents($val);
|
$val = file_get_contents($val);
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -44,15 +44,15 @@ class Plugin extends \Sabre\CardDAV\Plugin {
|
||||||
*/
|
*/
|
||||||
protected function getAddressbookHomeForPrincipal($principal) {
|
protected function getAddressbookHomeForPrincipal($principal) {
|
||||||
if (strrpos($principal, 'principals/users', -strlen($principal)) !== false) {
|
if (strrpos($principal, 'principals/users', -strlen($principal)) !== false) {
|
||||||
list(, $principalId) = \Sabre\Uri\split($principal);
|
[, $principalId] = \Sabre\Uri\split($principal);
|
||||||
return self::ADDRESSBOOK_ROOT . '/users/' . $principalId;
|
return self::ADDRESSBOOK_ROOT . '/users/' . $principalId;
|
||||||
}
|
}
|
||||||
if (strrpos($principal, 'principals/groups', -strlen($principal)) !== false) {
|
if (strrpos($principal, 'principals/groups', -strlen($principal)) !== false) {
|
||||||
list(, $principalId) = \Sabre\Uri\split($principal);
|
[, $principalId] = \Sabre\Uri\split($principal);
|
||||||
return self::ADDRESSBOOK_ROOT . '/groups/' . $principalId;
|
return self::ADDRESSBOOK_ROOT . '/groups/' . $principalId;
|
||||||
}
|
}
|
||||||
if (strrpos($principal, 'principals/system', -strlen($principal)) !== false) {
|
if (strrpos($principal, 'principals/system', -strlen($principal)) !== false) {
|
||||||
list(, $principalId) = \Sabre\Uri\split($principal);
|
[, $principalId] = \Sabre\Uri\split($principal);
|
||||||
return self::ADDRESSBOOK_ROOT . '/system/' . $principalId;
|
return self::ADDRESSBOOK_ROOT . '/system/' . $principalId;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -212,7 +212,7 @@ class MoveCalendar extends Command {
|
||||||
private function checkShares(array $calendar, string $userOrigin, string $userDestination, bool $force = false): bool {
|
private function checkShares(array $calendar, string $userOrigin, string $userDestination, bool $force = false): bool {
|
||||||
$shares = $this->calDav->getShares($calendar['id']);
|
$shares = $this->calDav->getShares($calendar['id']);
|
||||||
foreach ($shares as $share) {
|
foreach ($shares as $share) {
|
||||||
list(, $prefix, $userOrGroup) = explode('/', $share['href'], 3);
|
[, $prefix, $userOrGroup] = explode('/', $share['href'], 3);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check that user destination is member of the groups which whom the calendar was shared
|
* Check that user destination is member of the groups which whom the calendar was shared
|
||||||
|
|
|
@ -54,7 +54,7 @@ class LegacyDAVACL extends DavAclPlugin {
|
||||||
}
|
}
|
||||||
|
|
||||||
private function convertPrincipal($principal, $toV2) {
|
private function convertPrincipal($principal, $toV2) {
|
||||||
list(, $name) = \Sabre\Uri\split($principal);
|
[, $name] = \Sabre\Uri\split($principal);
|
||||||
if ($toV2) {
|
if ($toV2) {
|
||||||
return "principals/users/$name";
|
return "principals/users/$name";
|
||||||
}
|
}
|
||||||
|
|
|
@ -144,7 +144,7 @@ class File extends Node implements IFile {
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @var Storage $partStorage */
|
/** @var Storage $partStorage */
|
||||||
list($partStorage) = $this->fileView->resolvePath($this->path);
|
[$partStorage] = $this->fileView->resolvePath($this->path);
|
||||||
$needsPartFile = $partStorage->needsPartFile() && (strlen($this->path) > 1);
|
$needsPartFile = $partStorage->needsPartFile() && (strlen($this->path) > 1);
|
||||||
|
|
||||||
$view = \OC\Files\Filesystem::getView();
|
$view = \OC\Files\Filesystem::getView();
|
||||||
|
@ -168,9 +168,9 @@ class File extends Node implements IFile {
|
||||||
|
|
||||||
// the part file and target file might be on a different storage in case of a single file storage (e.g. single file share)
|
// the part file and target file might be on a different storage in case of a single file storage (e.g. single file share)
|
||||||
/** @var \OC\Files\Storage\Storage $partStorage */
|
/** @var \OC\Files\Storage\Storage $partStorage */
|
||||||
list($partStorage, $internalPartPath) = $this->fileView->resolvePath($partFilePath);
|
[$partStorage, $internalPartPath] = $this->fileView->resolvePath($partFilePath);
|
||||||
/** @var \OC\Files\Storage\Storage $storage */
|
/** @var \OC\Files\Storage\Storage $storage */
|
||||||
list($storage, $internalPath) = $this->fileView->resolvePath($this->path);
|
[$storage, $internalPath] = $this->fileView->resolvePath($this->path);
|
||||||
try {
|
try {
|
||||||
if (!$needsPartFile) {
|
if (!$needsPartFile) {
|
||||||
$this->changeLock(ILockingProvider::LOCK_EXCLUSIVE);
|
$this->changeLock(ILockingProvider::LOCK_EXCLUSIVE);
|
||||||
|
@ -223,7 +223,7 @@ class File extends Node implements IFile {
|
||||||
// because we have no clue about the cause we can only throw back a 500/Internal Server Error
|
// because we have no clue about the cause we can only throw back a 500/Internal Server Error
|
||||||
throw new Exception('Could not write file contents');
|
throw new Exception('Could not write file contents');
|
||||||
}
|
}
|
||||||
list($count, $result) = \OC_Helper::streamCopy($data, $target);
|
[$count, $result] = \OC_Helper::streamCopy($data, $target);
|
||||||
fclose($target);
|
fclose($target);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -501,7 +501,7 @@ class File extends Node implements IFile {
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
/** @var \OCP\Files\Storage $storage */
|
/** @var \OCP\Files\Storage $storage */
|
||||||
list($storage, $internalPath) = $this->fileView->resolvePath($this->path);
|
[$storage, $internalPath] = $this->fileView->resolvePath($this->path);
|
||||||
if (is_null($storage)) {
|
if (is_null($storage)) {
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
|
@ -518,7 +518,7 @@ class File extends Node implements IFile {
|
||||||
* @throws ServiceUnavailable
|
* @throws ServiceUnavailable
|
||||||
*/
|
*/
|
||||||
private function createFileChunked($data) {
|
private function createFileChunked($data) {
|
||||||
list($path, $name) = \Sabre\Uri\split($this->path);
|
[$path, $name] = \Sabre\Uri\split($this->path);
|
||||||
|
|
||||||
$info = \OC_FileChunking::decodeName($name);
|
$info = \OC_FileChunking::decodeName($name);
|
||||||
if (empty($info)) {
|
if (empty($info)) {
|
||||||
|
@ -541,13 +541,13 @@ class File extends Node implements IFile {
|
||||||
|
|
||||||
if ($chunk_handler->isComplete()) {
|
if ($chunk_handler->isComplete()) {
|
||||||
/** @var Storage $storage */
|
/** @var Storage $storage */
|
||||||
list($storage,) = $this->fileView->resolvePath($path);
|
[$storage,] = $this->fileView->resolvePath($path);
|
||||||
$needsPartFile = $storage->needsPartFile();
|
$needsPartFile = $storage->needsPartFile();
|
||||||
$partFile = null;
|
$partFile = null;
|
||||||
|
|
||||||
$targetPath = $path . '/' . $info['name'];
|
$targetPath = $path . '/' . $info['name'];
|
||||||
/** @var \OC\Files\Storage\Storage $targetStorage */
|
/** @var \OC\Files\Storage\Storage $targetStorage */
|
||||||
list($targetStorage, $targetInternalPath) = $this->fileView->resolvePath($targetPath);
|
[$targetStorage, $targetInternalPath] = $this->fileView->resolvePath($targetPath);
|
||||||
|
|
||||||
$exists = $this->fileView->file_exists($targetPath);
|
$exists = $this->fileView->file_exists($targetPath);
|
||||||
|
|
||||||
|
@ -557,13 +557,13 @@ class File extends Node implements IFile {
|
||||||
$this->emitPreHooks($exists, $targetPath);
|
$this->emitPreHooks($exists, $targetPath);
|
||||||
$this->fileView->changeLock($targetPath, ILockingProvider::LOCK_EXCLUSIVE);
|
$this->fileView->changeLock($targetPath, ILockingProvider::LOCK_EXCLUSIVE);
|
||||||
/** @var \OC\Files\Storage\Storage $targetStorage */
|
/** @var \OC\Files\Storage\Storage $targetStorage */
|
||||||
list($targetStorage, $targetInternalPath) = $this->fileView->resolvePath($targetPath);
|
[$targetStorage, $targetInternalPath] = $this->fileView->resolvePath($targetPath);
|
||||||
|
|
||||||
if ($needsPartFile) {
|
if ($needsPartFile) {
|
||||||
// we first assembly the target file as a part file
|
// we first assembly the target file as a part file
|
||||||
$partFile = $this->getPartFileBasePath($path . '/' . $info['name']) . '.ocTransferId' . $info['transferid'] . '.part';
|
$partFile = $this->getPartFileBasePath($path . '/' . $info['name']) . '.ocTransferId' . $info['transferid'] . '.part';
|
||||||
/** @var \OC\Files\Storage\Storage $targetStorage */
|
/** @var \OC\Files\Storage\Storage $targetStorage */
|
||||||
list($partStorage, $partInternalPath) = $this->fileView->resolvePath($partFile);
|
[$partStorage, $partInternalPath] = $this->fileView->resolvePath($partFile);
|
||||||
|
|
||||||
|
|
||||||
$chunk_handler->file_assemble($partStorage, $partInternalPath);
|
$chunk_handler->file_assemble($partStorage, $partInternalPath);
|
||||||
|
|
|
@ -202,8 +202,8 @@ class FilesPlugin extends ServerPlugin {
|
||||||
if (!$sourceNode instanceof Node) {
|
if (!$sourceNode instanceof Node) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
list($sourceDir,) = \Sabre\Uri\split($source);
|
[$sourceDir,] = \Sabre\Uri\split($source);
|
||||||
list($destinationDir,) = \Sabre\Uri\split($destination);
|
[$destinationDir,] = \Sabre\Uri\split($destination);
|
||||||
|
|
||||||
if ($sourceDir !== $destinationDir) {
|
if ($sourceDir !== $destinationDir) {
|
||||||
$sourceNodeFileInfo = $sourceNode->getFileInfo();
|
$sourceNodeFileInfo = $sourceNode->getFileInfo();
|
||||||
|
@ -496,7 +496,7 @@ class FilesPlugin extends ServerPlugin {
|
||||||
public function sendFileIdHeader($filePath, \Sabre\DAV\INode $node = null) {
|
public function sendFileIdHeader($filePath, \Sabre\DAV\INode $node = null) {
|
||||||
// chunked upload handling
|
// chunked upload handling
|
||||||
if (isset($_SERVER['HTTP_OC_CHUNKED'])) {
|
if (isset($_SERVER['HTTP_OC_CHUNKED'])) {
|
||||||
list($path, $name) = \Sabre\Uri\split($filePath);
|
[$path, $name] = \Sabre\Uri\split($filePath);
|
||||||
$info = \OC_FileChunking::decodeName($name);
|
$info = \OC_FileChunking::decodeName($name);
|
||||||
if (!empty($info)) {
|
if (!empty($info)) {
|
||||||
$filePath = $path . '/' . $info['name'];
|
$filePath = $path . '/' . $info['name'];
|
||||||
|
|
|
@ -131,8 +131,8 @@ abstract class Node implements \Sabre\DAV\INode {
|
||||||
throw new \Sabre\DAV\Exception\Forbidden();
|
throw new \Sabre\DAV\Exception\Forbidden();
|
||||||
}
|
}
|
||||||
|
|
||||||
list($parentPath,) = \Sabre\Uri\split($this->path);
|
[$parentPath,] = \Sabre\Uri\split($this->path);
|
||||||
list(, $newName) = \Sabre\Uri\split($name);
|
[, $newName] = \Sabre\Uri\split($name);
|
||||||
|
|
||||||
// verify path of the target
|
// verify path of the target
|
||||||
$this->verifyPath();
|
$this->verifyPath();
|
||||||
|
|
|
@ -80,7 +80,7 @@ class ObjectTree extends CachingTree {
|
||||||
private function resolveChunkFile($path) {
|
private function resolveChunkFile($path) {
|
||||||
if (isset($_SERVER['HTTP_OC_CHUNKED'])) {
|
if (isset($_SERVER['HTTP_OC_CHUNKED'])) {
|
||||||
// resolve to real file name to find the proper node
|
// resolve to real file name to find the proper node
|
||||||
list($dir, $name) = \Sabre\Uri\split($path);
|
[$dir, $name] = \Sabre\Uri\split($path);
|
||||||
if ($dir === '/' || $dir === '.') {
|
if ($dir === '/' || $dir === '.') {
|
||||||
$dir = '';
|
$dir = '';
|
||||||
}
|
}
|
||||||
|
@ -220,7 +220,7 @@ class ObjectTree extends CachingTree {
|
||||||
// this will trigger existence check
|
// this will trigger existence check
|
||||||
$this->getNodeForPath($sourcePath);
|
$this->getNodeForPath($sourcePath);
|
||||||
|
|
||||||
list($destinationDir, $destinationName) = \Sabre\Uri\split($destinationPath);
|
[$destinationDir, $destinationName] = \Sabre\Uri\split($destinationPath);
|
||||||
try {
|
try {
|
||||||
$this->fileView->verifyPath($destinationDir, $destinationName);
|
$this->fileView->verifyPath($destinationDir, $destinationName);
|
||||||
} catch (\OCP\Files\InvalidPathException $ex) {
|
} catch (\OCP\Files\InvalidPathException $ex) {
|
||||||
|
@ -237,7 +237,7 @@ class ObjectTree extends CachingTree {
|
||||||
throw new FileLocked($e->getMessage(), $e->getCode(), $e);
|
throw new FileLocked($e->getMessage(), $e->getCode(), $e);
|
||||||
}
|
}
|
||||||
|
|
||||||
list($destinationDir,) = \Sabre\Uri\split($destinationPath);
|
[$destinationDir,] = \Sabre\Uri\split($destinationPath);
|
||||||
$this->markDirty($destinationDir);
|
$this->markDirty($destinationDir);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -154,11 +154,11 @@ class Principal implements BackendInterface {
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
public function getPrincipalByPath($path) {
|
public function getPrincipalByPath($path) {
|
||||||
list($prefix, $name) = \Sabre\Uri\split($path);
|
[$prefix, $name] = \Sabre\Uri\split($path);
|
||||||
$decodedName = urldecode($name);
|
$decodedName = urldecode($name);
|
||||||
|
|
||||||
if ($name === 'calendar-proxy-write' || $name === 'calendar-proxy-read') {
|
if ($name === 'calendar-proxy-write' || $name === 'calendar-proxy-read') {
|
||||||
list($prefix2, $name2) = \Sabre\Uri\split($prefix);
|
[$prefix2, $name2] = \Sabre\Uri\split($prefix);
|
||||||
|
|
||||||
if ($prefix2 === $this->principalPrefix) {
|
if ($prefix2 === $this->principalPrefix) {
|
||||||
$user = $this->userManager->get($name2);
|
$user = $this->userManager->get($name2);
|
||||||
|
@ -213,7 +213,7 @@ class Principal implements BackendInterface {
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
public function getGroupMembership($principal, $needGroups = false) {
|
public function getGroupMembership($principal, $needGroups = false) {
|
||||||
list($prefix, $name) = \Sabre\Uri\split($principal);
|
[$prefix, $name] = \Sabre\Uri\split($principal);
|
||||||
|
|
||||||
if ($prefix !== $this->principalPrefix) {
|
if ($prefix !== $this->principalPrefix) {
|
||||||
return [];
|
return [];
|
||||||
|
@ -532,7 +532,7 @@ class Principal implements BackendInterface {
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
|
|
||||||
list($prefix, $name) = \Sabre\Uri\split($principal);
|
[$prefix, $name] = \Sabre\Uri\split($principal);
|
||||||
if ($this->hasCircles && $prefix === $this->principalPrefix) {
|
if ($this->hasCircles && $prefix === $this->principalPrefix) {
|
||||||
$user = $this->userManager->get($name);
|
$user = $this->userManager->get($name);
|
||||||
if (!$user) {
|
if (!$user) {
|
||||||
|
|
|
@ -152,7 +152,7 @@ class QuotaPlugin extends \Sabre\DAV\ServerPlugin {
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($length) {
|
if ($length) {
|
||||||
list($parentPath, $newName) = \Sabre\Uri\split($path);
|
[$parentPath, $newName] = \Sabre\Uri\split($path);
|
||||||
if (is_null($parentPath)) {
|
if (is_null($parentPath)) {
|
||||||
$parentPath = '';
|
$parentPath = '';
|
||||||
}
|
}
|
||||||
|
|
|
@ -151,7 +151,7 @@ class SharesPlugin extends \Sabre\DAV\ServerPlugin {
|
||||||
if (isset($this->cachedShares[$sabreNode->getId()])) {
|
if (isset($this->cachedShares[$sabreNode->getId()])) {
|
||||||
$shares = $this->cachedShares[$sabreNode->getId()];
|
$shares = $this->cachedShares[$sabreNode->getId()];
|
||||||
} else {
|
} else {
|
||||||
list($parentPath,) = \Sabre\Uri\split($sabreNode->getPath());
|
[$parentPath,] = \Sabre\Uri\split($sabreNode->getPath());
|
||||||
if ($parentPath === '') {
|
if ($parentPath === '') {
|
||||||
$parentPath = '/';
|
$parentPath = '/';
|
||||||
}
|
}
|
||||||
|
|
|
@ -245,13 +245,13 @@ class TagsPlugin extends \Sabre\DAV\ServerPlugin {
|
||||||
$isFav = null;
|
$isFav = null;
|
||||||
|
|
||||||
$propFind->handle(self::TAGS_PROPERTYNAME, function () use (&$isFav, $node) {
|
$propFind->handle(self::TAGS_PROPERTYNAME, function () use (&$isFav, $node) {
|
||||||
list($tags, $isFav) = $this->getTagsAndFav($node->getId());
|
[$tags, $isFav] = $this->getTagsAndFav($node->getId());
|
||||||
return new TagList($tags);
|
return new TagList($tags);
|
||||||
});
|
});
|
||||||
|
|
||||||
$propFind->handle(self::FAVORITE_PROPERTYNAME, function () use ($isFav, $node) {
|
$propFind->handle(self::FAVORITE_PROPERTYNAME, function () use ($isFav, $node) {
|
||||||
if (is_null($isFav)) {
|
if (is_null($isFav)) {
|
||||||
list(, $isFav) = $this->getTagsAndFav($node->getId());
|
[, $isFav] = $this->getTagsAndFav($node->getId());
|
||||||
}
|
}
|
||||||
if ($isFav) {
|
if ($isFav) {
|
||||||
return 1;
|
return 1;
|
||||||
|
|
|
@ -163,7 +163,7 @@ class SystemPrincipalBackend extends AbstractBackend {
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
public function getGroupMembership($principal) {
|
public function getGroupMembership($principal) {
|
||||||
list($prefix, ) = \Sabre\Uri\split($principal);
|
[$prefix, ] = \Sabre\Uri\split($principal);
|
||||||
|
|
||||||
if ($prefix === 'principals/system') {
|
if ($prefix === 'principals/system') {
|
||||||
$principal = $this->getPrincipalByPath($principal);
|
$principal = $this->getPrincipalByPath($principal);
|
||||||
|
|
|
@ -312,7 +312,7 @@ class FileSearchBackend implements ISearchBackend {
|
||||||
* @return ISearchOperator
|
* @return ISearchOperator
|
||||||
*/
|
*/
|
||||||
private function transformSearchOperation(Operator $operator) {
|
private function transformSearchOperation(Operator $operator) {
|
||||||
list(, $trimmedType) = explode('}', $operator->type);
|
[, $trimmedType] = explode('}', $operator->type);
|
||||||
switch ($operator->type) {
|
switch ($operator->type) {
|
||||||
case Operator::OPERATION_AND:
|
case Operator::OPERATION_AND:
|
||||||
case Operator::OPERATION_OR:
|
case Operator::OPERATION_OR:
|
||||||
|
|
|
@ -55,7 +55,7 @@ class FilesHome extends Directory {
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getName() {
|
public function getName() {
|
||||||
list(,$name) = \Sabre\Uri\split($this->principalInfo['uri']);
|
[,$name] = \Sabre\Uri\split($this->principalInfo['uri']);
|
||||||
return $name;
|
return $name;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -44,7 +44,7 @@ class RootCollection extends AbstractPrincipalCollection {
|
||||||
* @return INode
|
* @return INode
|
||||||
*/
|
*/
|
||||||
public function getChildForPrincipal(array $principalInfo) {
|
public function getChildForPrincipal(array $principalInfo) {
|
||||||
list(,$name) = \Sabre\Uri\split($principalInfo['uri']);
|
[,$name] = \Sabre\Uri\split($principalInfo['uri']);
|
||||||
$user = \OC::$server->getUserSession()->getUser();
|
$user = \OC::$server->getUserSession()->getUser();
|
||||||
if (is_null($user) || $name !== $user->getUID()) {
|
if (is_null($user) || $name !== $user->getUID()) {
|
||||||
// a user is only allowed to see their own home contents, so in case another collection
|
// a user is only allowed to see their own home contents, so in case another collection
|
||||||
|
|
|
@ -77,7 +77,7 @@ trait PrincipalProxyTrait {
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
public function getGroupMembership($principal, $needGroups = false) {
|
public function getGroupMembership($principal, $needGroups = false) {
|
||||||
list($prefix, $name) = \Sabre\Uri\split($principal);
|
[$prefix, $name] = \Sabre\Uri\split($principal);
|
||||||
|
|
||||||
if ($prefix !== $this->principalPrefix) {
|
if ($prefix !== $this->principalPrefix) {
|
||||||
return [];
|
return [];
|
||||||
|
@ -113,7 +113,7 @@ trait PrincipalProxyTrait {
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
public function setGroupMemberSet($principal, array $members) {
|
public function setGroupMemberSet($principal, array $members) {
|
||||||
list($principalUri, $target) = \Sabre\Uri\split($principal);
|
[$principalUri, $target] = \Sabre\Uri\split($principal);
|
||||||
|
|
||||||
if ($target !== 'calendar-proxy-write' && $target !== 'calendar-proxy-read') {
|
if ($target !== 'calendar-proxy-write' && $target !== 'calendar-proxy-read') {
|
||||||
throw new Exception('Setting members of the group is not supported yet');
|
throw new Exception('Setting members of the group is not supported yet');
|
||||||
|
@ -129,11 +129,11 @@ trait PrincipalProxyTrait {
|
||||||
$permission |= ProxyMapper::PERMISSION_WRITE;
|
$permission |= ProxyMapper::PERMISSION_WRITE;
|
||||||
}
|
}
|
||||||
|
|
||||||
list($prefix, $owner) = \Sabre\Uri\split($principalUri);
|
[$prefix, $owner] = \Sabre\Uri\split($principalUri);
|
||||||
$proxies = $this->proxyMapper->getProxiesOf($principalUri);
|
$proxies = $this->proxyMapper->getProxiesOf($principalUri);
|
||||||
|
|
||||||
foreach ($members as $member) {
|
foreach ($members as $member) {
|
||||||
list($prefix, $name) = \Sabre\Uri\split($member);
|
[$prefix, $name] = \Sabre\Uri\split($member);
|
||||||
|
|
||||||
if ($prefix !== $this->principalPrefix) {
|
if ($prefix !== $this->principalPrefix) {
|
||||||
throw new Exception('Invalid member group prefix: ' . $prefix);
|
throw new Exception('Invalid member group prefix: ' . $prefix);
|
||||||
|
@ -182,8 +182,8 @@ trait PrincipalProxyTrait {
|
||||||
* @return bool
|
* @return bool
|
||||||
*/
|
*/
|
||||||
private function isProxyPrincipal(string $principalUri):bool {
|
private function isProxyPrincipal(string $principalUri):bool {
|
||||||
list($realPrincipalUri, $proxy) = \Sabre\Uri\split($principalUri);
|
[$realPrincipalUri, $proxy] = \Sabre\Uri\split($principalUri);
|
||||||
list($prefix, $userId) = \Sabre\Uri\split($realPrincipalUri);
|
[$prefix, $userId] = \Sabre\Uri\split($realPrincipalUri);
|
||||||
|
|
||||||
if (!isset($prefix) || !isset($userId)) {
|
if (!isset($prefix) || !isset($userId)) {
|
||||||
return false;
|
return false;
|
||||||
|
@ -201,7 +201,7 @@ trait PrincipalProxyTrait {
|
||||||
* @return bool
|
* @return bool
|
||||||
*/
|
*/
|
||||||
private function isReadProxyPrincipal(string $principalUri):bool {
|
private function isReadProxyPrincipal(string $principalUri):bool {
|
||||||
list(, $proxy) = \Sabre\Uri\split($principalUri);
|
[, $proxy] = \Sabre\Uri\split($principalUri);
|
||||||
return $proxy === 'calendar-proxy-read';
|
return $proxy === 'calendar-proxy-read';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -210,7 +210,7 @@ trait PrincipalProxyTrait {
|
||||||
* @return bool
|
* @return bool
|
||||||
*/
|
*/
|
||||||
private function isWriteProxyPrincipal(string $principalUri):bool {
|
private function isWriteProxyPrincipal(string $principalUri):bool {
|
||||||
list(, $proxy) = \Sabre\Uri\split($principalUri);
|
[, $proxy] = \Sabre\Uri\split($principalUri);
|
||||||
return $proxy === 'calendar-proxy-write';
|
return $proxy === 'calendar-proxy-write';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -219,7 +219,7 @@ trait PrincipalProxyTrait {
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
private function getPrincipalUriFromProxyPrincipal(string $principalUri):string {
|
private function getPrincipalUriFromProxyPrincipal(string $principalUri):string {
|
||||||
list($realPrincipalUri, ) = \Sabre\Uri\split($principalUri);
|
[$realPrincipalUri, ] = \Sabre\Uri\split($principalUri);
|
||||||
return $realPrincipalUri;
|
return $realPrincipalUri;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -74,7 +74,7 @@ class UploadHome implements ICollection {
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getName() {
|
public function getName() {
|
||||||
list(,$name) = \Sabre\Uri\split($this->principalInfo['uri']);
|
[,$name] = \Sabre\Uri\split($this->principalInfo['uri']);
|
||||||
return $name;
|
return $name;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -81,7 +81,7 @@ class EmailProviderTest extends AbstractNotificationProviderTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testSendWithoutAttendees():void {
|
public function testSendWithoutAttendees():void {
|
||||||
list($user1, $user2, $user3, , $user5) = $users = $this->getUsers();
|
[$user1, $user2, $user3, , $user5] = $users = $this->getUsers();
|
||||||
|
|
||||||
$enL10N = $this->createMock(IL10N::class);
|
$enL10N = $this->createMock(IL10N::class);
|
||||||
$enL10N->method('t')
|
$enL10N->method('t')
|
||||||
|
@ -191,7 +191,7 @@ class EmailProviderTest extends AbstractNotificationProviderTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testSendWithAttendees(): void {
|
public function testSendWithAttendees(): void {
|
||||||
list($user1, $user2, $user3, , $user5) = $users = $this->getUsers();
|
[$user1, $user2, $user3, , $user5] = $users = $this->getUsers();
|
||||||
|
|
||||||
$enL10N = $this->createMock(IL10N::class);
|
$enL10N = $this->createMock(IL10N::class);
|
||||||
$enL10N->method('t')
|
$enL10N->method('t')
|
||||||
|
|
|
@ -201,7 +201,7 @@ class AddressBookImplTest extends TestCase {
|
||||||
->willReturn(['carddata' => 'data']);
|
->willReturn(['carddata' => 'data']);
|
||||||
$addressBookImpl->expects($this->once())->method('readCard')
|
$addressBookImpl->expects($this->once())->method('readCard')
|
||||||
->with('data')->willReturn($this->vCard);
|
->with('data')->willReturn($this->vCard);
|
||||||
$this->vCard->expects($this->exactly(count($properties)-1))
|
$this->vCard->expects($this->exactly(count($properties) - 1))
|
||||||
->method('createProperty');
|
->method('createProperty');
|
||||||
$this->backend->expects($this->never())->method('createCard');
|
$this->backend->expects($this->never())->method('createCard');
|
||||||
$this->backend->expects($this->once())->method('updateCard');
|
$this->backend->expects($this->once())->method('updateCard');
|
||||||
|
@ -237,7 +237,7 @@ class AddressBookImplTest extends TestCase {
|
||||||
$addressBookImpl->expects($this->once())->method('readCard')
|
$addressBookImpl->expects($this->once())->method('readCard')
|
||||||
->with('data')->willReturn($this->vCard);
|
->with('data')->willReturn($this->vCard);
|
||||||
$this->vCard->method('createProperty')->willReturn($textProperty);
|
$this->vCard->method('createProperty')->willReturn($textProperty);
|
||||||
$this->vCard->expects($this->exactly(count($properties)-1))
|
$this->vCard->expects($this->exactly(count($properties) - 1))
|
||||||
->method('createProperty');
|
->method('createProperty');
|
||||||
$this->vCard->expects($this->once())->method('remove')
|
$this->vCard->expects($this->once())->method('remove')
|
||||||
->with('ADR');
|
->with('ADR');
|
||||||
|
|
|
@ -1087,7 +1087,7 @@ class FileTest extends TestCase {
|
||||||
$userView = \OC\Files\Filesystem::getView();
|
$userView = \OC\Files\Filesystem::getView();
|
||||||
}
|
}
|
||||||
$files = [];
|
$files = [];
|
||||||
list($storage, $internalPath) = $userView->resolvePath($path);
|
[$storage, $internalPath] = $userView->resolvePath($path);
|
||||||
if ($storage instanceof Local) {
|
if ($storage instanceof Local) {
|
||||||
$realPath = $storage->getSourcePath($internalPath);
|
$realPath = $storage->getSourcePath($internalPath);
|
||||||
$dh = opendir($realPath);
|
$dh = opendir($realPath);
|
||||||
|
|
|
@ -423,7 +423,7 @@ class EncryptAll {
|
||||||
}
|
}
|
||||||
|
|
||||||
$subject = $this->l->t('one-time password for server-side-encryption');
|
$subject = $this->l->t('one-time password for server-side-encryption');
|
||||||
list($htmlBody, $textBody) = $this->createMailBody($password);
|
[$htmlBody, $textBody] = $this->createMailBody($password);
|
||||||
|
|
||||||
// send it out now
|
// send it out now
|
||||||
try {
|
try {
|
||||||
|
|
|
@ -138,7 +138,7 @@ class MountPublicLinkController extends Controller {
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
list(, $server) = $this->addressHandler->splitUserRemote($shareWith);
|
[, $server] = $this->addressHandler->splitUserRemote($shareWith);
|
||||||
$share = $this->shareManager->getShareByToken($token);
|
$share = $this->shareManager->getShareByToken($token);
|
||||||
} catch (HintException $e) {
|
} catch (HintException $e) {
|
||||||
return new JSONResponse(['message' => $e->getHint()], Http::STATUS_BAD_REQUEST);
|
return new JSONResponse(['message' => $e->getHint()], Http::STATUS_BAD_REQUEST);
|
||||||
|
|
|
@ -219,7 +219,7 @@ class RequestHandlerController extends OCSController {
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$provider = $this->cloudFederationProviderManager->getCloudFederationProvider('file');
|
$provider = $this->cloudFederationProviderManager->getCloudFederationProvider('file');
|
||||||
list($newToken, $localId) = $provider->notificationReceived('REQUEST_RESHARE', $id, $notification);
|
[$newToken, $localId] = $provider->notificationReceived('REQUEST_RESHARE', $id, $notification);
|
||||||
return new Http\DataResponse([
|
return new Http\DataResponse([
|
||||||
'token' => $newToken,
|
'token' => $newToken,
|
||||||
'remoteId' => $localId
|
'remoteId' => $localId
|
||||||
|
|
|
@ -221,7 +221,7 @@ class FederatedShareProvider implements IShareProvider {
|
||||||
$ownerCloudId = $this->cloudIdManager->getCloudId($remoteShare['owner'], $remoteShare['remote']);
|
$ownerCloudId = $this->cloudIdManager->getCloudId($remoteShare['owner'], $remoteShare['remote']);
|
||||||
$shareId = $this->addShareToDB($itemSource, $itemType, $shareWith, $sharedBy, $ownerCloudId->getId(), $permissions, 'tmp_token_' . time(), $shareType);
|
$shareId = $this->addShareToDB($itemSource, $itemType, $shareWith, $sharedBy, $ownerCloudId->getId(), $permissions, 'tmp_token_' . time(), $shareType);
|
||||||
$share->setId($shareId);
|
$share->setId($shareId);
|
||||||
list($token, $remoteId) = $this->askOwnerToReShare($shareWith, $share, $shareId);
|
[$token, $remoteId] = $this->askOwnerToReShare($shareWith, $share, $shareId);
|
||||||
// remote share was create successfully if we get a valid token as return
|
// remote share was create successfully if we get a valid token as return
|
||||||
$send = is_string($token) && $token !== '';
|
$send = is_string($token) && $token !== '';
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
|
@ -323,7 +323,7 @@ class FederatedShareProvider implements IShareProvider {
|
||||||
$remoteId = $remoteShare['remote_id'];
|
$remoteId = $remoteShare['remote_id'];
|
||||||
$remote = $remoteShare['remote'];
|
$remote = $remoteShare['remote'];
|
||||||
|
|
||||||
list($token, $remoteId) = $this->notifications->requestReShare(
|
[$token, $remoteId] = $this->notifications->requestReShare(
|
||||||
$token,
|
$token,
|
||||||
$remoteId,
|
$remoteId,
|
||||||
$shareId,
|
$shareId,
|
||||||
|
@ -435,9 +435,9 @@ class FederatedShareProvider implements IShareProvider {
|
||||||
$remoteId = $this->getRemoteId($share);
|
$remoteId = $this->getRemoteId($share);
|
||||||
// if the local user is the owner we send the permission change to the initiator
|
// if the local user is the owner we send the permission change to the initiator
|
||||||
if ($this->userManager->userExists($share->getShareOwner())) {
|
if ($this->userManager->userExists($share->getShareOwner())) {
|
||||||
list(, $remote) = $this->addressHandler->splitUserRemote($share->getSharedBy());
|
[, $remote] = $this->addressHandler->splitUserRemote($share->getSharedBy());
|
||||||
} else { // ... if not we send the permission change to the owner
|
} else { // ... if not we send the permission change to the owner
|
||||||
list(, $remote) = $this->addressHandler->splitUserRemote($share->getShareOwner());
|
[, $remote] = $this->addressHandler->splitUserRemote($share->getShareOwner());
|
||||||
}
|
}
|
||||||
$this->notifications->sendPermissionChange($remote, $remoteId, $share->getToken(), $share->getPermissions());
|
$this->notifications->sendPermissionChange($remote, $remoteId, $share->getToken(), $share->getPermissions());
|
||||||
}
|
}
|
||||||
|
@ -541,7 +541,7 @@ class FederatedShareProvider implements IShareProvider {
|
||||||
* @throws \OC\HintException
|
* @throws \OC\HintException
|
||||||
*/
|
*/
|
||||||
public function delete(IShare $share) {
|
public function delete(IShare $share) {
|
||||||
list(, $remote) = $this->addressHandler->splitUserRemote($share->getSharedWith());
|
[, $remote] = $this->addressHandler->splitUserRemote($share->getSharedWith());
|
||||||
|
|
||||||
// if the local user is the owner we can send the unShare request directly...
|
// if the local user is the owner we can send the unShare request directly...
|
||||||
if ($this->userManager->userExists($share->getShareOwner())) {
|
if ($this->userManager->userExists($share->getShareOwner())) {
|
||||||
|
@ -576,9 +576,9 @@ class FederatedShareProvider implements IShareProvider {
|
||||||
// also send a unShare request to the initiator, if this is a different user than the owner
|
// also send a unShare request to the initiator, if this is a different user than the owner
|
||||||
if ($share->getShareOwner() !== $share->getSharedBy()) {
|
if ($share->getShareOwner() !== $share->getSharedBy()) {
|
||||||
if ($isOwner) {
|
if ($isOwner) {
|
||||||
list(, $remote) = $this->addressHandler->splitUserRemote($share->getSharedBy());
|
[, $remote] = $this->addressHandler->splitUserRemote($share->getSharedBy());
|
||||||
} else {
|
} else {
|
||||||
list(, $remote) = $this->addressHandler->splitUserRemote($share->getShareOwner());
|
[, $remote] = $this->addressHandler->splitUserRemote($share->getShareOwner());
|
||||||
}
|
}
|
||||||
$remoteId = $this->getRemoteId($share);
|
$remoteId = $this->getRemoteId($share);
|
||||||
$this->notifications->sendRevokeShare($remote, $remoteId, $share->getToken());
|
$this->notifications->sendRevokeShare($remote, $remoteId, $share->getToken());
|
||||||
|
|
|
@ -95,7 +95,7 @@ class Notifications {
|
||||||
* @throws \OC\ServerNotAvailableException
|
* @throws \OC\ServerNotAvailableException
|
||||||
*/
|
*/
|
||||||
public function sendRemoteShare($token, $shareWith, $name, $remoteId, $owner, $ownerFederatedId, $sharedBy, $sharedByFederatedId, $shareType) {
|
public function sendRemoteShare($token, $shareWith, $name, $remoteId, $owner, $ownerFederatedId, $sharedBy, $sharedByFederatedId, $shareType) {
|
||||||
list($user, $remote) = $this->addressHandler->splitUserRemote($shareWith);
|
[$user, $remote] = $this->addressHandler->splitUserRemote($shareWith);
|
||||||
|
|
||||||
if ($user && $remote) {
|
if ($user && $remote) {
|
||||||
$local = $this->addressHandler->generateRemoteURL();
|
$local = $this->addressHandler->generateRemoteURL();
|
||||||
|
|
|
@ -183,7 +183,7 @@ class CloudFederationProviderFiles implements ICloudFederationProvider {
|
||||||
throw new ProviderCouldNotAddShareException('Unsupported protocol for data exchange.', '', Http::STATUS_NOT_IMPLEMENTED);
|
throw new ProviderCouldNotAddShareException('Unsupported protocol for data exchange.', '', Http::STATUS_NOT_IMPLEMENTED);
|
||||||
}
|
}
|
||||||
|
|
||||||
list($ownerUid, $remote) = $this->addressHandler->splitUserRemote($share->getOwner());
|
[$ownerUid, $remote] = $this->addressHandler->splitUserRemote($share->getOwner());
|
||||||
// for backward compatibility make sure that the remote url stored in the
|
// for backward compatibility make sure that the remote url stored in the
|
||||||
// database ends with a trailing slash
|
// database ends with a trailing slash
|
||||||
if (substr($remote, -1) !== '/') {
|
if (substr($remote, -1) !== '/') {
|
||||||
|
@ -385,7 +385,7 @@ class CloudFederationProviderFiles implements ICloudFederationProvider {
|
||||||
$this->verifyShare($share, $token);
|
$this->verifyShare($share, $token);
|
||||||
$this->executeAcceptShare($share);
|
$this->executeAcceptShare($share);
|
||||||
if ($share->getShareOwner() !== $share->getSharedBy()) {
|
if ($share->getShareOwner() !== $share->getSharedBy()) {
|
||||||
list(, $remote) = $this->addressHandler->splitUserRemote($share->getSharedBy());
|
[, $remote] = $this->addressHandler->splitUserRemote($share->getSharedBy());
|
||||||
$remoteId = $this->federatedShareProvider->getRemoteId($share);
|
$remoteId = $this->federatedShareProvider->getRemoteId($share);
|
||||||
$notification = $this->cloudFederationFactory->getCloudFederationNotification();
|
$notification = $this->cloudFederationFactory->getCloudFederationNotification();
|
||||||
$notification->setMessage(
|
$notification->setMessage(
|
||||||
|
@ -411,7 +411,7 @@ class CloudFederationProviderFiles implements ICloudFederationProvider {
|
||||||
protected function executeAcceptShare(IShare $share) {
|
protected function executeAcceptShare(IShare $share) {
|
||||||
try {
|
try {
|
||||||
$fileId = (int)$share->getNode()->getId();
|
$fileId = (int)$share->getNode()->getId();
|
||||||
list($file, $link) = $this->getFile($this->getCorrectUid($share), $fileId);
|
[$file, $link] = $this->getFile($this->getCorrectUid($share), $fileId);
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
throw new ShareNotFound();
|
throw new ShareNotFound();
|
||||||
}
|
}
|
||||||
|
@ -455,7 +455,7 @@ class CloudFederationProviderFiles implements ICloudFederationProvider {
|
||||||
$this->verifyShare($share, $token);
|
$this->verifyShare($share, $token);
|
||||||
|
|
||||||
if ($share->getShareOwner() !== $share->getSharedBy()) {
|
if ($share->getShareOwner() !== $share->getSharedBy()) {
|
||||||
list(, $remote) = $this->addressHandler->splitUserRemote($share->getSharedBy());
|
[, $remote] = $this->addressHandler->splitUserRemote($share->getSharedBy());
|
||||||
$remoteId = $this->federatedShareProvider->getRemoteId($share);
|
$remoteId = $this->federatedShareProvider->getRemoteId($share);
|
||||||
$notification = $this->cloudFederationFactory->getCloudFederationNotification();
|
$notification = $this->cloudFederationFactory->getCloudFederationNotification();
|
||||||
$notification->setMessage(
|
$notification->setMessage(
|
||||||
|
@ -487,7 +487,7 @@ class CloudFederationProviderFiles implements ICloudFederationProvider {
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$fileId = (int)$share->getNode()->getId();
|
$fileId = (int)$share->getNode()->getId();
|
||||||
list($file, $link) = $this->getFile($this->getCorrectUid($share), $fileId);
|
[$file, $link] = $this->getFile($this->getCorrectUid($share), $fileId);
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
throw new ShareNotFound();
|
throw new ShareNotFound();
|
||||||
}
|
}
|
||||||
|
@ -642,7 +642,7 @@ class CloudFederationProviderFiles implements ICloudFederationProvider {
|
||||||
$share = $this->federatedShareProvider->getShareById($id);
|
$share = $this->federatedShareProvider->getShareById($id);
|
||||||
// don't allow to share a file back to the owner
|
// don't allow to share a file back to the owner
|
||||||
try {
|
try {
|
||||||
list($user, $remote) = $this->addressHandler->splitUserRemote($shareWith);
|
[$user, $remote] = $this->addressHandler->splitUserRemote($shareWith);
|
||||||
$owner = $share->getShareOwner();
|
$owner = $share->getShareOwner();
|
||||||
$currentServer = $this->addressHandler->generateRemoteURL();
|
$currentServer = $this->addressHandler->generateRemoteURL();
|
||||||
if ($this->addressHandler->compareAddresses($user, $remote, $owner, $currentServer)) {
|
if ($this->addressHandler->compareAddresses($user, $remote, $owner, $currentServer)) {
|
||||||
|
|
|
@ -108,7 +108,7 @@ class AddressHandlerTest extends \Test\TestCase {
|
||||||
->method('search')
|
->method('search')
|
||||||
->willReturn([]);
|
->willReturn([]);
|
||||||
|
|
||||||
list($remoteUser, $remoteUrl) = $this->addressHandler->splitUserRemote($remote);
|
[$remoteUser, $remoteUrl] = $this->addressHandler->splitUserRemote($remote);
|
||||||
$this->assertSame($expectedUser, $remoteUser);
|
$this->assertSame($expectedUser, $remoteUser);
|
||||||
$this->assertSame($expectedUrl, $remoteUrl);
|
$this->assertSame($expectedUrl, $remoteUrl);
|
||||||
}
|
}
|
||||||
|
|
|
@ -363,7 +363,7 @@ class Provider implements IProvider {
|
||||||
try {
|
try {
|
||||||
$fullPath = rtrim($encryptionContainer->getPath(), '/');
|
$fullPath = rtrim($encryptionContainer->getPath(), '/');
|
||||||
// Remove /user/files/...
|
// Remove /user/files/...
|
||||||
list(,,, $path) = explode('/', $fullPath, 4);
|
[,,, $path] = explode('/', $fullPath, 4);
|
||||||
if (!$path) {
|
if (!$path) {
|
||||||
throw new InvalidPathException('Path could not be split correctly');
|
throw new InvalidPathException('Path could not be split correctly');
|
||||||
}
|
}
|
||||||
|
|
|
@ -180,7 +180,7 @@ class Scan extends Base {
|
||||||
$inputPath = $input->getOption('path');
|
$inputPath = $input->getOption('path');
|
||||||
if ($inputPath) {
|
if ($inputPath) {
|
||||||
$inputPath = '/' . trim($inputPath, '/');
|
$inputPath = '/' . trim($inputPath, '/');
|
||||||
list(, $user,) = explode('/', $inputPath, 3);
|
[, $user,] = explode('/', $inputPath, 3);
|
||||||
$users = [$user];
|
$users = [$user];
|
||||||
} elseif ($input->getOption('all')) {
|
} elseif ($input->getOption('all')) {
|
||||||
$users = $this->userManager->search('');
|
$users = $this->userManager->search('');
|
||||||
|
|
|
@ -153,7 +153,7 @@ class Create extends Base {
|
||||||
$output->writeln('<error>Invalid mount configuration option "' . $configOption . '"</error>');
|
$output->writeln('<error>Invalid mount configuration option "' . $configOption . '"</error>');
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
list($key, $value) = explode('=', $configOption, 2);
|
[$key, $value] = explode('=', $configOption, 2);
|
||||||
if (!$this->validateParam($key, $value, $storageBackend, $authBackend)) {
|
if (!$this->validateParam($key, $value, $storageBackend, $authBackend)) {
|
||||||
$output->writeln('<error>Unknown configuration for backends "' . $key . '"</error>');
|
$output->writeln('<error>Unknown configuration for backends "' . $key . '"</error>');
|
||||||
return 1;
|
return 1;
|
||||||
|
|
|
@ -111,7 +111,7 @@ class Verify extends Base {
|
||||||
$output->writeln('<error>Invalid mount configuration option "' . $configOption . '"</error>');
|
$output->writeln('<error>Invalid mount configuration option "' . $configOption . '"</error>');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
list($key, $value) = explode('=', $configOption, 2);
|
[$key, $value] = explode('=', $configOption, 2);
|
||||||
$storage->setBackendOption($key, $value);
|
$storage->setBackendOption($key, $value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -223,7 +223,7 @@ class ShareesAPIController extends OCSController {
|
||||||
$this->result['lookupEnabled'] = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'yes') === 'yes';
|
$this->result['lookupEnabled'] = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'yes') === 'yes';
|
||||||
}
|
}
|
||||||
|
|
||||||
list($result, $hasMoreResults) = $this->collaboratorSearch->search($search, $shareTypes, $lookup, $this->limit, $this->offset);
|
[$result, $hasMoreResults] = $this->collaboratorSearch->search($search, $shareTypes, $lookup, $this->limit, $this->offset);
|
||||||
|
|
||||||
// extra treatment for 'exact' subarray, with a single merge expected keys might be lost
|
// extra treatment for 'exact' subarray, with a single merge expected keys might be lost
|
||||||
if (isset($result['exact'])) {
|
if (isset($result['exact'])) {
|
||||||
|
@ -290,7 +290,7 @@ class ShareesAPIController extends OCSController {
|
||||||
foreach ($shareTypes as $shareType) {
|
foreach ($shareTypes as $shareType) {
|
||||||
$sharees = $this->getAllShareesByType($user, $shareType);
|
$sharees = $this->getAllShareesByType($user, $shareType);
|
||||||
$shareTypeResults = [];
|
$shareTypeResults = [];
|
||||||
foreach ($sharees as list($sharee, $displayname)) {
|
foreach ($sharees as [$sharee, $displayname]) {
|
||||||
if (!isset($this->searchResultTypeMap[$shareType])) {
|
if (!isset($this->searchResultTypeMap[$shareType])) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,7 +40,7 @@ class Cache extends \OC\Files\Cache\Cache {
|
||||||
public function __construct($storage, ICloudId $cloudId) {
|
public function __construct($storage, ICloudId $cloudId) {
|
||||||
$this->cloudId = $cloudId;
|
$this->cloudId = $cloudId;
|
||||||
$this->storage = $storage;
|
$this->storage = $storage;
|
||||||
list(, $remote) = explode('://', $cloudId->getRemote(), 2);
|
[, $remote] = explode('://', $cloudId->getRemote(), 2);
|
||||||
$this->remote = $remote;
|
$this->remote = $remote;
|
||||||
$this->remoteUser = $cloudId->getUser();
|
$this->remoteUser = $cloudId->getUser();
|
||||||
parent::__construct($storage);
|
parent::__construct($storage);
|
||||||
|
|
|
@ -73,9 +73,9 @@ class Storage extends DAV implements ISharedStorage, IDisableEncryptionStorage {
|
||||||
$this->cloudId = $options['cloudId'];
|
$this->cloudId = $options['cloudId'];
|
||||||
$discoveryService = \OC::$server->query(\OCP\OCS\IDiscoveryService::class);
|
$discoveryService = \OC::$server->query(\OCP\OCS\IDiscoveryService::class);
|
||||||
|
|
||||||
list($protocol, $remote) = explode('://', $this->cloudId->getRemote());
|
[$protocol, $remote] = explode('://', $this->cloudId->getRemote());
|
||||||
if (strpos($remote, '/')) {
|
if (strpos($remote, '/')) {
|
||||||
list($host, $root) = explode('/', $remote, 2);
|
[$host, $root] = explode('/', $remote, 2);
|
||||||
} else {
|
} else {
|
||||||
$host = $remote;
|
$host = $remote;
|
||||||
$root = '';
|
$root = '';
|
||||||
|
|
|
@ -63,7 +63,7 @@ class Scanner extends \OC\Files\Cache\Scanner {
|
||||||
}
|
}
|
||||||
if ($this->storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage')) {
|
if ($this->storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage')) {
|
||||||
/** @var \OC\Files\Storage\Storage $storage */
|
/** @var \OC\Files\Storage\Storage $storage */
|
||||||
list($storage) = $this->storage->resolvePath('');
|
[$storage] = $this->storage->resolvePath('');
|
||||||
$this->sourceScanner = $storage->getScanner();
|
$this->sourceScanner = $storage->getScanner();
|
||||||
return $this->sourceScanner;
|
return $this->sourceScanner;
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -90,7 +90,7 @@ class CacheTest extends TestCase {
|
||||||
$this->view->file_put_contents('container/shareddir/subdir/another too.txt', $textData);
|
$this->view->file_put_contents('container/shareddir/subdir/another too.txt', $textData);
|
||||||
$this->view->file_put_contents('container/shareddir/subdir/not a text file.xml', '<xml></xml>');
|
$this->view->file_put_contents('container/shareddir/subdir/not a text file.xml', '<xml></xml>');
|
||||||
|
|
||||||
list($this->ownerStorage,) = $this->view->resolvePath('');
|
[$this->ownerStorage,] = $this->view->resolvePath('');
|
||||||
$this->ownerCache = $this->ownerStorage->getCache();
|
$this->ownerCache = $this->ownerStorage->getCache();
|
||||||
$this->ownerStorage->getScanner()->scan('');
|
$this->ownerStorage->getScanner()->scan('');
|
||||||
|
|
||||||
|
@ -124,7 +124,7 @@ class CacheTest extends TestCase {
|
||||||
|
|
||||||
// retrieve the shared storage
|
// retrieve the shared storage
|
||||||
$secondView = new \OC\Files\View('/' . self::TEST_FILES_SHARING_API_USER2);
|
$secondView = new \OC\Files\View('/' . self::TEST_FILES_SHARING_API_USER2);
|
||||||
list($this->sharedStorage,) = $secondView->resolvePath('files/shareddir');
|
[$this->sharedStorage,] = $secondView->resolvePath('files/shareddir');
|
||||||
$this->sharedCache = $this->sharedStorage->getCache();
|
$this->sharedCache = $this->sharedStorage->getCache();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -213,7 +213,7 @@ class CacheTest extends TestCase {
|
||||||
*/
|
*/
|
||||||
public function testSearch() {
|
public function testSearch() {
|
||||||
foreach ($this->searchDataProvider() as $data) {
|
foreach ($this->searchDataProvider() as $data) {
|
||||||
list($pattern, $expectedFiles) = $data;
|
[$pattern, $expectedFiles] = $data;
|
||||||
|
|
||||||
$results = $this->sharedStorage->getCache()->search($pattern);
|
$results = $this->sharedStorage->getCache()->search($pattern);
|
||||||
|
|
||||||
|
@ -410,7 +410,7 @@ class CacheTest extends TestCase {
|
||||||
|
|
||||||
self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
|
self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
|
||||||
$this->assertTrue(\OC\Files\Filesystem::file_exists('/test.txt'));
|
$this->assertTrue(\OC\Files\Filesystem::file_exists('/test.txt'));
|
||||||
list($sharedStorage) = \OC\Files\Filesystem::resolvePath('/' . self::TEST_FILES_SHARING_API_USER2 . '/files/test.txt');
|
[$sharedStorage] = \OC\Files\Filesystem::resolvePath('/' . self::TEST_FILES_SHARING_API_USER2 . '/files/test.txt');
|
||||||
/**
|
/**
|
||||||
* @var \OCA\Files_Sharing\SharedStorage $sharedStorage
|
* @var \OCA\Files_Sharing\SharedStorage $sharedStorage
|
||||||
*/
|
*/
|
||||||
|
@ -442,7 +442,7 @@ class CacheTest extends TestCase {
|
||||||
|
|
||||||
self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
|
self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
|
||||||
$this->assertTrue(\OC\Files\Filesystem::file_exists('/foo'));
|
$this->assertTrue(\OC\Files\Filesystem::file_exists('/foo'));
|
||||||
list($sharedStorage) = \OC\Files\Filesystem::resolvePath('/' . self::TEST_FILES_SHARING_API_USER2 . '/files/foo');
|
[$sharedStorage] = \OC\Files\Filesystem::resolvePath('/' . self::TEST_FILES_SHARING_API_USER2 . '/files/foo');
|
||||||
/**
|
/**
|
||||||
* @var \OCA\Files_Sharing\SharedStorage $sharedStorage
|
* @var \OCA\Files_Sharing\SharedStorage $sharedStorage
|
||||||
*/
|
*/
|
||||||
|
@ -469,12 +469,12 @@ class CacheTest extends TestCase {
|
||||||
$this->shareManager->updateShare($share);
|
$this->shareManager->updateShare($share);
|
||||||
\OC_Util::tearDownFS();
|
\OC_Util::tearDownFS();
|
||||||
|
|
||||||
list($sourceStorage) = \OC\Files\Filesystem::resolvePath('/' . self::TEST_FILES_SHARING_API_USER1 . '/files/foo');
|
[$sourceStorage] = \OC\Files\Filesystem::resolvePath('/' . self::TEST_FILES_SHARING_API_USER1 . '/files/foo');
|
||||||
|
|
||||||
self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
|
self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
|
||||||
$this->assertTrue(\OC\Files\Filesystem::file_exists('/foo'));
|
$this->assertTrue(\OC\Files\Filesystem::file_exists('/foo'));
|
||||||
/** @var SharedStorage $sharedStorage */
|
/** @var SharedStorage $sharedStorage */
|
||||||
list($sharedStorage) = \OC\Files\Filesystem::resolvePath('/' . self::TEST_FILES_SHARING_API_USER2 . '/files/foo');
|
[$sharedStorage] = \OC\Files\Filesystem::resolvePath('/' . self::TEST_FILES_SHARING_API_USER2 . '/files/foo');
|
||||||
|
|
||||||
$this->assertEquals($sourceStorage->getCache()->getNumericStorageId(), $sharedStorage->getCache()->getNumericStorageId());
|
$this->assertEquals($sourceStorage->getCache()->getNumericStorageId(), $sharedStorage->getCache()->getNumericStorageId());
|
||||||
}
|
}
|
||||||
|
@ -511,7 +511,7 @@ class CacheTest extends TestCase {
|
||||||
|
|
||||||
\OC\Files\Filesystem::file_put_contents('/sub/bar.txt', 'bar');
|
\OC\Files\Filesystem::file_put_contents('/sub/bar.txt', 'bar');
|
||||||
/** @var SharedStorage $sharedStorage */
|
/** @var SharedStorage $sharedStorage */
|
||||||
list($sharedStorage) = \OC\Files\Filesystem::resolvePath('/' . self::TEST_FILES_SHARING_API_USER2 . '/files/sub');
|
[$sharedStorage] = \OC\Files\Filesystem::resolvePath('/' . self::TEST_FILES_SHARING_API_USER2 . '/files/sub');
|
||||||
|
|
||||||
$this->assertTrue($sharedStorage->getCache()->inCache('bar.txt'));
|
$this->assertTrue($sharedStorage->getCache()->inCache('bar.txt'));
|
||||||
|
|
||||||
|
|
|
@ -76,7 +76,7 @@ class PermissionsTest extends TestCase {
|
||||||
$this->view->file_put_contents('container/shareddir/textfile.txt', $textData);
|
$this->view->file_put_contents('container/shareddir/textfile.txt', $textData);
|
||||||
$this->view->file_put_contents('container/shareddirrestricted/textfile1.txt', $textData);
|
$this->view->file_put_contents('container/shareddirrestricted/textfile1.txt', $textData);
|
||||||
|
|
||||||
list($this->ownerStorage, $internalPath) = $this->view->resolvePath('');
|
[$this->ownerStorage, $internalPath] = $this->view->resolvePath('');
|
||||||
$this->ownerCache = $this->ownerStorage->getCache();
|
$this->ownerCache = $this->ownerStorage->getCache();
|
||||||
$this->ownerStorage->getScanner()->scan('');
|
$this->ownerStorage->getScanner()->scan('');
|
||||||
|
|
||||||
|
@ -110,8 +110,8 @@ class PermissionsTest extends TestCase {
|
||||||
|
|
||||||
// retrieve the shared storage
|
// retrieve the shared storage
|
||||||
$this->secondView = new \OC\Files\View('/' . self::TEST_FILES_SHARING_API_USER2);
|
$this->secondView = new \OC\Files\View('/' . self::TEST_FILES_SHARING_API_USER2);
|
||||||
list($this->sharedStorage, $internalPath) = $this->secondView->resolvePath('files/shareddir');
|
[$this->sharedStorage, $internalPath] = $this->secondView->resolvePath('files/shareddir');
|
||||||
list($this->sharedStorageRestrictedShare, $internalPath) = $this->secondView->resolvePath('files/shareddirrestricted');
|
[$this->sharedStorageRestrictedShare, $internalPath] = $this->secondView->resolvePath('files/shareddirrestricted');
|
||||||
$this->sharedCache = $this->sharedStorage->getCache();
|
$this->sharedCache = $this->sharedStorage->getCache();
|
||||||
$this->sharedCacheRestrictedShare = $this->sharedStorageRestrictedShare->getCache();
|
$this->sharedCacheRestrictedShare = $this->sharedStorageRestrictedShare->getCache();
|
||||||
}
|
}
|
||||||
|
|
|
@ -107,7 +107,7 @@ class SharedStorageTest extends TestCase {
|
||||||
|
|
||||||
// delete the local folder
|
// delete the local folder
|
||||||
/** @var \OC\Files\Storage\Storage $storage */
|
/** @var \OC\Files\Storage\Storage $storage */
|
||||||
list($storage, $internalPath) = \OC\Files\Filesystem::resolvePath('/' . self::TEST_FILES_SHARING_API_USER2 . '/files/localfolder');
|
[$storage, $internalPath] = \OC\Files\Filesystem::resolvePath('/' . self::TEST_FILES_SHARING_API_USER2 . '/files/localfolder');
|
||||||
$storage->rmdir($internalPath);
|
$storage->rmdir($internalPath);
|
||||||
|
|
||||||
//enforce reload of the mount points
|
//enforce reload of the mount points
|
||||||
|
@ -442,7 +442,7 @@ class SharedStorageTest extends TestCase {
|
||||||
/**
|
/**
|
||||||
* @var \OCP\Files\Storage $sharedStorage
|
* @var \OCP\Files\Storage $sharedStorage
|
||||||
*/
|
*/
|
||||||
list($sharedStorage,) = $view->resolvePath($this->folder);
|
[$sharedStorage,] = $view->resolvePath($this->folder);
|
||||||
$this->assertTrue($sharedStorage->instanceOfStorage('OCA\Files_Sharing\ISharedStorage'));
|
$this->assertTrue($sharedStorage->instanceOfStorage('OCA\Files_Sharing\ISharedStorage'));
|
||||||
|
|
||||||
$sourceStorage = new \OC\Files\Storage\Temporary([]);
|
$sourceStorage = new \OC\Files\Storage\Temporary([]);
|
||||||
|
@ -475,7 +475,7 @@ class SharedStorageTest extends TestCase {
|
||||||
/**
|
/**
|
||||||
* @var \OCP\Files\Storage $sharedStorage
|
* @var \OCP\Files\Storage $sharedStorage
|
||||||
*/
|
*/
|
||||||
list($sharedStorage,) = $view->resolvePath($this->folder);
|
[$sharedStorage,] = $view->resolvePath($this->folder);
|
||||||
$this->assertTrue($sharedStorage->instanceOfStorage('OCA\Files_Sharing\ISharedStorage'));
|
$this->assertTrue($sharedStorage->instanceOfStorage('OCA\Files_Sharing\ISharedStorage'));
|
||||||
|
|
||||||
$sourceStorage = new \OC\Files\Storage\Temporary([]);
|
$sourceStorage = new \OC\Files\Storage\Temporary([]);
|
||||||
|
|
|
@ -64,7 +64,7 @@ class WatcherTest extends TestCase {
|
||||||
$this->view->mkdir('container/shareddir');
|
$this->view->mkdir('container/shareddir');
|
||||||
$this->view->mkdir('container/shareddir/subdir');
|
$this->view->mkdir('container/shareddir/subdir');
|
||||||
|
|
||||||
list($this->ownerStorage, $internalPath) = $this->view->resolvePath('');
|
[$this->ownerStorage, $internalPath] = $this->view->resolvePath('');
|
||||||
$this->ownerCache = $this->ownerStorage->getCache();
|
$this->ownerCache = $this->ownerStorage->getCache();
|
||||||
$this->ownerStorage->getScanner()->scan('');
|
$this->ownerStorage->getScanner()->scan('');
|
||||||
|
|
||||||
|
@ -85,7 +85,7 @@ class WatcherTest extends TestCase {
|
||||||
|
|
||||||
// retrieve the shared storage
|
// retrieve the shared storage
|
||||||
$secondView = new \OC\Files\View('/' . self::TEST_FILES_SHARING_API_USER2);
|
$secondView = new \OC\Files\View('/' . self::TEST_FILES_SHARING_API_USER2);
|
||||||
list($this->sharedStorage, $internalPath) = $secondView->resolvePath('files/shareddir');
|
[$this->sharedStorage, $internalPath] = $secondView->resolvePath('files/shareddir');
|
||||||
$this->sharedCache = $this->sharedStorage->getCache();
|
$this->sharedCache = $this->sharedStorage->getCache();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -59,7 +59,7 @@ class RootCollection extends AbstractPrincipalCollection {
|
||||||
* @return INode
|
* @return INode
|
||||||
*/
|
*/
|
||||||
public function getChildForPrincipal(array $principalInfo): TrashHome {
|
public function getChildForPrincipal(array $principalInfo): TrashHome {
|
||||||
list(, $name) = \Sabre\Uri\split($principalInfo['uri']);
|
[, $name] = \Sabre\Uri\split($principalInfo['uri']);
|
||||||
$user = \OC::$server->getUserSession()->getUser();
|
$user = \OC::$server->getUserSession()->getUser();
|
||||||
if (is_null($user) || $name !== $user->getUID()) {
|
if (is_null($user) || $name !== $user->getUID()) {
|
||||||
throw new \Sabre\DAV\Exception\Forbidden();
|
throw new \Sabre\DAV\Exception\Forbidden();
|
||||||
|
|
|
@ -58,7 +58,7 @@ class TrashHome implements ICollection {
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getName(): string {
|
public function getName(): string {
|
||||||
list(, $name) = \Sabre\Uri\split($this->principalInfo['uri']);
|
[, $name] = \Sabre\Uri\split($this->principalInfo['uri']);
|
||||||
return $name;
|
return $name;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -198,7 +198,7 @@ class TrashbinTest extends \Test\TestCase {
|
||||||
$manipulatedList = $this->manipulateDeleteTime($filesInTrash, $this->trashRoot1, $expiredDate);
|
$manipulatedList = $this->manipulateDeleteTime($filesInTrash, $this->trashRoot1, $expiredDate);
|
||||||
|
|
||||||
$testClass = new TrashbinForTesting();
|
$testClass = new TrashbinForTesting();
|
||||||
list($sizeOfDeletedFiles, $count) = $testClass->dummyDeleteExpiredFiles($manipulatedList, $expireAt);
|
[$sizeOfDeletedFiles, $count] = $testClass->dummyDeleteExpiredFiles($manipulatedList, $expireAt);
|
||||||
|
|
||||||
$this->assertSame(10, $sizeOfDeletedFiles);
|
$this->assertSame(10, $sizeOfDeletedFiles);
|
||||||
$this->assertSame(2, $count);
|
$this->assertSame(2, $count);
|
||||||
|
@ -657,7 +657,7 @@ class TrashbinTest extends \Test\TestCase {
|
||||||
$trashedFile = $filesInTrash[0];
|
$trashedFile = $filesInTrash[0];
|
||||||
|
|
||||||
// delete source folder
|
// delete source folder
|
||||||
list($storage, $internalPath) = $this->rootView->resolvePath('/' . self::TEST_TRASHBIN_USER1 . '/files/folder');
|
[$storage, $internalPath] = $this->rootView->resolvePath('/' . self::TEST_TRASHBIN_USER1 . '/files/folder');
|
||||||
if ($storage instanceof \OC\Files\Storage\Local) {
|
if ($storage instanceof \OC\Files\Storage\Local) {
|
||||||
$folderAbsPath = $storage->getSourcePath($internalPath);
|
$folderAbsPath = $storage->getSourcePath($internalPath);
|
||||||
// make folder read-only
|
// make folder read-only
|
||||||
|
|
|
@ -70,7 +70,7 @@ class RootCollection extends AbstractPrincipalCollection {
|
||||||
* @return INode
|
* @return INode
|
||||||
*/
|
*/
|
||||||
public function getChildForPrincipal(array $principalInfo) {
|
public function getChildForPrincipal(array $principalInfo) {
|
||||||
list(, $name) = \Sabre\Uri\split($principalInfo['uri']);
|
[, $name] = \Sabre\Uri\split($principalInfo['uri']);
|
||||||
$user = \OC::$server->getUserSession()->getUser();
|
$user = \OC::$server->getUserSession()->getUser();
|
||||||
if (is_null($user) || $name !== $user->getUID()) {
|
if (is_null($user) || $name !== $user->getUID()) {
|
||||||
throw new \Sabre\DAV\Exception\Forbidden();
|
throw new \Sabre\DAV\Exception\Forbidden();
|
||||||
|
|
|
@ -53,7 +53,7 @@ class VersionHome implements ICollection {
|
||||||
}
|
}
|
||||||
|
|
||||||
private function getUser() {
|
private function getUser() {
|
||||||
list(, $name) = \Sabre\Uri\split($this->principalInfo['uri']);
|
[, $name] = \Sabre\Uri\split($this->principalInfo['uri']);
|
||||||
$user = $this->userManager->get($name);
|
$user = $this->userManager->get($name);
|
||||||
if (!$user) {
|
if (!$user) {
|
||||||
throw new NoUserException();
|
throw new NoUserException();
|
||||||
|
|
|
@ -129,7 +129,7 @@ class Storage {
|
||||||
* @param string $source source path
|
* @param string $source source path
|
||||||
*/
|
*/
|
||||||
public static function setSourcePathAndUser($source) {
|
public static function setSourcePathAndUser($source) {
|
||||||
list($uid, $path) = self::getUidAndFilename($source);
|
[$uid, $path] = self::getUidAndFilename($source);
|
||||||
self::$sourcePathAndUser[$source] = ['uid' => $uid, 'path' => $path];
|
self::$sourcePathAndUser[$source] = ['uid' => $uid, 'path' => $path];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -179,7 +179,7 @@ class Storage {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
list($uid, $filename) = self::getUidAndFilename($filename);
|
[$uid, $filename] = self::getUidAndFilename($filename);
|
||||||
|
|
||||||
$files_view = new View('/'.$uid .'/files');
|
$files_view = new View('/'.$uid .'/files');
|
||||||
|
|
||||||
|
@ -214,7 +214,7 @@ class Storage {
|
||||||
* @param string $path
|
* @param string $path
|
||||||
*/
|
*/
|
||||||
public static function markDeletedFile($path) {
|
public static function markDeletedFile($path) {
|
||||||
list($uid, $filename) = self::getUidAndFilename($path);
|
[$uid, $filename] = self::getUidAndFilename($path);
|
||||||
self::$deletedFiles[$path] = [
|
self::$deletedFiles[$path] = [
|
||||||
'uid' => $uid,
|
'uid' => $uid,
|
||||||
'filename' => $filename];
|
'filename' => $filename];
|
||||||
|
@ -232,7 +232,7 @@ class Storage {
|
||||||
* @var \OC\Files\Storage\Storage $storage
|
* @var \OC\Files\Storage\Storage $storage
|
||||||
* @var string $internalPath
|
* @var string $internalPath
|
||||||
*/
|
*/
|
||||||
list($storage, $internalPath) = $view->resolvePath($path);
|
[$storage, $internalPath] = $view->resolvePath($path);
|
||||||
$cache = $storage->getCache($internalPath);
|
$cache = $storage->getCache($internalPath);
|
||||||
$cache->remove($internalPath);
|
$cache->remove($internalPath);
|
||||||
}
|
}
|
||||||
|
@ -270,7 +270,7 @@ class Storage {
|
||||||
* @param string $operation can be 'copy' or 'rename'
|
* @param string $operation can be 'copy' or 'rename'
|
||||||
*/
|
*/
|
||||||
public static function renameOrCopy($sourcePath, $targetPath, $operation) {
|
public static function renameOrCopy($sourcePath, $targetPath, $operation) {
|
||||||
list($sourceOwner, $sourcePath) = self::getSourcePathAndUser($sourcePath);
|
[$sourceOwner, $sourcePath] = self::getSourcePathAndUser($sourcePath);
|
||||||
|
|
||||||
// it was a upload of a existing file if no old path exists
|
// it was a upload of a existing file if no old path exists
|
||||||
// in this case the pre-hook already called the store method and we can
|
// in this case the pre-hook already called the store method and we can
|
||||||
|
@ -279,7 +279,7 @@ class Storage {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
list($targetOwner, $targetPath) = self::getUidAndFilename($targetPath);
|
[$targetOwner, $targetPath] = self::getUidAndFilename($targetPath);
|
||||||
|
|
||||||
$sourcePath = ltrim($sourcePath, '/');
|
$sourcePath = ltrim($sourcePath, '/');
|
||||||
$targetPath = ltrim($targetPath, '/');
|
$targetPath = ltrim($targetPath, '/');
|
||||||
|
@ -399,9 +399,9 @@ class Storage {
|
||||||
*/
|
*/
|
||||||
private static function copyFileContents($view, $path1, $path2) {
|
private static function copyFileContents($view, $path1, $path2) {
|
||||||
/** @var \OC\Files\Storage\Storage $storage1 */
|
/** @var \OC\Files\Storage\Storage $storage1 */
|
||||||
list($storage1, $internalPath1) = $view->resolvePath($path1);
|
[$storage1, $internalPath1] = $view->resolvePath($path1);
|
||||||
/** @var \OC\Files\Storage\Storage $storage2 */
|
/** @var \OC\Files\Storage\Storage $storage2 */
|
||||||
list($storage2, $internalPath2) = $view->resolvePath($path2);
|
[$storage2, $internalPath2] = $view->resolvePath($path2);
|
||||||
|
|
||||||
$view->lockFile($path1, ILockingProvider::LOCK_EXCLUSIVE);
|
$view->lockFile($path1, ILockingProvider::LOCK_EXCLUSIVE);
|
||||||
$view->lockFile($path2, ILockingProvider::LOCK_EXCLUSIVE);
|
$view->lockFile($path2, ILockingProvider::LOCK_EXCLUSIVE);
|
||||||
|
@ -410,7 +410,7 @@ class Storage {
|
||||||
if ($storage1->instanceOfStorage('\OC\Files\ObjectStore\ObjectStoreStorage') || $storage2->instanceOfStorage('\OC\Files\ObjectStore\ObjectStoreStorage')) {
|
if ($storage1->instanceOfStorage('\OC\Files\ObjectStore\ObjectStoreStorage') || $storage2->instanceOfStorage('\OC\Files\ObjectStore\ObjectStoreStorage')) {
|
||||||
$source = $storage1->fopen($internalPath1, 'r');
|
$source = $storage1->fopen($internalPath1, 'r');
|
||||||
$target = $storage2->fopen($internalPath2, 'w');
|
$target = $storage2->fopen($internalPath2, 'w');
|
||||||
list(, $result) = \OC_Helper::streamCopy($source, $target);
|
[, $result] = \OC_Helper::streamCopy($source, $target);
|
||||||
fclose($source);
|
fclose($source);
|
||||||
fclose($target);
|
fclose($target);
|
||||||
|
|
||||||
|
@ -611,7 +611,7 @@ class Storage {
|
||||||
$expiration = self::getExpiration();
|
$expiration = self::getExpiration();
|
||||||
|
|
||||||
if ($expiration->shouldAutoExpire()) {
|
if ($expiration->shouldAutoExpire()) {
|
||||||
list($toDelete, $size) = self::getAutoExpireList($time, $versions);
|
[$toDelete, $size] = self::getAutoExpireList($time, $versions);
|
||||||
} else {
|
} else {
|
||||||
$size = 0;
|
$size = 0;
|
||||||
$toDelete = []; // versions we want to delete
|
$toDelete = []; // versions we want to delete
|
||||||
|
@ -778,7 +778,7 @@ class Storage {
|
||||||
$allVersions = Storage::getVersions($uid, $filename);
|
$allVersions = Storage::getVersions($uid, $filename);
|
||||||
|
|
||||||
$time = time();
|
$time = time();
|
||||||
list($toDelete, $sizeOfDeletedVersions) = self::getExpireList($time, $allVersions, $availableSpace <= 0);
|
[$toDelete, $sizeOfDeletedVersions] = self::getExpireList($time, $allVersions, $availableSpace <= 0);
|
||||||
|
|
||||||
$availableSpace = $availableSpace + $sizeOfDeletedVersions;
|
$availableSpace = $availableSpace + $sizeOfDeletedVersions;
|
||||||
$versionsSize = $versionsSize - $sizeOfDeletedVersions;
|
$versionsSize = $versionsSize - $sizeOfDeletedVersions;
|
||||||
|
@ -789,7 +789,7 @@ class Storage {
|
||||||
$allVersions = $result['all'];
|
$allVersions = $result['all'];
|
||||||
|
|
||||||
foreach ($result['by_file'] as $versions) {
|
foreach ($result['by_file'] as $versions) {
|
||||||
list($toDeleteNew, $size) = self::getExpireList($time, $versions, $availableSpace <= 0);
|
[$toDeleteNew, $size] = self::getExpireList($time, $versions, $availableSpace <= 0);
|
||||||
$toDelete = array_merge($toDelete, $toDeleteNew);
|
$toDelete = array_merge($toDelete, $toDeleteNew);
|
||||||
$sizeOfDeletedVersions += $size;
|
$sizeOfDeletedVersions += $size;
|
||||||
}
|
}
|
||||||
|
|
|
@ -189,7 +189,7 @@ class UsersController extends Controller {
|
||||||
);
|
);
|
||||||
|
|
||||||
$groupsInfo->setSorting($sortGroupsBy);
|
$groupsInfo->setSorting($sortGroupsBy);
|
||||||
list($adminGroup, $groups) = $groupsInfo->get();
|
[$adminGroup, $groups] = $groupsInfo->get();
|
||||||
|
|
||||||
if (!$isLDAPUsed && $this->appManager->isEnabledForUser('user_ldap')) {
|
if (!$isLDAPUsed && $this->appManager->isEnabledForUser('user_ldap')) {
|
||||||
$isLDAPUsed = (bool)array_reduce($this->userManager->getBackends(), function ($ldapFound, $backend) {
|
$isLDAPUsed = (bool)array_reduce($this->userManager->getBackends(), function ($ldapFound, $backend) {
|
||||||
|
|
|
@ -317,7 +317,7 @@ class Provider implements IProvider {
|
||||||
protected function getSystemTagParameter($parameter) {
|
protected function getSystemTagParameter($parameter) {
|
||||||
$tagData = json_decode($parameter, true);
|
$tagData = json_decode($parameter, true);
|
||||||
if ($tagData === null) {
|
if ($tagData === null) {
|
||||||
list($name, $status) = explode('|||', substr($parameter, 3, -3));
|
[$name, $status] = explode('|||', substr($parameter, 3, -3));
|
||||||
$tagData = [
|
$tagData = [
|
||||||
'id' => 0,// No way to recover the ID
|
'id' => 0,// No way to recover the ID
|
||||||
'name' => $name,
|
'name' => $name,
|
||||||
|
|
|
@ -102,7 +102,7 @@ class Util {
|
||||||
* @return float
|
* @return float
|
||||||
*/
|
*/
|
||||||
public function calculateLuminance($color) {
|
public function calculateLuminance($color) {
|
||||||
list($red, $green, $blue) = $this->hexToRGB($color);
|
[$red, $green, $blue] = $this->hexToRGB($color);
|
||||||
$compiler = new Compiler();
|
$compiler = new Compiler();
|
||||||
$hsl = $compiler->toHSL($red, $green, $blue);
|
$hsl = $compiler->toHSL($red, $green, $blue);
|
||||||
return $hsl[3] / 100;
|
return $hsl[3] / 100;
|
||||||
|
@ -113,7 +113,7 @@ class Util {
|
||||||
* @return float
|
* @return float
|
||||||
*/
|
*/
|
||||||
public function calculateLuma($color) {
|
public function calculateLuma($color) {
|
||||||
list($red, $green, $blue) = $this->hexToRGB($color);
|
[$red, $green, $blue] = $this->hexToRGB($color);
|
||||||
return (0.2126 * $red + 0.7152 * $green + 0.0722 * $blue) / 255;
|
return (0.2126 * $red + 0.7152 * $green + 0.0722 * $blue) / 255;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1254,7 +1254,7 @@ class Access extends LDAPUtility {
|
||||||
if ($search === false) {
|
if ($search === false) {
|
||||||
return $counter > 0 ? $counter : false;
|
return $counter > 0 ? $counter : false;
|
||||||
}
|
}
|
||||||
list($sr, $pagedSearchOK) = $search;
|
[$sr, $pagedSearchOK] = $search;
|
||||||
|
|
||||||
/* ++ Fixing RHDS searches with pages with zero results ++
|
/* ++ Fixing RHDS searches with pages with zero results ++
|
||||||
* countEntriesInSearchResults() method signature changed
|
* countEntriesInSearchResults() method signature changed
|
||||||
|
@ -1321,7 +1321,7 @@ class Access extends LDAPUtility {
|
||||||
if ($search === false) {
|
if ($search === false) {
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
list($sr, $pagedSearchOK) = $search;
|
[$sr, $pagedSearchOK] = $search;
|
||||||
$cr = $this->connection->getConnectionResource();
|
$cr = $this->connection->getConnectionResource();
|
||||||
|
|
||||||
if ($skipHandling) {
|
if ($skipHandling) {
|
||||||
|
|
|
@ -93,7 +93,7 @@ class RenewPasswordController extends Controller {
|
||||||
$errors = [];
|
$errors = [];
|
||||||
$messages = [];
|
$messages = [];
|
||||||
if (is_array($renewPasswordMessages)) {
|
if (is_array($renewPasswordMessages)) {
|
||||||
list($errors, $messages) = $renewPasswordMessages;
|
[$errors, $messages] = $renewPasswordMessages;
|
||||||
}
|
}
|
||||||
$this->session->remove('renewPasswordMessages');
|
$this->session->remove('renewPasswordMessages');
|
||||||
foreach ($errors as $value) {
|
foreach ($errors as $value) {
|
||||||
|
|
|
@ -238,7 +238,7 @@ class AccessTest extends TestCase {
|
||||||
* @param array $case
|
* @param array $case
|
||||||
*/
|
*/
|
||||||
public function testStringResemblesDN($case) {
|
public function testStringResemblesDN($case) {
|
||||||
list($lw, $con, $um, $helper) = $this->getConnectorAndLdapMock();
|
[$lw, $con, $um, $helper] = $this->getConnectorAndLdapMock();
|
||||||
/** @var IConfig|\PHPUnit\Framework\MockObject\MockObject $config */
|
/** @var IConfig|\PHPUnit\Framework\MockObject\MockObject $config */
|
||||||
$config = $this->createMock(IConfig::class);
|
$config = $this->createMock(IConfig::class);
|
||||||
$access = new Access($con, $lw, $um, $helper, $config, $this->ncUserManager);
|
$access = new Access($con, $lw, $um, $helper, $config, $this->ncUserManager);
|
||||||
|
@ -260,7 +260,7 @@ class AccessTest extends TestCase {
|
||||||
* @param $case
|
* @param $case
|
||||||
*/
|
*/
|
||||||
public function testStringResemblesDNLDAPmod($case) {
|
public function testStringResemblesDNLDAPmod($case) {
|
||||||
list(, $con, $um, $helper) = $this->getConnectorAndLdapMock();
|
[, $con, $um, $helper] = $this->getConnectorAndLdapMock();
|
||||||
/** @var IConfig|\PHPUnit\Framework\MockObject\MockObject $config */
|
/** @var IConfig|\PHPUnit\Framework\MockObject\MockObject $config */
|
||||||
$config = $this->createMock(IConfig::class);
|
$config = $this->createMock(IConfig::class);
|
||||||
$lw = new LDAP();
|
$lw = new LDAP();
|
||||||
|
@ -430,7 +430,7 @@ class AccessTest extends TestCase {
|
||||||
* @param $attribute
|
* @param $attribute
|
||||||
*/
|
*/
|
||||||
public function testSanitizeDN($attribute) {
|
public function testSanitizeDN($attribute) {
|
||||||
list($lw, $con, $um, $helper) = $this->getConnectorAndLdapMock();
|
[$lw, $con, $um, $helper] = $this->getConnectorAndLdapMock();
|
||||||
/** @var IConfig|\PHPUnit\Framework\MockObject\MockObject $config */
|
/** @var IConfig|\PHPUnit\Framework\MockObject\MockObject $config */
|
||||||
$config = $this->createMock(IConfig::class);
|
$config = $this->createMock(IConfig::class);
|
||||||
|
|
||||||
|
|
|
@ -106,7 +106,7 @@ abstract class AbstractMappingTest extends \Test\TestCase {
|
||||||
* Hint: successful mapping is tested inherently with mapEntries().
|
* Hint: successful mapping is tested inherently with mapEntries().
|
||||||
*/
|
*/
|
||||||
public function testMap() {
|
public function testMap() {
|
||||||
list($mapper, $data) = $this->initTest();
|
[$mapper, $data] = $this->initTest();
|
||||||
|
|
||||||
// test that mapping will not happen when it shall not
|
// test that mapping will not happen when it shall not
|
||||||
$tooLongDN = 'uid=joann,ou=Secret Small Specialized Department,ou=Some Tremendously Important Department,ou=Another Very Important Department,ou=Pretty Meaningful Derpartment,ou=Quite Broad And General Department,ou=The Topmost Department,dc=hugelysuccessfulcompany,dc=com';
|
$tooLongDN = 'uid=joann,ou=Secret Small Specialized Department,ou=Some Tremendously Important Department,ou=Another Very Important Department,ou=Pretty Meaningful Derpartment,ou=Quite Broad And General Department,ou=The Topmost Department,dc=hugelysuccessfulcompany,dc=com';
|
||||||
|
@ -126,7 +126,7 @@ abstract class AbstractMappingTest extends \Test\TestCase {
|
||||||
* mapping entries
|
* mapping entries
|
||||||
*/
|
*/
|
||||||
public function testUnmap() {
|
public function testUnmap() {
|
||||||
list($mapper, $data) = $this->initTest();
|
[$mapper, $data] = $this->initTest();
|
||||||
|
|
||||||
foreach ($data as $entry) {
|
foreach ($data as $entry) {
|
||||||
$result = $mapper->unmap($entry['name']);
|
$result = $mapper->unmap($entry['name']);
|
||||||
|
@ -142,7 +142,7 @@ abstract class AbstractMappingTest extends \Test\TestCase {
|
||||||
* and unsuccessful requests.
|
* and unsuccessful requests.
|
||||||
*/
|
*/
|
||||||
public function testGetMethods() {
|
public function testGetMethods() {
|
||||||
list($mapper, $data) = $this->initTest();
|
[$mapper, $data] = $this->initTest();
|
||||||
|
|
||||||
foreach ($data as $entry) {
|
foreach ($data as $entry) {
|
||||||
$fdn = $mapper->getDNByName($entry['name']);
|
$fdn = $mapper->getDNByName($entry['name']);
|
||||||
|
@ -170,7 +170,7 @@ abstract class AbstractMappingTest extends \Test\TestCase {
|
||||||
* tests getNamesBySearch() for successful and unsuccessful requests.
|
* tests getNamesBySearch() for successful and unsuccessful requests.
|
||||||
*/
|
*/
|
||||||
public function testSearch() {
|
public function testSearch() {
|
||||||
list($mapper,) = $this->initTest();
|
[$mapper,] = $this->initTest();
|
||||||
|
|
||||||
$names = $mapper->getNamesBySearch('oo', '%', '%');
|
$names = $mapper->getNamesBySearch('oo', '%', '%');
|
||||||
$this->assertTrue(is_array($names));
|
$this->assertTrue(is_array($names));
|
||||||
|
@ -186,7 +186,7 @@ abstract class AbstractMappingTest extends \Test\TestCase {
|
||||||
* tests setDNbyUUID() for successful and unsuccessful update.
|
* tests setDNbyUUID() for successful and unsuccessful update.
|
||||||
*/
|
*/
|
||||||
public function testSetDNMethod() {
|
public function testSetDNMethod() {
|
||||||
list($mapper, $data) = $this->initTest();
|
[$mapper, $data] = $this->initTest();
|
||||||
|
|
||||||
$newDN = 'uid=modified,dc=example,dc=org';
|
$newDN = 'uid=modified,dc=example,dc=org';
|
||||||
$done = $mapper->setDNbyUUID($newDN, $data[0]['uuid']);
|
$done = $mapper->setDNbyUUID($newDN, $data[0]['uuid']);
|
||||||
|
@ -206,7 +206,7 @@ abstract class AbstractMappingTest extends \Test\TestCase {
|
||||||
*/
|
*/
|
||||||
public function testSetUUIDMethod() {
|
public function testSetUUIDMethod() {
|
||||||
/** @var AbstractMapping $mapper */
|
/** @var AbstractMapping $mapper */
|
||||||
list($mapper, $data) = $this->initTest();
|
[$mapper, $data] = $this->initTest();
|
||||||
|
|
||||||
$newUUID = 'ABC737-DEF754';
|
$newUUID = 'ABC737-DEF754';
|
||||||
|
|
||||||
|
@ -225,7 +225,7 @@ abstract class AbstractMappingTest extends \Test\TestCase {
|
||||||
* tests clear() for successful update.
|
* tests clear() for successful update.
|
||||||
*/
|
*/
|
||||||
public function testClear() {
|
public function testClear() {
|
||||||
list($mapper, $data) = $this->initTest();
|
[$mapper, $data] = $this->initTest();
|
||||||
|
|
||||||
$done = $mapper->clear();
|
$done = $mapper->clear();
|
||||||
$this->assertTrue($done);
|
$this->assertTrue($done);
|
||||||
|
@ -239,7 +239,7 @@ abstract class AbstractMappingTest extends \Test\TestCase {
|
||||||
* tests clear() for successful update.
|
* tests clear() for successful update.
|
||||||
*/
|
*/
|
||||||
public function testClearCb() {
|
public function testClearCb() {
|
||||||
list($mapper, $data) = $this->initTest();
|
[$mapper, $data] = $this->initTest();
|
||||||
|
|
||||||
$callbackCalls = 0;
|
$callbackCalls = 0;
|
||||||
$test = $this;
|
$test = $this;
|
||||||
|
@ -262,7 +262,7 @@ abstract class AbstractMappingTest extends \Test\TestCase {
|
||||||
* tests getList() method
|
* tests getList() method
|
||||||
*/
|
*/
|
||||||
public function testList() {
|
public function testList() {
|
||||||
list($mapper, $data) = $this->initTest();
|
[$mapper, $data] = $this->initTest();
|
||||||
|
|
||||||
// get all entries without specifying offset or limit
|
// get all entries without specifying offset or limit
|
||||||
$results = $mapper->getList();
|
$results = $mapper->getList();
|
||||||
|
@ -284,7 +284,7 @@ abstract class AbstractMappingTest extends \Test\TestCase {
|
||||||
|
|
||||||
public function testGetListOfIdsByDn() {
|
public function testGetListOfIdsByDn() {
|
||||||
/** @var AbstractMapping $mapper */
|
/** @var AbstractMapping $mapper */
|
||||||
list($mapper,) = $this->initTest();
|
[$mapper,] = $this->initTest();
|
||||||
|
|
||||||
$listOfDNs = [];
|
$listOfDNs = [];
|
||||||
for ($i = 0; $i < 66640; $i++) {
|
for ($i = 0; $i < 66640; $i++) {
|
||||||
|
|
|
@ -98,7 +98,7 @@ class WizardTest extends TestCase {
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testCumulativeSearchOnAttributeLimited() {
|
public function testCumulativeSearchOnAttributeLimited() {
|
||||||
list($wizard, $configuration, $ldap) = $this->getWizardAndMocks();
|
[$wizard, $configuration, $ldap] = $this->getWizardAndMocks();
|
||||||
|
|
||||||
$configuration->expects($this->any())
|
$configuration->expects($this->any())
|
||||||
->method('__get')
|
->method('__get')
|
||||||
|
@ -158,7 +158,7 @@ class WizardTest extends TestCase {
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testCumulativeSearchOnAttributeUnlimited() {
|
public function testCumulativeSearchOnAttributeUnlimited() {
|
||||||
list($wizard, $configuration, $ldap) = $this->getWizardAndMocks();
|
[$wizard, $configuration, $ldap] = $this->getWizardAndMocks();
|
||||||
|
|
||||||
$configuration->expects($this->any())
|
$configuration->expects($this->any())
|
||||||
->method('__get')
|
->method('__get')
|
||||||
|
@ -234,7 +234,7 @@ class WizardTest extends TestCase {
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testDetectEmailAttributeAlreadySet() {
|
public function testDetectEmailAttributeAlreadySet() {
|
||||||
list($wizard, $configuration, $ldap, $access)
|
[$wizard, $configuration, $ldap, $access]
|
||||||
= $this->getWizardAndMocks();
|
= $this->getWizardAndMocks();
|
||||||
|
|
||||||
$configuration->expects($this->any())
|
$configuration->expects($this->any())
|
||||||
|
@ -256,7 +256,7 @@ class WizardTest extends TestCase {
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testDetectEmailAttributeOverrideSet() {
|
public function testDetectEmailAttributeOverrideSet() {
|
||||||
list($wizard, $configuration, $ldap, $access)
|
[$wizard, $configuration, $ldap, $access]
|
||||||
= $this->getWizardAndMocks();
|
= $this->getWizardAndMocks();
|
||||||
|
|
||||||
$configuration->expects($this->any())
|
$configuration->expects($this->any())
|
||||||
|
@ -295,7 +295,7 @@ class WizardTest extends TestCase {
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testDetectEmailAttributeFind() {
|
public function testDetectEmailAttributeFind() {
|
||||||
list($wizard, $configuration, $ldap, $access)
|
[$wizard, $configuration, $ldap, $access]
|
||||||
= $this->getWizardAndMocks();
|
= $this->getWizardAndMocks();
|
||||||
|
|
||||||
$configuration->expects($this->any())
|
$configuration->expects($this->any())
|
||||||
|
@ -334,7 +334,7 @@ class WizardTest extends TestCase {
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testDetectEmailAttributeFindNothing() {
|
public function testDetectEmailAttributeFindNothing() {
|
||||||
list($wizard, $configuration, $ldap, $access)
|
[$wizard, $configuration, $ldap, $access]
|
||||||
= $this->getWizardAndMocks();
|
= $this->getWizardAndMocks();
|
||||||
|
|
||||||
$configuration->expects($this->any())
|
$configuration->expects($this->any())
|
||||||
|
@ -374,7 +374,7 @@ class WizardTest extends TestCase {
|
||||||
public function testCumulativeSearchOnAttributeSkipReadDN() {
|
public function testCumulativeSearchOnAttributeSkipReadDN() {
|
||||||
// tests that there is no infinite loop, when skipping already processed
|
// tests that there is no infinite loop, when skipping already processed
|
||||||
// DNs (they can be returned multiple times for multiple filters )
|
// DNs (they can be returned multiple times for multiple filters )
|
||||||
list($wizard, $configuration, $ldap) = $this->getWizardAndMocks();
|
[$wizard, $configuration, $ldap] = $this->getWizardAndMocks();
|
||||||
|
|
||||||
$configuration->expects($this->any())
|
$configuration->expects($this->any())
|
||||||
->method('__get')
|
->method('__get')
|
||||||
|
|
|
@ -79,8 +79,8 @@ class RequestTime implements ICheck {
|
||||||
* @return int
|
* @return int
|
||||||
*/
|
*/
|
||||||
protected function getTimestamp($currentTimestamp, $value) {
|
protected function getTimestamp($currentTimestamp, $value) {
|
||||||
list($time1, $timezone1) = explode(' ', $value);
|
[$time1, $timezone1] = explode(' ', $value);
|
||||||
list($hour1, $minute1) = explode(':', $time1);
|
[$hour1, $minute1] = explode(':', $time1);
|
||||||
$date1 = new \DateTime('now', new \DateTimeZone($timezone1));
|
$date1 = new \DateTime('now', new \DateTimeZone($timezone1));
|
||||||
$date1->setTimestamp($currentTimestamp);
|
$date1->setTimestamp($currentTimestamp);
|
||||||
$date1->setTime($hour1, $minute1);
|
$date1->setTime($hour1, $minute1);
|
||||||
|
|
|
@ -231,7 +231,7 @@ class RuleMatcher implements IRuleMatcher {
|
||||||
$checkInstance->setFileInfo($this->fileInfo['storage'], $this->fileInfo['path'], $this->fileInfo['isDir']);
|
$checkInstance->setFileInfo($this->fileInfo['storage'], $this->fileInfo['path'], $this->fileInfo['isDir']);
|
||||||
} elseif ($checkInstance instanceof IEntityCheck) {
|
} elseif ($checkInstance instanceof IEntityCheck) {
|
||||||
foreach ($this->contexts as $entityInfo) {
|
foreach ($this->contexts as $entityInfo) {
|
||||||
list($entity, $subject) = $entityInfo;
|
[$entity, $subject] = $entityInfo;
|
||||||
$checkInstance->setEntitySubject($entity, $subject);
|
$checkInstance->setEntitySubject($entity, $subject);
|
||||||
}
|
}
|
||||||
} elseif (!$checkInstance instanceof ICheck) {
|
} elseif (!$checkInstance instanceof ICheck) {
|
||||||
|
|
|
@ -173,7 +173,7 @@ trait Avatar {
|
||||||
* @param string size
|
* @param string size
|
||||||
*/
|
*/
|
||||||
public function lastAvatarIsASquareOfSize(string $size) {
|
public function lastAvatarIsASquareOfSize(string $size) {
|
||||||
list($width, $height) = getimagesizefromstring($this->lastAvatar);
|
[$width, $height] = getimagesizefromstring($this->lastAvatar);
|
||||||
|
|
||||||
Assert::assertEquals($width, $height, 'Avatar is not a square');
|
Assert::assertEquals($width, $height, 'Avatar is not a square');
|
||||||
Assert::assertEquals($size, $width);
|
Assert::assertEquals($size, $width);
|
||||||
|
|
|
@ -356,7 +356,7 @@ With help from many libraries and frameworks including:
|
||||||
if (strpos($entry, '> ') === false) {
|
if (strpos($entry, '> ') === false) {
|
||||||
$this->mailMap[$entry] = $entry;
|
$this->mailMap[$entry] = $entry;
|
||||||
} else {
|
} else {
|
||||||
list($use, $actual) = explode('> ', $entry);
|
[$use, $actual] = explode('> ', $entry);
|
||||||
$this->mailMap[$actual] = $use . '>';
|
$this->mailMap[$actual] = $use . '>';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,7 +40,7 @@ class AppFrameworkTainter implements AfterFunctionLikeAnalysisInterface {
|
||||||
if ($stmt->isPublic() && !$stmt->isMagic()) {
|
if ($stmt->isPublic() && !$stmt->isMagic()) {
|
||||||
foreach ($stmt->params as $i => $param) {
|
foreach ($stmt->params as $i => $param) {
|
||||||
$expr_type = new Psalm\Type\Union([new Psalm\Type\Atomic\TString()]);
|
$expr_type = new Psalm\Type\Union([new Psalm\Type\Atomic\TString()]);
|
||||||
$expr_identifier = (strtolower($statements_source->getFQCLN()) . '::' . strtolower($classlike_storage->cased_name) . '#' . ($i+1));
|
$expr_identifier = (strtolower($statements_source->getFQCLN()) . '::' . strtolower($classlike_storage->cased_name) . '#' . ($i + 1));
|
||||||
|
|
||||||
if ($expr_type) {
|
if ($expr_type) {
|
||||||
$codebase->addTaintSource(
|
$codebase->addTaintSource(
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
"ext-xmlreader": "*"
|
"ext-xmlreader": "*"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"nextcloud/coding-standard": "^0.3.0",
|
"nextcloud/coding-standard": "^0.5.0",
|
||||||
"vimeo/psalm": "^4.0"
|
"vimeo/psalm": "^4.0"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||||
"This file is @generated automatically"
|
"This file is @generated automatically"
|
||||||
],
|
],
|
||||||
"content-hash": "dad26d14cb2d2c73421ba7ce9567cbff",
|
"content-hash": "4970547e139d7ea77cd8b6d38c729084",
|
||||||
"packages": [],
|
"packages": [],
|
||||||
"packages-dev": [
|
"packages-dev": [
|
||||||
{
|
{
|
||||||
|
@ -228,28 +228,29 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "composer/semver",
|
"name": "composer/semver",
|
||||||
"version": "1.7.1",
|
"version": "3.2.4",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/composer/semver.git",
|
"url": "https://github.com/composer/semver.git",
|
||||||
"reference": "38276325bd896f90dfcfe30029aa5db40df387a7"
|
"reference": "a02fdf930a3c1c3ed3a49b5f63859c0c20e10464"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/composer/semver/zipball/38276325bd896f90dfcfe30029aa5db40df387a7",
|
"url": "https://api.github.com/repos/composer/semver/zipball/a02fdf930a3c1c3ed3a49b5f63859c0c20e10464",
|
||||||
"reference": "38276325bd896f90dfcfe30029aa5db40df387a7",
|
"reference": "a02fdf930a3c1c3ed3a49b5f63859c0c20e10464",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": "^5.3.2 || ^7.0"
|
"php": "^5.3.2 || ^7.0 || ^8.0"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"phpunit/phpunit": "^4.5 || ^5.0.5"
|
"phpstan/phpstan": "^0.12.54",
|
||||||
|
"symfony/phpunit-bridge": "^4.2 || ^5"
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-master": "1.x-dev"
|
"dev-main": "3.x-dev"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
|
@ -299,7 +300,7 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2020-09-27T13:13:07+00:00"
|
"time": "2020-11-13T08:59:24+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "composer/xdebug-handler",
|
"name": "composer/xdebug-handler",
|
||||||
|
@ -394,16 +395,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "doctrine/annotations",
|
"name": "doctrine/annotations",
|
||||||
"version": "1.10.3",
|
"version": "1.11.1",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/doctrine/annotations.git",
|
"url": "https://github.com/doctrine/annotations.git",
|
||||||
"reference": "5db60a4969eba0e0c197a19c077780aadbc43c5d"
|
"reference": "ce77a7ba1770462cd705a91a151b6c3746f9c6ad"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/doctrine/annotations/zipball/5db60a4969eba0e0c197a19c077780aadbc43c5d",
|
"url": "https://api.github.com/repos/doctrine/annotations/zipball/ce77a7ba1770462cd705a91a151b6c3746f9c6ad",
|
||||||
"reference": "5db60a4969eba0e0c197a19c077780aadbc43c5d",
|
"reference": "ce77a7ba1770462cd705a91a151b6c3746f9c6ad",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -413,12 +414,14 @@
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"doctrine/cache": "1.*",
|
"doctrine/cache": "1.*",
|
||||||
"phpunit/phpunit": "^7.5"
|
"doctrine/coding-standard": "^6.0 || ^8.1",
|
||||||
|
"phpstan/phpstan": "^0.12.20",
|
||||||
|
"phpunit/phpunit": "^7.5 || ^9.1.5"
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-master": "1.9.x-dev"
|
"dev-master": "1.11.x-dev"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
|
@ -453,13 +456,13 @@
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"description": "Docblock Annotations Parser",
|
"description": "Docblock Annotations Parser",
|
||||||
"homepage": "http://www.doctrine-project.org",
|
"homepage": "https://www.doctrine-project.org/projects/annotations.html",
|
||||||
"keywords": [
|
"keywords": [
|
||||||
"annotations",
|
"annotations",
|
||||||
"docblock",
|
"docblock",
|
||||||
"parser"
|
"parser"
|
||||||
],
|
],
|
||||||
"time": "2020-05-25T17:24:27+00:00"
|
"time": "2020-10-26T10:28:16+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "doctrine/lexer",
|
"name": "doctrine/lexer",
|
||||||
|
@ -632,27 +635,27 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "friendsofphp/php-cs-fixer",
|
"name": "friendsofphp/php-cs-fixer",
|
||||||
"version": "v2.16.3",
|
"version": "v2.18.2",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
|
"url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
|
||||||
"reference": "83baf823a33a1cbd5416c8626935cf3f843c10b0"
|
"reference": "18f8c9d184ba777380794a389fabc179896ba913"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/83baf823a33a1cbd5416c8626935cf3f843c10b0",
|
"url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/18f8c9d184ba777380794a389fabc179896ba913",
|
||||||
"reference": "83baf823a33a1cbd5416c8626935cf3f843c10b0",
|
"reference": "18f8c9d184ba777380794a389fabc179896ba913",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"composer/semver": "^1.4",
|
"composer/semver": "^1.4 || ^2.0 || ^3.0",
|
||||||
"composer/xdebug-handler": "^1.2",
|
"composer/xdebug-handler": "^1.2",
|
||||||
"doctrine/annotations": "^1.2",
|
"doctrine/annotations": "^1.2",
|
||||||
"ext-json": "*",
|
"ext-json": "*",
|
||||||
"ext-tokenizer": "*",
|
"ext-tokenizer": "*",
|
||||||
"php": "^5.6 || ^7.0",
|
"php": "^5.6 || ^7.0 || ^8.0",
|
||||||
"php-cs-fixer/diff": "^1.3",
|
"php-cs-fixer/diff": "^1.3",
|
||||||
"symfony/console": "^3.4.17 || ^4.1.6 || ^5.0",
|
"symfony/console": "^3.4.43 || ^4.1.6 || ^5.0",
|
||||||
"symfony/event-dispatcher": "^3.0 || ^4.0 || ^5.0",
|
"symfony/event-dispatcher": "^3.0 || ^4.0 || ^5.0",
|
||||||
"symfony/filesystem": "^3.0 || ^4.0 || ^5.0",
|
"symfony/filesystem": "^3.0 || ^4.0 || ^5.0",
|
||||||
"symfony/finder": "^3.0 || ^4.0 || ^5.0",
|
"symfony/finder": "^3.0 || ^4.0 || ^5.0",
|
||||||
|
@ -663,22 +666,24 @@
|
||||||
"symfony/stopwatch": "^3.0 || ^4.0 || ^5.0"
|
"symfony/stopwatch": "^3.0 || ^4.0 || ^5.0"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"johnkary/phpunit-speedtrap": "^1.1 || ^2.0 || ^3.0",
|
|
||||||
"justinrainbow/json-schema": "^5.0",
|
"justinrainbow/json-schema": "^5.0",
|
||||||
"keradus/cli-executor": "^1.2",
|
"keradus/cli-executor": "^1.4",
|
||||||
"mikey179/vfsstream": "^1.6",
|
"mikey179/vfsstream": "^1.6",
|
||||||
"php-coveralls/php-coveralls": "^2.1",
|
"php-coveralls/php-coveralls": "^2.4.2",
|
||||||
"php-cs-fixer/accessible-object": "^1.0",
|
"php-cs-fixer/accessible-object": "^1.0",
|
||||||
"php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.1",
|
"php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2",
|
||||||
"php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.1",
|
"php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1",
|
||||||
"phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.1",
|
"phpspec/prophecy-phpunit": "^1.1 || ^2.0",
|
||||||
"phpunitgoodpractices/traits": "^1.8",
|
"phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.13 || ^9.5",
|
||||||
"symfony/phpunit-bridge": "^4.3 || ^5.0",
|
"phpunitgoodpractices/polyfill": "^1.5",
|
||||||
|
"phpunitgoodpractices/traits": "^1.9.1",
|
||||||
|
"sanmai/phpunit-legacy-adapter": "^6.4 || ^8.2.1",
|
||||||
|
"symfony/phpunit-bridge": "^5.2.1",
|
||||||
"symfony/yaml": "^3.0 || ^4.0 || ^5.0"
|
"symfony/yaml": "^3.0 || ^4.0 || ^5.0"
|
||||||
},
|
},
|
||||||
"suggest": {
|
"suggest": {
|
||||||
"ext-dom": "For handling output formats in XML",
|
"ext-dom": "For handling output formats in XML",
|
||||||
"ext-mbstring": "For handling non-UTF8 characters in cache signature.",
|
"ext-mbstring": "For handling non-UTF8 characters.",
|
||||||
"php-cs-fixer/phpunit-constraint-isidenticalstring": "For IsIdenticalString constraint.",
|
"php-cs-fixer/phpunit-constraint-isidenticalstring": "For IsIdenticalString constraint.",
|
||||||
"php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "For XmlMatchesXsd constraint.",
|
"php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "For XmlMatchesXsd constraint.",
|
||||||
"symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible."
|
"symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible."
|
||||||
|
@ -719,13 +724,17 @@
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"description": "A tool to automatically fix PHP code style",
|
"description": "A tool to automatically fix PHP code style",
|
||||||
|
"support": {
|
||||||
|
"issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues",
|
||||||
|
"source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v2.18.2"
|
||||||
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
"url": "https://github.com/keradus",
|
"url": "https://github.com/keradus",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2020-04-15T18:51:10+00:00"
|
"time": "2021-01-26T00:22:21+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "netresearch/jsonmapper",
|
"name": "netresearch/jsonmapper",
|
||||||
|
@ -775,21 +784,21 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "nextcloud/coding-standard",
|
"name": "nextcloud/coding-standard",
|
||||||
"version": "v0.3.0",
|
"version": "v0.5.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/nextcloud/coding-standard.git",
|
"url": "https://github.com/nextcloud/coding-standard.git",
|
||||||
"reference": "4f5cd012760f8293e19e602651a0ecaa265e4db9"
|
"reference": "742ed895ae76c10daf95e08488cfb3f554199f40"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/nextcloud/coding-standard/zipball/4f5cd012760f8293e19e602651a0ecaa265e4db9",
|
"url": "https://api.github.com/repos/nextcloud/coding-standard/zipball/742ed895ae76c10daf95e08488cfb3f554199f40",
|
||||||
"reference": "4f5cd012760f8293e19e602651a0ecaa265e4db9",
|
"reference": "742ed895ae76c10daf95e08488cfb3f554199f40",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"friendsofphp/php-cs-fixer": "^2.16",
|
"friendsofphp/php-cs-fixer": "^2.17",
|
||||||
"php": "^7.2"
|
"php": "^7.2|^8.0"
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"autoload": {
|
"autoload": {
|
||||||
|
@ -808,7 +817,7 @@
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"description": "Nextcloud coding standards for the php cs fixer",
|
"description": "Nextcloud coding standards for the php cs fixer",
|
||||||
"time": "2020-04-10T14:57:18+00:00"
|
"time": "2021-01-11T14:15:58+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "nikic/php-parser",
|
"name": "nikic/php-parser",
|
||||||
|
@ -911,70 +920,25 @@
|
||||||
],
|
],
|
||||||
"time": "2019-03-29T20:06:56+00:00"
|
"time": "2019-03-29T20:06:56+00:00"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "paragonie/random_compat",
|
|
||||||
"version": "v9.99.99",
|
|
||||||
"source": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://github.com/paragonie/random_compat.git",
|
|
||||||
"reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95"
|
|
||||||
},
|
|
||||||
"dist": {
|
|
||||||
"type": "zip",
|
|
||||||
"url": "https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
|
|
||||||
"reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
|
|
||||||
"shasum": ""
|
|
||||||
},
|
|
||||||
"require": {
|
|
||||||
"php": "^7"
|
|
||||||
},
|
|
||||||
"require-dev": {
|
|
||||||
"phpunit/phpunit": "4.*|5.*",
|
|
||||||
"vimeo/psalm": "^1"
|
|
||||||
},
|
|
||||||
"suggest": {
|
|
||||||
"ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
|
|
||||||
},
|
|
||||||
"type": "library",
|
|
||||||
"notification-url": "https://packagist.org/downloads/",
|
|
||||||
"license": [
|
|
||||||
"MIT"
|
|
||||||
],
|
|
||||||
"authors": [
|
|
||||||
{
|
|
||||||
"name": "Paragon Initiative Enterprises",
|
|
||||||
"email": "security@paragonie.com",
|
|
||||||
"homepage": "https://paragonie.com"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
|
|
||||||
"keywords": [
|
|
||||||
"csprng",
|
|
||||||
"polyfill",
|
|
||||||
"pseudorandom",
|
|
||||||
"random"
|
|
||||||
],
|
|
||||||
"time": "2018-07-02T15:55:56+00:00"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "php-cs-fixer/diff",
|
"name": "php-cs-fixer/diff",
|
||||||
"version": "v1.3.0",
|
"version": "v1.3.1",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/PHP-CS-Fixer/diff.git",
|
"url": "https://github.com/PHP-CS-Fixer/diff.git",
|
||||||
"reference": "78bb099e9c16361126c86ce82ec4405ebab8e756"
|
"reference": "dbd31aeb251639ac0b9e7e29405c1441907f5759"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/78bb099e9c16361126c86ce82ec4405ebab8e756",
|
"url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/dbd31aeb251639ac0b9e7e29405c1441907f5759",
|
||||||
"reference": "78bb099e9c16361126c86ce82ec4405ebab8e756",
|
"reference": "dbd31aeb251639ac0b9e7e29405c1441907f5759",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": "^5.6 || ^7.0"
|
"php": "^5.6 || ^7.0 || ^8.0"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"phpunit/phpunit": "^5.7.23 || ^6.4.3",
|
"phpunit/phpunit": "^5.7.23 || ^6.4.3 || ^7.0",
|
||||||
"symfony/process": "^3.3"
|
"symfony/process": "^3.3"
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
|
@ -988,14 +952,14 @@
|
||||||
"BSD-3-Clause"
|
"BSD-3-Clause"
|
||||||
],
|
],
|
||||||
"authors": [
|
"authors": [
|
||||||
{
|
|
||||||
"name": "Kore Nordmann",
|
|
||||||
"email": "mail@kore-nordmann.de"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "Sebastian Bergmann",
|
"name": "Sebastian Bergmann",
|
||||||
"email": "sebastian@phpunit.de"
|
"email": "sebastian@phpunit.de"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "Kore Nordmann",
|
||||||
|
"email": "mail@kore-nordmann.de"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "SpacePossum"
|
"name": "SpacePossum"
|
||||||
}
|
}
|
||||||
|
@ -1005,7 +969,7 @@
|
||||||
"keywords": [
|
"keywords": [
|
||||||
"diff"
|
"diff"
|
||||||
],
|
],
|
||||||
"time": "2018-02-15T16:58:55+00:00"
|
"time": "2020-10-14T08:39:05+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpdocumentor/reflection-common",
|
"name": "phpdocumentor/reflection-common",
|
||||||
|
@ -1359,16 +1323,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/console",
|
"name": "symfony/console",
|
||||||
"version": "v5.1.8",
|
"version": "v5.2.1",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/console.git",
|
"url": "https://github.com/symfony/console.git",
|
||||||
"reference": "e0b2c29c0fa6a69089209bbe8fcff4df2a313d0e"
|
"reference": "47c02526c532fb381374dab26df05e7313978976"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/console/zipball/e0b2c29c0fa6a69089209bbe8fcff4df2a313d0e",
|
"url": "https://api.github.com/repos/symfony/console/zipball/47c02526c532fb381374dab26df05e7313978976",
|
||||||
"reference": "e0b2c29c0fa6a69089209bbe8fcff4df2a313d0e",
|
"reference": "47c02526c532fb381374dab26df05e7313978976",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -1429,6 +1393,12 @@
|
||||||
],
|
],
|
||||||
"description": "Symfony Console Component",
|
"description": "Symfony Console Component",
|
||||||
"homepage": "https://symfony.com",
|
"homepage": "https://symfony.com",
|
||||||
|
"keywords": [
|
||||||
|
"cli",
|
||||||
|
"command line",
|
||||||
|
"console",
|
||||||
|
"terminal"
|
||||||
|
],
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
"url": "https://symfony.com/sponsor",
|
"url": "https://symfony.com/sponsor",
|
||||||
|
@ -1443,20 +1413,20 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2020-10-24T12:01:57+00:00"
|
"time": "2020-12-18T08:03:05+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/deprecation-contracts",
|
"name": "symfony/deprecation-contracts",
|
||||||
"version": "v2.1.2",
|
"version": "v2.2.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/deprecation-contracts.git",
|
"url": "https://github.com/symfony/deprecation-contracts.git",
|
||||||
"reference": "dd99cb3a0aff6cadd2a8d7d7ed72c2161e218337"
|
"reference": "5fa56b4074d1ae755beb55617ddafe6f5d78f665"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/dd99cb3a0aff6cadd2a8d7d7ed72c2161e218337",
|
"url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5fa56b4074d1ae755beb55617ddafe6f5d78f665",
|
||||||
"reference": "dd99cb3a0aff6cadd2a8d7d7ed72c2161e218337",
|
"reference": "5fa56b4074d1ae755beb55617ddafe6f5d78f665",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -1465,7 +1435,11 @@
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-master": "2.1-dev"
|
"dev-master": "2.2-dev"
|
||||||
|
},
|
||||||
|
"thanks": {
|
||||||
|
"name": "symfony/contracts",
|
||||||
|
"url": "https://github.com/symfony/contracts"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
|
@ -1503,20 +1477,20 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2020-05-27T08:34:37+00:00"
|
"time": "2020-09-07T11:33:47+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/event-dispatcher",
|
"name": "symfony/event-dispatcher",
|
||||||
"version": "v5.1.2",
|
"version": "v5.2.1",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/event-dispatcher.git",
|
"url": "https://github.com/symfony/event-dispatcher.git",
|
||||||
"reference": "cc0d059e2e997e79ca34125a52f3e33de4424ac7"
|
"reference": "1c93f7a1dff592c252574c79a8635a8a80856042"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/cc0d059e2e997e79ca34125a52f3e33de4424ac7",
|
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/1c93f7a1dff592c252574c79a8635a8a80856042",
|
||||||
"reference": "cc0d059e2e997e79ca34125a52f3e33de4424ac7",
|
"reference": "1c93f7a1dff592c252574c79a8635a8a80856042",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -1536,6 +1510,7 @@
|
||||||
"psr/log": "~1.0",
|
"psr/log": "~1.0",
|
||||||
"symfony/config": "^4.4|^5.0",
|
"symfony/config": "^4.4|^5.0",
|
||||||
"symfony/dependency-injection": "^4.4|^5.0",
|
"symfony/dependency-injection": "^4.4|^5.0",
|
||||||
|
"symfony/error-handler": "^4.4|^5.0",
|
||||||
"symfony/expression-language": "^4.4|^5.0",
|
"symfony/expression-language": "^4.4|^5.0",
|
||||||
"symfony/http-foundation": "^4.4|^5.0",
|
"symfony/http-foundation": "^4.4|^5.0",
|
||||||
"symfony/service-contracts": "^1.1|^2",
|
"symfony/service-contracts": "^1.1|^2",
|
||||||
|
@ -1546,11 +1521,6 @@
|
||||||
"symfony/http-kernel": ""
|
"symfony/http-kernel": ""
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
|
||||||
"branch-alias": {
|
|
||||||
"dev-master": "5.1-dev"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"autoload": {
|
"autoload": {
|
||||||
"psr-4": {
|
"psr-4": {
|
||||||
"Symfony\\Component\\EventDispatcher\\": ""
|
"Symfony\\Component\\EventDispatcher\\": ""
|
||||||
|
@ -1589,20 +1559,20 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2020-05-20T17:43:50+00:00"
|
"time": "2020-12-18T08:03:05+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/event-dispatcher-contracts",
|
"name": "symfony/event-dispatcher-contracts",
|
||||||
"version": "v2.1.2",
|
"version": "v2.2.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/event-dispatcher-contracts.git",
|
"url": "https://github.com/symfony/event-dispatcher-contracts.git",
|
||||||
"reference": "405952c4e90941a17e52ef7489a2bd94870bb290"
|
"reference": "0ba7d54483095a198fa51781bc608d17e84dffa2"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/405952c4e90941a17e52ef7489a2bd94870bb290",
|
"url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/0ba7d54483095a198fa51781bc608d17e84dffa2",
|
||||||
"reference": "405952c4e90941a17e52ef7489a2bd94870bb290",
|
"reference": "0ba7d54483095a198fa51781bc608d17e84dffa2",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -1615,7 +1585,11 @@
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-master": "2.1-dev"
|
"dev-master": "2.2-dev"
|
||||||
|
},
|
||||||
|
"thanks": {
|
||||||
|
"name": "symfony/contracts",
|
||||||
|
"url": "https://github.com/symfony/contracts"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
|
@ -1661,20 +1635,20 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2020-05-20T17:43:50+00:00"
|
"time": "2020-09-07T11:33:47+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/filesystem",
|
"name": "symfony/filesystem",
|
||||||
"version": "v5.1.2",
|
"version": "v5.2.1",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/filesystem.git",
|
"url": "https://github.com/symfony/filesystem.git",
|
||||||
"reference": "6e4320f06d5f2cce0d96530162491f4465179157"
|
"reference": "fa8f8cab6b65e2d99a118e082935344c5ba8c60d"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/filesystem/zipball/6e4320f06d5f2cce0d96530162491f4465179157",
|
"url": "https://api.github.com/repos/symfony/filesystem/zipball/fa8f8cab6b65e2d99a118e082935344c5ba8c60d",
|
||||||
"reference": "6e4320f06d5f2cce0d96530162491f4465179157",
|
"reference": "fa8f8cab6b65e2d99a118e082935344c5ba8c60d",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -1682,11 +1656,6 @@
|
||||||
"symfony/polyfill-ctype": "~1.8"
|
"symfony/polyfill-ctype": "~1.8"
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
|
||||||
"branch-alias": {
|
|
||||||
"dev-master": "5.1-dev"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"autoload": {
|
"autoload": {
|
||||||
"psr-4": {
|
"psr-4": {
|
||||||
"Symfony\\Component\\Filesystem\\": ""
|
"Symfony\\Component\\Filesystem\\": ""
|
||||||
|
@ -1725,31 +1694,26 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2020-05-30T20:35:19+00:00"
|
"time": "2020-11-30T17:05:38+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/finder",
|
"name": "symfony/finder",
|
||||||
"version": "v5.1.2",
|
"version": "v5.2.1",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/finder.git",
|
"url": "https://github.com/symfony/finder.git",
|
||||||
"reference": "4298870062bfc667cb78d2b379be4bf5dec5f187"
|
"reference": "0b9231a5922fd7287ba5b411893c0ecd2733e5ba"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/finder/zipball/4298870062bfc667cb78d2b379be4bf5dec5f187",
|
"url": "https://api.github.com/repos/symfony/finder/zipball/0b9231a5922fd7287ba5b411893c0ecd2733e5ba",
|
||||||
"reference": "4298870062bfc667cb78d2b379be4bf5dec5f187",
|
"reference": "0b9231a5922fd7287ba5b411893c0ecd2733e5ba",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=7.2.5"
|
"php": ">=7.2.5"
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
|
||||||
"branch-alias": {
|
|
||||||
"dev-master": "5.1-dev"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"autoload": {
|
"autoload": {
|
||||||
"psr-4": {
|
"psr-4": {
|
||||||
"Symfony\\Component\\Finder\\": ""
|
"Symfony\\Component\\Finder\\": ""
|
||||||
|
@ -1788,33 +1752,29 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2020-05-20T17:43:50+00:00"
|
"time": "2020-12-08T17:02:38+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/options-resolver",
|
"name": "symfony/options-resolver",
|
||||||
"version": "v5.1.2",
|
"version": "v5.2.1",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/options-resolver.git",
|
"url": "https://github.com/symfony/options-resolver.git",
|
||||||
"reference": "663f5dd5e14057d1954fe721f9709d35837f2447"
|
"reference": "87a2a4a766244e796dd9cb9d6f58c123358cd986"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/options-resolver/zipball/663f5dd5e14057d1954fe721f9709d35837f2447",
|
"url": "https://api.github.com/repos/symfony/options-resolver/zipball/87a2a4a766244e796dd9cb9d6f58c123358cd986",
|
||||||
"reference": "663f5dd5e14057d1954fe721f9709d35837f2447",
|
"reference": "87a2a4a766244e796dd9cb9d6f58c123358cd986",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=7.2.5",
|
"php": ">=7.2.5",
|
||||||
"symfony/deprecation-contracts": "^2.1",
|
"symfony/deprecation-contracts": "^2.1",
|
||||||
|
"symfony/polyfill-php73": "~1.0",
|
||||||
"symfony/polyfill-php80": "^1.15"
|
"symfony/polyfill-php80": "^1.15"
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
|
||||||
"branch-alias": {
|
|
||||||
"dev-master": "5.1-dev"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"autoload": {
|
"autoload": {
|
||||||
"psr-4": {
|
"psr-4": {
|
||||||
"Symfony\\Component\\OptionsResolver\\": ""
|
"Symfony\\Component\\OptionsResolver\\": ""
|
||||||
|
@ -1858,20 +1818,20 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2020-05-23T13:08:13+00:00"
|
"time": "2020-10-24T12:08:07+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/polyfill-ctype",
|
"name": "symfony/polyfill-ctype",
|
||||||
"version": "v1.20.0",
|
"version": "v1.22.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/polyfill-ctype.git",
|
"url": "https://github.com/symfony/polyfill-ctype.git",
|
||||||
"reference": "f4ba089a5b6366e453971d3aad5fe8e897b37f41"
|
"reference": "c6c942b1ac76c82448322025e084cadc56048b4e"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/f4ba089a5b6366e453971d3aad5fe8e897b37f41",
|
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/c6c942b1ac76c82448322025e084cadc56048b4e",
|
||||||
"reference": "f4ba089a5b6366e453971d3aad5fe8e897b37f41",
|
"reference": "c6c942b1ac76c82448322025e084cadc56048b4e",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -1883,7 +1843,7 @@
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-main": "1.20-dev"
|
"dev-main": "1.22-dev"
|
||||||
},
|
},
|
||||||
"thanks": {
|
"thanks": {
|
||||||
"name": "symfony/polyfill",
|
"name": "symfony/polyfill",
|
||||||
|
@ -1934,20 +1894,20 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2020-10-23T14:02:19+00:00"
|
"time": "2021-01-07T16:49:33+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/polyfill-intl-grapheme",
|
"name": "symfony/polyfill-intl-grapheme",
|
||||||
"version": "v1.20.0",
|
"version": "v1.22.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/polyfill-intl-grapheme.git",
|
"url": "https://github.com/symfony/polyfill-intl-grapheme.git",
|
||||||
"reference": "c7cf3f858ec7d70b89559d6e6eb1f7c2517d479c"
|
"reference": "267a9adeb8ecb8071040a740930e077cdfb987af"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/c7cf3f858ec7d70b89559d6e6eb1f7c2517d479c",
|
"url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/267a9adeb8ecb8071040a740930e077cdfb987af",
|
||||||
"reference": "c7cf3f858ec7d70b89559d6e6eb1f7c2517d479c",
|
"reference": "267a9adeb8ecb8071040a740930e077cdfb987af",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -1959,7 +1919,7 @@
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-main": "1.20-dev"
|
"dev-main": "1.22-dev"
|
||||||
},
|
},
|
||||||
"thanks": {
|
"thanks": {
|
||||||
"name": "symfony/polyfill",
|
"name": "symfony/polyfill",
|
||||||
|
@ -2012,20 +1972,20 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2020-10-23T14:02:19+00:00"
|
"time": "2021-01-07T16:49:33+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/polyfill-intl-normalizer",
|
"name": "symfony/polyfill-intl-normalizer",
|
||||||
"version": "v1.20.0",
|
"version": "v1.22.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/polyfill-intl-normalizer.git",
|
"url": "https://github.com/symfony/polyfill-intl-normalizer.git",
|
||||||
"reference": "727d1096295d807c309fb01a851577302394c897"
|
"reference": "6e971c891537eb617a00bb07a43d182a6915faba"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/727d1096295d807c309fb01a851577302394c897",
|
"url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/6e971c891537eb617a00bb07a43d182a6915faba",
|
||||||
"reference": "727d1096295d807c309fb01a851577302394c897",
|
"reference": "6e971c891537eb617a00bb07a43d182a6915faba",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -2037,7 +1997,7 @@
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-main": "1.20-dev"
|
"dev-main": "1.22-dev"
|
||||||
},
|
},
|
||||||
"thanks": {
|
"thanks": {
|
||||||
"name": "symfony/polyfill",
|
"name": "symfony/polyfill",
|
||||||
|
@ -2093,20 +2053,20 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2020-10-23T14:02:19+00:00"
|
"time": "2021-01-07T17:09:11+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/polyfill-mbstring",
|
"name": "symfony/polyfill-mbstring",
|
||||||
"version": "v1.20.0",
|
"version": "v1.22.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/polyfill-mbstring.git",
|
"url": "https://github.com/symfony/polyfill-mbstring.git",
|
||||||
"reference": "39d483bdf39be819deabf04ec872eb0b2410b531"
|
"reference": "f377a3dd1fde44d37b9831d68dc8dea3ffd28e13"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/39d483bdf39be819deabf04ec872eb0b2410b531",
|
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/f377a3dd1fde44d37b9831d68dc8dea3ffd28e13",
|
||||||
"reference": "39d483bdf39be819deabf04ec872eb0b2410b531",
|
"reference": "f377a3dd1fde44d37b9831d68dc8dea3ffd28e13",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -2118,7 +2078,7 @@
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-main": "1.20-dev"
|
"dev-main": "1.22-dev"
|
||||||
},
|
},
|
||||||
"thanks": {
|
"thanks": {
|
||||||
"name": "symfony/polyfill",
|
"name": "symfony/polyfill",
|
||||||
|
@ -2170,47 +2130,35 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2020-10-23T14:02:19+00:00"
|
"time": "2021-01-07T16:49:33+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/polyfill-php70",
|
"name": "symfony/polyfill-php70",
|
||||||
"version": "v1.17.1",
|
"version": "v1.20.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/polyfill-php70.git",
|
"url": "https://github.com/symfony/polyfill-php70.git",
|
||||||
"reference": "471b096aede7025bace8eb356b9ac801aaba7e2d"
|
"reference": "5f03a781d984aae42cebd18e7912fa80f02ee644"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/471b096aede7025bace8eb356b9ac801aaba7e2d",
|
"url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/5f03a781d984aae42cebd18e7912fa80f02ee644",
|
||||||
"reference": "471b096aede7025bace8eb356b9ac801aaba7e2d",
|
"reference": "5f03a781d984aae42cebd18e7912fa80f02ee644",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"paragonie/random_compat": "~1.0|~2.0|~9.99",
|
"php": ">=7.1"
|
||||||
"php": ">=5.3.3"
|
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "metapackage",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-master": "1.17-dev"
|
"dev-main": "1.20-dev"
|
||||||
},
|
},
|
||||||
"thanks": {
|
"thanks": {
|
||||||
"name": "symfony/polyfill",
|
"name": "symfony/polyfill",
|
||||||
"url": "https://github.com/symfony/polyfill"
|
"url": "https://github.com/symfony/polyfill"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"autoload": {
|
|
||||||
"psr-4": {
|
|
||||||
"Symfony\\Polyfill\\Php70\\": ""
|
|
||||||
},
|
|
||||||
"files": [
|
|
||||||
"bootstrap.php"
|
|
||||||
],
|
|
||||||
"classmap": [
|
|
||||||
"Resources/stubs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"notification-url": "https://packagist.org/downloads/",
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
"license": [
|
"license": [
|
||||||
"MIT"
|
"MIT"
|
||||||
|
@ -2247,29 +2195,33 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2020-06-06T08:46:27+00:00"
|
"time": "2020-10-23T14:02:19+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/polyfill-php72",
|
"name": "symfony/polyfill-php72",
|
||||||
"version": "v1.17.0",
|
"version": "v1.22.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/polyfill-php72.git",
|
"url": "https://github.com/symfony/polyfill-php72.git",
|
||||||
"reference": "f048e612a3905f34931127360bdd2def19a5e582"
|
"reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/f048e612a3905f34931127360bdd2def19a5e582",
|
"url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9",
|
||||||
"reference": "f048e612a3905f34931127360bdd2def19a5e582",
|
"reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=5.3.3"
|
"php": ">=7.1"
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-master": "1.17-dev"
|
"dev-main": "1.22-dev"
|
||||||
|
},
|
||||||
|
"thanks": {
|
||||||
|
"name": "symfony/polyfill",
|
||||||
|
"url": "https://github.com/symfony/polyfill"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
|
@ -2316,20 +2268,20 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2020-05-12T16:47:27+00:00"
|
"time": "2021-01-07T16:49:33+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/polyfill-php73",
|
"name": "symfony/polyfill-php73",
|
||||||
"version": "v1.20.0",
|
"version": "v1.22.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/polyfill-php73.git",
|
"url": "https://github.com/symfony/polyfill-php73.git",
|
||||||
"reference": "8ff431c517be11c78c48a39a66d37431e26a6bed"
|
"reference": "a678b42e92f86eca04b7fa4c0f6f19d097fb69e2"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/8ff431c517be11c78c48a39a66d37431e26a6bed",
|
"url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/a678b42e92f86eca04b7fa4c0f6f19d097fb69e2",
|
||||||
"reference": "8ff431c517be11c78c48a39a66d37431e26a6bed",
|
"reference": "a678b42e92f86eca04b7fa4c0f6f19d097fb69e2",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -2338,7 +2290,7 @@
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-main": "1.20-dev"
|
"dev-main": "1.22-dev"
|
||||||
},
|
},
|
||||||
"thanks": {
|
"thanks": {
|
||||||
"name": "symfony/polyfill",
|
"name": "symfony/polyfill",
|
||||||
|
@ -2392,20 +2344,20 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2020-10-23T14:02:19+00:00"
|
"time": "2021-01-07T16:49:33+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/polyfill-php80",
|
"name": "symfony/polyfill-php80",
|
||||||
"version": "v1.20.0",
|
"version": "v1.22.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/polyfill-php80.git",
|
"url": "https://github.com/symfony/polyfill-php80.git",
|
||||||
"reference": "e70aa8b064c5b72d3df2abd5ab1e90464ad009de"
|
"reference": "dc3063ba22c2a1fd2f45ed856374d79114998f91"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/e70aa8b064c5b72d3df2abd5ab1e90464ad009de",
|
"url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/dc3063ba22c2a1fd2f45ed856374d79114998f91",
|
||||||
"reference": "e70aa8b064c5b72d3df2abd5ab1e90464ad009de",
|
"reference": "dc3063ba22c2a1fd2f45ed856374d79114998f91",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -2414,7 +2366,7 @@
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-main": "1.20-dev"
|
"dev-main": "1.22-dev"
|
||||||
},
|
},
|
||||||
"thanks": {
|
"thanks": {
|
||||||
"name": "symfony/polyfill",
|
"name": "symfony/polyfill",
|
||||||
|
@ -2472,20 +2424,20 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2020-10-23T14:02:19+00:00"
|
"time": "2021-01-07T16:49:33+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/process",
|
"name": "symfony/process",
|
||||||
"version": "v5.1.2",
|
"version": "v5.2.1",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/process.git",
|
"url": "https://github.com/symfony/process.git",
|
||||||
"reference": "7f6378c1fa2147eeb1b4c385856ce9de0d46ebd1"
|
"reference": "bd8815b8b6705298beaa384f04fabd459c10bedd"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/process/zipball/7f6378c1fa2147eeb1b4c385856ce9de0d46ebd1",
|
"url": "https://api.github.com/repos/symfony/process/zipball/bd8815b8b6705298beaa384f04fabd459c10bedd",
|
||||||
"reference": "7f6378c1fa2147eeb1b4c385856ce9de0d46ebd1",
|
"reference": "bd8815b8b6705298beaa384f04fabd459c10bedd",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -2493,11 +2445,6 @@
|
||||||
"symfony/polyfill-php80": "^1.15"
|
"symfony/polyfill-php80": "^1.15"
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
|
||||||
"branch-alias": {
|
|
||||||
"dev-master": "5.1-dev"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"autoload": {
|
"autoload": {
|
||||||
"psr-4": {
|
"psr-4": {
|
||||||
"Symfony\\Component\\Process\\": ""
|
"Symfony\\Component\\Process\\": ""
|
||||||
|
@ -2536,7 +2483,7 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2020-05-30T20:35:19+00:00"
|
"time": "2020-12-08T17:03:37+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/service-contracts",
|
"name": "symfony/service-contracts",
|
||||||
|
@ -2616,16 +2563,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/stopwatch",
|
"name": "symfony/stopwatch",
|
||||||
"version": "v5.1.2",
|
"version": "v5.2.1",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/stopwatch.git",
|
"url": "https://github.com/symfony/stopwatch.git",
|
||||||
"reference": "0f7c58cf81dbb5dd67d423a89d577524a2ec0323"
|
"reference": "2b105c0354f39a63038a1d8bf776ee92852813af"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/stopwatch/zipball/0f7c58cf81dbb5dd67d423a89d577524a2ec0323",
|
"url": "https://api.github.com/repos/symfony/stopwatch/zipball/2b105c0354f39a63038a1d8bf776ee92852813af",
|
||||||
"reference": "0f7c58cf81dbb5dd67d423a89d577524a2ec0323",
|
"reference": "2b105c0354f39a63038a1d8bf776ee92852813af",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -2633,11 +2580,6 @@
|
||||||
"symfony/service-contracts": "^1.0|^2"
|
"symfony/service-contracts": "^1.0|^2"
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
|
||||||
"branch-alias": {
|
|
||||||
"dev-master": "5.1-dev"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"autoload": {
|
"autoload": {
|
||||||
"psr-4": {
|
"psr-4": {
|
||||||
"Symfony\\Component\\Stopwatch\\": ""
|
"Symfony\\Component\\Stopwatch\\": ""
|
||||||
|
@ -2676,20 +2618,20 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2020-05-20T17:43:50+00:00"
|
"time": "2020-11-01T16:14:45+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/string",
|
"name": "symfony/string",
|
||||||
"version": "v5.1.8",
|
"version": "v5.2.1",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/string.git",
|
"url": "https://github.com/symfony/string.git",
|
||||||
"reference": "a97573e960303db71be0dd8fda9be3bca5e0feea"
|
"reference": "5bd67751d2e3f7d6f770c9154b8fbcb2aa05f7ed"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/string/zipball/a97573e960303db71be0dd8fda9be3bca5e0feea",
|
"url": "https://api.github.com/repos/symfony/string/zipball/5bd67751d2e3f7d6f770c9154b8fbcb2aa05f7ed",
|
||||||
"reference": "a97573e960303db71be0dd8fda9be3bca5e0feea",
|
"reference": "5bd67751d2e3f7d6f770c9154b8fbcb2aa05f7ed",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -2756,7 +2698,7 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2020-10-24T12:01:57+00:00"
|
"time": "2020-12-05T07:33:16+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "vimeo/psalm",
|
"name": "vimeo/psalm",
|
||||||
|
@ -2968,5 +2910,5 @@
|
||||||
"ext-xmlreader": "*"
|
"ext-xmlreader": "*"
|
||||||
},
|
},
|
||||||
"platform-dev": [],
|
"platform-dev": [],
|
||||||
"plugin-api-version": "1.1.0"
|
"plugin-api-version": "2.0.0"
|
||||||
}
|
}
|
||||||
|
|
|
@ -91,7 +91,7 @@ class CreateJs extends Command implements CompletionAwareInterface {
|
||||||
}
|
}
|
||||||
|
|
||||||
private function writeFiles($app, $path, $lang, OutputInterface $output) {
|
private function writeFiles($app, $path, $lang, OutputInterface $output) {
|
||||||
list($translations, $plurals) = $this->loadTranslations($path, $lang);
|
[$translations, $plurals] = $this->loadTranslations($path, $lang);
|
||||||
$this->writeJsFile($app, $path, $lang, $output, $translations, $plurals);
|
$this->writeJsFile($app, $path, $lang, $output, $translations, $plurals);
|
||||||
$this->writeJsonFile($path, $lang, $output, $translations, $plurals);
|
$this->writeJsonFile($path, $lang, $output, $translations, $plurals);
|
||||||
}
|
}
|
||||||
|
|
|
@ -63,7 +63,7 @@ class State extends Base {
|
||||||
|
|
||||||
$providerStates = $this->registry->getProviderStates($user);
|
$providerStates = $this->registry->getProviderStates($user);
|
||||||
$filtered = $this->filterEnabledDisabledUnknownProviders($providerStates);
|
$filtered = $this->filterEnabledDisabledUnknownProviders($providerStates);
|
||||||
list($enabled, $disabled) = $filtered;
|
[$enabled, $disabled] = $filtered;
|
||||||
|
|
||||||
if (!empty($enabled)) {
|
if (!empty($enabled)) {
|
||||||
$output->writeln("Two-factor authentication is enabled for user $uid");
|
$output->writeln("Two-factor authentication is enabled for user $uid");
|
||||||
|
|
|
@ -156,7 +156,7 @@ class LoginController extends Controller {
|
||||||
|
|
||||||
$loginMessages = $this->session->get('loginMessages');
|
$loginMessages = $this->session->get('loginMessages');
|
||||||
if (is_array($loginMessages)) {
|
if (is_array($loginMessages)) {
|
||||||
list($errors, $messages) = $loginMessages;
|
[$errors, $messages] = $loginMessages;
|
||||||
$this->initialStateService->provideInitialState('core', 'loginMessages', $messages);
|
$this->initialStateService->provideInitialState('core', 'loginMessages', $messages);
|
||||||
$this->initialStateService->provideInitialState('core', 'loginErrors', $errors);
|
$this->initialStateService->provideInitialState('core', 'loginErrors', $errors);
|
||||||
}
|
}
|
||||||
|
|
|
@ -93,7 +93,7 @@ class OCSController extends \OCP\AppFramework\OCSController {
|
||||||
*/
|
*/
|
||||||
public function getCapabilities() {
|
public function getCapabilities() {
|
||||||
$result = [];
|
$result = [];
|
||||||
list($major, $minor, $micro) = \OCP\Util::getVersion();
|
[$major, $minor, $micro] = \OCP\Util::getVersion();
|
||||||
$result['version'] = [
|
$result['version'] = [
|
||||||
'major' => $major,
|
'major' => $major,
|
||||||
'minor' => $minor,
|
'minor' => $minor,
|
||||||
|
|
|
@ -108,7 +108,7 @@ class TwoFactorChallengeController extends Controller {
|
||||||
$user = $this->userSession->getUser();
|
$user = $this->userSession->getUser();
|
||||||
$providerSet = $this->twoFactorManager->getProviderSet($user);
|
$providerSet = $this->twoFactorManager->getProviderSet($user);
|
||||||
$allProviders = $providerSet->getProviders();
|
$allProviders = $providerSet->getProviders();
|
||||||
list($providers, $backupProvider) = $this->splitProvidersAndBackupCodes($allProviders);
|
[$providers, $backupProvider] = $this->splitProvidersAndBackupCodes($allProviders);
|
||||||
$setupProviders = $this->twoFactorManager->getLoginSetupProviders($user);
|
$setupProviders = $this->twoFactorManager->getLoginSetupProviders($user);
|
||||||
|
|
||||||
$data = [
|
$data = [
|
||||||
|
|
|
@ -110,7 +110,7 @@ class Autoloader {
|
||||||
} elseif (strpos($class, 'OC_') === 0) {
|
} elseif (strpos($class, 'OC_') === 0) {
|
||||||
$paths[] = \OC::$SERVERROOT . '/lib/private/legacy/' . strtolower(str_replace('_', '/', substr($class, 3)) . '.php');
|
$paths[] = \OC::$SERVERROOT . '/lib/private/legacy/' . strtolower(str_replace('_', '/', substr($class, 3)) . '.php');
|
||||||
} elseif (strpos($class, 'OCA\\') === 0) {
|
} elseif (strpos($class, 'OCA\\') === 0) {
|
||||||
list(, $app, $rest) = explode('\\', $class, 3);
|
[, $app, $rest] = explode('\\', $class, 3);
|
||||||
$app = strtolower($app);
|
$app = strtolower($app);
|
||||||
$appPath = \OC_App::getAppPath($app);
|
$appPath = \OC_App::getAppPath($app);
|
||||||
if ($appPath && stream_resolve_include_path($appPath)) {
|
if ($appPath && stream_resolve_include_path($appPath)) {
|
||||||
|
|
|
@ -102,7 +102,7 @@ class EventMerger implements IEventMerger {
|
||||||
|
|
||||||
// Other parameters are not the same => can not combine
|
// Other parameters are not the same => can not combine
|
||||||
try {
|
try {
|
||||||
list($combined, $parameters) = $this->combineParameters($mergeParameter, $event, $previousEvent);
|
[$combined, $parameters] = $this->combineParameters($mergeParameter, $event, $previousEvent);
|
||||||
} catch (\UnexpectedValueException $e) {
|
} catch (\UnexpectedValueException $e) {
|
||||||
return $event;
|
return $event;
|
||||||
}
|
}
|
||||||
|
|
|
@ -123,7 +123,7 @@ class DependencyAnalyzer {
|
||||||
// version string but null. In case one parameter is null normalization
|
// version string but null. In case one parameter is null normalization
|
||||||
// will therefore be skipped
|
// will therefore be skipped
|
||||||
if ($first !== null && $second !== null) {
|
if ($first !== null && $second !== null) {
|
||||||
list($first, $second) = $this->normalizeVersions($first, $second);
|
[$first, $second] = $this->normalizeVersions($first, $second);
|
||||||
}
|
}
|
||||||
|
|
||||||
return version_compare($first, $second, $operator);
|
return version_compare($first, $second, $operator);
|
||||||
|
|
|
@ -148,13 +148,13 @@ class App {
|
||||||
/** @var Dispatcher $dispatcher */
|
/** @var Dispatcher $dispatcher */
|
||||||
$dispatcher = $container['Dispatcher'];
|
$dispatcher = $container['Dispatcher'];
|
||||||
|
|
||||||
list(
|
[
|
||||||
$httpHeaders,
|
$httpHeaders,
|
||||||
$responseHeaders,
|
$responseHeaders,
|
||||||
$responseCookies,
|
$responseCookies,
|
||||||
$output,
|
$output,
|
||||||
$response
|
$response
|
||||||
) = $dispatcher->dispatch($controller, $methodName);
|
] = $dispatcher->dispatch($controller, $methodName);
|
||||||
|
|
||||||
$io = $container[IOutput::class];
|
$io = $container[IOutput::class];
|
||||||
|
|
||||||
|
@ -228,7 +228,7 @@ class App {
|
||||||
|
|
||||||
$dispatcher = $container['Dispatcher'];
|
$dispatcher = $container['Dispatcher'];
|
||||||
|
|
||||||
list(, , $output) = $dispatcher->dispatch($controller, $methodName);
|
[, , $output] = $dispatcher->dispatch($controller, $methodName);
|
||||||
return $output;
|
return $output;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -776,7 +776,7 @@ class Request implements \ArrayAccess, \Countable, IRequest {
|
||||||
|
|
||||||
// strip off the script name's dir and file name
|
// strip off the script name's dir and file name
|
||||||
// FIXME: Sabre does not really belong here
|
// FIXME: Sabre does not really belong here
|
||||||
list($path, $name) = \Sabre\Uri\split($scriptName);
|
[$path, $name] = \Sabre\Uri\split($scriptName);
|
||||||
if (!empty($path)) {
|
if (!empty($path)) {
|
||||||
if ($path === $pathInfo || strpos($pathInfo, $path.'/') === 0) {
|
if ($path === $pathInfo || strpos($pathInfo, $path.'/') === 0) {
|
||||||
$pathInfo = substr($pathInfo, \strlen($path));
|
$pathInfo = substr($pathInfo, \strlen($path));
|
||||||
|
|
|
@ -133,7 +133,7 @@ class RouteConfig {
|
||||||
if (count($split) !== 2) {
|
if (count($split) !== 2) {
|
||||||
throw new \UnexpectedValueException('Invalid route name');
|
throw new \UnexpectedValueException('Invalid route name');
|
||||||
}
|
}
|
||||||
list($controller, $action) = $split;
|
[$controller, $action] = $split;
|
||||||
|
|
||||||
$controllerName = $this->buildControllerName($controller);
|
$controllerName = $this->buildControllerName($controller);
|
||||||
$actionName = $this->buildActionName($action);
|
$actionName = $this->buildActionName($action);
|
||||||
|
|
|
@ -96,7 +96,7 @@ class RouteParser {
|
||||||
if (count($split) !== 2) {
|
if (count($split) !== 2) {
|
||||||
throw new \UnexpectedValueException('Invalid route name');
|
throw new \UnexpectedValueException('Invalid route name');
|
||||||
}
|
}
|
||||||
list($controller, $action) = $split;
|
[$controller, $action] = $split;
|
||||||
|
|
||||||
$controllerName = $this->buildControllerName($controller);
|
$controllerName = $this->buildControllerName($controller);
|
||||||
$actionName = $this->buildActionName($action);
|
$actionName = $this->buildActionName($action);
|
||||||
|
|
|
@ -63,7 +63,7 @@ class ControllerMethodReflector implements IControllerMethodReflector {
|
||||||
$cutString = str_replace(' ', '', $cutString);
|
$cutString = str_replace(' ', '', $cutString);
|
||||||
$splittedArray = explode(',', $cutString);
|
$splittedArray = explode(',', $cutString);
|
||||||
foreach ($splittedArray as $annotationValues) {
|
foreach ($splittedArray as $annotationValues) {
|
||||||
list($key, $value) = explode('=', $annotationValues);
|
[$key, $value] = explode('=', $annotationValues);
|
||||||
$this->annotations[$annontation][$key] = $value;
|
$this->annotations[$annontation][$key] = $value;
|
||||||
}
|
}
|
||||||
continue;
|
continue;
|
||||||
|
|
|
@ -187,7 +187,7 @@ abstract class Avatar implements IAvatar {
|
||||||
$font = __DIR__ . '/../../../core/fonts/NotoSans-Regular.ttf';
|
$font = __DIR__ . '/../../../core/fonts/NotoSans-Regular.ttf';
|
||||||
|
|
||||||
$fontSize = $size * 0.4;
|
$fontSize = $size * 0.4;
|
||||||
list($x, $y) = $this->imageTTFCenter(
|
[$x, $y] = $this->imageTTFCenter(
|
||||||
$im, $text, $font, (int)$fontSize
|
$im, $text, $font, (int)$fontSize
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
@ -59,7 +59,7 @@ class RemoteGroupPlugin implements ISearchPlugin {
|
||||||
$resultType = new SearchResultType('remote_groups');
|
$resultType = new SearchResultType('remote_groups');
|
||||||
|
|
||||||
if ($this->enabled && $this->cloudIdManager->isValidCloudId($search) && $offset === 0) {
|
if ($this->enabled && $this->cloudIdManager->isValidCloudId($search) && $offset === 0) {
|
||||||
list($remoteGroup, $serverUrl) = $this->splitGroupRemote($search);
|
[$remoteGroup, $serverUrl] = $this->splitGroupRemote($search);
|
||||||
$result['exact'][] = [
|
$result['exact'][] = [
|
||||||
'label' => $remoteGroup . " ($serverUrl)",
|
'label' => $remoteGroup . " ($serverUrl)",
|
||||||
'guid' => $remoteGroup,
|
'guid' => $remoteGroup,
|
||||||
|
|
|
@ -87,7 +87,7 @@ class RemotePlugin implements ISearchPlugin {
|
||||||
$cloudIdType = $cloudIdData['type'];
|
$cloudIdType = $cloudIdData['type'];
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
list($remoteUser, $serverUrl) = $this->splitUserRemote($cloudId);
|
[$remoteUser, $serverUrl] = $this->splitUserRemote($cloudId);
|
||||||
} catch (\InvalidArgumentException $e) {
|
} catch (\InvalidArgumentException $e) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@ -151,7 +151,7 @@ class RemotePlugin implements ISearchPlugin {
|
||||||
*/
|
*/
|
||||||
if (!$searchResult->hasExactIdMatch($resultType) && $this->cloudIdManager->isValidCloudId($search) && $offset === 0) {
|
if (!$searchResult->hasExactIdMatch($resultType) && $this->cloudIdManager->isValidCloudId($search) && $offset === 0) {
|
||||||
try {
|
try {
|
||||||
list($remoteUser, $serverUrl) = $this->splitUserRemote($search);
|
[$remoteUser, $serverUrl] = $this->splitUserRemote($search);
|
||||||
$localUser = $this->userManager->get($remoteUser);
|
$localUser = $this->userManager->get($remoteUser);
|
||||||
if ($localUser === null || $search !== $localUser->getCloudId()) {
|
if ($localUser === null || $search !== $localUser->getCloudId()) {
|
||||||
$result['exact'][] = [
|
$result['exact'][] = [
|
||||||
|
|
|
@ -68,7 +68,7 @@ class QuoteHelper {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (substr_count($string, '.')) {
|
if (substr_count($string, '.')) {
|
||||||
list($alias, $columnName) = explode('.', $string, 2);
|
[$alias, $columnName] = explode('.', $string, 2);
|
||||||
|
|
||||||
if ($columnName === '*') {
|
if ($columnName === '*') {
|
||||||
return '`' . $alias . '`.*';
|
return '`' . $alias . '`.*';
|
||||||
|
|
|
@ -70,7 +70,7 @@ class File implements \OCP\Encryption\IFile {
|
||||||
public function getAccessList($path) {
|
public function getAccessList($path) {
|
||||||
|
|
||||||
// Make sure that a share key is generated for the owner too
|
// Make sure that a share key is generated for the owner too
|
||||||
list($owner, $ownerPath) = $this->util->getUidAndFilename($path);
|
[$owner, $ownerPath] = $this->util->getUidAndFilename($path);
|
||||||
|
|
||||||
// always add owner to the list of users with access to the file
|
// always add owner to the list of users with access to the file
|
||||||
$userIds = [$owner];
|
$userIds = [$owner];
|
||||||
|
|
|
@ -365,7 +365,7 @@ class Storage implements IStorage {
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
private function getFileKeyDir($encryptionModuleId, $path) {
|
private function getFileKeyDir($encryptionModuleId, $path) {
|
||||||
list($owner, $filename) = $this->util->getUidAndFilename($path);
|
[$owner, $filename] = $this->util->getUidAndFilename($path);
|
||||||
|
|
||||||
// in case of system wide mount points the keys are stored directly in the data directory
|
// in case of system wide mount points the keys are stored directly in the data directory
|
||||||
if ($this->util->isSystemWideMountPoint($filename, $owner)) {
|
if ($this->util->isSystemWideMountPoint($filename, $owner)) {
|
||||||
|
@ -457,7 +457,7 @@ class Storage implements IStorage {
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
protected function getPathToKeys($path) {
|
protected function getPathToKeys($path) {
|
||||||
list($owner, $relativePath) = $this->util->getUidAndFilename($path);
|
[$owner, $relativePath] = $this->util->getUidAndFilename($path);
|
||||||
$systemWideMountPoint = $this->util->isSystemWideMountPoint($relativePath, $owner);
|
$systemWideMountPoint = $this->util->isSystemWideMountPoint($relativePath, $owner);
|
||||||
|
|
||||||
if ($systemWideMountPoint) {
|
if ($systemWideMountPoint) {
|
||||||
|
|
|
@ -87,7 +87,7 @@ class Update {
|
||||||
if ($this->encryptionManager->isEnabled()) {
|
if ($this->encryptionManager->isEnabled()) {
|
||||||
if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
|
if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
|
||||||
$path = Filesystem::getPath($params['fileSource']);
|
$path = Filesystem::getPath($params['fileSource']);
|
||||||
list($owner, $ownerPath) = $this->getOwnerPath($path);
|
[$owner, $ownerPath] = $this->getOwnerPath($path);
|
||||||
$absPath = '/' . $owner . '/files/' . $ownerPath;
|
$absPath = '/' . $owner . '/files/' . $ownerPath;
|
||||||
$this->update($absPath);
|
$this->update($absPath);
|
||||||
}
|
}
|
||||||
|
@ -103,7 +103,7 @@ class Update {
|
||||||
if ($this->encryptionManager->isEnabled()) {
|
if ($this->encryptionManager->isEnabled()) {
|
||||||
if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
|
if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
|
||||||
$path = Filesystem::getPath($params['fileSource']);
|
$path = Filesystem::getPath($params['fileSource']);
|
||||||
list($owner, $ownerPath) = $this->getOwnerPath($path);
|
[$owner, $ownerPath] = $this->getOwnerPath($path);
|
||||||
$absPath = '/' . $owner . '/files/' . $ownerPath;
|
$absPath = '/' . $owner . '/files/' . $ownerPath;
|
||||||
$this->update($absPath);
|
$this->update($absPath);
|
||||||
}
|
}
|
||||||
|
@ -136,7 +136,7 @@ class Update {
|
||||||
$this->encryptionManager->isEnabled() &&
|
$this->encryptionManager->isEnabled() &&
|
||||||
dirname($source) !== dirname($target)
|
dirname($source) !== dirname($target)
|
||||||
) {
|
) {
|
||||||
list($owner, $ownerPath) = $this->getOwnerPath($target);
|
[$owner, $ownerPath] = $this->getOwnerPath($target);
|
||||||
$absPath = '/' . $owner . '/files/' . $ownerPath;
|
$absPath = '/' . $owner . '/files/' . $ownerPath;
|
||||||
$this->update($absPath);
|
$this->update($absPath);
|
||||||
}
|
}
|
||||||
|
|
|
@ -66,7 +66,7 @@ class HomeCache extends Cache {
|
||||||
$result->closeCursor();
|
$result->closeCursor();
|
||||||
|
|
||||||
if ($row) {
|
if ($row) {
|
||||||
list($sum) = array_values($row);
|
[$sum] = array_values($row);
|
||||||
$totalSize = 0 + $sum;
|
$totalSize = 0 + $sum;
|
||||||
$entry['size'] += 0;
|
$entry['size'] += 0;
|
||||||
if ($entry['size'] !== $totalSize) {
|
if ($entry['size'] !== $totalSize) {
|
||||||
|
|
|
@ -42,7 +42,7 @@ class HomePropagator extends Propagator {
|
||||||
* @param int $sizeDifference number of bytes the file has grown
|
* @param int $sizeDifference number of bytes the file has grown
|
||||||
*/
|
*/
|
||||||
public function propagateChange($internalPath, $time, $sizeDifference = 0) {
|
public function propagateChange($internalPath, $time, $sizeDifference = 0) {
|
||||||
list($baseFolder) = explode('/', $internalPath, 2);
|
[$baseFolder] = explode('/', $internalPath, 2);
|
||||||
if (in_array($baseFolder, $this->ignoredBaseFolders)) {
|
if (in_array($baseFolder, $this->ignoredBaseFolders)) {
|
||||||
return [];
|
return [];
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -129,7 +129,7 @@ class QuerySearchHelper {
|
||||||
private function searchComparisonToDBExpr(IQueryBuilder $builder, ISearchComparison $comparison, array $operatorMap) {
|
private function searchComparisonToDBExpr(IQueryBuilder $builder, ISearchComparison $comparison, array $operatorMap) {
|
||||||
$this->validateComparison($comparison);
|
$this->validateComparison($comparison);
|
||||||
|
|
||||||
list($field, $value, $type) = $this->getOperatorFieldAndValue($comparison);
|
[$field, $value, $type] = $this->getOperatorFieldAndValue($comparison);
|
||||||
if (isset($operatorMap[$type])) {
|
if (isset($operatorMap[$type])) {
|
||||||
$queryOperator = $operatorMap[$type];
|
$queryOperator = $operatorMap[$type];
|
||||||
return $builder->expr()->$queryOperator($field, $this->getParameterForValue($builder, $value));
|
return $builder->expr()->$queryOperator($field, $this->getParameterForValue($builder, $value));
|
||||||
|
|
|
@ -40,7 +40,7 @@ class JailPropagator extends Propagator {
|
||||||
*/
|
*/
|
||||||
public function propagateChange($internalPath, $time, $sizeDifference = 0) {
|
public function propagateChange($internalPath, $time, $sizeDifference = 0) {
|
||||||
/** @var \OC\Files\Storage\Storage $storage */
|
/** @var \OC\Files\Storage\Storage $storage */
|
||||||
list($storage, $sourceInternalPath) = $this->storage->resolvePath($internalPath);
|
[$storage, $sourceInternalPath] = $this->storage->resolvePath($internalPath);
|
||||||
$storage->getPropagator()->propagateChange($sourceInternalPath, $time, $sizeDifference);
|
$storage->getPropagator()->propagateChange($sourceInternalPath, $time, $sizeDifference);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -322,7 +322,7 @@ class UserMountCache implements IUserMountCache {
|
||||||
*/
|
*/
|
||||||
public function getMountsForFileId($fileId, $user = null) {
|
public function getMountsForFileId($fileId, $user = null) {
|
||||||
try {
|
try {
|
||||||
list($storageId, $internalPath) = $this->getCacheInfoFromFileId($fileId);
|
[$storageId, $internalPath] = $this->getCacheInfoFromFileId($fileId);
|
||||||
} catch (NotFoundException $e) {
|
} catch (NotFoundException $e) {
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
|
|
|
@ -301,7 +301,7 @@ class Folder extends Node implements \OCP\Files\Folder {
|
||||||
public function getById($id) {
|
public function getById($id) {
|
||||||
$mountCache = $this->root->getUserMountCache();
|
$mountCache = $this->root->getUserMountCache();
|
||||||
if (strpos($this->getPath(), '/', 1) > 0) {
|
if (strpos($this->getPath(), '/', 1) > 0) {
|
||||||
list(, $user) = explode('/', $this->getPath());
|
[, $user] = explode('/', $this->getPath());
|
||||||
} else {
|
} else {
|
||||||
$user = null;
|
$user = null;
|
||||||
}
|
}
|
||||||
|
|
|
@ -159,7 +159,7 @@ class Node implements \OCP\Files\Node {
|
||||||
* @throws \OCP\Files\NotFoundException
|
* @throws \OCP\Files\NotFoundException
|
||||||
*/
|
*/
|
||||||
public function getStorage() {
|
public function getStorage() {
|
||||||
list($storage,) = $this->view->resolvePath($this->path);
|
[$storage,] = $this->view->resolvePath($this->path);
|
||||||
return $storage;
|
return $storage;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -174,7 +174,7 @@ class Node implements \OCP\Files\Node {
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
public function getInternalPath() {
|
public function getInternalPath() {
|
||||||
list(, $internalPath) = $this->view->resolvePath($this->path);
|
[, $internalPath] = $this->view->resolvePath($this->path);
|
||||||
return $internalPath;
|
return $internalPath;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue