diff --git a/administrator/components/com_media/views/imageslist/tmpl/default.php b/administrator/components/com_media/views/imageslist/tmpl/default.php
index 3c57623633fab..87b35908186ee 100644
--- a/administrator/components/com_media/views/imageslist/tmpl/default.php
+++ b/administrator/components/com_media/views/imageslist/tmpl/default.php
@@ -48,7 +48,7 @@
 }
 ?>
 <?php if (count($this->images) > 0 || count($this->folders) > 0) : ?>
-	<ul class="manager thumbnails">
+	<ul class="manager thumbnails thumbnails-media">
 		<?php for ($i = 0, $n = count($this->folders); $i < $n; $i++) :
 			$this->setFolder($i);
 			echo $this->loadTemplate('folder');
diff --git a/administrator/components/com_media/views/medialist/tmpl/thumbs.php b/administrator/components/com_media/views/medialist/tmpl/thumbs.php
index a3eefc89de627..44ff5c3e49013 100644
--- a/administrator/components/com_media/views/medialist/tmpl/thumbs.php
+++ b/administrator/components/com_media/views/medialist/tmpl/thumbs.php
@@ -100,7 +100,7 @@
 		</label>
 	</div>
 
-	<ul class="manager thumbnails">
+	<ul class="manager thumbnails thumbnails-media">
 		<?php
 			echo $this->loadTemplate('up'),
 				$this->loadTemplate('folders'),
