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

[CS] Code style Fix some inline doc blocks for IDE hinting - round 2 #19863

Merged
merged 1 commit into from
Mar 17, 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 libraries/cms.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
// Register the library base path for CMS libraries.
JLoader::registerPrefix('J', JPATH_PLATFORM . '/cms', false, true);

/** @note This will be loaded through composer in Joomla 4 **/
/** @note This will be loaded through composer in Joomla 4 */
JLoader::registerNamespace('Joomla\\CMS', JPATH_PLATFORM . '/src', false, false, 'psr4');

// Create the Composer autoloader
Expand Down
2 changes: 1 addition & 1 deletion libraries/loader.php
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public static function discover($classPrefix, $parentPath, $force = true, $recur
$iterator = new DirectoryIterator($parentPath);
}

/* @type $file DirectoryIterator */
/** @type $file DirectoryIterator */
foreach ($iterator as $file)
{
$fileName = $file->getFilename();
Expand Down
4 changes: 2 additions & 2 deletions libraries/src/Environment/Browser.php
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,12 @@ class Browser
* @since 12.1
*/
protected $robots = array(
/* The most common ones. */
// The most common ones.
'Googlebot',
'msnbot',
'Slurp',
'Yahoo',
/* The rest alphabetically. */
// The rest alphabetically.
'Arachnoidea',
'ArchitextSpider',
'Ask Jeeves',
Expand Down
2 changes: 1 addition & 1 deletion libraries/src/Http/HttpFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public static function getHttpTransports()
$names = array();
$iterator = new \DirectoryIterator(__DIR__ . '/Transport');

/* @type $file \DirectoryIterator */
/** @type $file \DirectoryIterator */
foreach ($iterator as $file)
{
$fileName = $file->getFilename();
Expand Down
3 changes: 2 additions & 1 deletion libraries/src/Language/Language.php
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,8 @@ public function __construct($lang = null, $debug = false)

if (class_exists($class))
{
/* Class exists. Try to find
/**
* Class exists. Try to find
* -a transliterate method,
* -a getPluralSuffixes method,
* -a getIgnoredSearchWords method
Expand Down
2 changes: 1 addition & 1 deletion libraries/src/Session/Session.php
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ public static function getStores()
// Get an iterator and loop trough the driver classes.
$iterator = new \DirectoryIterator(JPATH_LIBRARIES . '/joomla/session/storage');

/* @type $file \DirectoryIterator */
/** @type $file \DirectoryIterator */
foreach ($iterator as $file)
{
$fileName = $file->getFilename();
Expand Down
4 changes: 2 additions & 2 deletions libraries/src/User/UserHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,7 @@ public static function getSalt($encryption = 'md5-hex', $seed = '', $plaintext =
}
break;

case 'aprmd5': /* 64 characters that are valid for APRMD5 passwords. */
case 'aprmd5': // 64 characters that are valid for APRMD5 passwords.
$APRMD5 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';

if ($seed)
Expand Down Expand Up @@ -684,7 +684,7 @@ public static function genRandomPassword($length = 8)
*/
protected static function _toAPRMD5($value, $count)
{
/* 64 characters that are valid for APRMD5 passwords. */
// 64 characters that are valid for APRMD5 passwords.
$APRMD5 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';

$aprmd5 = '';
Expand Down
2 changes: 1 addition & 1 deletion modules/mod_articles_category/helper.php
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ public static function getList(&$params)
{
$item->slug = $item->id . ':' . $item->alias;

/** @deprecated Catslug is deprecated, use catid instead. 4.0 **/
/** @deprecated Catslug is deprecated, use catid instead. 4.0 */
$item->catslug = $item->catid . ':' . $item->category_alias;

if ($access || in_array($item->access, $authorised))
Expand Down
2 changes: 1 addition & 1 deletion modules/mod_articles_latest/helper.php
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ public static function getList(&$params)
{
$item->slug = $item->id . ':' . $item->alias;

/** @deprecated Catslug is deprecated, use catid instead. 4.0 **/
/** @deprecated Catslug is deprecated, use catid instead. 4.0 */
$item->catslug = $item->catid . ':' . $item->category_alias;

if ($access || in_array($item->access, $authorised))
Expand Down
2 changes: 1 addition & 1 deletion modules/mod_articles_news/helper.php
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public static function getList(&$params)
$item->readmore = strlen(trim($item->fulltext));
$item->slug = $item->id . ':' . $item->alias;

/** @deprecated Catslug is deprecated, use catid instead. 4.0 **/
/** @deprecated Catslug is deprecated, use catid instead. 4.0 */
$item->catslug = $item->catid . ':' . $item->category_alias;

if ($access || in_array($item->access, $authorised))
Expand Down
2 changes: 1 addition & 1 deletion modules/mod_articles_popular/helper.php
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public static function getList(&$params)
{
$item->slug = $item->id . ':' . $item->alias;

/** @deprecated Catslug is deprecated, use catid instead. 4.0 **/
/** @deprecated Catslug is deprecated, use catid instead. 4.0 */
$item->catslug = $item->catid . ':' . $item->category_alias;

if ($access || in_array($item->access, $authorised))
Expand Down
2 changes: 1 addition & 1 deletion modules/mod_related_items/helper.php
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ public static function getList(&$params)
{
$item->slug = $item->id . ':' . $item->alias;

/** @deprecated Catslug is deprecated, use catid instead. 4.0 **/
/** @deprecated Catslug is deprecated, use catid instead. 4.0 */
$item->catslug = $item->catid . ':' . $item->category_alias;

$item->route = JRoute::_(ContentHelperRoute::getArticleRoute($item->slug, $item->catid, $item->language));
Expand Down