Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable10] AppManager text typo and PHPdoc return tags #31918

Merged
merged 2 commits into from
Jul 18, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/dav/lib/CardDAV/CardDavBackend.php
Original file line number Diff line number Diff line change
Expand Up @@ -896,7 +896,7 @@ public function getCardUri($id) {
*
* @param int $addressBookId
* @param string $uri
* @returns array
* @return array
*/
public function getContact($addressBookId, $uri) {
$result = [];
Expand Down
6 changes: 3 additions & 3 deletions lib/private/App/AppManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -191,9 +191,9 @@ private function checkAppForUser($enabled, $user) {

$groupIds = json_decode($enabled);

if (!is_array($groupIds)) {
$jsonError = json_last_error();
\OC::$server->getLogger()->warning('AppManger::checkAppForUser - can\'t decode group IDs: ' . print_r($enabled, true) . ' - json error code: ' . $jsonError, ['app' => 'lib']);
if (!\is_array($groupIds)) {
$jsonError = \json_last_error();
\OC::$server->getLogger()->warning('AppManager::checkAppForUser - can\'t decode group IDs: ' . print_r($enabled, true) . ' - json error code: ' . $jsonError, ['app' => 'lib']);
return false;
}

Expand Down
2 changes: 1 addition & 1 deletion lib/private/App/DependencyAnalyzer.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ function __construct(Platform $platform, IL10N $l) {

/**
* @param array $app
* @returns array of missing dependencies
* @return array of missing dependencies
*/
public function analyze(array $app) {
$this->appInfo = $app;
Expand Down
1 change: 1 addition & 0 deletions lib/private/App/PlatformRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ public function normalizeVersion($version, $fullVersion = null) {

/**
* @param string $stability
* @return string
*/
private function expandStability($stability) {
$stability = strtolower($stability);
Expand Down
1 change: 1 addition & 0 deletions lib/private/Encryption/Manager.php
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ public function isReady() {

/**
* @param string $user
* @return bool
*/
public function isReadyForUser($user) {
if (!$this->isReady()) {
Expand Down
3 changes: 2 additions & 1 deletion lib/private/Files/Filesystem.php
Original file line number Diff line number Diff line change
Expand Up @@ -802,6 +802,7 @@ static public function search($query) {

/**
* @param string $query
* @return FileInfo[] array of file info
*/
static public function searchByMime($query) {
return self::$defaultInstance->searchByMime($query);
Expand All @@ -810,7 +811,7 @@ static public function searchByMime($query) {
/**
* @param string|int $tag name or tag id
* @param string $userId owner of the tags
* @return FileInfo[] array or file info
* @return FileInfo[] array of file info
*/
static public function searchByTag($tag, $userId) {
return self::$defaultInstance->searchByTag($tag, $userId);
Expand Down
2 changes: 1 addition & 1 deletion lib/private/Installer.php
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ public static function installApp( $data = []) {
/**
* @brief checks whether or not an app is installed
* @param string $app app
* @returns bool
* @return bool
*
* Checks whether or not an app is installed, i.e. registered in apps table.
*/
Expand Down
1 change: 1 addition & 0 deletions lib/private/Share/Helper.php
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ public static function generateTarget($itemType, $itemSource, $shareType, $share
* @param string $uidOwner The user that the parent was shared with (optional)
* @param int $newParent new parent for the childrens
* @param bool $excludeGroupChildren exclude group children elements
* @return array of deleted items
*/
public static function delete($parent, $excludeParent = false, $uidOwner = null, $newParent = null, $excludeGroupChildren = false) {
$ids = [$parent];
Expand Down
1 change: 1 addition & 0 deletions lib/private/legacy/defaults.php
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ public function __construct() {

/**
* @param string $method
* @return bool
*/
private function themeExist($method) {
if (isset($this->theme) && method_exists($this->theme, $method)) {
Expand Down
2 changes: 2 additions & 0 deletions lib/private/legacy/template/functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,8 @@ function preview_icon( $path ) {

/**
* @param string $path
* @param string $token
* @return string link to the public preview
*/
function publicPreview_icon ( $path, $token ) {
return \OC::$server->getURLGenerator()->linkToRoute('core_ajax_public_preview', ['x' => 32, 'y' => 32, 'file' => $path, 't' => $token]);
Expand Down