diff --git a/administrator/templates/isis/css/template-rtl.css b/administrator/templates/isis/css/template-rtl.css
index f912c9fed34fa..298fff2841810 100644
--- a/administrator/templates/isis/css/template-rtl.css
+++ b/administrator/templates/isis/css/template-rtl.css
@@ -7433,7 +7433,7 @@ body .navbar-fixed-top {
 	color: #0C192E;
 	text-shadow: 0 1px 0 #FFF;
 	margin-bottom: 10px;
-	min-height: 43px;
+	min-height: 51px;
 }
 .subhead-collapse {
 	margin-bottom: 11px;
@@ -8484,10 +8484,10 @@ textarea.noResize {
 #imageForm .well {
 	margin-bottom: 5px;
 }
-.thumbnails {
+.thumbnails-media {
 	margin-left: 0;
 }
-.thumbnails .thumbnail {
+.thumbnails-media .thumbnail {
 	background-color: #f4f4f4;
 	border-radius: 3px;
 	border: 0;
@@ -8501,7 +8501,7 @@ textarea.noResize {
 	text-align: center;
 	overflow: hidden;
 }
-.thumbnails .thumbnail .close {
+.thumbnails-media .thumbnail .close {
 	background-color: #ccc;
 	border-left: 1px solid rgba(0,0,0,0.1);
 	height: 22px;
@@ -8512,11 +8512,11 @@ textarea.noResize {
 	top: 0;
 	right: 0;
 }
-.thumbnails .thumbnail .close:hover {
+.thumbnails-media .thumbnail .close:hover {
 	background-color: #bbb;
 }
-.thumbnails .thumbnail *,
-.thumbnails .thumbnail *:before {
+.thumbnails-media .thumbnail *,
+.thumbnails-media .thumbnail *:before {
 	-webkit-transition: all 0.2s ease;
 	transition: all 0.2s ease;
 	-webkit-background-clip: padding-box;
@@ -8524,29 +8524,29 @@ textarea.noResize {
 	-webkit-box-sizing: border-box;
 	box-sizing: border-box;
 }
-.thumbnails .thumbnail input[type="radio"],
-.thumbnails .thumbnail input[type="checkbox"] {
+.thumbnails-media .thumbnail input[type="radio"],
+.thumbnails-media .thumbnail input[type="checkbox"] {
 	margin: 0;
 	opacity: 0.55;
 	position: absolute;
 	top: 5px;
 	left: 5px;
 }
-.thumbnails .thumbnail .controls,
-.thumbnails .thumbnail .imginfoBorder {
+.thumbnails-media .thumbnail .controls,
+.thumbnails-media .thumbnail .imginfoBorder {
 	display: none;
 }
-.thumbnails .imgThumb {
+.thumbnails-media .imgThumb {
 	position: relative;
 	z-index: 1;
 	width: 100%;
 	display: inline-block;
 }
-.thumbnails .imgThumb input {
+.thumbnails-media .imgThumb input {
 	display: none;
 }
-.thumbnails .imgThumb label,
-.thumbnails .imgThumb .imgThumbInside {
+.thumbnails-media .imgThumb label,
+.thumbnails-media .imgThumb .imgThumbInside {
 	display: block;
 	line-height: 100px;
 	position: relative;
@@ -8554,8 +8554,8 @@ textarea.noResize {
 	border-radius: 3px;
 	overflow: hidden;
 }
-.thumbnails .imgThumb label:before,
-.thumbnails .imgThumb .imgThumbInside:before {
+.thumbnails-media .imgThumb label:before,
+.thumbnails-media .imgThumb .imgThumbInside:before {
 	font-family: "IcoMoon";
 	font-style: normal;
 	content: 'G';
@@ -8573,27 +8573,27 @@ textarea.noResize {
 	box-shadow: 0 1px 2px rgba(0,0,0,0.05);
 	border-radius: 0 3px;
 }
-.thumbnails .imgThumb img {
+.thumbnails-media .imgThumb img {
 	width: auto;
 }
-.thumbnails .selected :checked + label,
-.thumbnails .selected .imgThumbInside,
-.thumbnails .imgInput :checked + label,
-.thumbnails .imgInput .imgThumbInside {
+.thumbnails-media .selected :checked + label,
+.thumbnails-media .selected .imgThumbInside,
+.thumbnails-media .imgInput :checked + label,
+.thumbnails-media .imgInput .imgThumbInside {
 	background-color: #ddd;
 }
-.thumbnails .selected :checked + label:before,
-.thumbnails .selected .imgThumbInside:before,
-.thumbnails .imgInput :checked + label:before,
-.thumbnails .imgInput .imgThumbInside:before {
+.thumbnails-media .selected :checked + label:before,
+.thumbnails-media .selected .imgThumbInside:before,
+.thumbnails-media .imgInput :checked + label:before,
+.thumbnails-media .imgInput .imgThumbInside:before {
 	-webkit-transform: scale(1);
 	transform: scale(1);
 	opacity: 1;
 }
-.thumbnails .selected :checked + label:after,
-.thumbnails .selected .imgThumbInside:after,
-.thumbnails .imgInput :checked + label:after,
-.thumbnails .imgInput .imgThumbInside:after {
+.thumbnails-media .selected :checked + label:after,
+.thumbnails-media .selected .imgThumbInside:after,
+.thumbnails-media .imgInput :checked + label:after,
+.thumbnails-media .imgInput .imgThumbInside:after {
 	position: absolute;
 	top: 0;
 	left: 0;
@@ -8603,8 +8603,8 @@ textarea.noResize {
 	border: 3px solid #46a546;
 	border-radius: 5px;
 }
-.thumbnails .imgDelete a.close,
-.thumbnails .imgPreview a {
+.thumbnails-media .imgDelete a.close,
+.thumbnails-media .imgPreview a {
 	padding: 0;
 	position: absolute;
 	left: 0;
@@ -8612,7 +8612,7 @@ textarea.noResize {
 	height: 26px;
 	width: 26px;
 }
-.thumbnails .imgDelete a.close {
+.thumbnails-media .imgDelete a.close {
 	background-color: #bd362f;
 	border-color: #bd362f rgba(0,0,0,0.2) rgba(0,0,0,0.2) #bd362f;
 	top: 0;
@@ -8627,16 +8627,16 @@ textarea.noResize {
 	-webkit-transform: scale(0.5);
 	transform: scale(0.5);
 }
-.thumbnails .imgDelete a.close:hover {
+.thumbnails-media .imgDelete a.close:hover {
 	background-color: #802420;
 }
-.thumbnails .thumbnail:hover .imgDelete a.close {
+.thumbnails-media .thumbnail:hover .imgDelete a.close {
 	opacity: 1;
 	-webkit-transform: scale(1);
 	transform: scale(1);
 }
-.thumbnails .imgPreview a,
-.thumbnails .imgDetails {
+.thumbnails-media .imgPreview a,
+.thumbnails-media .imgDetails {
 	position: absolute;
 	left: 0;
 	background-color: #fff;
@@ -8648,22 +8648,22 @@ textarea.noResize {
 	border-radius: 0 3px 0 0;
 	z-index: 1;
 }
-.thumbnails .imgPreview a:hover,
-.thumbnails .imgDetails:hover {
+.thumbnails-media .imgPreview a:hover,
+.thumbnails-media .imgDetails:hover {
 	background-color: #eee;
 }
-.thumbnails .imgDetails {
+.thumbnails-media .imgDetails {
 	padding: 0 5px;
 	line-height: 20px;
 	color: #555;
 }
-.thumbnails .imgFolder span {
+.thumbnails-media .imgFolder span {
 	line-height: 90px;
 	font-size: 38px;
 	margin: 0;
 	width: auto;
 }
-.thumbnails .imgFolder + .imgDetails {
+.thumbnails-media .imgFolder + .imgDetails {
 	color: inherit;
 }
 #folderframe.thumbnail {
@@ -9711,26 +9711,26 @@ a.grid_true {
 .modal-header {
 	text-align: right;
 }
-#mediamanager-form .thumbnails .thumbnail {
+#mediamanager-form .thumbnails-media .thumbnail {
 	margin-left: 18px !important;
 	margin-right: 0;
 }
-.thumbnails .imgThumb label::before,
-.thumbnails .imgThumb .imgThumbInside::before {
+.thumbnails-media .imgThumb label::before,
+.thumbnails-media .imgThumb .imgThumbInside::before {
 	left: 0;
 	right: auto;
 	border-radius: 3px 0;
 }
-.thumbnails .thumbnail input[type="radio"],
-.thumbnails .thumbnail input[type="checkbox"] {
+.thumbnails-media .thumbnail input[type="radio"],
+.thumbnails-media .thumbnail input[type="checkbox"] {
 	left: auto;
 	right: 5px;
 }
-.thumbnails .imgDelete a.close {
+.thumbnails-media .imgDelete a.close {
 	border-radius: 0 3px;
 }
-.thumbnails .imgPreview a,
-.thumbnails .imgDetails {
+.thumbnails-media .imgPreview a,
+.thumbnails-media .imgDetails {
 	border-radius: 3px 0;
 	border-width: 1px 0 0 1px;
 	left: auto;
diff --git a/administrator/templates/isis/css/template.css b/administrator/templates/isis/css/template.css
index 1f8bd85d3c188..8a435c0052c4d 100644
--- a/administrator/templates/isis/css/template.css
+++ b/administrator/templates/isis/css/template.css
@@ -7433,7 +7433,7 @@ body .navbar-fixed-top {
 	color: #0C192E;
 	text-shadow: 0 1px 0 #FFF;
 	margin-bottom: 10px;
-	min-height: 43px;
+	min-height: 51px;
 }
 .subhead-collapse {
 	margin-bottom: 11px;
@@ -8484,10 +8484,10 @@ textarea.noResize {
 #imageForm .well {
 	margin-bottom: 5px;
 }
-.thumbnails {
+.thumbnails-media {
 	margin-left: 0;
 }
-.thumbnails .thumbnail {
+.thumbnails-media .thumbnail {
 	background-color: #f4f4f4;
 	border-radius: 3px;
 	border: 0;
@@ -8501,7 +8501,7 @@ textarea.noResize {
 	text-align: center;
 	overflow: hidden;
 }
-.thumbnails .thumbnail .close {
+.thumbnails-media .thumbnail .close {
 	background-color: #ccc;
 	border-left: 1px solid rgba(0,0,0,0.1);
 	height: 22px;
@@ -8512,11 +8512,11 @@ textarea.noResize {
 	top: 0;
 	right: 0;
 }
-.thumbnails .thumbnail .close:hover {
+.thumbnails-media .thumbnail .close:hover {
 	background-color: #bbb;
 }
-.thumbnails .thumbnail *,
-.thumbnails .thumbnail *:before {
+.thumbnails-media .thumbnail *,
+.thumbnails-media .thumbnail *:before {
 	-webkit-transition: all 0.2s ease;
 	transition: all 0.2s ease;
 	-webkit-background-clip: padding-box;
@@ -8524,29 +8524,29 @@ textarea.noResize {
 	-webkit-box-sizing: border-box;
 	box-sizing: border-box;
 }
-.thumbnails .thumbnail input[type="radio"],
-.thumbnails .thumbnail input[type="checkbox"] {
+.thumbnails-media .thumbnail input[type="radio"],
+.thumbnails-media .thumbnail input[type="checkbox"] {
 	margin: 0;
 	opacity: 0.55;
 	position: absolute;
 	top: 5px;
 	left: 5px;
 }
-.thumbnails .thumbnail .controls,
-.thumbnails .thumbnail .imginfoBorder {
+.thumbnails-media .thumbnail .controls,
+.thumbnails-media .thumbnail .imginfoBorder {
 	display: none;
 }
-.thumbnails .imgThumb {
+.thumbnails-media .imgThumb {
 	position: relative;
 	z-index: 1;
 	width: 100%;
 	display: inline-block;
 }
-.thumbnails .imgThumb input {
+.thumbnails-media .imgThumb input {
 	display: none;
 }
-.thumbnails .imgThumb label,
-.thumbnails .imgThumb .imgThumbInside {
+.thumbnails-media .imgThumb label,
+.thumbnails-media .imgThumb .imgThumbInside {
 	display: block;
 	line-height: 100px;
 	position: relative;
@@ -8554,8 +8554,8 @@ textarea.noResize {
 	border-radius: 3px;
 	overflow: hidden;
 }
-.thumbnails .imgThumb label:before,
-.thumbnails .imgThumb .imgThumbInside:before {
+.thumbnails-media .imgThumb label:before,
+.thumbnails-media .imgThumb .imgThumbInside:before {
 	font-family: "IcoMoon";
 	font-style: normal;
 	content: 'G';
@@ -8573,27 +8573,27 @@ textarea.noResize {
 	box-shadow: 0 1px 2px rgba(0,0,0,0.05);
 	border-radius: 0 3px;
 }
-.thumbnails .imgThumb img {
+.thumbnails-media .imgThumb img {
 	width: auto;
 }
-.thumbnails .selected :checked + label,
-.thumbnails .selected .imgThumbInside,
-.thumbnails .imgInput :checked + label,
-.thumbnails .imgInput .imgThumbInside {
+.thumbnails-media .selected :checked + label,
+.thumbnails-media .selected .imgThumbInside,
+.thumbnails-media .imgInput :checked + label,
+.thumbnails-media .imgInput .imgThumbInside {
 	background-color: #ddd;
 }
-.thumbnails .selected :checked + label:before,
-.thumbnails .selected .imgThumbInside:before,
-.thumbnails .imgInput :checked + label:before,
-.thumbnails .imgInput .imgThumbInside:before {
+.thumbnails-media .selected :checked + label:before,
+.thumbnails-media .selected .imgThumbInside:before,
+.thumbnails-media .imgInput :checked + label:before,
+.thumbnails-media .imgInput .imgThumbInside:before {
 	-webkit-transform: scale(1);
 	transform: scale(1);
 	opacity: 1;
 }
-.thumbnails .selected :checked + label:after,
-.thumbnails .selected .imgThumbInside:after,
-.thumbnails .imgInput :checked + label:after,
-.thumbnails .imgInput .imgThumbInside:after {
+.thumbnails-media .selected :checked + label:after,
+.thumbnails-media .selected .imgThumbInside:after,
+.thumbnails-media .imgInput :checked + label:after,
+.thumbnails-media .imgInput .imgThumbInside:after {
 	position: absolute;
 	top: 0;
 	left: 0;
@@ -8603,8 +8603,8 @@ textarea.noResize {
 	border: 3px solid #46a546;
 	border-radius: 5px;
 }
-.thumbnails .imgDelete a.close,
-.thumbnails .imgPreview a {
+.thumbnails-media .imgDelete a.close,
+.thumbnails-media .imgPreview a {
 	padding: 0;
 	position: absolute;
 	left: 0;
@@ -8612,7 +8612,7 @@ textarea.noResize {
 	height: 26px;
 	width: 26px;
 }
-.thumbnails .imgDelete a.close {
+.thumbnails-media .imgDelete a.close {
 	background-color: #bd362f;
 	border-color: #bd362f rgba(0,0,0,0.2) rgba(0,0,0,0.2) #bd362f;
 	top: 0;
@@ -8627,16 +8627,16 @@ textarea.noResize {
 	-webkit-transform: scale(0.5);
 	transform: scale(0.5);
 }
-.thumbnails .imgDelete a.close:hover {
+.thumbnails-media .imgDelete a.close:hover {
 	background-color: #802420;
 }
-.thumbnails .thumbnail:hover .imgDelete a.close {
+.thumbnails-media .thumbnail:hover .imgDelete a.close {
 	opacity: 1;
 	-webkit-transform: scale(1);
 	transform: scale(1);
 }
-.thumbnails .imgPreview a,
-.thumbnails .imgDetails {
+.thumbnails-media .imgPreview a,
+.thumbnails-media .imgDetails {
 	position: absolute;
 	left: 0;
 	background-color: #fff;
@@ -8648,22 +8648,22 @@ textarea.noResize {
 	border-radius: 0 3px 0 0;
 	z-index: 1;
 }
-.thumbnails .imgPreview a:hover,
-.thumbnails .imgDetails:hover {
+.thumbnails-media .imgPreview a:hover,
+.thumbnails-media .imgDetails:hover {
 	background-color: #eee;
 }
-.thumbnails .imgDetails {
+.thumbnails-media .imgDetails {
 	padding: 0 5px;
 	line-height: 20px;
 	color: #555;
 }
-.thumbnails .imgFolder span {
+.thumbnails-media .imgFolder span {
 	line-height: 90px;
 	font-size: 38px;
 	margin: 0;
 	width: auto;
 }
-.thumbnails .imgFolder + .imgDetails {
+.thumbnails-media .imgFolder + .imgDetails {
 	color: inherit;
 }
 #folderframe.thumbnail {
diff --git a/administrator/templates/isis/less/template-rtl.less b/administrator/templates/isis/less/template-rtl.less
index 0e4f19231a489..5489b87dcb0ec 100644
--- a/administrator/templates/isis/less/template-rtl.less
+++ b/administrator/templates/isis/less/template-rtl.less
@@ -353,23 +353,23 @@ a.grid_true {
 
 
 /* Media Manager */
-#mediamanager-form .thumbnails .thumbnail {
+#mediamanager-form .thumbnails-media .thumbnail {
     margin-left: 18px !important;
     margin-right: 0;
 }
-.thumbnails .imgThumb label::before, .thumbnails .imgThumb .imgThumbInside::before {
+.thumbnails-media .imgThumb label::before, .thumbnails-media .imgThumb .imgThumbInside::before {
 	left: 0;
 	right: auto;
 	border-radius: 3px 0;
 }
-.thumbnails .thumbnail input[type="radio"], .thumbnails .thumbnail input[type="checkbox"] {
+.thumbnails-media .thumbnail input[type="radio"], .thumbnails-media .thumbnail input[type="checkbox"] {
     left: auto;
     right: 5px;
 }
-.thumbnails .imgDelete a.close {
+.thumbnails-media .imgDelete a.close {
 	border-radius: 0 3px;
 }
-.thumbnails .imgPreview a, .thumbnails .imgDetails {
+.thumbnails-media .imgPreview a, .thumbnails-media .imgDetails {
     border-radius: 3px 0;
     border-width: 1px 0 0 1px;
     left: auto;
diff --git a/administrator/templates/isis/less/template.less b/administrator/templates/isis/less/template.less
index 12da5522abf98..b5a78a7d0f8db 100644
--- a/administrator/templates/isis/less/template.less
+++ b/administrator/templates/isis/less/template.less
@@ -407,7 +407,7 @@ body .navbar-fixed-top {
 	color: #0C192E;
 	text-shadow: 0 1px 0 #FFF;
 	margin-bottom: 10px;
-	min-height: 43px;
+	min-height: 51px;
 }
 
 .subhead-collapse {
@@ -1520,7 +1520,7 @@ textarea.noResize {
 		margin-bottom: 5px;
 	}
 }
-.thumbnails {
+.thumbnails-media {
 	@thumbSize:100px;
 	margin-left: 0;
 	.thumbnail {
diff --git a/composer.json b/composer.json
index 23adbcaa8d2f9..695a0555cc1de 100644
--- a/composer.json
+++ b/composer.json
@@ -31,7 +31,7 @@
         "ircmaxell/password-compat": "1.*",
         "leafo/lessphp": "0.5.0",
         "paragonie/random_compat": "~1.0",
-        "phpmailer/phpmailer": "^5.2.18",
+        "phpmailer/phpmailer": "^5.2.20",
         "symfony/polyfill-php55": "~1.2",
         "symfony/polyfill-php56": "~1.0",
         "symfony/yaml": "2.*",
diff --git a/composer.lock b/composer.lock
index 485a87499ced3..b780110f1cd27 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "ca7cb035c1ac04233d3c822f1160546c",
-    "content-hash": "161f91c41caf9a179d905264523b29ae",
+    "content-hash": "126eeca3e1a2354c350bd5ad6fdb4f47",
     "packages": [
         {
             "name": "ircmaxell/password-compat",
@@ -47,7 +46,7 @@
                 "hashing",
                 "password"
             ],
-            "time": "2014-11-20 16:49:30"
+            "time": "2014-11-20T16:49:30+00:00"
         },
         {
             "name": "joomla/application",
@@ -102,7 +101,7 @@
                 "framework",
                 "joomla"
             ],
-            "time": "2016-12-10 17:26:50"
+            "time": "2016-12-10T17:26:50+00:00"
         },
         {
             "name": "joomla/compat",
@@ -139,7 +138,7 @@
                 "framework",
                 "joomla"
             ],
-            "time": "2015-02-24 00:21:06"
+            "time": "2015-02-24T00:21:06+00:00"
         },
         {
             "name": "joomla/data",
@@ -188,7 +187,7 @@
                 "framework",
                 "joomla"
             ],
-            "time": "2016-04-02 22:20:43"
+            "time": "2016-04-02T22:20:43+00:00"
         },
         {
             "name": "joomla/di",
@@ -237,7 +236,7 @@
                 "ioc",
                 "joomla"
             ],
-            "time": "2015-04-02 16:30:40"
+            "time": "2015-04-02T16:30:40+00:00"
         },
         {
             "name": "joomla/event",
@@ -283,7 +282,7 @@
                 "framework",
                 "joomla"
             ],
-            "time": "2016-03-13 19:41:09"
+            "time": "2016-03-13T19:41:09+00:00"
         },
         {
             "name": "joomla/filter",
@@ -333,7 +332,7 @@
                 "framework",
                 "joomla"
             ],
-            "time": "2016-10-16 18:10:33"
+            "time": "2016-10-16T18:10:33+00:00"
         },
         {
             "name": "joomla/input",
@@ -381,7 +380,7 @@
                 "input",
                 "joomla"
             ],
-            "time": "2014-10-12 18:01:36"
+            "time": "2014-10-12T18:01:36+00:00"
         },
         {
             "name": "joomla/registry",
@@ -434,7 +433,7 @@
                 "joomla",
                 "registry"
             ],
-            "time": "2016-05-14 20:42:05"
+            "time": "2016-05-14T20:42:05+00:00"
         },
         {
             "name": "joomla/session",
@@ -484,7 +483,7 @@
                 "joomla",
                 "session"
             ],
-            "time": "2016-12-21 21:08:20"
+            "time": "2016-12-21T21:08:20+00:00"
         },
         {
             "name": "joomla/string",
@@ -550,7 +549,7 @@
                 "joomla",
                 "string"
             ],
-            "time": "2016-12-10 18:13:42"
+            "time": "2016-12-10T18:13:42+00:00"
         },
         {
             "name": "joomla/uri",
@@ -587,7 +586,7 @@
                 "joomla",
                 "uri"
             ],
-            "time": "2014-02-09 02:57:17"
+            "time": "2014-02-09T02:57:17+00:00"
         },
         {
             "name": "joomla/utilities",
@@ -633,7 +632,7 @@
                 "joomla",
                 "utilities"
             ],
-            "time": "2016-12-10 17:09:33"
+            "time": "2016-12-10T17:09:33+00:00"
         },
         {
             "name": "leafo/lessphp",
@@ -674,7 +673,7 @@
             ],
             "description": "lessphp is a compiler for LESS written in PHP.",
             "homepage": "http://leafo.net/lessphp/",
-            "time": "2014-11-24 18:39:20"
+            "time": "2014-11-24T18:39:20+00:00"
         },
         {
             "name": "paragonie/random_compat",
@@ -722,20 +721,20 @@
                 "pseudorandom",
                 "random"
             ],
-            "time": "2016-03-18 20:34:03"
+            "time": "2016-03-18T20:34:03+00:00"
         },
         {
             "name": "phpmailer/phpmailer",
-            "version": "v5.2.19",
+            "version": "v5.2.21",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPMailer/PHPMailer.git",
-                "reference": "9e4b8fb3deb7d9cfa515c04cec41f71bc37ce9a9"
+                "reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/9e4b8fb3deb7d9cfa515c04cec41f71bc37ce9a9",
-                "reference": "9e4b8fb3deb7d9cfa515c04cec41f71bc37ce9a9",
+                "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d51856b76c06fc687fcd9180efa7a0bed0d761e",
+                "reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e",
                 "shasum": ""
             },
             "require": {
@@ -782,7 +781,7 @@
                 }
             ],
             "description": "PHPMailer is a full-featured email creation and transfer class for PHP",
-            "time": "2016-12-26 10:09:10"
+            "time": "2016-12-28T15:35:48+00:00"
         },
         {
             "name": "psr/log",
@@ -829,7 +828,7 @@
                 "psr",
                 "psr-3"
             ],
-            "time": "2016-10-10 12:19:37"
+            "time": "2016-10-10T12:19:37+00:00"
         },
         {
             "name": "simplepie/simplepie",
@@ -883,7 +882,7 @@
                 "feeds",
                 "rss"
             ],
-            "time": "2012-10-30 17:54:03"
+            "time": "2012-10-30T17:54:03+00:00"
         },
         {
             "name": "symfony/polyfill-php55",
@@ -939,7 +938,7 @@
                 "portable",
                 "shim"
             ],
-            "time": "2016-11-14 01:06:16"
+            "time": "2016-11-14T01:06:16+00:00"
         },
         {
             "name": "symfony/polyfill-php56",
@@ -995,7 +994,7 @@
                 "portable",
                 "shim"
             ],
-            "time": "2016-11-14 01:06:16"
+            "time": "2016-11-14T01:06:16+00:00"
         },
         {
             "name": "symfony/polyfill-util",
@@ -1047,7 +1046,7 @@
                 "polyfill",
                 "shim"
             ],
-            "time": "2016-11-14 01:06:16"
+            "time": "2016-11-14T01:06:16+00:00"
         },
         {
             "name": "symfony/yaml",
@@ -1096,7 +1095,7 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2016-11-14 16:15:57"
+            "time": "2016-11-14T16:15:57+00:00"
         }
     ],
     "packages-dev": [
@@ -1152,7 +1151,7 @@
                 "constructor",
                 "instantiate"
             ],
-            "time": "2015-06-14 21:17:01"
+            "time": "2015-06-14T21:17:01+00:00"
         },
         {
             "name": "friendsofphp/php-cs-fixer",
@@ -1210,7 +1209,7 @@
                 }
             ],
             "description": "A tool to automatically fix PHP code style",
-            "time": "2016-07-22 06:46:28"
+            "time": "2016-07-22T06:46:28+00:00"
         },
         {
             "name": "pear/cache_lite",
@@ -1260,7 +1259,7 @@
             "keywords": [
                 "cache"
             ],
-            "time": "2014-05-11 15:02:19"
+            "time": "2014-05-11T15:02:19+00:00"
         },
         {
             "name": "phpdocumentor/reflection-docblock",
@@ -1309,7 +1308,7 @@
                     "email": "mike.vanriel@naenius.com"
                 }
             ],
-            "time": "2015-02-03 12:10:50"
+            "time": "2015-02-03T12:10:50+00:00"
         },
         {
             "name": "phpspec/prophecy",
@@ -1372,7 +1371,7 @@
                 "spy",
                 "stub"
             ],
-            "time": "2016-11-21 14:58:47"
+            "time": "2016-11-21T14:58:47+00:00"
         },
         {
             "name": "phpunit/dbunit",
@@ -1431,7 +1430,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2015-08-07 04:57:38"
+            "time": "2015-08-07T04:57:38+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -1493,7 +1492,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2015-10-06 15:47:00"
+            "time": "2015-10-06T15:47:00+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -1540,7 +1539,7 @@
                 "filesystem",
                 "iterator"
             ],
-            "time": "2016-10-03 07:40:28"
+            "time": "2016-10-03T07:40:28+00:00"
         },
         {
             "name": "phpunit/php-text-template",
@@ -1581,7 +1580,7 @@
             "keywords": [
                 "template"
             ],
-            "time": "2015-06-21 13:50:34"
+            "time": "2015-06-21T13:50:34+00:00"
         },
         {
             "name": "phpunit/php-timer",
@@ -1625,7 +1624,7 @@
             "keywords": [
                 "timer"
             ],
-            "time": "2016-05-12 18:03:57"
+            "time": "2016-05-12T18:03:57+00:00"
         },
         {
             "name": "phpunit/php-token-stream",
@@ -1674,7 +1673,7 @@
             "keywords": [
                 "tokenizer"
             ],
-            "time": "2016-11-15 14:06:22"
+            "time": "2016-11-15T14:06:22+00:00"
         },
         {
             "name": "phpunit/phpunit",
@@ -1746,7 +1745,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2016-12-09 02:45:31"
+            "time": "2016-12-09T02:45:31+00:00"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
@@ -1802,7 +1801,7 @@
                 "mock",
                 "xunit"
             ],
-            "time": "2015-10-02 06:51:40"
+            "time": "2015-10-02T06:51:40+00:00"
         },
         {
             "name": "sebastian/comparator",
@@ -1866,7 +1865,7 @@
                 "compare",
                 "equality"
             ],
-            "time": "2016-11-19 09:18:40"
+            "time": "2016-11-19T09:18:40+00:00"
         },
         {
             "name": "sebastian/diff",
@@ -1918,7 +1917,7 @@
             "keywords": [
                 "diff"
             ],
-            "time": "2015-12-08 07:14:41"
+            "time": "2015-12-08T07:14:41+00:00"
         },
         {
             "name": "sebastian/environment",
@@ -1968,7 +1967,7 @@
                 "environment",
                 "hhvm"
             ],
-            "time": "2016-08-18 05:49:44"
+            "time": "2016-08-18T05:49:44+00:00"
         },
         {
             "name": "sebastian/exporter",
@@ -2035,7 +2034,7 @@
                 "export",
                 "exporter"
             ],
-            "time": "2016-06-17 09:04:28"
+            "time": "2016-06-17T09:04:28+00:00"
         },
         {
             "name": "sebastian/global-state",
@@ -2086,7 +2085,7 @@
             "keywords": [
                 "global state"
             ],
-            "time": "2015-10-12 03:26:01"
+            "time": "2015-10-12T03:26:01+00:00"
         },
         {
             "name": "sebastian/recursion-context",
@@ -2139,7 +2138,7 @@
             ],
             "description": "Provides functionality to recursively process PHP variables",
             "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "time": "2015-11-11 19:50:13"
+            "time": "2015-11-11T19:50:13+00:00"
         },
         {
             "name": "sebastian/version",
@@ -2174,7 +2173,7 @@
             ],
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
             "homepage": "https://github.com/sebastianbergmann/version",
-            "time": "2015-06-21 13:59:46"
+            "time": "2015-06-21T13:59:46+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
@@ -2249,7 +2248,7 @@
                 "phpcs",
                 "standards"
             ],
-            "time": "2014-12-04 22:32:15"
+            "time": "2014-12-04T22:32:15+00:00"
         },
         {
             "name": "symfony/console",
@@ -2310,7 +2309,7 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2016-12-06 11:59:35"
+            "time": "2016-12-06T11:59:35+00:00"
         },
         {
             "name": "symfony/debug",
@@ -2367,7 +2366,7 @@
             ],
             "description": "Symfony Debug Component",
             "homepage": "https://symfony.com",
-            "time": "2016-11-15 12:53:17"
+            "time": "2016-11-15T12:53:17+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
@@ -2427,7 +2426,7 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2016-10-13 01:43:15"
+            "time": "2016-10-13T01:43:15+00:00"
         },
         {
             "name": "symfony/filesystem",
@@ -2476,7 +2475,7 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "https://symfony.com",
-            "time": "2016-10-18 04:28:30"
+            "time": "2016-10-18T04:28:30+00:00"
         },
         {
             "name": "symfony/finder",
@@ -2525,7 +2524,7 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2016-12-13 09:38:12"
+            "time": "2016-12-13T09:38:12+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
@@ -2584,7 +2583,7 @@
                 "portable",
                 "shim"
             ],
-            "time": "2016-11-14 01:06:16"
+            "time": "2016-11-14T01:06:16+00:00"
         },
         {
             "name": "symfony/process",
@@ -2633,7 +2632,7 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "time": "2016-11-24 00:43:03"
+            "time": "2016-11-24T00:43:03+00:00"
         },
         {
             "name": "symfony/stopwatch",
@@ -2682,7 +2681,7 @@
             ],
             "description": "Symfony Stopwatch Component",
             "homepage": "https://symfony.com",
-            "time": "2016-06-29 05:29:29"
+            "time": "2016-06-29T05:29:29+00:00"
         }
     ],
     "aliases": [],
diff --git a/libraries/cms/installer/adapter.php b/libraries/cms/installer/adapter.php
index 3871828f1f6d1..4583ed3e7b250 100644
--- a/libraries/cms/installer/adapter.php
+++ b/libraries/cms/installer/adapter.php
@@ -476,6 +476,12 @@ protected function doDatabaseTransactions()
 
 				return false;
 			}
+
+			// If installing with success and there is an uninstall script, add a installer rollback step to rollback if needed
+			if ($route === 'install' && isset($this->getManifest()->uninstall->sql))
+			{
+				$this->parent->pushStep(array('type' => 'query', 'script' => $this->getManifest()->uninstall->sql));
+			}
 		}
 
 		return true;
diff --git a/libraries/cms/installer/installer.php b/libraries/cms/installer/installer.php
index 976ab7281af6a..9b35f28804ef6 100644
--- a/libraries/cms/installer/installer.php
+++ b/libraries/cms/installer/installer.php
@@ -393,9 +393,8 @@ public function abort($msg = null, $type = null)
 					break;
 
 				case 'query':
-					// Placeholder in case this is necessary in the future
-					// $stepval is always false because if this step was called it invariably failed
-					$stepval = false;
+					// Execute the query.
+					$stepval = $this->parseSQLFiles($step['script']);
 					break;
 
 				case 'extension':
diff --git a/libraries/joomla/filesystem/support/stringcontroller.php b/libraries/joomla/filesystem/support/stringcontroller.php
index 93731c824c29f..a249d520265f1 100644
--- a/libraries/joomla/filesystem/support/stringcontroller.php
+++ b/libraries/joomla/filesystem/support/stringcontroller.php
@@ -51,7 +51,7 @@ public function createRef($reference, &$string)
 	 *
 	 * @param   string  $reference  The key for the reference.
 	 *
-	 * @return  mixed  False if not set, reference if it it exists
+	 * @return  mixed  False if not set, reference if it exists
 	 *
 	 * @since   11.1
 	 */
diff --git a/libraries/joomla/language/language.php b/libraries/joomla/language/language.php
index 2c51c5ec5e5c2..b4a0405db4b50 100644
--- a/libraries/joomla/language/language.php
+++ b/libraries/joomla/language/language.php
@@ -318,60 +318,50 @@ public static function getInstance($lang, $debug = false)
 	public function _($string, $jsSafe = false, $interpretBackSlashes = true)
 	{
 		// Detect empty string
-		if ($string == '')
+		if (empty($string))
 		{
 			return '';
 		}
 
-		$key = strtoupper($string);
+		$key    = strtoupper($string);
+		$string = isset($this->strings[$key]) ? $this->strings[$key] : $string;
 
-		if (isset($this->strings[$key]))
+		// Store debug information
+		if ($this->debug)
 		{
-			$string = $this->debug ? '**' . $this->strings[$key] . '**' : $this->strings[$key];
-
-			// Store debug information
-			if ($this->debug)
+			if (isset($this->strings[$key]))
 			{
-				$caller = $this->getCallerInfo();
-
-				if (!array_key_exists($key, $this->used))
-				{
-					$this->used[$key] = array();
-				}
-
-				$this->used[$key][] = $caller;
+				$boundary   = '**';
+				$property   = 'used';
+				$additional = array();
 			}
-		}
-		else
-		{
-			if ($this->debug)
+			else
 			{
-				$caller = $this->getCallerInfo();
-				$caller['string'] = $string;
-
-				if (!array_key_exists($key, $this->orphans))
-				{
-					$this->orphans[$key] = array();
-				}
-
-				$this->orphans[$key][] = $caller;
+				$boundary   = '??';
+				$property   = 'orphans';
+				$additional = array('string' => $string);
+			}
 
-				$string = '??' . $string . '??';
+			if (!isset($this->$property[$key]))
+			{
+				$this->$property[$key] = array();
 			}
+
+			$this->$property[$key][] = array_replace($this->getCallerInfo(), $additional);
+			
+			$string = $boundary . $string . $boundary;
 		}
 
+		// Javascript
 		if ($jsSafe)
 		{
-			// Javascript filter
-			$string = addslashes($string);
+			return addslashes($string);
 		}
-		elseif ($interpretBackSlashes)
+
+		// Interpret \n and \t characters
+		if ($interpretBackSlashes && strpos($string, '\\') !== false)
 		{
-			if (strpos($string, '\\') !== false)
-			{
-				// Interpret \n and \t characters
-				$string = str_replace(array('\\\\', '\t', '\n'), array("\\", "\t", "\n"), $string);
-			}
+			return str_replace(array('\\\\', '\t', '\n'), array("\\", "\t", "\n"), $string);
 		}
 
 		return $string;
diff --git a/libraries/joomla/language/text.php b/libraries/joomla/language/text.php
index 463af3c3f82b5..7f4777f4ee3d1 100644
--- a/libraries/joomla/language/text.php
+++ b/libraries/joomla/language/text.php
@@ -63,16 +63,16 @@ public static function _($string, $jsSafe = false, $interpretBackSlashes = true,
 			return $string;
 		}
 
-		$lang = JFactory::getLanguage();
+		$translatedString = JFactory::getLanguage()->_($string, $jsSafe, $interpretBackSlashes);
 
 		if ($script)
 		{
-			static::$strings[$string] = $lang->_($string, $jsSafe, $interpretBackSlashes);
+			static::$strings[$string] = $translatedString;
 
 			return $string;
 		}
 
-		return $lang->_($string, $jsSafe, $interpretBackSlashes);
+		return $translatedString;
 	}
 
 	/**
@@ -90,46 +90,46 @@ public static function _($string, $jsSafe = false, $interpretBackSlashes = true,
 	private static function passSprintf(&$string, $jsSafe = false, $interpretBackSlashes = true, $script = false)
 	{
 		// Check if string contains a comma
-		if (strpos($string, ',') === false)
+		if (strpos($string, ',') === false || strpos($string, '%') === false)
 		{
 			return false;
 		}
 
 		$lang = JFactory::getLanguage();
-		$string_parts = explode(',', $string);
+		$stringParts = explode(',', $string);
 
 		// Pass all parts through the JText translator
-		foreach ($string_parts as $i => $str)
+		foreach ($stringParts as $i => $str)
 		{
-			$string_parts[$i] = $lang->_($str, $jsSafe, $interpretBackSlashes);
+			$stringParts[$i] = $lang->_($str, $jsSafe, $interpretBackSlashes);
 		}
 
-		$first_part = array_shift($string_parts);
+		$firstPart = array_shift($stringParts);
 
 		// Replace custom named placeholders with sprinftf style placeholders
-		$first_part = preg_replace('/\[\[%([0-9]+):[^\]]*\]\]/', '%\1$s', $first_part);
+		$firstPart = preg_replace('#\[\[%([0-9]+):[^\]]*\]\]#', '%\1$s', $firstPart);
 
 		// Check if string contains sprintf placeholders
-		if (!preg_match('/%([0-9]+\$)?s/', $first_part))
+		if (!preg_match('#%([0-9]+\$)?s#', $firstPart))
 		{
 			return false;
 		}
 
-		$final_string = vsprintf($first_part, $string_parts);
+		$finalString = vsprintf($firstPart, $stringParts);
 
 		// Return false if string hasn't changed
-		if ($first_part === $final_string)
+		if ($firstPart === $finalString)
 		{
 			return false;
 		}
 
-		$string = $final_string;
+		$string = $finalString;
 
 		if ($script)
 		{
-			foreach ($string_parts as $i => $str)
+			foreach ($stringParts as $i => $str)
 			{
-				static::$strings[$str] = $string_parts[$i];
+				static::$strings[$str] = $stringParts[$i];
 			}
 		}
 
diff --git a/libraries/vendor/composer/ClassLoader.php b/libraries/vendor/composer/ClassLoader.php
index ac67d302a1866..4626994fd4d8a 100644
--- a/libraries/vendor/composer/ClassLoader.php
+++ b/libraries/vendor/composer/ClassLoader.php
@@ -55,6 +55,7 @@ class ClassLoader
     private $classMap = array();
     private $classMapAuthoritative = false;
     private $missingClasses = array();
+    private $apcuPrefix;
 
     public function getPrefixes()
     {
@@ -271,6 +272,26 @@ public function isClassMapAuthoritative()
         return $this->classMapAuthoritative;
     }
 
+    /**
+     * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
+     *
+     * @param string|null $apcuPrefix
+     */
+    public function setApcuPrefix($apcuPrefix)
+    {
+        $this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
+    }
+
+    /**
+     * The APCu prefix in use, or null if APCu caching is not enabled.
+     *
+     * @return string|null
+     */
+    public function getApcuPrefix()
+    {
+        return $this->apcuPrefix;
+    }
+
     /**
      * Registers this instance as an autoloader.
      *
@@ -313,11 +334,6 @@ public function loadClass($class)
      */
     public function findFile($class)
     {
-        // work around for PHP 5.3.0 - 5.3.2 https://bugs.php.net/50731
-        if ('\\' == $class[0]) {
-            $class = substr($class, 1);
-        }
-
         // class map lookup
         if (isset($this->classMap[$class])) {
             return $this->classMap[$class];
@@ -325,6 +341,12 @@ public function findFile($class)
         if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
             return false;
         }
+        if (null !== $this->apcuPrefix) {
+            $file = apcu_fetch($this->apcuPrefix.$class, $hit);
+            if ($hit) {
+                return $file;
+            }
+        }
 
         $file = $this->findFileWithExtension($class, '.php');
 
@@ -333,6 +355,10 @@ public function findFile($class)
             $file = $this->findFileWithExtension($class, '.hh');
         }
 
+        if (null !== $this->apcuPrefix) {
+            apcu_add($this->apcuPrefix.$class, $file);
+        }
+
         if (false === $file) {
             // Remember that this class does not exist.
             $this->missingClasses[$class] = true;
diff --git a/libraries/vendor/composer/installed.json b/libraries/vendor/composer/installed.json
index 9f6a3c75ea4e3..fe028139199c1 100644
--- a/libraries/vendor/composer/installed.json
+++ b/libraries/vendor/composer/installed.json
@@ -17,7 +17,7 @@
         "require": {
             "php": ">=5.3.10"
         },
-        "time": "2014-02-09 02:57:17",
+        "time": "2014-02-09T02:57:17+00:00",
         "type": "joomla-package",
         "installation-source": "dist",
         "autoload": {
@@ -62,7 +62,7 @@
             "phpunit/phpunit": "4.*",
             "squizlabs/php_codesniffer": "1.*"
         },
-        "time": "2014-10-12 18:01:36",
+        "time": "2014-10-12T18:01:36+00:00",
         "type": "joomla-package",
         "extra": {
             "branch-alias": {
@@ -106,7 +106,7 @@
         "require-dev": {
             "phpunit/phpunit": "4.*"
         },
-        "time": "2014-11-20 16:49:30",
+        "time": "2014-11-20T16:49:30+00:00",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
@@ -150,7 +150,7 @@
         "require": {
             "php": ">=5.3.10"
         },
-        "time": "2015-02-24 00:21:06",
+        "time": "2015-02-24T00:21:06+00:00",
         "type": "joomla-package",
         "installation-source": "dist",
         "autoload": {
@@ -193,7 +193,7 @@
             "phpunit/phpunit": "4.*",
             "squizlabs/php_codesniffer": "1.*"
         },
-        "time": "2015-04-02 16:30:40",
+        "time": "2015-04-02T16:30:40+00:00",
         "type": "joomla-package",
         "extra": {
             "branch-alias": {
@@ -237,7 +237,7 @@
             "reference": "0f5a7f5545d2bcf4e9fad9a228c8ad89cc9aa283",
             "shasum": ""
         },
-        "time": "2014-11-24 18:39:20",
+        "time": "2014-11-24T18:39:20+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -287,7 +287,7 @@
             "phpunit/phpunit": "~4.8|~5.0",
             "squizlabs/php_codesniffer": "1.*"
         },
-        "time": "2016-03-13 19:41:09",
+        "time": "2016-03-13T19:41:09+00:00",
         "type": "joomla-package",
         "extra": {
             "branch-alias": {
@@ -337,7 +337,7 @@
         "suggest": {
             "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
         },
-        "time": "2016-03-18 20:34:03",
+        "time": "2016-03-18T20:34:03+00:00",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
@@ -381,7 +381,7 @@
         "require": {
             "php": ">=5.2.0"
         },
-        "time": "2012-10-30 17:54:03",
+        "time": "2012-10-30T17:54:03+00:00",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
@@ -444,7 +444,7 @@
             "phpunit/phpunit": "~4.8|~5.0",
             "squizlabs/php_codesniffer": "1.*"
         },
-        "time": "2016-04-02 22:20:43",
+        "time": "2016-04-02T22:20:43+00:00",
         "type": "joomla-package",
         "extra": {
             "branch-alias": {
@@ -500,7 +500,7 @@
         "suggest": {
             "symfony/yaml": "Install symfony/yaml if you require YAML support."
         },
-        "time": "2016-05-14 20:42:05",
+        "time": "2016-05-14T20:42:05+00:00",
         "type": "joomla-package",
         "extra": {
             "branch-alias": {
@@ -543,7 +543,7 @@
         "require": {
             "php": ">=5.3.0"
         },
-        "time": "2016-10-10 12:19:37",
+        "time": "2016-10-10T12:19:37+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -600,7 +600,7 @@
         "suggest": {
             "ext-mbstring": "For improved processing"
         },
-        "time": "2016-12-10 18:13:42",
+        "time": "2016-12-10T18:13:42+00:00",
         "type": "joomla-package",
         "extra": {
             "branch-alias": {
@@ -665,7 +665,7 @@
             "phpunit/phpunit": "~4.8|~5.0",
             "squizlabs/php_codesniffer": "1.*"
         },
-        "time": "2016-12-10 17:09:33",
+        "time": "2016-12-10T17:09:33+00:00",
         "type": "joomla-package",
         "extra": {
             "branch-alias": {
@@ -717,7 +717,7 @@
         "suggest": {
             "joomla/language": "Required only if you want to use `OutputFilter::stringURLSafe`."
         },
-        "time": "2016-10-16 18:10:33",
+        "time": "2016-10-16T18:10:33+00:00",
         "type": "joomla-package",
         "extra": {
             "branch-alias": {
@@ -774,7 +774,7 @@
             "joomla/session": "To use AbstractWebApplication with session support, install joomla/session",
             "joomla/uri": "To use AbstractWebApplication, install joomla/uri"
         },
-        "time": "2016-12-10 17:26:50",
+        "time": "2016-12-10T17:26:50+00:00",
         "type": "joomla-package",
         "extra": {
             "branch-alias": {
@@ -818,7 +818,7 @@
             "ircmaxell/password-compat": "~1.0",
             "php": ">=5.3.3"
         },
-        "time": "2016-11-14 01:06:16",
+        "time": "2016-11-14T01:06:16+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -875,7 +875,7 @@
         "require": {
             "php": ">=5.3.3"
         },
-        "time": "2016-11-14 01:06:16",
+        "time": "2016-11-14T01:06:16+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -930,7 +930,7 @@
             "php": ">=5.3.3",
             "symfony/polyfill-util": "~1.0"
         },
-        "time": "2016-11-14 01:06:16",
+        "time": "2016-11-14T01:06:16+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -987,7 +987,7 @@
         "require": {
             "php": ">=5.3.9"
         },
-        "time": "2016-11-14 16:15:57",
+        "time": "2016-11-14T16:15:57+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -1052,7 +1052,7 @@
         "suggest": {
             "joomla/database": "Install joomla/database if you want to use Database session storage."
         },
-        "time": "2016-12-21 21:08:20",
+        "time": "2016-12-21T21:08:20+00:00",
         "type": "joomla-package",
         "installation-source": "dist",
         "autoload": {
@@ -1074,17 +1074,17 @@
     },
     {
         "name": "phpmailer/phpmailer",
-        "version": "v5.2.19",
-        "version_normalized": "5.2.19.0",
+        "version": "v5.2.21",
+        "version_normalized": "5.2.21.0",
         "source": {
             "type": "git",
             "url": "https://github.com/PHPMailer/PHPMailer.git",
-            "reference": "9e4b8fb3deb7d9cfa515c04cec41f71bc37ce9a9"
+            "reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/9e4b8fb3deb7d9cfa515c04cec41f71bc37ce9a9",
-            "reference": "9e4b8fb3deb7d9cfa515c04cec41f71bc37ce9a9",
+            "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d51856b76c06fc687fcd9180efa7a0bed0d761e",
+            "reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e",
             "shasum": ""
         },
         "require": {
@@ -1097,7 +1097,7 @@
         "suggest": {
             "league/oauth2-google": "Needed for Google XOAUTH2 authentication"
         },
-        "time": "2016-12-26 10:09:10",
+        "time": "2016-12-28T15:35:48+00:00",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
diff --git a/libraries/vendor/phpmailer/phpmailer/VERSION b/libraries/vendor/phpmailer/phpmailer/VERSION
index 1c26b6f22f621..567eefa2cdf13 100644
--- a/libraries/vendor/phpmailer/phpmailer/VERSION
+++ b/libraries/vendor/phpmailer/phpmailer/VERSION
@@ -1 +1 @@
-5.2.19
\ No newline at end of file
+5.2.21
diff --git a/libraries/vendor/phpmailer/phpmailer/class.phpmailer.php b/libraries/vendor/phpmailer/phpmailer/class.phpmailer.php
index 6afcf9ae94a39..8ff13f11046ae 100644
--- a/libraries/vendor/phpmailer/phpmailer/class.phpmailer.php
+++ b/libraries/vendor/phpmailer/phpmailer/class.phpmailer.php
@@ -31,7 +31,7 @@ class PHPMailer
      * The PHPMailer Version number.
      * @var string
      */
-    public $Version = '5.2.19';
+    public $Version = '5.2.21';
 
     /**
      * Email priority.
@@ -1364,19 +1364,24 @@ public function postSend()
      */
     protected function sendmailSend($header, $body)
     {
-        if (!empty($this->Sender)) {
+        // CVE-2016-10033, CVE-2016-10045: Don't pass -f if characters will be escaped.
+        if (!empty($this->Sender) and self::isShellSafe($this->Sender)) {
             if ($this->Mailer == 'qmail') {
-                $sendmail = sprintf('%s -f%s', escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender));
+                $sendmailFmt = '%s -f%s';
             } else {
-                $sendmail = sprintf('%s -oi -f%s -t', escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender));
+                $sendmailFmt = '%s -oi -f%s -t';
             }
         } else {
             if ($this->Mailer == 'qmail') {
-                $sendmail = sprintf('%s', escapeshellcmd($this->Sendmail));
+                $sendmailFmt = '%s';
             } else {
-                $sendmail = sprintf('%s -oi -t', escapeshellcmd($this->Sendmail));
+                $sendmailFmt = '%s -oi -t';
             }
         }
+
+        // TODO: If possible, this should be changed to escapeshellarg.  Needs thorough testing.
+        $sendmail = sprintf($sendmailFmt, escapeshellcmd($this->Sendmail), $this->Sender);
+
         if ($this->SingleTo) {
             foreach ($this->SingleToArray as $toAddr) {
                 if (!@$mail = popen($sendmail, 'w')) {
@@ -1422,6 +1427,40 @@ protected function sendmailSend($header, $body)
         return true;
     }
 
+    /**
+     * Fix CVE-2016-10033 and CVE-2016-10045 by disallowing potentially unsafe shell characters.
+     *
+     * Note that escapeshellarg and escapeshellcmd are inadequate for our purposes, especially on Windows.
+     * @param string $string The string to be validated
+     * @see https://github.com/PHPMailer/PHPMailer/issues/924 CVE-2016-10045 bug report
+     * @access protected
+     * @return boolean
+     */
+    protected static function isShellSafe($string)
+    {
+        // Future-proof
+        if (escapeshellcmd($string) !== $string
+            or !in_array(escapeshellarg($string), array("'$string'", "\"$string\""))
+        ) {
+            return false;
+        }
+
+        $length = strlen($string);
+
+        for ($i = 0; $i < $length; $i++) {
+            $c = $string[$i];
+
+            // All other characters have a special meaning in at least one common shell, including = and +.
+            // Full stop (.) has a special meaning in cmd.exe, but its impact should be negligible here.
+            // Note that this does permit non-Latin alphanumeric characters based on the current locale.
+            if (!ctype_alnum($c) && strpos('@_-.', $c) === false) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
     /**
      * Send mail using the PHP mail() function.
      * @param string $header The message headers
@@ -1442,7 +1481,10 @@ protected function mailSend($header, $body)
         $params = null;
         //This sets the SMTP envelope sender which gets turned into a return-path header by the receiver
         if (!empty($this->Sender) and $this->validateAddress($this->Sender)) {
-            $params = sprintf('-f%s', escapeshellarg($this->Sender));
+            // CVE-2016-10033, CVE-2016-10045: Don't pass -f if characters will be escaped.
+            if (self::isShellSafe($this->Sender)) {
+                $params = sprintf('-f%s', $this->Sender);
+            }
         }
         if (!empty($this->Sender) and !ini_get('safe_mode') and $this->validateAddress($this->Sender)) {
             $old_from = ini_get('sendmail_from');
diff --git a/libraries/vendor/phpmailer/phpmailer/class.pop3.php b/libraries/vendor/phpmailer/phpmailer/class.pop3.php
index 32d614b35907c..373c886cded3e 100644
--- a/libraries/vendor/phpmailer/phpmailer/class.pop3.php
+++ b/libraries/vendor/phpmailer/phpmailer/class.pop3.php
@@ -34,7 +34,7 @@ class POP3
      * @var string
      * @access public
      */
-    public $Version = '5.2.19';
+    public $Version = '5.2.21';
 
     /**
      * Default POP3 port number.
diff --git a/libraries/vendor/phpmailer/phpmailer/class.smtp.php b/libraries/vendor/phpmailer/phpmailer/class.smtp.php
index 04ced65812905..270162b26400e 100644
--- a/libraries/vendor/phpmailer/phpmailer/class.smtp.php
+++ b/libraries/vendor/phpmailer/phpmailer/class.smtp.php
@@ -30,7 +30,7 @@ class SMTP
      * The PHPMailer SMTP version number.
      * @var string
      */
-    const VERSION = '5.2.19';
+    const VERSION = '5.2.21';
 
     /**
      * SMTP line break constant.
@@ -81,7 +81,7 @@ class SMTP
      * @deprecated Use the `VERSION` constant instead
      * @see SMTP::VERSION
      */
-    public $Version = '5.2.19';
+    public $Version = '5.2.21';
 
     /**
      * SMTP server port number.
diff --git a/media/system/js/fields/calendar-locales/ar.js b/media/system/js/fields/calendar-locales/ar.js
new file mode 100644
index 0000000000000..1215f2fc29b9d
--- /dev/null
+++ b/media/system/js/fields/calendar-locales/ar.js
@@ -0,0 +1,19 @@
+window.JoomlaCalLocale = {
+	today : "اليوم",
+	weekend : [6, 5],
+	wk : "الأسبوع",
+	time : "الساعة:",
+	days : ["الأحد", "الإثنين", "الثلاثاء", "الأربعاء", "الخميس", "الجمعة", "السبت"],
+	shortDays : ["الأحد", "الإثنين", "الثلاثاء", "الأربعاء", "الخميس", "الجمعة", "السبت"],
+	months : ["كانون الثّاني", "شباط", "آذار", "نيسان", "أيّار", "حزيران", "تمّوز", "آب", "أيلول", "تشرين الأوّل", "تشرين الثّاني", "كانون الأوّل"],
+	shortMonths : ["كانون الثّاني", "شباط", "آذار", "نيسان", "أيّار", "حزيران", "تمّوز", "آب", "أيلول", "تشرين الأوّل", "تشرين الثّاني", "كانون الأوّل"],
+	AM : "ق‌ظ",
+	PM :  "ب‌ظ",
+	am : "ق‌ظ",
+	pm : "ب‌ظ",
+	dateType : "gregorian",
+	minYear : 1900,
+	maxYear : 2100,
+	exit: "إغلاق",
+	save: "الغاء"
+};
\ No newline at end of file
diff --git a/plugins/search/categories/categories.php b/plugins/search/categories/categories.php
index 037a6fd14c905..647b4fa952f65 100644
--- a/plugins/search/categories/categories.php
+++ b/plugins/search/categories/categories.php
@@ -184,19 +184,15 @@ public function onContentSearch($text, $phrase = '', $ordering = '', $areas = nu
 
 		if ($rows)
 		{
-			$count = count($rows);
-
-			for ($i = 0; $i < $count; $i++)
+			foreach ($rows as $i => $row)
 			{
-				$rows[$i]->href = ContentHelperRoute::getCategoryRoute($rows[$i]->slug);
-				$rows[$i]->section = JText::_('JCATEGORY');
-			}
 
-			foreach ($rows as $category)
-			{
-				if (searchHelper::checkNoHtml($category, $searchText, array('name', 'title', 'text')))
+				if (searchHelper::checkNoHtml($row, $searchText, array('name', 'title', 'text')))
 				{
-					$return[] = $category;
+					$row->href = ContentHelperRoute::getCategoryRoute($row->slug);
+					$row->section = JText::_('JCATEGORY');
+
+					$return[] = $row;
 				}
 			}
 		}
diff --git a/tests/unit/bootstrap.php b/tests/unit/bootstrap.php
index 23120b4988d80..4b82eac6da0d3 100644
--- a/tests/unit/bootstrap.php
+++ b/tests/unit/bootstrap.php
@@ -5,11 +5,11 @@
  * Joomla is assumed to include the /unittest/ directory.
  * eg, /path/to/joomla/unittest/
  *
- * @package     Joomla.UnitTest
+ * @package    Joomla.UnitTest
  *
- * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE
- * @link        http://www.phpunit.de/manual/current/en/installation.html
+ * @copyright  Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ * @link       http://www.phpunit.de/manual/current/en/installation.html
  */
 
 /**
@@ -21,7 +21,6 @@
  */
 function jexit($message = 0)
 {
-	return;
 }
 
 define('_JEXEC', 1);
diff --git a/tests/unit/core/case/case.php b/tests/unit/core/case/case.php
index 270a79675ca59..4b266c9ae08d2 100644
--- a/tests/unit/core/case/case.php
+++ b/tests/unit/core/case/case.php
@@ -371,7 +371,7 @@ public function setExpectedError($error = null)
 	 */
 	protected function restoreErrorHandlers()
 	{
-		$this->setErrorhandlers($this->_stashedErrorState);
+		$this->setErrorHandlers($this->_stashedErrorState);
 	}
 
 	/**
diff --git a/tests/unit/core/case/database/postgresql.php b/tests/unit/core/case/database/postgresql.php
index 781b895a988d6..8085b65c13a3e 100644
--- a/tests/unit/core/case/database/postgresql.php
+++ b/tests/unit/core/case/database/postgresql.php
@@ -133,12 +133,12 @@ protected function getConnection()
 
 		if (!empty(self::$_options['host']))
 		{
-		        $dsn .= 'host=' . self::$_options['host'] . ';';
+			$dsn .= 'host=' . self::$_options['host'] . ';';
 		}
 
 		if (!empty(self::$_options['port']))
 		{
-		        $dsn .= 'port=' . self::$_options['port'] . ';';
+			$dsn .= 'port=' . self::$_options['port'] . ';';
 		}
 
 		$dsn .= 'dbname=' . self::$_options['database'];
diff --git a/tests/unit/core/mock/menu.php b/tests/unit/core/mock/menu.php
index a1faf3504e388..c13d3b64eac3e 100644
--- a/tests/unit/core/mock/menu.php
+++ b/tests/unit/core/mock/menu.php
@@ -87,7 +87,7 @@ protected static function prepareGetItemData()
 		foreach (self::$data as $id => $item)
 		{
 			$return[] = array($id, $item);
-			$return[] = array((string)$id, $item);
+			$return[] = array((string) $id, $item);
 		}
 
 		return $return;
diff --git a/tests/unit/stubs/discover1/challenger.php b/tests/unit/stubs/discover1/challenger.php
index cd8065a10bf00..37acc3f82e162 100644
--- a/tests/unit/stubs/discover1/challenger.php
+++ b/tests/unit/stubs/discover1/challenger.php
@@ -1 +1 @@
-<?php /* @codingStandardsIgnoreFile Empty file */ ?>
+<?php /* @codingStandardsIgnoreFile Empty file */
diff --git a/tests/unit/stubs/discover1/columbia.php b/tests/unit/stubs/discover1/columbia.php
index cd8065a10bf00..37acc3f82e162 100644
--- a/tests/unit/stubs/discover1/columbia.php
+++ b/tests/unit/stubs/discover1/columbia.php
@@ -1 +1 @@
-<?php /* @codingStandardsIgnoreFile Empty file */ ?>
+<?php /* @codingStandardsIgnoreFile Empty file */
diff --git a/tests/unit/suites/libraries/cms/html/JHtmlTest.php b/tests/unit/suites/libraries/cms/html/JHtmlTest.php
index 9bc5e50cf29a5..3e21be0f9f410 100644
--- a/tests/unit/suites/libraries/cms/html/JHtmlTest.php
+++ b/tests/unit/suites/libraries/cms/html/JHtmlTest.php
@@ -1348,7 +1348,7 @@ public function testTooltip()
 
 		$this->assertEquals(
 			JHtml::tooltip('Content', 'Title', 'tooltip.png', null, null, 'MyAlt', 'hasTooltip2'),
-			'<span class="hasTooltip2" title="'.
+			'<span class="hasTooltip2" title="' .
 			'&lt;strong&gt;Title&lt;/strong&gt;&lt;br /&gt;Content' .
 			'"><img src="' . JUri::base(true) .
 			'/media/system/images/tooltip.png" alt="MyAlt" /></span>',
@@ -1449,8 +1449,8 @@ public function testCalendar()
 			);
 			$readonly = isset($data['attribs']['readonly']) ? 'readonly="readonly"' : '';
 
-			$xml = new SimpleXMLElement('<field name="'.$data['name'].'" type="calendar" id="'.$data['id'].'"
-			format="'.$data['format'].'" title="' .$data['friendly_date'] . '" value="' . $data['formattedDate'] . '" '. $readonly . ' />');
+			$xml = new SimpleXMLElement('<field name="' . $data['name'] . '" type="calendar" id="' . $data['id'] . '"
+			format="' . $data['format'] . '" title="' . $data['friendly_date'] . '" value="' . $data['formattedDate'] . '" ' . $readonly . ' />');
 
 			$this->assertEquals(
 				'calendar',
@@ -1461,19 +1461,19 @@ public function testCalendar()
 			$this->assertEquals(
 				$data['friendly_date'],
 				(string) $xml->attributes()->title,
-				'Line:'.__LINE__.' The calendar input should have `title == "' . $data['friendly_date'] . '"`'
+				'Line:' . __LINE__ . ' The calendar input should have `title == "' . $data['friendly_date'] . '"`'
 			);
 
 			$this->assertEquals(
 				$data['name'],
 				(string) $xml->attributes()->name,
-				'Line:'.__LINE__.' The calendar input should have `name == "' . $data['name'] . '"`'
+				'Line:' . __LINE__ . ' The calendar input should have `name == "' . $data['name'] . '"`'
 			);
 
 			$this->assertEquals(
 				$data['id'],
 				(string) $xml->attributes()->id,
-				'Line:'.__LINE__.' The calendar input should have `id == "' . $data['id'] . '"`'
+				'Line:' . __LINE__ . ' The calendar input should have `id == "' . $data['id'] . '"`'
 			);
 
 			$this->assertEquals(
@@ -1494,19 +1494,19 @@ public function testCalendar()
 			$this->assertArrayHasKey(
 				'/media/system/js/fields/calendar-locales/en.js',
 				JFactory::getDocument()->_scripts,
-				'Line:'.__LINE__.' JS file "calendar-vanilla.min.js" should be loaded'
+				'Line:' . __LINE__ . ' JS file "calendar-vanilla.min.js" should be loaded'
 			);
 
 			$this->assertArrayHasKey(
 				'/media/system/js/fields/calendar-locales/date/gregorian/date-helper.min.js',
 				JFactory::getDocument()->_scripts,
-				'Line:'.__LINE__.' JS file "date.js" should be loaded'
+				'Line:' . __LINE__ . ' JS file "date.js" should be loaded'
 			);
 
 			$this->assertArrayHasKey(
 				'/media/system/js/fields/calendar-vanilla.min.js',
 				JFactory::getDocument()->_scripts,
-				'Line:'.__LINE__.' JS file "calendar-vanilla.min.js" should be loaded'
+				'Line:' . __LINE__ . ' JS file "calendar-vanilla.min.js" should be loaded'
 			);
 		}
 	}
diff --git a/tests/unit/suites/libraries/cms/installer/JInstallerTest.php b/tests/unit/suites/libraries/cms/installer/JInstallerTest.php
index 2e5dd73a78866..041ccde82053b 100644
--- a/tests/unit/suites/libraries/cms/installer/JInstallerTest.php
+++ b/tests/unit/suites/libraries/cms/installer/JInstallerTest.php
@@ -185,22 +185,6 @@ public function testGetPath()
 		);
 	}
 
-	/**
-	 * Test...
-	 *
-	 * @covers  JInstaller::abort
-	 *
-	 * @return void
-	 */
-	public function testAbortQuery()
-	{
-		$this->object->pushStep(array('type' => 'query'));
-
-		$this->assertFalse(
-			$this->object->abort()
-		);
-	}
-
 	/**
 	 * Test...
 	 *
diff --git a/tests/unit/suites/libraries/cms/router/JRouterSiteTest.php b/tests/unit/suites/libraries/cms/router/JRouterSiteTest.php
index 767039dfcd3c8..71d1fea5087a1 100644
--- a/tests/unit/suites/libraries/cms/router/JRouterSiteTest.php
+++ b/tests/unit/suites/libraries/cms/router/JRouterSiteTest.php
@@ -249,7 +249,7 @@ public function testParse($url, $mode, $map, $server, $expectedVars, $expectedUr
 		$vars = $object->parse($uri);
 
 		$this->assertEquals($expectedVars, $vars);
-		$this->assertEquals($expectedUris, (string)$uri);
+		$this->assertEquals($expectedUris, (string) $uri);
 	}
 
 	/**
@@ -500,7 +500,7 @@ public function testBuild($url, $mode, $vars, $map, $server, $expected)
 		$object->setMode($mode);
 
 		// Check the expected values
-		$this->assertEquals($expected, (string)($object->build($url)));
+		$this->assertEquals($expected, (string) ($object->build($url)));
 	}
 
 	/**
@@ -958,7 +958,7 @@ public function testBuildRawRoute()
 		$buildRawRouteMethod->setAccessible(true);
 
 		$buildRawRouteMethod->invokeArgs($object, array(&$uri));
-		$this->assertEquals('index.php', (string)$uri);
+		$this->assertEquals('index.php', (string) $uri);
 	}
 
 	/**
@@ -983,7 +983,7 @@ public function testAComponentRoutersPreprocessMethodIsExecuted()
 
 		$uri->setVar('option', 'com_test');
 		$buildRawRouteMethod->invokeArgs($object, array(&$uri));
-		$this->assertEquals('index.php?option=com_test&testvar=testvalue', (string)$uri);
+		$this->assertEquals('index.php?option=com_test&testvar=testvalue', (string) $uri);
 	}
 
 	/**
@@ -1009,7 +1009,7 @@ public function testABrokenOptionIsProperlySanitisedToGetTheRightRouter()
 		$uri->setVar('option', 'com_ te?st');
 		$uri->delVar('testvar');
 		$buildRawRouteMethod->invokeArgs($object, array(&$uri));
-		$this->assertEquals('index.php?option=com_ te?st&testvar=testvalue', (string)$uri);
+		$this->assertEquals('index.php?option=com_ te?st&testvar=testvalue', (string) $uri);
 	}
 
 	/**
@@ -1035,7 +1035,7 @@ public function testALegacyComponentRoutersPreprocessMethodIsExecuted()
 		$uri->setVar('option', 'com_test3');
 		$uri->delVar('testvar');
 		$buildRawRouteMethod->invokeArgs($object, array(&$uri));
-		$this->assertEquals('index.php?option=com_test3', (string)$uri);
+		$this->assertEquals('index.php?option=com_test3', (string) $uri);
 	}
 
 	/**
@@ -1117,7 +1117,7 @@ public function testBuildSefRoute($url, $expected)
 		$buildSefRouteMethod->setAccessible(true);
 		$buildSefRouteMethod->invokeArgs($object, array(&$uri));
 
-		$this->assertEquals($expected, (string)$uri);
+		$this->assertEquals($expected, (string) $uri);
 	}
 
 	/**
@@ -1221,7 +1221,7 @@ public function testProcessBuildRules($url, $mode, $expected)
 
 		$processBuildRulesMethod->invokeArgs($object, array(&$uri));
 
-		$this->assertEquals($expected, (string)$uri);
+		$this->assertEquals($expected, (string) $uri);
 	}
 
 	/**
@@ -1313,7 +1313,7 @@ public function testCreateUri($url, $preset, $expected)
 		$uri = $createUriMethod->invoke($object, $url);
 
 		$this->assertInstanceOf('JUri', $uri);
-		$this->assertEquals($expected, (string)$uri);
+		$this->assertEquals($expected, (string) $uri);
 	}
 
 	/**
diff --git a/tests/unit/suites/libraries/cms/router/JRouterTest.php b/tests/unit/suites/libraries/cms/router/JRouterTest.php
index 06d772ce067b4..c6cc0353d036a 100644
--- a/tests/unit/suites/libraries/cms/router/JRouterTest.php
+++ b/tests/unit/suites/libraries/cms/router/JRouterTest.php
@@ -653,7 +653,7 @@ public function testProcessingTheBuildRulesGivesTheRightUris($url, $functions, $
 			$this->object->attachBuildRule($function, $stage);
 		}
 
-		$this->assertEquals($expected, (string)$this->object->build($url));
+		$this->assertEquals($expected, (string) $this->object->build($url));
 	}
 
 	/**
@@ -728,7 +728,7 @@ function (JRouter $router, JUri $uri)
 			JRouter::PROCESS_AFTER
 		);
 
-		$this->assertEquals($expected, (string)$this->object->build($url));
+		$this->assertEquals($expected, (string) $this->object->build($url));
 	}
 
 	/**
@@ -811,7 +811,7 @@ public function testCreateUriGeneratesUriFromUrlAndPreset($url, $preset, $expect
 
 		$createUriMethod = new ReflectionMethod('JRouter', 'createUri');
 		$createUriMethod->setAccessible(true);
-		$this->assertEquals($expected, (string)($createUriMethod->invoke($this->object, $url)));
+		$this->assertEquals($expected, (string) ($createUriMethod->invoke($this->object, $url)));
 	}
 
 	/**
diff --git a/tests/unit/suites/libraries/joomla/controller/JControllerBaseTest.php b/tests/unit/suites/libraries/joomla/controller/JControllerBaseTest.php
index 2bc1b245a0360..0fe78a1796e21 100644
--- a/tests/unit/suites/libraries/joomla/controller/JControllerBaseTest.php
+++ b/tests/unit/suites/libraries/joomla/controller/JControllerBaseTest.php
@@ -172,6 +172,6 @@ protected function tearDown()
 	{
 		$this->restoreFactoryState();
 		unset($this->_instance);
-		parent::teardown();
+		parent::tearDown();
 	}
 }
diff --git a/tests/unit/suites/libraries/joomla/database/stubs/nosqldriver.php b/tests/unit/suites/libraries/joomla/database/stubs/nosqldriver.php
index 2185085f71829..7d98cd9163df8 100644
--- a/tests/unit/suites/libraries/joomla/database/stubs/nosqldriver.php
+++ b/tests/unit/suites/libraries/joomla/database/stubs/nosqldriver.php
@@ -84,7 +84,6 @@ public function connected()
 	 */
 	public function disconnect()
 	{
-		return;
 	}
 
 	/**
diff --git a/tests/unit/suites/libraries/joomla/date/JDateTest.php b/tests/unit/suites/libraries/joomla/date/JDateTest.php
index 874816ee4ee42..f9e03d625749c 100644
--- a/tests/unit/suites/libraries/joomla/date/JDateTest.php
+++ b/tests/unit/suites/libraries/joomla/date/JDateTest.php
@@ -208,36 +208,36 @@ public function casesFormat()
 				false,
 				'122007 164456',
 			),
- 			'Long' => array(
- 				'D F j, Y H:i:s',
+			'Long' => array(
+				'D F j, Y H:i:s',
 				true,
- 				'Thu December 20, 2007 11:44:56',
- 			),
- 			'LongGMT' => array(
- 				'D F j, Y H:i:s',
- 				false,
- 				'Thu December 20, 2007 16:44:56',
- 			),
- 			'Long2' => array(
- 				'H:i:s D F j, Y',
- 				false,
- 				'16:44:56 Thu December 20, 2007',
- 			),
- 			'Long3' => array(
- 				'H:i:s l F j, Y',
- 				false,
- 				'16:44:56 Thursday December 20, 2007',
- 			),
- 			'Long4' => array(
- 				'H:i:s l M j, Y',
- 				false,
- 				'16:44:56 Thursday Dec 20, 2007',
- 			),
- 			'RFC822' => array(
- 				'r',
- 				false,
- 				'Thu, 20 Dec 2007 16:44:56 +0000',
- 			),
+				'Thu December 20, 2007 11:44:56',
+			),
+			'LongGMT' => array(
+				'D F j, Y H:i:s',
+				false,
+				'Thu December 20, 2007 16:44:56',
+			),
+			'Long2' => array(
+				'H:i:s D F j, Y',
+				false,
+				'16:44:56 Thu December 20, 2007',
+			),
+			'Long3' => array(
+				'H:i:s l F j, Y',
+				false,
+				'16:44:56 Thursday December 20, 2007',
+			),
+			'Long4' => array(
+				'H:i:s l M j, Y',
+				false,
+				'16:44:56 Thursday Dec 20, 2007',
+			),
+			'RFC822' => array(
+				'r',
+				false,
+				'Thu, 20 Dec 2007 16:44:56 +0000',
+			),
 		);
 	}
 
@@ -535,10 +535,10 @@ public function test__construct($date, $tz, $expectedTime)
 			$this->equalTo($expectedTime)
 		);
 
- 		$this->assertThat(
- 			$jdate->format('D m/d/Y H:i', true, false),
- 			$this->equalTo($expectedTime)
- 		);
+		$this->assertThat(
+			$jdate->format('D m/d/Y H:i', true, false),
+			$this->equalTo($expectedTime)
+		);
 	}
 
 	/**
diff --git a/tests/unit/suites/libraries/joomla/document/JDocumentTest.php b/tests/unit/suites/libraries/joomla/document/JDocumentTest.php
index 5e6cf1ffb3e69..3128ccd1694f6 100644
--- a/tests/unit/suites/libraries/joomla/document/JDocumentTest.php
+++ b/tests/unit/suites/libraries/joomla/document/JDocumentTest.php
@@ -69,7 +69,7 @@ public function constructData()
 					'tab' => "\11",
 					'link' => '',
 					'base' => '',
-				    'mediaversion' => '1a2b3c4d'
+					'mediaversion' => '1a2b3c4d'
 				)
 			),
 			array(
diff --git a/tests/unit/suites/libraries/joomla/document/html/JDocumentHTMLTest.php b/tests/unit/suites/libraries/joomla/document/html/JDocumentHTMLTest.php
index 330563426e538..2b3dfe8c5bb29 100644
--- a/tests/unit/suites/libraries/joomla/document/html/JDocumentHTMLTest.php
+++ b/tests/unit/suites/libraries/joomla/document/html/JDocumentHTMLTest.php
@@ -63,9 +63,9 @@ class JDocumentHtmlTest extends TestCase
 		'custom' => array(
 			"<script>var html5 = true;</script>"
 		),
-	    'scriptText' => array(
-		    'JYES'
-	    )
+		'scriptText' => array(
+			'JYES'
+		)
 	);
 
 	/**
diff --git a/tests/unit/suites/libraries/joomla/feed/JFeedEntryTest.php b/tests/unit/suites/libraries/joomla/feed/JFeedEntryTest.php
index 0033c9fcd9536..25728cb7b66f3 100644
--- a/tests/unit/suites/libraries/joomla/feed/JFeedEntryTest.php
+++ b/tests/unit/suites/libraries/joomla/feed/JFeedEntryTest.php
@@ -352,6 +352,6 @@ protected function tearDown()
 	{
 		unset($this->_instance);
 
-		parent::teardown();
+		parent::tearDown();
 	}
 }
diff --git a/tests/unit/suites/libraries/joomla/feed/JFeedParserTest.php b/tests/unit/suites/libraries/joomla/feed/JFeedParserTest.php
index f83fd2d76dd9f..9978532645e00 100644
--- a/tests/unit/suites/libraries/joomla/feed/JFeedParserTest.php
+++ b/tests/unit/suites/libraries/joomla/feed/JFeedParserTest.php
@@ -55,7 +55,7 @@ public function testParse()
 
 		// Set the XML for the internal reader and move the stream to the <root> element.
 		$xml = '<root xmlns="http://bar.foo" xmlns:namespace="http://foo.bar"><tag1>foobar</tag1><namespace:tag2 attr="value" /></root>';
-		$this->_reader->Xml($xml);
+		$this->_reader->XML($xml);
 
 		// Advance the reader to the first <tag1> element.
 		do
@@ -207,7 +207,7 @@ public function testFetchNamespace()
 	public function testMoveToNextElement()
 	{
 		// Set the XML for the internal reader and move the stream to the <root> element.
-		$this->_reader->Xml('<root><node test="first"><child>foobar</child></node><node test="second"></node></root>');
+		$this->_reader->XML('<root><node test="first"><child>foobar</child></node><node test="second"></node></root>');
 		$this->_reader->next('root');
 
 		// Ensure that the current node is "root".
@@ -243,7 +243,7 @@ public function testMoveToNextElement()
 	public function testMoveToNextElementByName()
 	{
 		// Set the XML for the internal reader and move the stream to the <root> element.
-		$this->_reader->Xml('<root><node test="first"><child>foobar</child></node><node test="second"></node></root>');
+		$this->_reader->XML('<root><node test="first"><child>foobar</child></node><node test="second"></node></root>');
 
 		// Move to the next <node> element, which should be <node test="first">.
 		TestReflection::invoke($this->_instance, 'moveToNextElement', 'node');
@@ -266,7 +266,7 @@ public function testMoveToNextElementByName()
 	public function testMoveToClosingElement()
 	{
 		// Set the XML for the internal reader and move the stream to the <root> element.
-		$this->_reader->Xml('<root><child>foobar</child></root>');
+		$this->_reader->XML('<root><child>foobar</child></root>');
 		$this->_reader->next('root');
 
 		// Ensure that the current node is "root".
@@ -288,7 +288,7 @@ public function testMoveToClosingElement()
 	public function testMoveToClosingElementWithInternalElements()
 	{
 		// Set the XML for the internal reader and move the stream to the first <node> element.
-		$this->_reader->Xml('<root><node test="first"><child>foobar</child></node><node test="second"></node></root>');
+		$this->_reader->XML('<root><node test="first"><child>foobar</child></node><node test="second"></node></root>');
 
 		// Advance the reader to the first <node> element.
 		do
@@ -335,7 +335,7 @@ public function testMoveToClosingElementWithInternalElements()
 	public function testMoveToClosingElementWithSelfClosingTag()
 	{
 		// Set the XML for the internal reader and move the stream to the first <node> element.
-		$this->_reader->Xml('<root><node test="first" /><node test="second"></node></root>');
+		$this->_reader->XML('<root><node test="first" /><node test="second"></node></root>');
 
 		// Advance the reader to the first <node> element.
 		do
@@ -399,6 +399,6 @@ protected function tearDown()
 		unset($this->_instance);
 		unset($this->_reader);
 
-		parent::teardown();
+		parent::tearDown();
 	}
 }
diff --git a/tests/unit/suites/libraries/joomla/feed/JFeedTest.php b/tests/unit/suites/libraries/joomla/feed/JFeedTest.php
index f468170ae2f96..a1c1495e6f816 100644
--- a/tests/unit/suites/libraries/joomla/feed/JFeedTest.php
+++ b/tests/unit/suites/libraries/joomla/feed/JFeedTest.php
@@ -450,6 +450,6 @@ protected function tearDown()
 	{
 		unset($this->_instance);
 
-		parent::teardown();
+		parent::tearDown();
 	}
 }
diff --git a/tests/unit/suites/libraries/joomla/feed/parser/JFeedParserAtomTest.php b/tests/unit/suites/libraries/joomla/feed/parser/JFeedParserAtomTest.php
index 2a2645fafd287..48638040e6ff0 100644
--- a/tests/unit/suites/libraries/joomla/feed/parser/JFeedParserAtomTest.php
+++ b/tests/unit/suites/libraries/joomla/feed/parser/JFeedParserAtomTest.php
@@ -247,7 +247,7 @@ public function testHandleUpdated()
 	public function testInitialise($expected, $xml)
 	{
 		// Set the XML for the internal reader.
-		$this->_reader->Xml($xml);
+		$this->_reader->XML($xml);
 
 		// Advance the reader to the first element.
 		do
@@ -329,6 +329,6 @@ protected function tearDown()
 		unset($this->_instance);
 		unset($this->_reader);
 
-		parent::teardown();
+		parent::tearDown();
 	}
 }
diff --git a/tests/unit/suites/libraries/joomla/feed/parser/JFeedParserRssTest.php b/tests/unit/suites/libraries/joomla/feed/parser/JFeedParserRssTest.php
index 94d662fb96bab..6f7c880856f39 100644
--- a/tests/unit/suites/libraries/joomla/feed/parser/JFeedParserRssTest.php
+++ b/tests/unit/suites/libraries/joomla/feed/parser/JFeedParserRssTest.php
@@ -453,7 +453,7 @@ public function testHandleWebmaster()
 	public function testInitialise($expected, $xml)
 	{
 		// Set the XML for the internal reader.
-		$this->_reader->Xml($xml);
+		$this->_reader->XML($xml);
 
 		// Advance the reader to the first element.
 		do
@@ -576,6 +576,6 @@ protected function tearDown()
 		unset($this->_instance);
 		unset($this->_reader);
 
-		parent::teardown();
+		parent::tearDown();
 	}
 }
diff --git a/tests/unit/suites/libraries/joomla/form/JFormTest.php b/tests/unit/suites/libraries/joomla/form/JFormTest.php
index 14be009c97278..8aad969eea94c 100644
--- a/tests/unit/suites/libraries/joomla/form/JFormTest.php
+++ b/tests/unit/suites/libraries/joomla/form/JFormTest.php
@@ -78,8 +78,8 @@ private function _showXml($form)
 		$dom = new DOMDocument('1.0');
 		$dom->preserveWhiteSpace = false;
 		$dom->formatOutput = true;
-		$dom->loadXml($form->getXml()->asXml());
-		echo $dom->saveXml();
+		$dom->loadXML($form->getXml()->asXml());
+		echo $dom->saveXML();
 	}
 
 	/**
@@ -1467,15 +1467,15 @@ public function testLoad()
 			'Line:' . __LINE__ . ' The show_title in the params group has been replaced by show_abstract.'
 		);
 
-		$originalform = new JFormInspector('form1');
-		$originalform->load(JFormDataHelper::$loadDocument);
-		$originalset = $originalform->getXml()->xpath('/form/fields/field');
+		$originalForm = new JFormInspector('form1');
+		$originalForm->load(JFormDataHelper::$loadDocument);
+		$originalSet = $originalForm->getXml()->xpath('/form/fields/field');
 		$set = $form->getXml()->xpath('/form/fields/field');
 
-		for ($i = 0; $i < count($originalset); $i++)
+		for ($i = 0, $iMax = count($originalSet); $i < $iMax; ++$i)
 		{
 			$this->assertThat(
-				(string) ($originalset[$i]->attributes()->name) == (string) ($set[$i]->attributes()->name),
+				(string) $originalSet[$i]->attributes()->name === (string) $set[$i]->attributes()->name,
 				$this->isTrue(),
 				'Line:' . __LINE__ . ' Replace should leave fields in the original order.'
 			);
diff --git a/tests/unit/suites/libraries/joomla/github/JGithubPackageOrgsTest.php b/tests/unit/suites/libraries/joomla/github/JGithubPackageOrgsTest.php
index 8bcbca43ba83d..87567d736e01f 100644
--- a/tests/unit/suites/libraries/joomla/github/JGithubPackageOrgsTest.php
+++ b/tests/unit/suites/libraries/joomla/github/JGithubPackageOrgsTest.php
@@ -23,9 +23,9 @@ class JGithubPackageOrgsTest extends PHPUnit_Framework_TestCase
 	protected $response;
 
 	/**
-     * @var JGithubPackageOrgs
-     */
-    protected $object;
+	 * @var JGithubPackageOrgs
+	 */
+	protected $object;
 
 	/**
 	 * @var    string  Sample JSON string.
@@ -75,60 +75,60 @@ protected function tearDown()
 		parent::tearDown();
 	}
 
-    /**
-     * @covers JGithubPackageOrgs::getList
-     */
-    public function testGetList()
-    {
-	    $this->response->code = 200;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('get')
-		    ->with('/users/joomla/orgs')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->getList('joomla'),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
-
-    /**
-     * @covers JGithubPackageOrgs::get
-     */
-    public function testGet()
-    {
-	    $this->response->code = 200;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('get')
-		    ->with('/orgs/joomla')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->get('joomla'),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
-
-    /**
-     * @covers JGithubPackageOrgs::edit
-     */
-    public function testEdit()
-    {
-	    $this->response->code = 200;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('patch')
-		    ->with('/orgs/joomla')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->edit('joomla', 'email@example.com'),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
+	/**
+	 * @covers JGithubPackageOrgs::getList
+	 */
+	public function testGetList()
+	{
+		$this->response->code = 200;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('get')
+			->with('/users/joomla/orgs')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->getList('joomla'),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
+
+	/**
+	 * @covers JGithubPackageOrgs::get
+	 */
+	public function testGet()
+	{
+		$this->response->code = 200;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('get')
+			->with('/orgs/joomla')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->get('joomla'),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
+
+	/**
+	 * @covers JGithubPackageOrgs::edit
+	 */
+	public function testEdit()
+	{
+		$this->response->code = 200;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('patch')
+			->with('/orgs/joomla')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->edit('joomla', 'email@example.com'),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
 }
diff --git a/tests/unit/suites/libraries/joomla/github/JGithubPackageSearchTest.php b/tests/unit/suites/libraries/joomla/github/JGithubPackageSearchTest.php
index bd2b36673b48b..19445f98bac58 100644
--- a/tests/unit/suites/libraries/joomla/github/JGithubPackageSearchTest.php
+++ b/tests/unit/suites/libraries/joomla/github/JGithubPackageSearchTest.php
@@ -23,9 +23,9 @@ class JGithubPackageSearchTest extends PHPUnit_Framework_TestCase
 	protected $response;
 
 	/**
-     * @var JGithubPackageSearch
-     */
-    protected $object;
+	 * @var JGithubPackageSearch
+	 */
+	protected $object;
 
 	/**
 	 * @var    string  Sample JSON string.
@@ -75,24 +75,24 @@ protected function tearDown()
 		parent::tearDown();
 	}
 
-    /**
-     * @covers JGithubPackageSearch::issues
-     */
-    public function testIssues()
-    {
-	    $this->response->code = 200;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('get')
-		    ->with('/legacy/issues/search/joomla/joomla-platform/open/github')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->issues('joomla', 'joomla-platform', 'open', 'github'),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
+	/**
+	 * @covers JGithubPackageSearch::issues
+	 */
+	public function testIssues()
+	{
+		$this->response->code = 200;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('get')
+			->with('/legacy/issues/search/joomla/joomla-platform/open/github')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->issues('joomla', 'joomla-platform', 'open', 'github'),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
 
 	/**
 	 * @covers JGithubPackageSearch::issues
@@ -108,60 +108,60 @@ public function testIssuesInvalidState()
 	}
 
 	/**
-     * @covers JGithubPackageSearch::repositories
-     */
-    public function testRepositories()
-    {
-	    $this->response->code = 200;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('get')
-		    ->with('/legacy/repos/search/joomla')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->repositories('joomla'),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
-
-    /**
-     * @covers JGithubPackageSearch::users
-     */
-    public function testUsers()
-    {
-	    $this->response->code = 200;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('get')
-		    ->with('/legacy/user/search/joomla')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->users('joomla'),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
-
-    /**
-     * @covers JGithubPackageSearch::email
-     */
-    public function testEmail()
-    {
-	    $this->response->code = 200;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('get')
-		    ->with('/legacy/user/email/email@joomla')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->email('email@joomla'),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
+	 * @covers JGithubPackageSearch::repositories
+	 */
+	public function testRepositories()
+	{
+		$this->response->code = 200;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('get')
+			->with('/legacy/repos/search/joomla')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->repositories('joomla'),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
+
+	/**
+	 * @covers JGithubPackageSearch::users
+	 */
+	public function testUsers()
+	{
+		$this->response->code = 200;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('get')
+			->with('/legacy/user/search/joomla')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->users('joomla'),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
+
+	/**
+	 * @covers JGithubPackageSearch::email
+	 */
+	public function testEmail()
+	{
+		$this->response->code = 200;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('get')
+			->with('/legacy/user/email/email@joomla')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->email('email@joomla'),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
 
 }
diff --git a/tests/unit/suites/libraries/joomla/github/activity/JGithubPackageActivityNotificationsTest.php b/tests/unit/suites/libraries/joomla/github/activity/JGithubPackageActivityNotificationsTest.php
index c9b182fd412fa..fdade55e2107b 100644
--- a/tests/unit/suites/libraries/joomla/github/activity/JGithubPackageActivityNotificationsTest.php
+++ b/tests/unit/suites/libraries/joomla/github/activity/JGithubPackageActivityNotificationsTest.php
@@ -82,16 +82,14 @@ public function testGetList()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('get')
-		             ->with('/notifications?&all=1&participating=1', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('get')
+			->with('/notifications?&all=1&participating=1', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->getList(),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 
 	/**
@@ -121,16 +119,14 @@ public function testGetListRepository()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('get')
-		             ->with('/repos/joomla/joomla-platform/notifications?&all=1&participating=1', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('get')
+			->with('/repos/joomla/joomla-platform/notifications?&all=1&participating=1', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->getListRepository('joomla', 'joomla-platform'),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 
 	/**
@@ -161,16 +157,14 @@ public function testMarkRead()
 		$this->response->body = '';
 
 		$this->client->expects($this->once())
-		             ->method('put')
-		             ->with('/notifications', '{"unread":true,"read":true}', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('put')
+			->with('/notifications', '{"unread":true,"read":true}', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->markRead(),
 			$this->equalTo($this->response->body)
-		)
-		;
+		);
 	}
 
 	public function testMarkReadLastRead()
@@ -182,16 +176,14 @@ public function testMarkReadLastRead()
 		$data = '{"unread":true,"read":true,"last_read_at":"1966-09-14T00:00:00+00:00"}';
 
 		$this->client->expects($this->once())
-		             ->method('put')
-		             ->with('/notifications', $data, 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('put')
+			->with('/notifications', $data, 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->markRead(true, true, $date),
 			$this->equalTo($this->response->body)
-		)
-		;
+		);
 	}
 
 	/**
@@ -224,16 +216,14 @@ public function testMarkReadRepository()
 		$data = '{"unread":true,"read":true}';
 
 		$this->client->expects($this->once())
-		             ->method('put')
-		             ->with('/repos/joomla/joomla-platform/notifications', $data, 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('put')
+			->with('/repos/joomla/joomla-platform/notifications', $data, 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->markReadRepository('joomla', 'joomla-platform', true, true),
 			$this->equalTo($this->response->body)
-		)
-		;
+		);
 	}
 
 	public function testMarkReadRepositoryLastRead()
@@ -245,16 +235,14 @@ public function testMarkReadRepositoryLastRead()
 		$data = '{"unread":true,"read":true,"last_read_at":"1966-09-14T00:00:00+00:00"}';
 
 		$this->client->expects($this->once())
-		             ->method('put')
-		             ->with('/repos/joomla/joomla-platform/notifications', $data, 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('put')
+			->with('/repos/joomla/joomla-platform/notifications', $data, 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->markReadRepository('joomla', 'joomla-platform', true, true, $date),
 			$this->equalTo($this->response->body)
-		)
-		;
+		);
 	}
 
 	/**
@@ -276,16 +264,14 @@ public function testViewThread()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('get')
-		             ->with('/notifications/threads/1', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('get')
+			->with('/notifications/threads/1', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->viewThread(1),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 
 	/**
@@ -313,16 +299,14 @@ public function testMarkReadThread()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('patch')
-		             ->with('/notifications/threads/1', '{"unread":true,"read":true}', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('patch')
+			->with('/notifications/threads/1', '{"unread":true,"read":true}', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->markReadThread(1),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 
 	/**
@@ -335,8 +319,6 @@ public function testMarkReadThread()
 	 * Status: 200 OK
 	 * X-RateLimit-Limit: 5000
 	 * X-RateLimit-Remaining: 4999
-
-
 	 */
 	public function testGetThreadSubscription()
 	{
@@ -344,16 +326,14 @@ public function testGetThreadSubscription()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('get')
-		             ->with('/notifications/threads/1/subscription', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('get')
+			->with('/notifications/threads/1/subscription', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->getThreadSubscription(1),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 
 	/**
@@ -373,9 +353,6 @@ public function testGetThreadSubscription()
 	 * Status: 200 OK
 	 * X-RateLimit-Limit: 5000
 	 * X-RateLimit-Remaining: 4999
-
-
-
 	 */
 	public function testSetThreadSubscription()
 	{
@@ -383,16 +360,14 @@ public function testSetThreadSubscription()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('put')
-		             ->with('/notifications/threads/1/subscription', '{"subscribed":true,"ignored":false}', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('put')
+			->with('/notifications/threads/1/subscription', '{"subscribed":true,"ignored":false}', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->setThreadSubscription(1, true, false),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 
 	/**
@@ -405,7 +380,6 @@ public function testSetThreadSubscription()
 	 * Status: 204 No Content
 	 * X-RateLimit-Limit: 5000
 	 * X-RateLimit-Remaining: 4999
-
 	 */
 	public function testDeleteThreadSubscription()
 	{
@@ -413,15 +387,13 @@ public function testDeleteThreadSubscription()
 		$this->response->body = '';
 
 		$this->client->expects($this->once())
-		             ->method('delete')
-		             ->with('/notifications/threads/1/subscription', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('delete')
+			->with('/notifications/threads/1/subscription', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->deleteThreadSubscription(1),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 }
diff --git a/tests/unit/suites/libraries/joomla/github/activity/JGithubPackageActivityStarringTest.php b/tests/unit/suites/libraries/joomla/github/activity/JGithubPackageActivityStarringTest.php
index fac40a6676ec4..87dd347af9e5c 100644
--- a/tests/unit/suites/libraries/joomla/github/activity/JGithubPackageActivityStarringTest.php
+++ b/tests/unit/suites/libraries/joomla/github/activity/JGithubPackageActivityStarringTest.php
@@ -77,16 +77,14 @@ public function testGetList()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('get')
-		             ->with('/repos/joomla/joomla-platform/stargazers', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('get')
+			->with('/repos/joomla/joomla-platform/stargazers', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->getList('joomla', 'joomla-platform'),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 
 	/**
@@ -120,16 +118,14 @@ public function testGetRepositories()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('get')
-		             ->with('/user/starred', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('get')
+			->with('/user/starred', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->getRepositories(),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 
 	/**
@@ -158,16 +154,14 @@ public function testCheck()
 		$this->response->body = true;
 
 		$this->client->expects($this->once())
-		             ->method('get')
-		             ->with('/user/starred/joomla/joomla-platform', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('get')
+			->with('/user/starred/joomla/joomla-platform', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->check('joomla', 'joomla-platform'),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 
 	public function testCheckFalse()
@@ -176,16 +170,14 @@ public function testCheckFalse()
 		$this->response->body = false;
 
 		$this->client->expects($this->once())
-		             ->method('get')
-		             ->with('/user/starred/joomla/joomla-platform', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('get')
+			->with('/user/starred/joomla/joomla-platform', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->check('joomla', 'joomla-platform'),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 
 	/**
@@ -197,16 +189,14 @@ public function testCheckUnexpected()
 		$this->response->body = false;
 
 		$this->client->expects($this->once())
-		             ->method('get')
-		             ->with('/user/starred/joomla/joomla-platform', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('get')
+			->with('/user/starred/joomla/joomla-platform', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->check('joomla', 'joomla-platform'),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 
 	/**
@@ -229,16 +219,14 @@ public function testStar()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('put')
-		             ->with('/user/starred/joomla/joomla-platform', '', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('put')
+			->with('/user/starred/joomla/joomla-platform', '', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->star('joomla', 'joomla-platform'),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 
 	/**
@@ -261,15 +249,13 @@ public function testUnstar()
 		$this->response->body = '';
 
 		$this->client->expects($this->once())
-		             ->method('delete')
-		             ->with('/user/starred/joomla/joomla-platform', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('delete')
+			->with('/user/starred/joomla/joomla-platform', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->unstar('joomla', 'joomla-platform'),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 }
diff --git a/tests/unit/suites/libraries/joomla/github/activity/JGithubPackageActivityWatchingTest.php b/tests/unit/suites/libraries/joomla/github/activity/JGithubPackageActivityWatchingTest.php
index a974f55c5d7bf..cf3b86a9ff1b9 100644
--- a/tests/unit/suites/libraries/joomla/github/activity/JGithubPackageActivityWatchingTest.php
+++ b/tests/unit/suites/libraries/joomla/github/activity/JGithubPackageActivityWatchingTest.php
@@ -74,16 +74,14 @@ public function testGetList()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('get')
-		             ->with('/repos/joomla/joomla-platform/subscribers', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('get')
+			->with('/repos/joomla/joomla-platform/subscribers', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->getList('joomla', 'joomla-platform'),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 
 	/**
@@ -109,16 +107,14 @@ public function testGetRepositories()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('get')
-		             ->with('/user/subscriptions', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('get')
+			->with('/user/subscriptions', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->getRepositories(),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 
 	public function testGetRepositoriesUser()
@@ -127,16 +123,14 @@ public function testGetRepositoriesUser()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('get')
-		             ->with('/users/joomla/subscriptions', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('get')
+			->with('/users/joomla/subscriptions', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->getRepositories('joomla'),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 
 	/**
@@ -156,16 +150,14 @@ public function testGetSubscription()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('get')
-		             ->with('/repos/joomla/joomla-platform/subscription', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('get')
+			->with('/repos/joomla/joomla-platform/subscription', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->getSubscription('joomla', 'joomla-platform'),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 
 	/**
@@ -192,16 +184,14 @@ public function testSetSubscription()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('put')
-		             ->with('/repos/joomla/joomla-platform/subscription', '{"subscribed":true,"ignored":false}', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('put')
+			->with('/repos/joomla/joomla-platform/subscription', '{"subscribed":true,"ignored":false}', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->setSubscription('joomla', 'joomla-platform', true, false),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 
 	/**
@@ -221,16 +211,14 @@ public function testDeleteSubscription()
 		$this->response->body = '';
 
 		$this->client->expects($this->once())
-		             ->method('delete')
-		             ->with('/repos/joomla/joomla-platform/subscription', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('delete')
+			->with('/repos/joomla/joomla-platform/subscription', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->deleteSubscription('joomla', 'joomla-platform'),
 			$this->equalTo($this->response->body)
-		)
-		;
+		);
 	}
 
 	/**
@@ -256,16 +244,14 @@ public function testCheck()
 		$this->response->body = '';
 
 		$this->client->expects($this->once())
-		             ->method('get')
-		             ->with('/user/subscriptions/joomla/joomla-platform', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('get')
+			->with('/user/subscriptions/joomla/joomla-platform', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->check('joomla', 'joomla-platform'),
 			$this->equalTo(true)
-		)
-		;
+		);
 	}
 
 	public function testCheckFalse()
@@ -274,16 +260,14 @@ public function testCheckFalse()
 		$this->response->body = '';
 
 		$this->client->expects($this->once())
-		             ->method('get')
-		             ->with('/user/subscriptions/joomla/joomla-platform', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('get')
+			->with('/user/subscriptions/joomla/joomla-platform', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->check('joomla', 'joomla-platform'),
 			$this->equalTo(false)
-		)
-		;
+		);
 	}
 
 	/**
@@ -295,10 +279,9 @@ public function testCheckUnexpected()
 		$this->response->body = '';
 
 		$this->client->expects($this->once())
-		             ->method('get')
-		             ->with('/user/subscriptions/joomla/joomla-platform', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('get')
+			->with('/user/subscriptions/joomla/joomla-platform', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->object->check('joomla', 'joomla-platform');
 	}
@@ -320,16 +303,14 @@ public function testWatch()
 		$this->response->body = '';
 
 		$this->client->expects($this->once())
-		             ->method('put')
-		             ->with('/user/subscriptions/joomla/joomla-platform', '', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('put')
+			->with('/user/subscriptions/joomla/joomla-platform', '', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->watch('joomla', 'joomla-platform'),
 			$this->equalTo($this->response->body)
-		)
-		;
+		);
 	}
 
 	/**
@@ -349,15 +330,13 @@ public function testUnwatch()
 		$this->response->body = '';
 
 		$this->client->expects($this->once())
-		             ->method('delete')
-		             ->with('/user/subscriptions/joomla/joomla-platform', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('delete')
+			->with('/user/subscriptions/joomla/joomla-platform', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->unwatch('joomla', 'joomla-platform'),
 			$this->equalTo($this->response->body)
-		)
-		;
+		);
 	}
 }
diff --git a/tests/unit/suites/libraries/joomla/github/data/JGithubPackageDataBlobsTest.php b/tests/unit/suites/libraries/joomla/github/data/JGithubPackageDataBlobsTest.php
index 4c64c7a9c165e..8a84f9690895c 100644
--- a/tests/unit/suites/libraries/joomla/github/data/JGithubPackageDataBlobsTest.php
+++ b/tests/unit/suites/libraries/joomla/github/data/JGithubPackageDataBlobsTest.php
@@ -79,16 +79,14 @@ public function testGet()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('get')
-		             ->with('/repos/joomla/joomla-platform/git/blobs/12345', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('get')
+			->with('/repos/joomla/joomla-platform/git/blobs/12345', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->get('joomla', 'joomla-platform', '12345'),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 
 	/**
@@ -120,15 +118,13 @@ public function testCreate()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('post')
-		             ->with('/repos/joomla/joomla-platform/git/blobs', '{"content":"Hello w\u00f6rld","encoding":"utf-8"}', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('post')
+			->with('/repos/joomla/joomla-platform/git/blobs', '{"content":"Hello w\u00f6rld","encoding":"utf-8"}', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->create('joomla', 'joomla-platform', 'Hello wörld'),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 }
diff --git a/tests/unit/suites/libraries/joomla/github/data/JGithubPackageDataCommitsTest.php b/tests/unit/suites/libraries/joomla/github/data/JGithubPackageDataCommitsTest.php
index 8de4a8df1cbee..29d483ec8b1c6 100644
--- a/tests/unit/suites/libraries/joomla/github/data/JGithubPackageDataCommitsTest.php
+++ b/tests/unit/suites/libraries/joomla/github/data/JGithubPackageDataCommitsTest.php
@@ -72,16 +72,14 @@ public function testGet()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('get')
-		             ->with('/repos/joomla/joomla-platform/git/commits/12345', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('get')
+			->with('/repos/joomla/joomla-platform/git/commits/12345', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->get('joomla', 'joomla-platform', '12345'),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 
 	/**
@@ -146,15 +144,13 @@ public function testCreate()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('post')
-		             ->with('/repos/joomla/joomla-platform/git/commits', '{"message":"My Message","tree":"12345","parents":[]}', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('post')
+			->with('/repos/joomla/joomla-platform/git/commits', '{"message":"My Message","tree":"12345","parents":[]}', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->create('joomla', 'joomla-platform', 'My Message', '12345'),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 }
diff --git a/tests/unit/suites/libraries/joomla/github/data/JGithubPackageDataTagsTest.php b/tests/unit/suites/libraries/joomla/github/data/JGithubPackageDataTagsTest.php
index 5626b054c38af..58e9f192a5994 100644
--- a/tests/unit/suites/libraries/joomla/github/data/JGithubPackageDataTagsTest.php
+++ b/tests/unit/suites/libraries/joomla/github/data/JGithubPackageDataTagsTest.php
@@ -72,16 +72,14 @@ public function testGet()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('get')
-		             ->with('/repos/joomla/joomla-platform/git/tags/12345', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('get')
+			->with('/repos/joomla/joomla-platform/git/tags/12345', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->get('joomla', 'joomla-platform', '12345'),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 
 	/**
@@ -120,15 +118,13 @@ public function testCreate()
 
 		$data = '{"tag":"0.1","message":"Message","object":"12345","type":"commit","tagger_name":"elkuku","tagger_email":"email@example.com","tagger_date":"123456789"}';
 		$this->client->expects($this->once())
-		             ->method('post')
-		             ->with('/repos/joomla/joomla-platform/git/tags', $data, 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('post')
+			->with('/repos/joomla/joomla-platform/git/tags', $data, 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->create('joomla', 'joomla-platform', '0.1', 'Message', '12345', 'commit', 'elkuku', 'email@example.com', '123456789'),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 }
diff --git a/tests/unit/suites/libraries/joomla/github/data/JGithubPackageDataTreesTest.php b/tests/unit/suites/libraries/joomla/github/data/JGithubPackageDataTreesTest.php
index f93db7caee828..f3261c0cc0c4e 100644
--- a/tests/unit/suites/libraries/joomla/github/data/JGithubPackageDataTreesTest.php
+++ b/tests/unit/suites/libraries/joomla/github/data/JGithubPackageDataTreesTest.php
@@ -72,16 +72,14 @@ public function testGet()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('get')
-		             ->with('/repos/joomla/joomla-platform/git/trees/12345', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('get')
+			->with('/repos/joomla/joomla-platform/git/trees/12345', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->get('joomla', 'joomla-platform', '12345'),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 
 	/**
@@ -101,16 +99,14 @@ public function testGetRecursively()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('get')
-		             ->with('/repos/joomla/joomla-platform/git/trees/12345?recursive=1', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('get')
+			->with('/repos/joomla/joomla-platform/git/trees/12345?recursive=1', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->getRecursively('joomla', 'joomla-platform', '12345'),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 
 	/**
@@ -158,15 +154,13 @@ public function testCreate()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('post')
-		             ->with('/repos/joomla/joomla-platform/git/trees', '{"tree":"12345","base_tree":"678"}', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('post')
+			->with('/repos/joomla/joomla-platform/git/trees', '{"tree":"12345","base_tree":"678"}', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->create('joomla', 'joomla-platform', '12345', '678'),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 }
diff --git a/tests/unit/suites/libraries/joomla/github/issues/JGithubPackageIssuesCommentsTest.php b/tests/unit/suites/libraries/joomla/github/issues/JGithubPackageIssuesCommentsTest.php
index 0b165efaa5165..07af0e779ea38 100644
--- a/tests/unit/suites/libraries/joomla/github/issues/JGithubPackageIssuesCommentsTest.php
+++ b/tests/unit/suites/libraries/joomla/github/issues/JGithubPackageIssuesCommentsTest.php
@@ -74,16 +74,14 @@ public function testGetList()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('get')
-		             ->with('/repos/joomla/joomla-platform/issues/1/comments', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('get')
+			->with('/repos/joomla/joomla-platform/issues/1/comments', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->getList('joomla', 'joomla-platform', '1'),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 
 	/**
@@ -114,16 +112,14 @@ public function testGetRepositoryList()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('get')
-		             ->with('/repos/joomla/joomla-platform/issues/comments?sort=created&direction=asc', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('get')
+			->with('/repos/joomla/joomla-platform/issues/comments?sort=created&direction=asc', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->getRepositoryList('joomla', 'joomla-platform'),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 
 	/**
@@ -156,16 +152,14 @@ public function testGetRepositoryListSince()
 		$date = new JDate('1966-09-15 12:34:56');
 
 		$this->client->expects($this->once())
-		             ->method('get')
-		             ->with('/repos/joomla/joomla-platform/issues/comments?sort=created&direction=asc&since=1966-09-15T12:34:56+00:00', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('get')
+			->with('/repos/joomla/joomla-platform/issues/comments?sort=created&direction=asc&since=1966-09-15T12:34:56+00:00', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->getRepositoryList('joomla', 'joomla-platform', 'created', 'asc', $date),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 
 	/**
@@ -201,16 +195,14 @@ public function testGet()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('get')
-		             ->with('/repos/joomla/joomla-platform/issues/comments/1', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('get')
+			->with('/repos/joomla/joomla-platform/issues/comments/1', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->get('joomla', 'joomla-platform', 1),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 
 	/**
@@ -254,16 +246,14 @@ public function testEdit()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('patch')
-		             ->with('/repos/joomla/joomla-platform/issues/comments/1', '{"body":"Hello"}', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('patch')
+			->with('/repos/joomla/joomla-platform/issues/comments/1', '{"body":"Hello"}', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->edit('joomla', 'joomla-platform', 1, 'Hello'),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 
 	/**
@@ -308,16 +298,14 @@ public function testCreate()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('post')
-		             ->with('/repos/joomla/joomla-platform/issues/1/comments', '{"body":"Hello"}', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('post')
+			->with('/repos/joomla/joomla-platform/issues/1/comments', '{"body":"Hello"}', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->create('joomla', 'joomla-platform', 1, 'Hello'),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 
 	/**
@@ -337,15 +325,13 @@ public function testDelete()
 		$this->response->body = '';
 
 		$this->client->expects($this->once())
-		             ->method('delete')
-		             ->with('/repos/joomla/joomla-platform/issues/comments/1', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('delete')
+			->with('/repos/joomla/joomla-platform/issues/comments/1', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->delete('joomla', 'joomla-platform', 1, 'Hello'),
 			$this->equalTo(true)
-		)
-		;
+		);
 	}
 }
diff --git a/tests/unit/suites/libraries/joomla/github/issues/JGithubPackageIssuesEventsTest.php b/tests/unit/suites/libraries/joomla/github/issues/JGithubPackageIssuesEventsTest.php
index 7db4e8491b22e..f68f195a3cc77 100644
--- a/tests/unit/suites/libraries/joomla/github/issues/JGithubPackageIssuesEventsTest.php
+++ b/tests/unit/suites/libraries/joomla/github/issues/JGithubPackageIssuesEventsTest.php
@@ -74,16 +74,14 @@ public function testGetList()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('get')
-		             ->with('/repos/joomla/joomla-platform/issues/1/events', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('get')
+			->with('/repos/joomla/joomla-platform/issues/1/events', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->getList('joomla', 'joomla-platform', '1'),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 
 	/**
@@ -105,16 +103,14 @@ public function testGetListRepository()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('get')
-		             ->with('/repos/joomla/joomla-platform/issues/1/comments', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('get')
+			->with('/repos/joomla/joomla-platform/issues/1/comments', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->getListRepository('joomla', 'joomla-platform', '1'),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 
 	/**
@@ -134,15 +130,13 @@ public function testGet()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('get')
-		             ->with('/repos/joomla/joomla-platform/issues/events/1', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('get')
+			->with('/repos/joomla/joomla-platform/issues/events/1', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->get('joomla', 'joomla-platform', '1'),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 }
diff --git a/tests/unit/suites/libraries/joomla/github/issues/JGithubPackageIssuesLabelsTest.php b/tests/unit/suites/libraries/joomla/github/issues/JGithubPackageIssuesLabelsTest.php
index b05afaa857208..ebf661e402668 100644
--- a/tests/unit/suites/libraries/joomla/github/issues/JGithubPackageIssuesLabelsTest.php
+++ b/tests/unit/suites/libraries/joomla/github/issues/JGithubPackageIssuesLabelsTest.php
@@ -71,16 +71,14 @@ public function testGetList()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('get')
-		             ->with('/repos/joomla/joomla-platform/labels', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('get')
+			->with('/repos/joomla/joomla-platform/labels', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->getList('joomla', 'joomla-platform', '1'),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 
 	/**
@@ -100,16 +98,14 @@ public function testGet()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('get')
-		             ->with('/repos/joomla/joomla-platform/labels/1', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('get')
+			->with('/repos/joomla/joomla-platform/labels/1', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->get('joomla', 'joomla-platform', '1'),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 
 	/**
@@ -148,16 +144,14 @@ public function testCreate()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('post')
-		             ->with('/repos/joomla/joomla-platform/labels', '{"name":"foobar","color":"red"}', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('post')
+			->with('/repos/joomla/joomla-platform/labels', '{"name":"foobar","color":"red"}', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->create('joomla', 'joomla-platform', 'foobar', 'red'),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 
 	/**
@@ -169,16 +163,14 @@ public function testCreateFailure()
 		$this->response->body = $this->errorString;
 
 		$this->client->expects($this->once())
-		             ->method('post')
-		             ->with('/repos/joomla/joomla-platform/labels', '{"name":"foobar","color":"red"}', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('post')
+			->with('/repos/joomla/joomla-platform/labels', '{"name":"foobar","color":"red"}', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->create('joomla', 'joomla-platform', 'foobar', 'red'),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 
 	/**
@@ -216,16 +208,14 @@ public function testUpdate()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('patch')
-		             ->with('/repos/joomla/joomla-platform/labels/foobar', '{"name":"boofaz","color":"red"}', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('patch')
+			->with('/repos/joomla/joomla-platform/labels/foobar', '{"name":"boofaz","color":"red"}', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->update('joomla', 'joomla-platform', 'foobar', 'boofaz', 'red'),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 
 	/**
@@ -245,16 +235,14 @@ public function testDelete()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('delete')
-		             ->with('/repos/joomla/joomla-platform/labels/foobar', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('delete')
+			->with('/repos/joomla/joomla-platform/labels/foobar', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->delete('joomla', 'joomla-platform', 'foobar'),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 
 	/**
@@ -274,16 +262,14 @@ public function testGetListByIssue()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('get')
-		             ->with('/repos/joomla/joomla-platform/issues/1/labels', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('get')
+			->with('/repos/joomla/joomla-platform/issues/1/labels', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->getListByIssue('joomla', 'joomla-platform', 1),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 
 	/**
@@ -318,16 +304,14 @@ public function testAdd()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('post')
-		             ->with('/repos/joomla/joomla-platform/issues/1/labels', '["A","B"]', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('post')
+			->with('/repos/joomla/joomla-platform/issues/1/labels', '["A","B"]', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->add('joomla', 'joomla-platform', 1, array('A', 'B')),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 
 	/**
@@ -355,16 +339,14 @@ public function testRemoveFromIssue()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('delete')
-		             ->with('/repos/joomla/joomla-platform/issues/1/labels/foobar', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('delete')
+			->with('/repos/joomla/joomla-platform/issues/1/labels/foobar', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->removeFromIssue('joomla', 'joomla-platform', 1, 'foobar'),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 
 	/**
@@ -400,16 +382,14 @@ public function testReplace()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('put')
-		             ->with('/repos/joomla/joomla-platform/issues/1/labels', '["A","B"]', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('put')
+			->with('/repos/joomla/joomla-platform/issues/1/labels', '["A","B"]', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->replace('joomla', 'joomla-platform', 1, array('A', 'B')),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 
 	/**
@@ -429,16 +409,14 @@ public function testRemoveAllFromIssue()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('delete')
-		             ->with('/repos/joomla/joomla-platform/issues/1/labels', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('delete')
+			->with('/repos/joomla/joomla-platform/issues/1/labels', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->removeAllFromIssue('joomla', 'joomla-platform', 1),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 
 	/**
@@ -466,15 +444,13 @@ public function testGetListByMilestone()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('get')
-		             ->with('/repos/joomla/joomla-platform/milestones/1/labels', 0, 0)
-		             ->will($this->returnValue($this->response))
-		;
+			->method('get')
+			->with('/repos/joomla/joomla-platform/milestones/1/labels', 0, 0)
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->getListByMilestone('joomla', 'joomla-platform', 1),
 			$this->equalTo(json_decode($this->response->body))
-		)
-		;
+		);
 	}
 }
diff --git a/tests/unit/suites/libraries/joomla/github/orgs/JGithubPackageOrgsMembersTest.php b/tests/unit/suites/libraries/joomla/github/orgs/JGithubPackageOrgsMembersTest.php
index 7e81a0aeec53b..f552ab72e56e5 100644
--- a/tests/unit/suites/libraries/joomla/github/orgs/JGithubPackageOrgsMembersTest.php
+++ b/tests/unit/suites/libraries/joomla/github/orgs/JGithubPackageOrgsMembersTest.php
@@ -23,9 +23,9 @@ class JGithubPackageOrgsMembersTest extends PHPUnit_Framework_TestCase
 	protected $response;
 
 	/**
-     * @var JGithubPackageOrgsMembers
-     */
-    protected $object;
+	 * @var JGithubPackageOrgsMembers
+	 */
+	protected $object;
 
 	/**
 	 * @var    string  Sample JSON string.
@@ -58,24 +58,24 @@ protected function setUp()
 		$this->object = new JGithubPackageOrgsMembers($this->options, $this->client);
 	}
 
-    /**
-     * @covers JGithubPackageOrgsMembers::getList
-     */
-    public function testGetList()
-    {
-	    $this->response->code = 200;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('get')
-		    ->with('/orgs/joomla/members')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->getList('joomla'),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
+	/**
+	 * @covers JGithubPackageOrgsMembers::getList
+	 */
+	public function testGetList()
+	{
+		$this->response->code = 200;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('get')
+			->with('/orgs/joomla/members')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->getList('joomla'),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
 
 	/**
 	 * @covers JGithubPackageOrgsMembers::getList
@@ -118,23 +118,23 @@ public function testGetListUnexpected()
 	}
 
 	/**
-     * @covers JGithubPackageOrgsMembers::check
-     */
-    public function testCheck()
-    {
-	    $this->response->code = 204;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('get')
-		    ->with('/orgs/joomla/members/elkuku')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->check('joomla', 'elkuku'),
-		    $this->equalTo(true)
-	    );
-    }
+	 * @covers JGithubPackageOrgsMembers::check
+	 */
+	public function testCheck()
+	{
+		$this->response->code = 204;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('get')
+			->with('/orgs/joomla/members/elkuku')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->check('joomla', 'elkuku'),
+			$this->equalTo(true)
+		);
+	}
 
 	/**
 	 * @covers JGithubPackageOrgsMembers::check
@@ -196,61 +196,61 @@ public function testCheckUnexpectedr()
 	}
 
 	/**
-     * @covers JGithubPackageOrgsMembers::remove
-     */
-    public function testRemove()
-    {
-	    $this->response->code = 204;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('delete')
-		    ->with('/orgs/joomla/members/elkuku')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->remove('joomla', 'elkuku'),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
-
-    /**
-     * @covers JGithubPackageOrgsMembers::getListPublic
-     */
-    public function testGetListPublic()
-    {
-	    $this->response->code = 200;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('get')
-		    ->with('/orgs/joomla/public_members')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->getListPublic('joomla'),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
-
-    /**
-     * @covers JGithubPackageOrgsMembers::checkPublic
-     */
-    public function testCheckPublic()
-    {
-	    $this->response->code = 204;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('get')
-		    ->with('/orgs/joomla/public_members/elkuku')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->checkPublic('joomla', 'elkuku'),
-		    $this->equalTo(true)
-	    );
-    }
+	 * @covers JGithubPackageOrgsMembers::remove
+	 */
+	public function testRemove()
+	{
+		$this->response->code = 204;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('delete')
+			->with('/orgs/joomla/members/elkuku')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->remove('joomla', 'elkuku'),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
+
+	/**
+	 * @covers JGithubPackageOrgsMembers::getListPublic
+	 */
+	public function testGetListPublic()
+	{
+		$this->response->code = 200;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('get')
+			->with('/orgs/joomla/public_members')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->getListPublic('joomla'),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
+
+	/**
+	 * @covers JGithubPackageOrgsMembers::checkPublic
+	 */
+	public function testCheckPublic()
+	{
+		$this->response->code = 204;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('get')
+			->with('/orgs/joomla/public_members/elkuku')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->checkPublic('joomla', 'elkuku'),
+			$this->equalTo(true)
+		);
+	}
 
 	/**
 	 * @covers JGithubPackageOrgsMembers::checkPublic
@@ -293,40 +293,40 @@ public function testCheckPublicUnexpected()
 	}
 
 	/**
-     * @covers JGithubPackageOrgsMembers::publicize
-     */
-    public function testPublicize()
-    {
-	    $this->response->code = 204;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('put')
-		    ->with('/orgs/joomla/public_members/elkuku')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->publicize('joomla', 'elkuku'),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
-
-    /**
-     * @covers JGithubPackageOrgsMembers::conceal
-     */
-    public function testConceal()
-    {
-	    $this->response->code = 204;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('delete')
-		    ->with('/orgs/joomla/public_members/elkuku')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->conceal('joomla', 'elkuku'),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
+	 * @covers JGithubPackageOrgsMembers::publicize
+	 */
+	public function testPublicize()
+	{
+		$this->response->code = 204;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('put')
+			->with('/orgs/joomla/public_members/elkuku')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->publicize('joomla', 'elkuku'),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
+
+	/**
+	 * @covers JGithubPackageOrgsMembers::conceal
+	 */
+	public function testConceal()
+	{
+		$this->response->code = 204;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('delete')
+			->with('/orgs/joomla/public_members/elkuku')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->conceal('joomla', 'elkuku'),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
 }
diff --git a/tests/unit/suites/libraries/joomla/github/orgs/JGithubPackageOrgsTeamsTest.php b/tests/unit/suites/libraries/joomla/github/orgs/JGithubPackageOrgsTeamsTest.php
index ef220076cb700..b601502a8c2b4 100644
--- a/tests/unit/suites/libraries/joomla/github/orgs/JGithubPackageOrgsTeamsTest.php
+++ b/tests/unit/suites/libraries/joomla/github/orgs/JGithubPackageOrgsTeamsTest.php
@@ -23,9 +23,9 @@ class JGithubPackageOrgsTeamsTest extends PHPUnit_Framework_TestCase
 	protected $response;
 
 	/**
-     * @var JGithubPackageOrgsTeams
-     */
-    protected $object;
+	 * @var JGithubPackageOrgsTeams
+	 */
+	protected $object;
 
 	/**
 	 * @var    string  Sample JSON string.
@@ -58,62 +58,62 @@ protected function setUp()
 		$this->object = new JGithubPackageOrgsTeams($this->options, $this->client);
 	}
 
-    /**
-     * @covers JGithubPackageOrgsTeams::getList
-     */
-    public function testGetList()
-    {
-	    $this->response->code = 200;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('get')
-		    ->with('/orgs/joomla/teams')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->getList('joomla'),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
-
-    /**
-     * @covers JGithubPackageOrgsTeams::get
-     */
-    public function testGet()
-    {
-	    $this->response->code = 200;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('get')
-		    ->with('/teams/123')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->get(123),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
-
-    /**
-     * @covers JGithubPackageOrgsTeams::create
-     */
-    public function testCreate()
-    {
-	    $this->response->code = 201;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('post')
-		    ->with('/orgs/joomla/teams')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->create('joomla', 'TheTeam', array('joomla-platform'), 'admin'),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
+	/**
+	 * @covers JGithubPackageOrgsTeams::getList
+	 */
+	public function testGetList()
+	{
+		$this->response->code = 200;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('get')
+			->with('/orgs/joomla/teams')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->getList('joomla'),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
+
+	/**
+	 * @covers JGithubPackageOrgsTeams::get
+	 */
+	public function testGet()
+	{
+		$this->response->code = 200;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('get')
+			->with('/teams/123')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->get(123),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
+
+	/**
+	 * @covers JGithubPackageOrgsTeams::create
+	 */
+	public function testCreate()
+	{
+		$this->response->code = 201;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('post')
+			->with('/orgs/joomla/teams')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->create('joomla', 'TheTeam', array('joomla-platform'), 'admin'),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
 
 	/**
 	 * @covers JGithubPackageOrgsTeams::create
@@ -129,23 +129,23 @@ public function testCreateWrongPermission()
 	}
 
 	/**
-     * @covers JGithubPackageOrgsTeams::edit
-     */
-    public function testEdit()
-    {
-	    $this->response->code = 200;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('patch')
-		    ->with('/teams/123')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->edit(123, 'TheTeam', 'admin'),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
+	 * @covers JGithubPackageOrgsTeams::edit
+	 */
+	public function testEdit()
+	{
+		$this->response->code = 200;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('patch')
+			->with('/teams/123')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->edit(123, 'TheTeam', 'admin'),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
 
 	/**
 	 * @covers JGithubPackageOrgsTeams::edit
@@ -161,61 +161,61 @@ public function testEditWrongPermission()
 	}
 
 	/**
-     * @covers JGithubPackageOrgsTeams::delete
-     */
-    public function testDelete()
-    {
-	    $this->response->code = 204;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('delete')
-		    ->with('/teams/123')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->delete(123),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
-
-    /**
-     * @covers JGithubPackageOrgsTeams::getListMembers
-     */
-    public function testGetListMembers()
-    {
-	    $this->response->code = 200;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('get')
-		    ->with('/teams/123/members')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->getListMembers(123),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
-
-    /**
-     * @covers JGithubPackageOrgsTeams::isMember
-     */
-    public function testIsMember()
-    {
-	    $this->response->code = 204;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('get')
-		    ->with('/teams/123/members/elkuku')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->isMember(123, 'elkuku'),
-		    $this->equalTo(json_decode(true))
-	    );
-    }
+	 * @covers JGithubPackageOrgsTeams::delete
+	 */
+	public function testDelete()
+	{
+		$this->response->code = 204;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('delete')
+			->with('/teams/123')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->delete(123),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
+
+	/**
+	 * @covers JGithubPackageOrgsTeams::getListMembers
+	 */
+	public function testGetListMembers()
+	{
+		$this->response->code = 200;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('get')
+			->with('/teams/123/members')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->getListMembers(123),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
+
+	/**
+	 * @covers JGithubPackageOrgsTeams::isMember
+	 */
+	public function testIsMember()
+	{
+		$this->response->code = 204;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('get')
+			->with('/teams/123/members/elkuku')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->isMember(123, 'elkuku'),
+			$this->equalTo(json_decode(true))
+		);
+	}
 
 	/**
 	 * @covers JGithubPackageOrgsTeams::isMember
@@ -258,80 +258,80 @@ public function testIsMemberUnexpected()
 	}
 
 	/**
-     * @covers JGithubPackageOrgsTeams::addMember
-     */
-    public function testAddMember()
-    {
-	    $this->response->code = 204;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('put')
-		    ->with('/teams/123/members/elkuku')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->addMember(123, 'elkuku'),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
-
-    /**
-     * @covers JGithubPackageOrgsTeams::removeMember
-     */
-    public function testRemoveMember()
-    {
-	    $this->response->code = 204;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('delete')
-		    ->with('/teams/123/members/elkuku')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->removeMember(123, 'elkuku'),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
-
-    /**
-     * @covers JGithubPackageOrgsTeams::getListRepos
-     */
-    public function testGetListRepos()
-    {
-	    $this->response->code = 200;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('get')
-		    ->with('/teams/123/repos')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->getListRepos(123),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
-
-    /**
-     * @covers JGithubPackageOrgsTeams::checkRepo
-     */
-    public function testCheckRepo()
-    {
-	    $this->response->code = 204;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('get')
-		    ->with('/teams/123/repos/joomla')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->checkRepo(123, 'joomla'),
-		    $this->equalTo(true)
-	    );
-    }
+	 * @covers JGithubPackageOrgsTeams::addMember
+	 */
+	public function testAddMember()
+	{
+		$this->response->code = 204;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('put')
+			->with('/teams/123/members/elkuku')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->addMember(123, 'elkuku'),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
+
+	/**
+	 * @covers JGithubPackageOrgsTeams::removeMember
+	 */
+	public function testRemoveMember()
+	{
+		$this->response->code = 204;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('delete')
+			->with('/teams/123/members/elkuku')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->removeMember(123, 'elkuku'),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
+
+	/**
+	 * @covers JGithubPackageOrgsTeams::getListRepos
+	 */
+	public function testGetListRepos()
+	{
+		$this->response->code = 200;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('get')
+			->with('/teams/123/repos')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->getListRepos(123),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
+
+	/**
+	 * @covers JGithubPackageOrgsTeams::checkRepo
+	 */
+	public function testCheckRepo()
+	{
+		$this->response->code = 204;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('get')
+			->with('/teams/123/repos/joomla')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->checkRepo(123, 'joomla'),
+			$this->equalTo(true)
+		);
+	}
 
 	/**
 	 * @covers JGithubPackageOrgsTeams::checkRepo
@@ -374,40 +374,40 @@ public function testCheckRepoUnexpected()
 	}
 
 	/**
-     * @covers JGithubPackageOrgsTeams::addRepo
-     */
-    public function testAddRepo()
-    {
-	    $this->response->code = 204;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('put')
-		    ->with('/teams/123/repos/joomla/joomla-platform')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->addRepo(123, 'joomla', 'joomla-platform'),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
-
-    /**
-     * @covers JGithubPackageOrgsTeams::removeRepo
-     */
-    public function testRemoveRepo()
-    {
-	    $this->response->code = 204;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('delete')
-		    ->with('/teams/123/repos/joomla/joomla-platform')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->removeRepo(123, 'joomla', 'joomla-platform'),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
+	 * @covers JGithubPackageOrgsTeams::addRepo
+	 */
+	public function testAddRepo()
+	{
+		$this->response->code = 204;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('put')
+			->with('/teams/123/repos/joomla/joomla-platform')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->addRepo(123, 'joomla', 'joomla-platform'),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
+
+	/**
+	 * @covers JGithubPackageOrgsTeams::removeRepo
+	 */
+	public function testRemoveRepo()
+	{
+		$this->response->code = 204;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('delete')
+			->with('/teams/123/repos/joomla/joomla-platform')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->removeRepo(123, 'joomla', 'joomla-platform'),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
 }
diff --git a/tests/unit/suites/libraries/joomla/github/repositories/JGithubPackageRepositoriesCollaboratorsTest.php b/tests/unit/suites/libraries/joomla/github/repositories/JGithubPackageRepositoriesCollaboratorsTest.php
index 5f98edb94d02b..cc31f041e4c24 100644
--- a/tests/unit/suites/libraries/joomla/github/repositories/JGithubPackageRepositoriesCollaboratorsTest.php
+++ b/tests/unit/suites/libraries/joomla/github/repositories/JGithubPackageRepositoriesCollaboratorsTest.php
@@ -23,9 +23,9 @@ class JGithubPackageRepositoriesCollaboratorsTest extends PHPUnit_Framework_Test
 	protected $response;
 
 	/**
-     * @var JGithubPackageRepositoriesCollaborators
-     */
-    protected $object;
+	 * @var JGithubPackageRepositoriesCollaborators
+	 */
+	protected $object;
 
 	/**
 	 * @var    string  Sample JSON string.
@@ -58,43 +58,43 @@ protected function setUp()
 		$this->object = new JGithubPackageRepositoriesCollaborators($this->options, $this->client);
 	}
 
-    /**
-     * @covers JGithubPackageRepositoriesCollaborators::getList
-     */
-    public function testGetList()
-    {
-	    $this->response->code = 200;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('get')
-		    ->with('/repos/joomla/joomla-platform/collaborators')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->getList('joomla', 'joomla-platform'),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
-
-    /**
-     * @covers JGithubPackageRepositoriesCollaborators::get
-     */
-    public function testGet()
-    {
-	    $this->response->code = 204;
-	    $this->response->body = true;
-
-	    $this->client->expects($this->once())
-		    ->method('get')
-		    ->with('/repos/joomla/joomla-platform/collaborators/elkuku')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->get('joomla', 'joomla-platform', 'elkuku'),
-		    $this->equalTo($this->response->body)
-	    );
-    }
+	/**
+	 * @covers JGithubPackageRepositoriesCollaborators::getList
+	 */
+	public function testGetList()
+	{
+		$this->response->code = 200;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('get')
+			->with('/repos/joomla/joomla-platform/collaborators')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->getList('joomla', 'joomla-platform'),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
+
+	/**
+	 * @covers JGithubPackageRepositoriesCollaborators::get
+	 */
+	public function testGet()
+	{
+		$this->response->code = 204;
+		$this->response->body = true;
+
+		$this->client->expects($this->once())
+			->method('get')
+			->with('/repos/joomla/joomla-platform/collaborators/elkuku')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->get('joomla', 'joomla-platform', 'elkuku'),
+			$this->equalTo($this->response->body)
+		);
+	}
 
 	/**
 	 * @covers JGithubPackageRepositoriesCollaborators::get
@@ -137,40 +137,40 @@ public function testGetUnexpected()
 	}
 
 	/**
-     * @covers JGithubPackageRepositoriesCollaborators::add
-     */
-    public function testAdd()
-    {
-	    $this->response->code = 204;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('put')
-		    ->with('/repos/joomla/joomla-platform/collaborators/elkuku')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->add('joomla', 'joomla-platform', 'elkuku'),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
-
-    /**
-     * @covers JGithubPackageRepositoriesCollaborators::remove
-     */
-    public function testRemove()
-    {
-	    $this->response->code = 204;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('delete')
-		    ->with('/repos/joomla/joomla-platform/collaborators/elkuku')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->remove('joomla', 'joomla-platform', 'elkuku'),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
+	 * @covers JGithubPackageRepositoriesCollaborators::add
+	 */
+	public function testAdd()
+	{
+		$this->response->code = 204;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('put')
+			->with('/repos/joomla/joomla-platform/collaborators/elkuku')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->add('joomla', 'joomla-platform', 'elkuku'),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
+
+	/**
+	 * @covers JGithubPackageRepositoriesCollaborators::remove
+	 */
+	public function testRemove()
+	{
+		$this->response->code = 204;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('delete')
+			->with('/repos/joomla/joomla-platform/collaborators/elkuku')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->remove('joomla', 'joomla-platform', 'elkuku'),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
 }
diff --git a/tests/unit/suites/libraries/joomla/github/repositories/JGithubPackageRepositoriesCommentsTest.php b/tests/unit/suites/libraries/joomla/github/repositories/JGithubPackageRepositoriesCommentsTest.php
index d07730e5251f9..35114435e47a2 100644
--- a/tests/unit/suites/libraries/joomla/github/repositories/JGithubPackageRepositoriesCommentsTest.php
+++ b/tests/unit/suites/libraries/joomla/github/repositories/JGithubPackageRepositoriesCommentsTest.php
@@ -23,9 +23,9 @@ class JGithubPackageRepositoriesCommentsTest extends PHPUnit_Framework_TestCase
 	protected $response;
 
 	/**
-     * @var JGithubPackageRepositoriesComments
-     */
-    protected $object;
+	 * @var JGithubPackageRepositoriesComments
+	 */
+	protected $object;
 
 	/**
 	 * @var    string  Sample JSON string.
@@ -58,117 +58,117 @@ protected function setUp()
 		$this->object = new JGithubPackageRepositoriesComments($this->options, $this->client);
 	}
 
-    /**
-     * @covers JGithubPackageRepositoriesComments::getListRepository
-     */
-    public function testGetListRepository()
-    {
-	    $this->response->code = 200;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('get')
-		    ->with('/repos/joomla/joomla-platform/comments')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->getListRepository('joomla', 'joomla-platform'),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
-
-    /**
-     * @covers JGithubPackageRepositoriesComments::getList
-     */
-    public function testGetList()
-    {
-	    $this->response->code = 200;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('get')
-		    ->with('/repos/joomla/joomla-platform/commits/123/comments')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->getList('joomla', 'joomla-platform', '123'),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
-
-    /**
-     * @covers JGithubPackageRepositoriesComments::get
-     */
-    public function testGet()
-    {
-	    $this->response->code = 200;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('get')
-		    ->with('/repos/joomla/joomla-platform/comments/123')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->get('joomla', 'joomla-platform', 123),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
-
-    /**
-     * @covers JGithubPackageRepositoriesComments::edit
-     */
-    public function testEdit()
-    {
-	    $this->response->code = 200;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('patch')
-		    ->with('/repos/joomla/joomla-platform/comments/123')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->edit('joomla', 'joomla-platform', 123, 'My Comment'),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
-
-    /**
-     * @covers JGithubPackageRepositoriesComments::delete
-     */
-    public function testDelete()
-    {
-	    $this->response->code = 204;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('delete')
-		    ->with('/repos/joomla/joomla-platform/comments/123')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->delete('joomla', 'joomla-platform', 123),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
-
-    /**
-     * @covers JGithubPackageRepositoriesComments::create
-     */
-    public function testCreate()
-    {
-	    $this->response->code = 201;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('post')
-		    ->with('/repos/joomla/joomla-platform/commits/123abc/comments')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->create('joomla', 'joomla-platform', '123abc', 'My Comment', 456, 'path/file.php', 789),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
+	/**
+	 * @covers JGithubPackageRepositoriesComments::getListRepository
+	 */
+	public function testGetListRepository()
+	{
+		$this->response->code = 200;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('get')
+			->with('/repos/joomla/joomla-platform/comments')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->getListRepository('joomla', 'joomla-platform'),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
+
+	/**
+	 * @covers JGithubPackageRepositoriesComments::getList
+	 */
+	public function testGetList()
+	{
+		$this->response->code = 200;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('get')
+			->with('/repos/joomla/joomla-platform/commits/123/comments')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->getList('joomla', 'joomla-platform', '123'),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
+
+	/**
+	 * @covers JGithubPackageRepositoriesComments::get
+	 */
+	public function testGet()
+	{
+		$this->response->code = 200;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('get')
+			->with('/repos/joomla/joomla-platform/comments/123')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->get('joomla', 'joomla-platform', 123),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
+
+	/**
+	 * @covers JGithubPackageRepositoriesComments::edit
+	 */
+	public function testEdit()
+	{
+		$this->response->code = 200;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('patch')
+			->with('/repos/joomla/joomla-platform/comments/123')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->edit('joomla', 'joomla-platform', 123, 'My Comment'),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
+
+	/**
+	 * @covers JGithubPackageRepositoriesComments::delete
+	 */
+	public function testDelete()
+	{
+		$this->response->code = 204;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('delete')
+			->with('/repos/joomla/joomla-platform/comments/123')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->delete('joomla', 'joomla-platform', 123),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
+
+	/**
+	 * @covers JGithubPackageRepositoriesComments::create
+	 */
+	public function testCreate()
+	{
+		$this->response->code = 201;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('post')
+			->with('/repos/joomla/joomla-platform/commits/123abc/comments')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->create('joomla', 'joomla-platform', '123abc', 'My Comment', 456, 'path/file.php', 789),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
 }
diff --git a/tests/unit/suites/libraries/joomla/github/repositories/JGithubPackageRepositoriesContentsTest.php b/tests/unit/suites/libraries/joomla/github/repositories/JGithubPackageRepositoriesContentsTest.php
index 5f902e129c5d8..b249019b620f4 100644
--- a/tests/unit/suites/libraries/joomla/github/repositories/JGithubPackageRepositoriesContentsTest.php
+++ b/tests/unit/suites/libraries/joomla/github/repositories/JGithubPackageRepositoriesContentsTest.php
@@ -23,9 +23,9 @@ class JGithubPackageRepositoriesContentsTest extends PHPUnit_Framework_TestCase
 	protected $response;
 
 	/**
-     * @var JGithubPackageRepositoriesContents
-     */
-    protected $object;
+	 * @var JGithubPackageRepositoriesContents
+	 */
+	protected $object;
 
 	/**
 	 * @var    string  Sample JSON string.
@@ -58,24 +58,24 @@ protected function setUp()
 		$this->object = new JGithubPackageRepositoriesContents($this->options, $this->client);
 	}
 
-    /**
-     * @covers JGithubPackageRepositoriesContents::getReadme
-     */
-    public function testGetReadme()
-    {
-	    $this->response->code = 200;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('get')
-		    ->with('/repos/joomla/joomla-platform/readme')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->getReadme('joomla', 'joomla-platform'),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
+	/**
+	 * @covers JGithubPackageRepositoriesContents::getReadme
+	 */
+	public function testGetReadme()
+	{
+		$this->response->code = 200;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('get')
+			->with('/repos/joomla/joomla-platform/readme')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->getReadme('joomla', 'joomla-platform'),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
 
 	/**
 	 * @covers JGithubPackageRepositoriesContents::getReadme
@@ -97,23 +97,23 @@ public function testGetReadmeRef()
 	}
 
 	/**
-     * @covers JGithubPackageRepositoriesContents::get
-     */
-    public function testGet()
-    {
-	    $this->response->code = 200;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('get')
-		    ->with('/repos/joomla/joomla-platform/contents/path/to/file.php')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->get('joomla', 'joomla-platform', 'path/to/file.php'),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
+	 * @covers JGithubPackageRepositoriesContents::get
+	 */
+	public function testGet()
+	{
+		$this->response->code = 200;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('get')
+			->with('/repos/joomla/joomla-platform/contents/path/to/file.php')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->get('joomla', 'joomla-platform', 'path/to/file.php'),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
 
 	/**
 	 * @covers JGithubPackageRepositoriesContents::get
@@ -135,23 +135,23 @@ public function testGetRef()
 	}
 
 	/**
-     * @covers JGithubPackageRepositoriesContents::getArchiveLink
-     */
-    public function testGetArchiveLink()
-    {
-	    $this->response->code = 302;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('get')
-		    ->with('/repos/joomla/joomla-platform/zipball')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->getArchiveLink('joomla', 'joomla-platform'),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
+	 * @covers JGithubPackageRepositoriesContents::getArchiveLink
+	 */
+	public function testGetArchiveLink()
+	{
+		$this->response->code = 302;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('get')
+			->with('/repos/joomla/joomla-platform/zipball')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->getArchiveLink('joomla', 'joomla-platform'),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
 
 	/**
 	 * @covers JGithubPackageRepositoriesContents::getArchiveLink
diff --git a/tests/unit/suites/libraries/joomla/github/repositories/JGithubPackageRepositoriesDownloadsTest.php b/tests/unit/suites/libraries/joomla/github/repositories/JGithubPackageRepositoriesDownloadsTest.php
index 3c343a83ae894..e1d85cab75eba 100644
--- a/tests/unit/suites/libraries/joomla/github/repositories/JGithubPackageRepositoriesDownloadsTest.php
+++ b/tests/unit/suites/libraries/joomla/github/repositories/JGithubPackageRepositoriesDownloadsTest.php
@@ -23,9 +23,9 @@ class JGithubPackageRepositoriesDownloadsTest extends PHPUnit_Framework_TestCase
 	protected $response;
 
 	/**
-     * @var JGithubPackageRepositoriesDownloads
-     */
-    protected $object;
+	 * @var JGithubPackageRepositoriesDownloads
+	 */
+	protected $object;
 
 	/**
 	 * @var    string  Sample JSON string.
@@ -58,98 +58,98 @@ protected function setUp()
 		$this->object = new JGithubPackageRepositoriesDownloads($this->options, $this->client);
 	}
 
-    /**
-     * @covers JGithubPackageRepositoriesDownloads::getList
-     */
-    public function testGetList()
-    {
-	    $this->response->code = 200;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('get')
-		    ->with('/repos/joomla/joomla-platform/downloads')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->getList('joomla', 'joomla-platform'),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
-
-    /**
-     * @covers JGithubPackageRepositoriesDownloads::get
-     */
-    public function testGet()
-    {
-	    $this->response->code = 200;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('get')
-		    ->with('/repos/joomla/joomla-platform/downloads/123abc')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->get('joomla', 'joomla-platform', '123abc'),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
-
-    /**
-     * @covers JGithubPackageRepositoriesDownloads::create
-     */
-    public function testCreate()
-    {
-	    $this->response->code = 201;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('post')
-		    ->with('/repos/joomla/joomla-platform/downloads')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->create('joomla', 'joomla-platform', 'aaa.zip', 1234, 'Description', 'content_type'),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
-
-    /**
-     * @covers JGithubPackageRepositoriesDownloads::upload
-     */
-    public function testUpload()
-    {
-	    $this->response->code = 201;
-	    $this->response->body = true;
-
-	    $this->client->expects($this->once())
-		    ->method('post')
-		    ->with('https://github.s3.amazonaws.com/')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->upload('joomla', 'joomla-platform', 123, 'a/b/aaa.zip', 'acl', 201, 'aaa.zip', '123abc', '123abc', '123abc','content_type', '@aaa.zip'),
-		    $this->equalTo($this->response->body)
-	    );
-    }
-
-    /**
-     * @covers JGithubPackageRepositoriesDownloads::delete
-     */
-    public function testDelete()
-    {
-	    $this->response->code = 204;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('delete')
-		    ->with('/repos/joomla/joomla-platform/downloads/123')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->delete('joomla', 'joomla-platform', 123),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
+	/**
+	 * @covers JGithubPackageRepositoriesDownloads::getList
+	 */
+	public function testGetList()
+	{
+		$this->response->code = 200;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('get')
+			->with('/repos/joomla/joomla-platform/downloads')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->getList('joomla', 'joomla-platform'),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
+
+	/**
+	 * @covers JGithubPackageRepositoriesDownloads::get
+	 */
+	public function testGet()
+	{
+		$this->response->code = 200;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('get')
+			->with('/repos/joomla/joomla-platform/downloads/123abc')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->get('joomla', 'joomla-platform', '123abc'),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
+
+	/**
+	 * @covers JGithubPackageRepositoriesDownloads::create
+	 */
+	public function testCreate()
+	{
+		$this->response->code = 201;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('post')
+			->with('/repos/joomla/joomla-platform/downloads')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->create('joomla', 'joomla-platform', 'aaa.zip', 1234, 'Description', 'content_type'),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
+
+	/**
+	 * @covers JGithubPackageRepositoriesDownloads::upload
+	 */
+	public function testUpload()
+	{
+		$this->response->code = 201;
+		$this->response->body = true;
+
+		$this->client->expects($this->once())
+			->method('post')
+			->with('https://github.s3.amazonaws.com/')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->upload('joomla', 'joomla-platform', 123, 'a/b/aaa.zip', 'acl', 201, 'aaa.zip', '123abc', '123abc', '123abc','content_type', '@aaa.zip'),
+			$this->equalTo($this->response->body)
+		);
+	}
+
+	/**
+	 * @covers JGithubPackageRepositoriesDownloads::delete
+	 */
+	public function testDelete()
+	{
+		$this->response->code = 204;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('delete')
+			->with('/repos/joomla/joomla-platform/downloads/123')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->delete('joomla', 'joomla-platform', 123),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
 }
diff --git a/tests/unit/suites/libraries/joomla/github/repositories/JGithubPackageRepositoriesKeysTest.php b/tests/unit/suites/libraries/joomla/github/repositories/JGithubPackageRepositoriesKeysTest.php
index ccc548576c0f4..ba00aac05ab2a 100644
--- a/tests/unit/suites/libraries/joomla/github/repositories/JGithubPackageRepositoriesKeysTest.php
+++ b/tests/unit/suites/libraries/joomla/github/repositories/JGithubPackageRepositoriesKeysTest.php
@@ -85,16 +85,14 @@ public function testGetList()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('get')
-		             ->with('/repos/joomla/joomla-platform/keys')
-		             ->will($this->returnValue($this->response))
-		;
+			->method('get')
+			->with('/repos/joomla/joomla-platform/keys')
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->getList('joomla', 'joomla-platform'),
 			$this->equalTo(json_decode($this->sampleString))
-		)
-		;
+		);
 	}
 
 	/**
@@ -121,16 +119,14 @@ public function testGet()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('get')
-		             ->with('/repos/joomla/joomla-platform/keys/1')
-		             ->will($this->returnValue($this->response))
-		;
+			->method('get')
+			->with('/repos/joomla/joomla-platform/keys/1')
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->get('joomla', 'joomla-platform', 1),
 			$this->equalTo(json_decode($this->sampleString))
-		)
-		;
+		);
 	}
 
 	/**
@@ -165,16 +161,14 @@ public function testCreate()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('post')
-		             ->with('/repos/joomla/joomla-platform/keys')
-		             ->will($this->returnValue($this->response))
-		;
+			->method('post')
+			->with('/repos/joomla/joomla-platform/keys')
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->create('joomla', 'joomla-platform', 'email@example.com', '123abc'),
 			$this->equalTo(json_decode($this->sampleString))
-		)
-		;
+		);
 	}
 
 	/**
@@ -208,16 +202,14 @@ public function testEdit()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('patch')
-		             ->with('/repos/joomla/joomla-platform/keys/1')
-		             ->will($this->returnValue($this->response))
-		;
+			->method('patch')
+			->with('/repos/joomla/joomla-platform/keys/1')
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->edit('joomla', 'joomla-platform', 1, 'email@example.com', '123abc'),
 			$this->equalTo(json_decode($this->sampleString))
-		)
-		;
+		);
 	}
 
 	/**
@@ -237,15 +229,13 @@ public function testDelete()
 		$this->response->body = true;
 
 		$this->client->expects($this->once())
-		             ->method('delete')
-		             ->with('/repos/joomla/joomla-platform/keys/1')
-		             ->will($this->returnValue($this->response))
-		;
+			->method('delete')
+			->with('/repos/joomla/joomla-platform/keys/1')
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->delete('joomla', 'joomla-platform', 1),
 			$this->equalTo($this->response->body)
-		)
-		;
+		);
 	}
 }
diff --git a/tests/unit/suites/libraries/joomla/github/repositories/JGithubPackageRepositoriesMergingTest.php b/tests/unit/suites/libraries/joomla/github/repositories/JGithubPackageRepositoriesMergingTest.php
index c91b56d32f62b..4ad299df38d73 100644
--- a/tests/unit/suites/libraries/joomla/github/repositories/JGithubPackageRepositoriesMergingTest.php
+++ b/tests/unit/suites/libraries/joomla/github/repositories/JGithubPackageRepositoriesMergingTest.php
@@ -178,16 +178,14 @@ public function testPerform()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('post')
-		             ->with('/repos/joomla/joomla-platform/merges')
-		             ->will($this->returnValue($this->response))
-		;
+			->method('post')
+			->with('/repos/joomla/joomla-platform/merges')
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->perform('joomla', 'joomla-platform', '123', '456', 'My Message'),
 			$this->equalTo(json_decode($this->sampleString))
-		)
-		;
+		);
 	}
 
 	/**
@@ -199,16 +197,14 @@ public function testPerformNoOp()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('post')
-		             ->with('/repos/joomla/joomla-platform/merges')
-		             ->will($this->returnValue($this->response))
-		;
+			->method('post')
+			->with('/repos/joomla/joomla-platform/merges')
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->perform('joomla', 'joomla-platform', '123', '456', 'My Message'),
 			$this->equalTo(json_decode($this->sampleString))
-		)
-		;
+		);
 	}
 
 	/**
@@ -220,16 +216,14 @@ public function testPerformMissing()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('post')
-		             ->with('/repos/joomla/joomla-platform/merges')
-		             ->will($this->returnValue($this->response))
-		;
+			->method('post')
+			->with('/repos/joomla/joomla-platform/merges')
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->perform('joomla', 'joomla-platform', '123', '456', 'My Message'),
 			$this->equalTo(json_decode($this->sampleString))
-		)
-		;
+		);
 	}
 
 	/**
@@ -241,16 +235,14 @@ public function testPerformConflict()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('post')
-		             ->with('/repos/joomla/joomla-platform/merges')
-		             ->will($this->returnValue($this->response))
-		;
+			->method('post')
+			->with('/repos/joomla/joomla-platform/merges')
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->perform('joomla', 'joomla-platform', '123', '456', 'My Message'),
 			$this->equalTo(json_decode($this->sampleString))
-		)
-		;
+		);
 	}
 
 	/**
@@ -262,15 +254,13 @@ public function testPerformUnexpected()
 		$this->response->body = $this->sampleString;
 
 		$this->client->expects($this->once())
-		             ->method('post')
-		             ->with('/repos/joomla/joomla-platform/merges')
-		             ->will($this->returnValue($this->response))
-		;
+			->method('post')
+			->with('/repos/joomla/joomla-platform/merges')
+			->will($this->returnValue($this->response));
 
 		$this->assertThat(
 			$this->object->perform('joomla', 'joomla-platform', '123', '456', 'My Message'),
 			$this->equalTo(json_decode($this->sampleString))
-		)
-		;
+		);
 	}
 }
diff --git a/tests/unit/suites/libraries/joomla/github/users/JGithubPackageUsersEmailsTest.php b/tests/unit/suites/libraries/joomla/github/users/JGithubPackageUsersEmailsTest.php
index 92f0862df0b62..63bc31233c05b 100644
--- a/tests/unit/suites/libraries/joomla/github/users/JGithubPackageUsersEmailsTest.php
+++ b/tests/unit/suites/libraries/joomla/github/users/JGithubPackageUsersEmailsTest.php
@@ -23,9 +23,9 @@ class JGithubPackageUsersEmailsTest extends PHPUnit_Framework_TestCase
 	protected $response;
 
 	/**
-     * @var JGithubPackageUsersEmails
-     */
-    protected $object;
+	 * @var JGithubPackageUsersEmails
+	 */
+	protected $object;
 
 	/**
 	 * @var    string  Sample JSON string.
@@ -58,60 +58,60 @@ protected function setUp()
 		$this->object = new JGithubPackageUsersEmails($this->options, $this->client);
 	}
 
-    /**
-     * @covers JGithubPackageUsersEmails::getList
-     */
-    public function testGetList()
-    {
-	    $this->response->code = 200;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('get')
-		    ->with('/user/emails')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->getList(),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
-
-    /**
-     * @covers JGithubPackageUsersEmails::add
-     */
-    public function testAdd()
-    {
-	    $this->response->code = 201;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('post')
-		    ->with('/user/emails')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->add('email@example.com'),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
-
-    /**
-     * @covers JGithubPackageUsersEmails::delete
-     */
-    public function testDelete()
-    {
-	    $this->response->code = 204;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('delete')
-		    ->with('/user/emails')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->delete('email@example.com'),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
+	/**
+	 * @covers JGithubPackageUsersEmails::getList
+	 */
+	public function testGetList()
+	{
+		$this->response->code = 200;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('get')
+			->with('/user/emails')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->getList(),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
+
+	/**
+	 * @covers JGithubPackageUsersEmails::add
+	 */
+	public function testAdd()
+	{
+		$this->response->code = 201;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('post')
+			->with('/user/emails')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->add('email@example.com'),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
+
+	/**
+	 * @covers JGithubPackageUsersEmails::delete
+	 */
+	public function testDelete()
+	{
+		$this->response->code = 204;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('delete')
+			->with('/user/emails')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->delete('email@example.com'),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
 }
diff --git a/tests/unit/suites/libraries/joomla/github/users/JGithubPackageUsersFollowersTest.php b/tests/unit/suites/libraries/joomla/github/users/JGithubPackageUsersFollowersTest.php
index 78f40d51adaf3..355fa1ef0d028 100644
--- a/tests/unit/suites/libraries/joomla/github/users/JGithubPackageUsersFollowersTest.php
+++ b/tests/unit/suites/libraries/joomla/github/users/JGithubPackageUsersFollowersTest.php
@@ -23,9 +23,9 @@ class JGithubPackageUsersFollowersTest extends PHPUnit_Framework_TestCase
 	protected $response;
 
 	/**
-     * @var JGithubPackageUsersFollowers
-     */
-    protected $object;
+	 * @var JGithubPackageUsersFollowers
+	 */
+	protected $object;
 
 	/**
 	 * @var    string  Sample JSON string.
@@ -58,24 +58,24 @@ protected function setUp()
 		$this->object = new JGithubPackageUsersFollowers($this->options, $this->client);
 	}
 
-    /**
-     * @covers JGithubPackageUsersFollowers::getList
-     */
-    public function testGetList()
-    {
-	    $this->response->code = 200;
-	    $this->response->body = $this->sampleString;
+	/**
+	 * @covers JGithubPackageUsersFollowers::getList
+	 */
+	public function testGetList()
+	{
+		$this->response->code = 200;
+		$this->response->body = $this->sampleString;
 
-	    $this->client->expects($this->once())
-		    ->method('get')
-		    ->with('/user/followers')
-		    ->will($this->returnValue($this->response));
+		$this->client->expects($this->once())
+			->method('get')
+			->with('/user/followers')
+			->will($this->returnValue($this->response));
 
-	    $this->assertThat(
-		    $this->object->getList(),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
+		$this->assertThat(
+			$this->object->getList(),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
 
 	/**
 	 * @covers JGithubPackageUsersFollowers::getList
@@ -96,24 +96,24 @@ public function testGetListWithUser()
 		);
 	}
 
-    /**
-     * @covers JGithubPackageUsersFollowers::getListFollowedBy
-     */
-    public function testGetListFollowedBy()
-    {
-	    $this->response->code = 200;
-	    $this->response->body = $this->sampleString;
+	/**
+	 * @covers JGithubPackageUsersFollowers::getListFollowedBy
+	 */
+	public function testGetListFollowedBy()
+	{
+		$this->response->code = 200;
+		$this->response->body = $this->sampleString;
 
-	    $this->client->expects($this->once())
-		    ->method('get')
-		    ->with('/user/following')
-		    ->will($this->returnValue($this->response));
+		$this->client->expects($this->once())
+			->method('get')
+			->with('/user/following')
+			->will($this->returnValue($this->response));
 
-	    $this->assertThat(
-		    $this->object->getListFollowedBy(),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
+		$this->assertThat(
+			$this->object->getListFollowedBy(),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
 
 	/**
 	 * @covers JGithubPackageUsersFollowers::getListFollowedBy
@@ -135,23 +135,23 @@ public function testGetListFollowedByWithUser()
 	}
 
 	/**
-     * @covers JGithubPackageUsersFollowers::check
-     */
-    public function testCheck()
-    {
-	    $this->response->code = 204;
-	    $this->response->body = true;
+	 * @covers JGithubPackageUsersFollowers::check
+	 */
+	public function testCheck()
+	{
+		$this->response->code = 204;
+		$this->response->body = true;
 
-	    $this->client->expects($this->once())
-		    ->method('get')
-		    ->with('/user/following/joomla')
-		    ->will($this->returnValue($this->response));
+		$this->client->expects($this->once())
+			->method('get')
+			->with('/user/following/joomla')
+			->will($this->returnValue($this->response));
 
-	    $this->assertThat(
-		    $this->object->check('joomla'),
-		    $this->equalTo($this->response->body)
-	    );
-    }
+		$this->assertThat(
+			$this->object->check('joomla'),
+			$this->equalTo($this->response->body)
+		);
+	}
 
 	/**
 	 * @covers JGithubPackageUsersFollowers::check
@@ -194,40 +194,40 @@ public function testCheckUnexpected()
 	}
 
 	/**
-     * @covers JGithubPackageUsersFollowers::follow
-     */
-    public function testFollow()
-    {
-	    $this->response->code = 204;
-	    $this->response->body = '';
-
-	    $this->client->expects($this->once())
-		    ->method('put')
-		    ->with('/user/following/joomla')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->follow('joomla'),
-		    $this->equalTo($this->response->body)
-	    );
-    }
-
-    /**
-     * @covers JGithubPackageUsersFollowers::unfollow
-     */
-    public function testUnfollow()
-    {
-	    $this->response->code = 204;
-	    $this->response->body = '';
-
-	    $this->client->expects($this->once())
-		    ->method('delete')
-		    ->with('/user/following/joomla')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->unfollow('joomla'),
-		    $this->equalTo($this->response->body)
-	    );
-    }
+	 * @covers JGithubPackageUsersFollowers::follow
+	 */
+	public function testFollow()
+	{
+		$this->response->code = 204;
+		$this->response->body = '';
+
+		$this->client->expects($this->once())
+			->method('put')
+			->with('/user/following/joomla')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->follow('joomla'),
+			$this->equalTo($this->response->body)
+		);
+	}
+
+	/**
+	 * @covers JGithubPackageUsersFollowers::unfollow
+	 */
+	public function testUnfollow()
+	{
+		$this->response->code = 204;
+		$this->response->body = '';
+
+		$this->client->expects($this->once())
+			->method('delete')
+			->with('/user/following/joomla')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->unfollow('joomla'),
+			$this->equalTo($this->response->body)
+		);
+	}
 }
diff --git a/tests/unit/suites/libraries/joomla/github/users/JGithubPackageUsersKeysTest.php b/tests/unit/suites/libraries/joomla/github/users/JGithubPackageUsersKeysTest.php
index 8019647f34f7c..afc5c5302e8ea 100644
--- a/tests/unit/suites/libraries/joomla/github/users/JGithubPackageUsersKeysTest.php
+++ b/tests/unit/suites/libraries/joomla/github/users/JGithubPackageUsersKeysTest.php
@@ -23,9 +23,9 @@ class JGithubPackageUsersKeysTest extends PHPUnit_Framework_TestCase
 	protected $response;
 
 	/**
-     * @var JGithubPackageUsersKeys
-     */
-    protected $object;
+	 * @var JGithubPackageUsersKeys
+	 */
+	protected $object;
 
 	/**
 	 * @var    string  Sample JSON string.
@@ -58,117 +58,117 @@ protected function setUp()
 		$this->object = new JGithubPackageUsersKeys($this->options, $this->client);
 	}
 
-    /**
-     * @covers JGithubPackageUsersKeys::getListUser
-     */
-    public function testGetListUser()
-    {
-	    $this->response->code = 200;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('get')
-		    ->with('/users/joomla/keys')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->getListUser('joomla'),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
-
-    /**
-     * @covers JGithubPackageUsersKeys::getList
-     */
-    public function testGetList()
-    {
-	    $this->response->code = 200;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('get')
-		    ->with('/users/keys')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->getList(),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
-
-    /**
-     * @covers JGithubPackageUsersKeys::get
-     */
-    public function testGet()
-    {
-	    $this->response->code = 200;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('get')
-		    ->with('/users/keys/1')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->get(1),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
-
-    /**
-     * @covers JGithubPackageUsersKeys::create
-     */
-    public function testCreate()
-    {
-	    $this->response->code = 201;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('post')
-		    ->with('/users/keys')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->create('email@example.com', '12345'),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
-
-    /**
-     * @covers JGithubPackageUsersKeys::edit
-     */
-    public function testEdit()
-    {
-	    $this->response->code = 200;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('patch')
-		    ->with('/users/keys/1')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->edit(1, 'email@example.com', '12345'),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
-
-    /**
-     * @covers JGithubPackageUsersKeys::delete
-     */
-    public function testDelete()
-    {
-	    $this->response->code = 204;
-	    $this->response->body = $this->sampleString;
-
-	    $this->client->expects($this->once())
-		    ->method('delete')
-		    ->with('/users/keys/1')
-		    ->will($this->returnValue($this->response));
-
-	    $this->assertThat(
-		    $this->object->delete(1),
-		    $this->equalTo(json_decode($this->sampleString))
-	    );
-    }
+	/**
+	 * @covers JGithubPackageUsersKeys::getListUser
+	 */
+	public function testGetListUser()
+	{
+		$this->response->code = 200;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('get')
+			->with('/users/joomla/keys')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->getListUser('joomla'),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
+
+	/**
+	 * @covers JGithubPackageUsersKeys::getList
+	 */
+	public function testGetList()
+	{
+		$this->response->code = 200;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('get')
+			->with('/users/keys')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->getList(),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
+
+	/**
+	 * @covers JGithubPackageUsersKeys::get
+	 */
+	public function testGet()
+	{
+		$this->response->code = 200;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('get')
+			->with('/users/keys/1')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->get(1),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
+
+	/**
+	 * @covers JGithubPackageUsersKeys::create
+	 */
+	public function testCreate()
+	{
+		$this->response->code = 201;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('post')
+			->with('/users/keys')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->create('email@example.com', '12345'),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
+
+	/**
+	 * @covers JGithubPackageUsersKeys::edit
+	 */
+	public function testEdit()
+	{
+		$this->response->code = 200;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('patch')
+			->with('/users/keys/1')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->edit(1, 'email@example.com', '12345'),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
+
+	/**
+	 * @covers JGithubPackageUsersKeys::delete
+	 */
+	public function testDelete()
+	{
+		$this->response->code = 204;
+		$this->response->body = $this->sampleString;
+
+		$this->client->expects($this->once())
+			->method('delete')
+			->with('/users/keys/1')
+			->will($this->returnValue($this->response));
+
+		$this->assertThat(
+			$this->object->delete(1),
+			$this->equalTo(json_decode($this->sampleString))
+		);
+	}
 }
diff --git a/tests/unit/suites/libraries/joomla/google/JGoogleDataAdsenseTest.php b/tests/unit/suites/libraries/joomla/google/JGoogleDataAdsenseTest.php
index ac9aca8a2af9b..7017935b3ca68 100644
--- a/tests/unit/suites/libraries/joomla/google/JGoogleDataAdsenseTest.php
+++ b/tests/unit/suites/libraries/joomla/google/JGoogleDataAdsenseTest.php
@@ -261,7 +261,7 @@ public function testGenerateReport()
 		$timezone = new DateTimeZone('Europe/London');
 		$start = new DateTime('now');
 		$end = new DateTime;
-		$end->setTimestamp(time() + 3600)->setTimeZone($timezone);
+		$end->setTimestamp(time() + 3600)->setTimezone($timezone);
 
 		$result = $this->object->generateReport('accountID', time(), time() + 100000, array('option' => 'value'));
 		$this->assertEquals($result, array('rows' => array(1, 2), 'totalMatchedRows' => 1));
diff --git a/tests/unit/suites/libraries/joomla/google/JGoogleDataCalendarTest.php b/tests/unit/suites/libraries/joomla/google/JGoogleDataCalendarTest.php
index 41cc4779a16e9..8bffa9e12ccb7 100644
--- a/tests/unit/suites/libraries/joomla/google/JGoogleDataCalendarTest.php
+++ b/tests/unit/suites/libraries/joomla/google/JGoogleDataCalendarTest.php
@@ -287,7 +287,7 @@ public function testCreateEvent()
 		$timezone = new DateTimeZone('Europe/London');
 		$start = new DateTime('now');
 		$end = new DateTime;
-		$end->setTimestamp(time() + 3600)->setTimeZone($timezone);
+		$end->setTimestamp(time() + 3600)->setTimezone($timezone);
 
 		$result = $this->object->createEvent('calendarID', time(), time() + 100000, array('option' => 'value'));
 		$this->assertEquals($result, array('items' => array('1' => 1, '2' => 2)));
diff --git a/tests/unit/suites/libraries/joomla/log/loggers/JLogLoggerCallbackTest.php b/tests/unit/suites/libraries/joomla/log/loggers/JLogLoggerCallbackTest.php
index dd363d6a2ae93..f6d31f2921e86 100644
--- a/tests/unit/suites/libraries/joomla/log/loggers/JLogLoggerCallbackTest.php
+++ b/tests/unit/suites/libraries/joomla/log/loggers/JLogLoggerCallbackTest.php
@@ -56,7 +56,6 @@ public function testConstructor02()
 		// Create a callback function (since php 5.3)
 		$callback = function ($entry)
 		{
-			return;
 		};
 
 		// Setup the basic configuration.
diff --git a/tests/unit/suites/libraries/joomla/model/JModelDatabaseTest.php b/tests/unit/suites/libraries/joomla/model/JModelDatabaseTest.php
index 26d69c98189bf..b52ed9ae8bec5 100644
--- a/tests/unit/suites/libraries/joomla/model/JModelDatabaseTest.php
+++ b/tests/unit/suites/libraries/joomla/model/JModelDatabaseTest.php
@@ -123,6 +123,6 @@ protected function tearDown()
 	{
 		$this->restoreFactoryState();
 		unset($this->_instance);
-		parent::teardown();
+		parent::tearDown();
 	}
 }
diff --git a/tests/unit/suites/libraries/joomla/session/JSessionTest.php b/tests/unit/suites/libraries/joomla/session/JSessionTest.php
index f4e6cb5783d82..00874fba88d2b 100644
--- a/tests/unit/suites/libraries/joomla/session/JSessionTest.php
+++ b/tests/unit/suites/libraries/joomla/session/JSessionTest.php
@@ -81,7 +81,7 @@ protected function tearDown()
 	 *
 	 * @return array
 	 */
-	Public function casesGetInstance()
+	public function casesGetInstance()
 	{
 		return array(
 			'first_instance' => array(
diff --git a/tests/unit/suites/libraries/joomla/table/JTableNestedTest.php b/tests/unit/suites/libraries/joomla/table/JTableNestedTest.php
index f37bd3e94e6e9..0258ed457ffb8 100644
--- a/tests/unit/suites/libraries/joomla/table/JTableNestedTest.php
+++ b/tests/unit/suites/libraries/joomla/table/JTableNestedTest.php
@@ -785,7 +785,7 @@ protected function getDataSet()
 	 */
 	protected function setUp()
 	{
-		parent::setup();
+		parent::setUp();
 
 // 		$this->saveFactoryState();
 
diff --git a/tests/unit/suites/libraries/joomla/user/JUserHelperTest.php b/tests/unit/suites/libraries/joomla/user/JUserHelperTest.php
index 2f337aa5f2df3..0ae76af60e2db 100644
--- a/tests/unit/suites/libraries/joomla/user/JUserHelperTest.php
+++ b/tests/unit/suites/libraries/joomla/user/JUserHelperTest.php
@@ -362,7 +362,7 @@ public function testVerifyPassword()
 		// Generate the old style password hash used before phpass was implemented.
 		$salt		= JUserHelper::genRandomPassword(32);
 		$crypted	= JUserHelper::getCryptedPassword($password, $salt);
-		$hashed	        = $crypted.':'.$salt;
+		$hashed	        = $crypted . ':' . $salt;
 		$this->assertTrue(
 			JUserHelper::verifyPassword('mySuperSecretPassword', $hashed),
 			'Properly verifies a password which was hashed before phpass was implemented'
diff --git a/tests/unit/suites/libraries/legacy/error/JErrorTest.php b/tests/unit/suites/libraries/legacy/error/JErrorTest.php
index fff5cc842e734..e4d624414ee6b 100644
--- a/tests/unit/suites/libraries/legacy/error/JErrorTest.php
+++ b/tests/unit/suites/libraries/legacy/error/JErrorTest.php
@@ -165,6 +165,5 @@ public function testSetErrorHandling()
 	 */
 	public function callbackHandler()
 	{
-		return;
 	}
 }
diff --git a/tests/unit/suites/libraries/legacy/model/stubs/name.php b/tests/unit/suites/libraries/legacy/model/stubs/name.php
index 05f6679020c7a..d584f1519c29f 100644
--- a/tests/unit/suites/libraries/legacy/model/stubs/name.php
+++ b/tests/unit/suites/libraries/legacy/model/stubs/name.php
@@ -26,6 +26,5 @@ class NokeywordInName extends JModelLegacy
 	 */
 	public function __construct()
 	{
-		return;
 	}
 }
diff --git a/tests/unit/suites/plugins/content/emailcloak/PlgContentEmailcloakTest.php b/tests/unit/suites/plugins/content/emailcloak/PlgContentEmailcloakTest.php
index 4a9a1bf755634..8e5e0693d408b 100644
--- a/tests/unit/suites/plugins/content/emailcloak/PlgContentEmailcloakTest.php
+++ b/tests/unit/suites/plugins/content/emailcloak/PlgContentEmailcloakTest.php
@@ -18,106 +18,106 @@
  */
 class PlgContentEmailcloakTest extends TestCaseDatabase
 {
-    /**
-     * An instance of the class to test.
-     *
-     * @var    PlgContentEmailcloak
-     * @since  3.6.2
-     */
-    protected $class;
-
-    /**
-     * Setup for testing.
-     *
-     * @return  void
-     *
-     * @since   3.6.2
-     */
-    public function setup()
-    {
-        JFactory::$application = $this->getMockCmsApp();
-        JFactory::$session = $this->getMockSession();
-
-        // force the cloak JS inline so that we can unit test it easier than messing with script head in document
-        JFactory::getApplication()->input->server->set('HTTP_X_REQUESTED_WITH', 'xmlhttprequest');
-
-        /**
-         * Create a mock dispatcher instance
-         *
-         * @var $dispatcher Mock_JEventDispatcher_f5646d4b e.g
-         */
-        $dispatcher = TestCaseDatabase::getMockDispatcher();
-
-        $plugin = array(
-            'name'   => 'emailcloak',
-            'type'   => 'Content',
-            'params' => new \JRegistry
-        );
-
-        $this->class = new PlgContentEmailcloak($dispatcher, $plugin);
-    }
-
-    /**
-     * Provides the data to test the constructor method.
-     * more examples to add can be found here:
-     *  - https://github.com/joomla/joomla-cms/pull/4182#issuecomment-53395318
-     *  - https://github.com/joomla/joomla-cms/pull/3735#issue-35215540
-     *
-     * @return  array
-     *
-     * @since   3.4
-     */
-    public function dataTestOnContentPrepare()
-    {
-        return array(
-
-            # 0
-            array(
-                // This first row is the input, this is what would be in the article
-                'this should not be parsed as it has no (at) sign in it - see what I did there? ;)',
-
-                /**
-                 * This second row is what you would expect the JS, after rendering in a browser
-                 * At the moment there is a slight unit test bug in that what you see here will start with
-                 * the opening <a> tag, and not the full surrounding html from the article - I might fix that in future
-                 * but for now we are testing the actual replacement inside the <a> tags and not the surrounding html
-                 * due to the crazyness of the unit tests converting from JS to HTML to compare
-                 */
-                'this should not be parsed as it has no (at) sign in it - see what I did there? ;)',
-
-                // this third row is the full output of the cloak with inline javascript mode enabled
-                ''
-
-            ),
-
-            # ? - see: https://github.com/joomla/joomla-cms/pull/11378#issuecomment-237829598
-            /**
-             * This is failing at the moment so Im excluding it while the above PR #11378 is worked on
-             * and while this unit test suite is being improved - but this test highlights the fact we need these tests!
-             *
-             * array(
-             * '<a href="mailto:toto@toto.com?subject=Mysubject" class="myclass" >email</a>',
-             * "<a href='mailto:toto@toto.com?subject=Mysubject' class='myclass' >email</a>",
-             * "
-             * <span id=\"cloak__HASH__\">JLIB_HTML_CLOAKING</span><script type='text/javascript'>
-             * document.getElementById('cloak__HASH__').innerHTML = '';
-             * var prefix = '&#109;a' + 'i&#108;' + '&#116;o';
-             * var path = 'hr' + 'ef' + '=';
-             * var addy__HASH__ = 't&#111;t&#111;' + '&#64;';
-             * addy__HASH__ = addy__HASH__ + 't&#111;t&#111;' + '&#46;' + 'c&#111;m?s&#117;bj&#101;ct=Mys&#117;bj&#101;ct';
-             * var addy_text__HASH__ = '&#101;m&#97;&#105;l';document.getElementById('cloak__HASH__').innerHTML += '<a ' + path + '\'' + prefix + ':' + addy__HASH__ + '\' class=\"myclass\" >'+addy_text__HASH__+'<\/a>';
-             * </script>
-             * "
-             * ),*/
-
-
-            # 1
-            array(
-                '<a href="http://mce_host/ourdirectory/email@example.org">anytext</a>',
-
-                "<a href='mailto:email@example.org'>anytext</a>",
-
-                "<span id=\"cloak__HASH__\">JLIB_HTML_CLOAKING</span><script type='text/javascript'>
+	/**
+	 * An instance of the class to test.
+	 *
+	 * @var    PlgContentEmailcloak
+	 * @since  3.6.2
+	 */
+	protected $class;
+
+	/**
+	 * Setup for testing.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.6.2
+	 */
+	public function setup()
+	{
+		JFactory::$application = $this->getMockCmsApp();
+		JFactory::$session = $this->getMockSession();
+
+		// force the cloak JS inline so that we can unit test it easier than messing with script head in document
+		JFactory::getApplication()->input->server->set('HTTP_X_REQUESTED_WITH', 'xmlhttprequest');
+
+		/**
+		 * Create a mock dispatcher instance
+		 *
+		 * @var $dispatcher Mock_JEventDispatcher_f5646d4b e.g
+		 */
+		$dispatcher = TestCaseDatabase::getMockDispatcher();
+
+		$plugin = array(
+			'name'   => 'emailcloak',
+			'type'   => 'Content',
+			'params' => new \JRegistry
+		);
+
+		$this->class = new PlgContentEmailcloak($dispatcher, $plugin);
+	}
+
+	/**
+	 * Provides the data to test the constructor method.
+	 * more examples to add can be found here:
+	 *  - https://github.com/joomla/joomla-cms/pull/4182#issuecomment-53395318
+	 *  - https://github.com/joomla/joomla-cms/pull/3735#issue-35215540
+	 *
+	 * @return  array
+	 *
+	 * @since   3.4
+	 */
+	public function dataTestOnContentPrepare()
+	{
+		return array(
+
+			# 0
+			array(
+				// This first row is the input, this is what would be in the article
+				'this should not be parsed as it has no (at) sign in it - see what I did there? ;)',
+
+				/**
+				 * This second row is what you would expect the JS, after rendering in a browser
+				 * At the moment there is a slight unit test bug in that what you see here will start with
+				 * the opening <a> tag, and not the full surrounding html from the article - I might fix that in future
+				 * but for now we are testing the actual replacement inside the <a> tags and not the surrounding html
+				 * due to the crazyness of the unit tests converting from JS to HTML to compare
+				 */
+				'this should not be parsed as it has no (at) sign in it - see what I did there? ;)',
+
+				// this third row is the full output of the cloak with inline javascript mode enabled
+				''
+
+			),
+
+			# ? - see: https://github.com/joomla/joomla-cms/pull/11378#issuecomment-237829598
+			/**
+			 * This is failing at the moment so Im excluding it while the above PR #11378 is worked on
+			 * and while this unit test suite is being improved - but this test highlights the fact we need these tests!
+			 *
+			 * array(
+			 * '<a href="mailto:toto@toto.com?subject=Mysubject" class="myclass" >email</a>',
+			 * "<a href='mailto:toto@toto.com?subject=Mysubject' class='myclass' >email</a>",
+			 * "
+			 * <span id=\"cloak__HASH__\">JLIB_HTML_CLOAKING</span><script type='text/javascript'>
+			 * document.getElementById('cloak__HASH__').innerHTML = '';
+			 * var prefix = '&#109;a' + 'i&#108;' + '&#116;o';
+			 * var path = 'hr' + 'ef' + '=';
+			 * var addy__HASH__ = 't&#111;t&#111;' + '&#64;';
+			 * addy__HASH__ = addy__HASH__ + 't&#111;t&#111;' + '&#46;' + 'c&#111;m?s&#117;bj&#101;ct=Mys&#117;bj&#101;ct';
+			 * var addy_text__HASH__ = '&#101;m&#97;&#105;l';document.getElementById('cloak__HASH__').innerHTML += '<a ' + path + '\'' + prefix + ':' + addy__HASH__ + '\' class=\"myclass\" >'+addy_text__HASH__+'<\/a>';
+			 * </script>
+			 * "
+			 * ),*/
+
+
+			# 1
+			array(
+				'<a href="http://mce_host/ourdirectory/email@example.org">anytext</a>',
+
+				"<a href='mailto:email@example.org'>anytext</a>",
+
+				"<span id=\"cloak__HASH__\">JLIB_HTML_CLOAKING</span><script type='text/javascript'>
 				document.getElementById('cloak__HASH__').innerHTML = '';
 				var prefix = '&#109;a' + 'i&#108;' + '&#116;o';
 				var path = 'hr' + 'ef' + '=';
@@ -125,44 +125,44 @@ public function dataTestOnContentPrepare()
 				addy__HASH__ = addy__HASH__ + '&#101;x&#97;mpl&#101;' + '&#46;' + '&#111;rg';
 				var addy_text__HASH__ = '&#97;nyt&#101;xt';document.getElementById('cloak__HASH__').innerHTML += '<a ' + path + '\'' + prefix + ':' + addy__HASH__ + '\'>'+addy_text__HASH__+'<\/a>';
 		</script>
-                "
-            ),
+				"
+			),
 
-            # 2
-            array(
-                '<p><a href="mailto:joe@nowhere.com"><span style="font-style: 8pt;">Joe_fontsize8</span></a></p>',
+			# 2
+			array(
+				'<p><a href="mailto:joe@nowhere.com"><span style="font-style: 8pt;">Joe_fontsize8</span></a></p>',
 
-                // This is out expected output - note the comment in above for the reason it doesnt have the surrounding <p> tags
-                "<a href='mailto:joe@nowhere.com'><span style=\"font-style: 8pt;\">Joe_fontsize8</span></a>",
+				// This is out expected output - note the comment in above for the reason it doesnt have the surrounding <p> tags
+				"<a href='mailto:joe@nowhere.com'><span style=\"font-style: 8pt;\">Joe_fontsize8</span></a>",
 
-                "<p><span id=\"cloak__HASH__\">JLIB_HTML_CLOAKING</span><script type='text/javascript'>
-                document.getElementById('cloak__HASH__').innerHTML = '';
+				"<p><span id=\"cloak__HASH__\">JLIB_HTML_CLOAKING</span><script type='text/javascript'>
+				document.getElementById('cloak__HASH__').innerHTML = '';
 				var prefix = 'ma' + 'il' + 'to';
 				var path = 'hr' + 'ef' + '=';
 				var addy__HASH__ = 'joe' + '@';
 				addy__HASH__ = addy__HASH__ + 'nowhere' + '.' + 'com';
 				var addy_text__HASH__ = '<span style=\"font-style: 8pt;\">Joe_fontsize8</span>';document.getElementById('cloak__HASH__').innerHTML += '<a ' + path + '\'' + prefix + ':' + addy__HASH__ + '\'>'+addy_text__HASH__+'<\/a>';
 		</script></p>
-                "
-            ),
+				"
+			),
 
-            # 3
-            array(
-                '<p><a href="mailto:joe@nowhere13.com?subject= A text"><span style="font-size: 14pt;">Joe_subject_ fontsize13</span></a></p>',
+			# 3
+			array(
+				'<p><a href="mailto:joe@nowhere13.com?subject= A text"><span style="font-size: 14pt;">Joe_subject_ fontsize13</span></a></p>',
 
-                '<a href=\'mailto:joe@nowhere13.com?subject= A text\'?subject= A text><span style="font-size: 14pt;">Joe_subject_ fontsize13</span></a>',
+				'<a href=\'mailto:joe@nowhere13.com?subject= A text\'?subject= A text><span style="font-size: 14pt;">Joe_subject_ fontsize13</span></a>',
 
-                "
-                <p><span id=\"cloak__HASH__\">JLIB_HTML_CLOAKING</span><script type='text/javascript'>
-                document.getElementById('cloak__HASH__').innerHTML = '';
+				"
+				<p><span id=\"cloak__HASH__\">JLIB_HTML_CLOAKING</span><script type='text/javascript'>
+				document.getElementById('cloak__HASH__').innerHTML = '';
 				var prefix = 'ma' + 'il' + 'to';
 				var path = 'hr' + 'ef' + '=';
 				var addy__HASH__ = 'joe' + '@';
 				addy__HASH__ = addy__HASH__ + 'nowhere13' + '.' + 'com?subject= A text';
 				var addy_text__HASH__ = '<span style=\"font-size: 14pt;\">Joe_subject_ fontsize13</span>';document.getElementById('cloak__HASH__').innerHTML += '<a ' + path + '\'' + prefix + ':' + addy__HASH__ + '\'?subject= A text>'+addy_text__HASH__+'<\/a>';
 		</script></p>
-                "
-            ),
+				"
+			),
 
 
 //            [
@@ -209,134 +209,134 @@ public function dataTestOnContentPrepare()
 //                '<a href="mailto:email@example.org">email@example.org</a>',
 //                '<a href="mailto:email@example.org">email@example.org</a>'
 //            ],
-        );
-    }
-
-    /**
-     * Tests PlgContentEmailcloakTest::_cloak()
-     *
-     * @param   string $input The text to test.
-     * @param   string $expected The expectation of the filtering.
-     *
-     * @return  void
-     *
-     * @dataProvider  dataTestOnContentPrepare
-     * @since         3.6.2
-     */
-    public function testOnContentPrepareWithRowNoFinder($input, $expectedHTML = NULL, $expectedJs)
-    {
-        $row = new \stdClass;
-        $row->text = $input;
-        $params = new JRegistry;
-
-        // assert we have the correct event
-        $this->assertInstanceOf('PlgContentEmailcloak', $this->class);
-
-        // assert that we are getting a clean process
-        $res = $this->class->onContentPrepare('com_content.article', $row, $params);
-        $this->assertEquals(1, $res);
-
-
-        // Get the md5 hash
-        preg_match("/addy_text([0-9a-z]{32})/", $row->text, $output_array);
-
-        // If we did some cloaking then test the JS
-        if (count($output_array)) {
-            $hash = $output_array[1];
-
-            // assert the JLIB_HTML_CLOAKING span is intact
-            $this->assertRegExp('/\<span\sid\=\"cloak[0-9a-z]{32}\"\>JLIB_HTML_CLOAKING\<\/span\>/', $row->text);
-            $cloakHTML = '<span id="cloak' . $hash . '">JLIB_HTML_CLOAKING</span>';
-            $this->assertContains($cloakHTML, $row->text);
-
-
-            if ($expectedJs) {
-                // need to do this to overcome whitespace comparison issue in phpunit for some reason...
-                preg_match_all("/\<script type=\'text\/javascript\'\>(.*)<\/script>/ism", $row->text, $innerJS);
-                $result = trim($innerJS[1][0]);
-
-                preg_match_all("/\<script type=\'text\/javascript\'\>(.*)<\/script>/ism", $expectedJs, $innerJS);
-                $expected = trim($innerJS[1][0]);
-
-                // assert the render is as the expected render with injected hash
-                $this->assertEquals(trim(str_replace('__HASH__', $hash, $expected)), $result);
-
-                if (null !== $expectedHTML) {
-                    $html = $this->convertJStoHTML($result, $hash);
-                    $this->assertEquals($html, $expectedHTML);
-                }
-            }
-
-
-        } else {
-
-            // ok we never cloaked an email but lets ensure we did not screw up the article text anyway!
-            $this->assertEquals($expectedHTML, $row->text);
-
-        }
-    }
-
-    /**
-     * Because phpunit cannot evaluate JS like a browser rendering testing framework can
-     * we convert the JS back to HTML by converting to PHP first
-     * Yes its probably a fudge, but is better than nothing as Joomla has no JS testing framework
-     *
-     * @param string $js the resultant JS
-     * @param string $hash the md5 hash
-     * @return string $resultantHTML the resultant HTML that would be rendered by JS.
-     */
-    private function convertJStoHTML($js, $hash)
-    {
-        $resultantHTML = null;
-        $debug = false;
-
-        $js = html_entity_decode($js);
-        $js = str_replace(sprintf('document.getElementById(\'cloak%s\').innerHTML = \'\';', $hash), '', $js);
-        $js = str_replace(sprintf('document.getElementById(\'cloak%s\').innerHTML +=', $hash), "\n\n" . '$resultantHTML = ', $js);
-        $js = str_replace('var ', '$', $js);
-        $js = str_replace("' + '", "", $js);
-        $js = preg_replace("/\saddy/", '$addy', $js);
-        $js = preg_replace(sprintf("/\'\+addy_text%s\+\'/", $hash), sprintf('\' . \$addy_text%s .\'', $hash), $js);
-        $js = preg_replace(sprintf("/\+\$addy%s\s\+/", $hash), sprintf('\' . \$addy_text%s .\'', $hash), $js);
-        $js = str_replace("+ path +", '. $path .', $js);
-        $js = str_replace("+ prefix +", '. $prefix .', $js);
-        $js = str_replace("+$", '.$', $js);
-        $js = str_replace("\/", '/', $js);
-        $js = str_replace(
-            sprintf('$addy%s +', $hash),
-            sprintf('$addy%s .', $hash),
-            $js);
-
-        // because with all those replaces, you and I will need this a lot :)
-        if (true === $debug) {
-            echo "\n\n" . trim($js) . "\n\n";
-            eval($js);
-            echo "\n\n";
-            var_dump(trim($resultantHTML));
-            die;
-        } else {
-            // EVAL IS EVIL - I know - but here its not a security risk, and is 'ok'-ish.
-            eval($js);
-        }
-
-        return trim($resultantHTML);
-    }
-
-    /**
-     * Tests that if we are the com_finder indexer that we return with no cloaking
-     * Tests also that we can set $row as string instead of a normal object
-     */
-    public function testIndexer()
-    {
-        $row = 'test string';
-        $params = new JRegistry;
-
-        // assert we have the correct event
-        $this->assertInstanceOf('PlgContentEmailcloak', $this->class);
-
-        // assert that we are getting a clean process
-        $res = $this->class->onContentPrepare('com_finder.indexer', $row, $params);
-        $this->assertEquals(1, $res);
-        $this->assertEquals('test string', $row);
-    }
+		);
+	}
+
+	/**
+	 * Tests PlgContentEmailcloakTest::_cloak()
+	 *
+	 * @param   string $input The text to test.
+	 * @param   string $expected The expectation of the filtering.
+	 *
+	 * @return  void
+	 *
+	 * @dataProvider  dataTestOnContentPrepare
+	 * @since         3.6.2
+	 */
+	public function testOnContentPrepareWithRowNoFinder($input, $expectedHTML = NULL, $expectedJs)
+	{
+		$row = new \stdClass;
+		$row->text = $input;
+		$params = new JRegistry;
+
+		// assert we have the correct event
+		$this->assertInstanceOf('PlgContentEmailcloak', $this->class);
+
+		// assert that we are getting a clean process
+		$res = $this->class->onContentPrepare('com_content.article', $row, $params);
+		$this->assertEquals(1, $res);
+
+
+		// Get the md5 hash
+		preg_match("/addy_text([0-9a-z]{32})/", $row->text, $output_array);
+
+		// If we did some cloaking then test the JS
+		if (count($output_array)) {
+			$hash = $output_array[1];
+
+			// assert the JLIB_HTML_CLOAKING span is intact
+			$this->assertRegExp('/\<span\sid\=\"cloak[0-9a-z]{32}\"\>JLIB_HTML_CLOAKING\<\/span\>/', $row->text);
+			$cloakHTML = '<span id="cloak' . $hash . '">JLIB_HTML_CLOAKING</span>';
+			$this->assertContains($cloakHTML, $row->text);
+
+
+			if ($expectedJs) {
+				// need to do this to overcome whitespace comparison issue in phpunit for some reason...
+				preg_match_all("/\<script type=\'text\/javascript\'\>(.*)<\/script>/ism", $row->text, $innerJS);
+				$result = trim($innerJS[1][0]);
+
+				preg_match_all("/\<script type=\'text\/javascript\'\>(.*)<\/script>/ism", $expectedJs, $innerJS);
+				$expected = trim($innerJS[1][0]);
+
+				// assert the render is as the expected render with injected hash
+				$this->assertEquals(trim(str_replace('__HASH__', $hash, $expected)), $result);
+
+				if (null !== $expectedHTML) {
+					$html = $this->convertJStoHTML($result, $hash);
+					$this->assertEquals($html, $expectedHTML);
+				}
+			}
+
+
+		} else {
+
+			// ok we never cloaked an email but lets ensure we did not screw up the article text anyway!
+			$this->assertEquals($expectedHTML, $row->text);
+
+		}
+	}
+
+	/**
+	 * Because phpunit cannot evaluate JS like a browser rendering testing framework can
+	 * we convert the JS back to HTML by converting to PHP first
+	 * Yes its probably a fudge, but is better than nothing as Joomla has no JS testing framework
+	 *
+	 * @param string $js the resultant JS
+	 * @param string $hash the md5 hash
+	 * @return string $resultantHTML the resultant HTML that would be rendered by JS.
+	 */
+	private function convertJStoHTML($js, $hash)
+	{
+		$resultantHTML = null;
+		$debug = false;
+
+		$js = html_entity_decode($js);
+		$js = str_replace(sprintf('document.getElementById(\'cloak%s\').innerHTML = \'\';', $hash), '', $js);
+		$js = str_replace(sprintf('document.getElementById(\'cloak%s\').innerHTML +=', $hash), "\n\n" . '$resultantHTML = ', $js);
+		$js = str_replace('var ', '$', $js);
+		$js = str_replace("' + '", "", $js);
+		$js = preg_replace("/\saddy/", '$addy', $js);
+		$js = preg_replace(sprintf("/\'\+addy_text%s\+\'/", $hash), sprintf('\' . \$addy_text%s .\'', $hash), $js);
+		$js = preg_replace(sprintf("/\+\$addy%s\s\+/", $hash), sprintf('\' . \$addy_text%s .\'', $hash), $js);
+		$js = str_replace("+ path +", '. $path .', $js);
+		$js = str_replace("+ prefix +", '. $prefix .', $js);
+		$js = str_replace("+$", '.$', $js);
+		$js = str_replace("\/", '/', $js);
+		$js = str_replace(
+			sprintf('$addy%s +', $hash),
+			sprintf('$addy%s .', $hash),
+			$js);
+
+		// because with all those replaces, you and I will need this a lot :)
+		if (true === $debug) {
+			echo "\n\n" . trim($js) . "\n\n";
+			eval($js);
+			echo "\n\n";
+			var_dump(trim($resultantHTML));
+			die;
+		} else {
+			// EVAL IS EVIL - I know - but here its not a security risk, and is 'ok'-ish.
+			eval($js);
+		}
+
+		return trim($resultantHTML);
+	}
+
+	/**
+	 * Tests that if we are the com_finder indexer that we return with no cloaking
+	 * Tests also that we can set $row as string instead of a normal object
+	 */
+	public function testIndexer()
+	{
+		$row = 'test string';
+		$params = new JRegistry;
+
+		// assert we have the correct event
+		$this->assertInstanceOf('PlgContentEmailcloak', $this->class);
+
+		// assert that we are getting a clean process
+		$res = $this->class->onContentPrepare('com_finder.indexer', $row, $params);
+		$this->assertEquals(1, $res);
+		$this->assertEquals('test string', $row);
+	}
 }