Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Clean up some code style issues (line length, doc blocks, comments).

  • Loading branch information...
commit cd421089642f09301244effa6c3d68c773c08862 1 parent 40d7a23
@elinw elinw authored
View
2  build/phpcs/Joomla/Sniffs/WhiteSpace/ObjectOperatorIndentSniff.php
@@ -143,7 +143,7 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
}
}
- // It cant be the last thing on the line either.
+ // It can't be the last thing on the line either.
$content = $phpcsFile->findNext(T_WHITESPACE, ($next + 1), null, true);
if ($tokens[$content]['line'] !== $tokens[$next]['line']) {
$error = 'Object operator must be at the start of the line, not the end';
View
4 build/phpcs/Joomla/ruleset.xml
@@ -16,7 +16,7 @@
<exclude-pattern>*/modal.css</exclude-pattern>
<!-- Include all sniffs in an external standard directory -->
-
+
<!-- Include some additional sniffs from the Generic standard -->
<rule ref="PEAR.Classes.ClassDeclaration"/>
@@ -67,7 +67,7 @@
</properties>
</rule>
- <!-- This messgae is not required as spaces are allowed for alignment -->
+ <!-- This message is not required as spaces are allowed for alignment -->
<rule ref="Generic.Functions.FunctionCallArgumentSpacing.TooMuchSpaceAfterComma">
<severity>0</severity>
</rule>
View
3  libraries/joomla/application/web/client.php
@@ -460,7 +460,8 @@ protected function detectPlatform($userAgent)
* Google encourages manufacturers to exclude the string Mobile from tablet device UA strings.
* In some modes Kindle Android devices include the string Mobile but they include the string Silk.
*/
- if (stripos($userAgent, 'Android 3') !== false || stripos($userAgent, 'Tablet') !== false || stripos($userAgent, 'Mobile') === false || stripos($userAgent, 'Silk') !== false )
+ if (stripos($userAgent, 'Android 3') !== false || stripos($userAgent, 'Tablet') !== false
+ || stripos($userAgent, 'Mobile') === false || stripos($userAgent, 'Silk') !== false )
{
$this->platform = self::ANDROIDTABLET;
}
View
11 libraries/joomla/image/image.php
@@ -78,7 +78,8 @@ public function __construct($source = null)
if (!isset(self::$formats[IMAGETYPE_JPEG]))
{
$info = gd_info();
- self::$formats[IMAGETYPE_JPEG] = (isset($info['JPEG Support']) && $info['JPEG Support'] || isset($info['JPG Support']) && $info['JPG Support']) ? true : false;
+ self::$formats[IMAGETYPE_JPEG] = (isset($info['JPEG Support']) && $info['JPEG Support']
+ || isset($info['JPG Support']) && $info['JPG Support']) ? true : false;
self::$formats[IMAGETYPE_PNG] = ($info['PNG Support']) ? true : false;
self::$formats[IMAGETYPE_GIF] = ($info['GIF Read Support']) ? true : false;
}
@@ -445,7 +446,7 @@ public function loadFile($path)
* @param mixed $width The width of the resized image in pixels or a percentage.
* @param mixed $height The height of the resized image in pixels or a percentage.
* @param bool $createNew If true the current image will be cloned, resized and returned; else
- * the current image will be resized and returned.
+ * the current image will be resized and returned.
* @param integer $scaleMethod Which method to use for scaling
*
* @return JImage
@@ -519,7 +520,7 @@ public function resize($width, $height, $createNew = true, $scaleMethod = self::
* @param mixed $angle The angle of rotation for the image
* @param integer $background The background color to use when areas are added due to rotation
* @param bool $createNew If true the current image will be cloned, rotated and returned; else
- * the current image will be rotated and returned.
+ * the current image will be rotated and returned.
*
* @return JImage
*
@@ -654,10 +655,8 @@ protected function getFilterInstance($type)
*
* @return object
*
- * @throws InvalidArgumentException If width,height or both given as zero
- *
* @since 11.3
- * @throws InvalidArgumentException
+ * @throws InvalidArgumentException If width, height or both given as zero
*/
protected function prepareDimensions($width, $height, $scaleMethod)
{
Please sign in to comment.
Something went wrong with that request. Please try again.