Skip to content
This repository has been archived by the owner on Sep 10, 2021. It is now read-only.

Commit

Permalink
Fix style
Browse files Browse the repository at this point in the history
  • Loading branch information
Jamie Snape committed Sep 24, 2015
1 parent 7663c78 commit 90c6026
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 15 deletions.
3 changes: 2 additions & 1 deletion .styleci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,9 @@ disabled:
- phpdoc_params
- phpdoc_separation
- phpdoc_to_comment
- phpdoc_types
- phpdoc_var_without_name
- pre_increment


finder:
exclude:
Expand Down
28 changes: 18 additions & 10 deletions core/models/base/FeedModelBase.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
/** Feed Model Base */
abstract class FeedModelBase extends AppModel
{
/** Constructor */
/** Constructor. */
public function __construct()
{
parent::__construct();
Expand Down Expand Up @@ -72,37 +72,45 @@ abstract protected function getFeeds(
$limit = 20
);

/** add a community */
/** Add a community. */
abstract protected function addCommunity($feed, $community);

/** Check policy */
/** Check policy. */
abstract public function policyCheck($feedDao, $userDao = null, $policy = 0);

/** get feeds (filtered by policies)
* @return Array of FeedDao
/**
* Get feeds (filtered by policies).
*
* @return array feed DAOs
*/
public function getGlobalFeeds($loggedUserDao, $policy = 0, $limit = 20)
{
return $this->getFeeds($loggedUserDao, null, null, $policy, $limit);
}

/** get feeds by user (filtered by policies)
* @return Array of FeedDao
/**
* Get feeds by user (filtered by policies).
*
* @return array feed DAOs
*/
public function getFeedsByUser($loggedUserDao, $userDao, $policy = 0, $limit = 20)
{
return $this->getFeeds($loggedUserDao, $userDao, null, $policy, $limit);
}

/** get feeds by community (filtered by policies)
* @return Array of FeedDao
/**
* Get feeds by community (filtered by policies).
*
* @return array feed DAOs
*/
public function getFeedsByCommunity($loggedUserDao, $communityDao, $policy = 0, $limit = 20)
{
return $this->getFeeds($loggedUserDao, null, $communityDao, $policy, $limit);
}

/** Create a feed
/**
* Create a feed.
*
* @return FeedDao
*/
public function createFeed($userDao, $type, $resource, $communityDao = null)
Expand Down
4 changes: 2 additions & 2 deletions core/models/base/UserModelBase.php
Original file line number Diff line number Diff line change
Expand Up @@ -394,9 +394,9 @@ public function createUser($email, $password, $firstname, $lastname, $admin = 0,
* @param string $s Size in pixels, defaults to 80px [ 1 - 512 ]
* @param string $d Default imageset to use [ 404 | mm | identicon | monsterid | wavatar ]
* @param string $r Maximum rating (inclusive) [ g | pg | r | x ]
* @param boole $img True to return a complete IMG tag False for just the URL
* @param bool $img True to return a complete IMG tag False for just the URL
* @param array $atts Optional, additional key/value attributes to include in the IMG tag
* @return String containing either just a URL or a complete image tag
* @return string containing either just a URL or a complete image tag
* @source http://gravatar.com/site/implement/images/php/
*/
public function getGravatarUrl($email, $s = 32, $d = '404', $r = 'g', $img = false, $atts = array())
Expand Down
2 changes: 1 addition & 1 deletion core/models/pdo/UserModel.php
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ public function getUsersFromSearch($search, $userDao, $limit = 14, $group = true
* NOTE: This may ONLY be used to authenticate site admins. This is meant to be
* used during the upgrade process only, not for general authentication.
*
* @return True or false: whether the authentication succeeded
* @return bool True if the authentication succeeded
*/
public function legacyAuthenticate($userDao, $instanceSalt, $password, $hash = false)
{
Expand Down
2 changes: 1 addition & 1 deletion modules/packages/models/pdo/PackageModel.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class Packages_PackageModel extends Packages_PackageModelBase
* Return all the record in the table.
*
* @param params Optional associative array specifying an 'os', 'arch', 'submissiontype' and 'packagetype'.
* @return Array of package Daos
* @return array Package DAOs
*/
public function get(
$params = array(
Expand Down

0 comments on commit 90c6026

Please sign in to comment.