[Pkg-owncloud-commits] [owncloud] 82/153: Merge pull request #8585 from owncloud/phpdoc-improvements-apps

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 6c4b650524c4a8655984b89d4e7d105cfa61808c
Merge: 1cff73b e7aebc5
Author: Andreas Fischer <bantu at owncloud.com>
Date:   Mon May 19 14:08:42 2014 +0200

    Merge pull request #8585 from owncloud/phpdoc-improvements-apps
    
    PHPDoc improvements /apps
    
    * owncloud/phpdoc-improvements-apps:
      Fix whitespace issues
      Reduce double-space with single-space.
      Remove spaces around | operator in doc block.
      Fix more missing or broken PHPDoc
      PHPDoc fixes for user_ldap
      Fix PHPDoc in /apps

 apps/files/index.php                     |  4 +--
 apps/files/lib/helper.php                |  2 +-
 apps/files_encryption/hooks/hooks.php    |  4 +--
 apps/files_encryption/lib/crypt.php      | 21 ++++++-----
 apps/files_encryption/lib/helper.php     |  2 +-
 apps/files_encryption/lib/keymanager.php |  6 ++--
 apps/files_encryption/lib/proxy.php      | 18 +++++-----
 apps/files_encryption/lib/session.php    |  4 +--
 apps/files_encryption/lib/stream.php     | 22 ++++++------
 apps/files_encryption/lib/util.php       | 11 +++---
 apps/files_encryption/tests/crypt.php    |  2 +-
 apps/files_encryption/tests/util.php     |  4 +--
 apps/files_external/lib/amazons3.php     |  2 +-
 apps/files_external/lib/config.php       | 22 ++++++------
 apps/files_external/lib/dropbox.php      |  4 +--
 apps/files_external/lib/ftp.php          |  2 +-
 apps/files_external/lib/smb.php          |  2 +-
 apps/files_external/lib/swift.php        | 32 ++++++++---------
 apps/files_sharing/lib/api.php           |  2 +-
 apps/files_sharing/lib/cache.php         |  4 +--
 apps/files_sharing/lib/maintainer.php    |  2 +-
 apps/files_sharing/lib/sharedstorage.php |  8 ++---
 apps/files_sharing/tests/api.php         | 10 +++---
 apps/files_sharing/tests/base.php        |  2 +-
 apps/files_trashbin/lib/hooks.php        |  4 +--
 apps/files_trashbin/lib/trashbin.php     | 62 ++++++++++++++++----------------
 apps/files_versions/lib/hooks.php        |  6 ++--
 apps/files_versions/lib/versions.php     | 12 +++----
 apps/user_ldap/group_ldap.php            | 30 ++++++++--------
 apps/user_ldap/group_proxy.php           | 52 +++++++++++++--------------
 apps/user_ldap/lib/access.php            | 60 +++++++++++++++----------------
 apps/user_ldap/lib/configuration.php     | 34 +++++++++---------
 apps/user_ldap/lib/connection.php        | 24 ++++++-------
 apps/user_ldap/lib/ildapwrapper.php      | 14 ++++----
 apps/user_ldap/lib/jobs.php              | 44 +++++++++++------------
 apps/user_ldap/lib/ldap.php              |  6 ++--
 apps/user_ldap/lib/proxy.php             | 32 ++++++++---------
 apps/user_ldap/lib/wizard.php            | 12 +++----
 apps/user_ldap/lib/wizardresult.php      |  6 ++--
 apps/user_ldap/settings.php              |  2 +-
 apps/user_ldap/tests/user_ldap.php       |  6 ++--
 apps/user_ldap/user_ldap.php             | 30 ++++++++--------
 apps/user_ldap/user_proxy.php            | 52 +++++++++++++--------------
 43 files changed, 338 insertions(+), 342 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git