diff --git a/administrator/components/com_installer/views/warnings/tmpl/default.php b/administrator/components/com_installer/views/warnings/tmpl/default.php
index debd56f6465ce..3997fbcec984e 100644
--- a/administrator/components/com_installer/views/warnings/tmpl/default.php
+++ b/administrator/components/com_installer/views/warnings/tmpl/default.php
@@ -22,7 +22,7 @@
 		<?php if (count($this->messages)) : ?>
 			<?php echo JHtml::_('bootstrap.startAccordion', 'warnings', array('active' => 'warning0')); ?>
 				<?php $i = 0; ?>
-				<?php foreach($this->messages as $message) : ?>
+				<?php foreach ($this->messages as $message) : ?>
 					<?php echo JHtml::_('bootstrap.addSlide', 'warnings', $message['message'], 'warning' . ($i++)); ?>
 						<?php echo $message['description']; ?>
 					<?php echo JHtml::_('bootstrap.endSlide'); ?>
diff --git a/administrator/components/com_modules/views/module/tmpl/edit.php b/administrator/components/com_modules/views/module/tmpl/edit.php
index a29aa1293b3e6..2e2c2301c7cd6 100644
--- a/administrator/components/com_modules/views/module/tmpl/edit.php
+++ b/administrator/components/com_modules/views/module/tmpl/edit.php
@@ -194,12 +194,12 @@
 							$short_description = JText::_($this->item->xml->description);
 							$this->fieldset = 'description';
 							$long_description = JLayoutHelper::render('joomla.edit.fieldset', $this);
-							if(!$long_description) {
+							if (!$long_description) {
 								$truncated = JHtmlString::truncate($short_description, 550, true, false);
-								if(strlen($truncated) > 500) {
+								if (strlen($truncated) > 500) {
 									$long_description = $short_description;
 									$short_description = JHtmlString::truncate($truncated, 250);
-									if($short_description == $long_description) {
+									if ($short_description == $long_description) {
 										$long_description = '';
 									}
 								}
diff --git a/administrator/components/com_plugins/views/plugin/tmpl/edit.php b/administrator/components/com_plugins/views/plugin/tmpl/edit.php
index c024d28dc3aa1..35343a31c8930 100644
--- a/administrator/components/com_plugins/views/plugin/tmpl/edit.php
+++ b/administrator/components/com_plugins/views/plugin/tmpl/edit.php
@@ -63,12 +63,12 @@
 							$short_description = JText::_($this->item->xml->description);
 							$this->fieldset = 'description';
 							$long_description = JLayoutHelper::render('joomla.edit.fieldset', $this);
-							if(!$long_description) {
+							if (!$long_description) {
 								$truncated = JHtmlString::truncate($short_description, 550, true, false);
-								if(strlen($truncated) > 500) {
+								if (strlen($truncated) > 500) {
 									$long_description = $short_description;
 									$short_description = JHtmlString::truncate($truncated, 250);
-									if($short_description == $long_description) {
+									if ($short_description == $long_description) {
 										$long_description = '';
 									}
 								}
diff --git a/administrator/components/com_tags/views/tag/tmpl/edit_metadata.php b/administrator/components/com_tags/views/tag/tmpl/edit_metadata.php
index 33ddf62260c72..bac041f112e56 100644
--- a/administrator/components/com_tags/views/tag/tmpl/edit_metadata.php
+++ b/administrator/components/com_tags/views/tag/tmpl/edit_metadata.php
@@ -21,7 +21,7 @@
 		<?php echo $this->form->getInput('metakey'); ?>
 	</div>
 </div>
-<?php foreach($this->form->getGroup('metadata') as $field): ?>
+<?php foreach ($this->form->getGroup('metadata') as $field): ?>
 <div class="control-group">
 	<?php if (!$field->hidden): ?>
 		<?php echo $field->label; ?>
diff --git a/administrator/components/com_templates/views/template/tmpl/default.php b/administrator/components/com_templates/views/template/tmpl/default.php
index a164b3b6ebd1f..3e1438f22c02f 100644
--- a/administrator/components/com_templates/views/template/tmpl/default.php
+++ b/administrator/components/com_templates/views/template/tmpl/default.php
@@ -77,7 +77,7 @@
 	});
 });");
 
-if($this->type == 'image')
+if ($this->type == 'image')
 {
 	JFactory::getDocument()->addScriptDeclaration("
 		jQuery(document).ready(function($) {
@@ -150,7 +150,7 @@ function clearCoords()
 	}
 ");
 
-if($this->type == 'font')
+if ($this->type == 'font')
 {
 	JFactory::getDocument()->addStyleDeclaration(
 			"/* Styles for font preview */
@@ -170,13 +170,13 @@ function clearCoords()
 <?php echo JHtml::_('bootstrap.addTab', 'myTab', 'editor', JText::_('COM_TEMPLATES_TAB_EDITOR')); ?>
 <div class="row-fluid">
 	<div class="span12">
-		<?php if($this->type == 'file'): ?>
+		<?php if ($this->type == 'file'): ?>
 			<p class="well well-small lead"><?php echo JText::sprintf('COM_TEMPLATES_TEMPLATE_FILENAME', $this->source->filename, $this->template->element); ?></p>
 		<?php endif; ?>
-		<?php if($this->type == 'image'): ?>
+		<?php if ($this->type == 'image'): ?>
 			<p class="well well-small lead"><?php echo JText::sprintf('COM_TEMPLATES_TEMPLATE_FILENAME', $this->image['path'], $this->template->element); ?></p>
 		<?php endif; ?>
-		<?php if($this->type == 'font'): ?>
+		<?php if ($this->type == 'font'): ?>
 			<p class="well well-small lead"><?php echo JText::sprintf('COM_TEMPLATES_TEMPLATE_FILENAME', $this->font['rel_path'], $this->template->element); ?></p>
 		<?php endif; ?>
 	</div>
@@ -186,7 +186,7 @@ function clearCoords()
 		<?php echo $this->loadTemplate('tree');?>
 	</div>
 	<div class="span9">
-		<?php if($this->type == 'home'): ?>
+		<?php if ($this->type == 'home'): ?>
 			<form action="<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="adminForm" id="adminForm" class="form-horizontal">
 				<input type="hidden" name="task" value="" />
 				<?php echo JHtml::_('form.token'); ?>
@@ -201,7 +201,7 @@ function clearCoords()
 				</div>
 			</form>
 		<?php endif; ?>
-		<?php if($this->type == 'file'): ?>
+		<?php if ($this->type == 'file'): ?>
 			<form action="<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="adminForm" id="adminForm" class="form-horizontal">
 
 				<div class="editor-border">
@@ -214,7 +214,7 @@ function clearCoords()
 
 			</form>
 		<?php endif; ?>
-		<?php if($this->type == 'archive'): ?>
+		<?php if ($this->type == 'archive'): ?>
 			<legend><?php echo JText::_('COM_TEMPLATES_FILE_CONTENT_PREVIEW'); ?></legend>
 			<form action="<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="adminForm" id="adminForm" class="form-horizontal">
 				<ul class="nav nav-stacked nav-list well">
@@ -234,7 +234,7 @@ function clearCoords()
 
 			</form>
 		<?php endif; ?>
-		<?php if($this->type == 'image'): ?>
+		<?php if ($this->type == 'image'): ?>
 			<img id="image-crop" src="<?php echo $this->image['address'] . '?' . time(); ?>" />
 			<form action="<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="adminForm" id="adminForm" class="form-horizontal">
 				<fieldset class="adminform">
@@ -247,7 +247,7 @@ function clearCoords()
 				</fieldset>
 			</form>
 		<?php endif; ?>
-		<?php if($this->type == 'font'): ?>
+		<?php if ($this->type == 'font'): ?>
 			<div class="font-preview">
 				<form action="<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="adminForm" id="adminForm" class="form-horizontal">
 					<fieldset class="adminform">
@@ -311,7 +311,7 @@ function clearCoords()
 		<legend><?php echo JText::_('COM_TEMPLATES_OVERRIDES_MODULES');?></legend>
 		<ul class="nav nav-list">
 			<?php $token = JSession::getFormToken() . '=' . 1; ?>
-			<?php foreach($this->overridesList['modules'] as $module): ?>
+			<?php foreach ($this->overridesList['modules'] as $module): ?>
 				<li>
 					<?php
 					$overrideLinkUrl = 'index.php?option=com_templates&view=template&task=template.overrides&folder=' . $module->path
@@ -354,7 +354,7 @@ function clearCoords()
 		<legend><?php echo JText::_('COM_TEMPLATES_OVERRIDES_LAYOUTS');?></legend>
 		<ul class="nav nav-list">
 			<?php $token = JSession::getFormToken() . '=' . 1; ?>
-			<?php foreach($this->overridesList['layouts'] as $layout): ?>
+			<?php foreach ($this->overridesList['layouts'] as $layout): ?>
 				<li>
 					<?php
 					$overrideLinkUrl = 'index.php?option=com_templates&view=template&task=template.overrides&folder=' . $layout->path
diff --git a/administrator/components/com_templates/views/template/tmpl/default_folders.php b/administrator/components/com_templates/views/template/tmpl/default_folders.php
index 6af67ce4e350d..28ffe1a75fb1d 100644
--- a/administrator/components/com_templates/views/template/tmpl/default_folders.php
+++ b/administrator/components/com_templates/views/template/tmpl/default_folders.php
@@ -12,8 +12,8 @@
 ?>
 
 <ul class='nav nav-list directory-tree'>
-	<?php foreach($this->files as $key => $value): ?>
-		<?php if(is_array($value)): ?>
+	<?php foreach ($this->files as $key => $value): ?>
+		<?php if (is_array($value)): ?>
 			<li class="folder-select">
 				<a class='folder-url nowrap' data-id='<?php echo base64_encode($key); ?>' href=''>
 					<span class='icon-folder-close'>&nbsp;<?php $explodeArray = explode('/', $key); echo end($explodeArray); ?></span>
diff --git a/administrator/components/com_templates/views/template/tmpl/default_tree.php b/administrator/components/com_templates/views/template/tmpl/default_tree.php
index 62f48c0d1a848..7cb55f94160b3 100644
--- a/administrator/components/com_templates/views/template/tmpl/default_tree.php
+++ b/administrator/components/com_templates/views/template/tmpl/default_tree.php
@@ -12,8 +12,8 @@
 ?>
 
 <ul class='nav nav-list directory-tree'>
-	<?php foreach($this->files as $key => $value): ?>
-		<?php if(is_array($value)): ?>
+	<?php foreach ($this->files as $key => $value): ?>
+		<?php if (is_array($value)): ?>
 			<?php
 			$keyArray  = explode('/', $key);
 			$fileArray = explode('/', $this->fileName);
@@ -51,7 +51,7 @@
 				<?php echo $this->directoryTree($value); ?>
 			</li>
 		<?php endif; ?>
-		<?php if(is_object($value)): ?>
+		<?php if (is_object($value)): ?>
 			<li>
 				<a class="file nowrap" href='<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . $this->id . '&file=' . $value->id) ?>'>
 					<span class='icon-file'>&nbsp;<?php echo $value->name; ?></span>
diff --git a/administrator/components/com_users/views/user/tmpl/edit.php b/administrator/components/com_users/views/user/tmpl/edit.php
index f0b678dbb2744..57cca4c40c48b 100644
--- a/administrator/components/com_users/views/user/tmpl/edit.php
+++ b/administrator/components/com_users/views/user/tmpl/edit.php
@@ -93,7 +93,7 @@
 			</div>
 		</div>
 		<div id="com_users_twofactor_forms_container">
-			<?php foreach($this->tfaform as $form): ?>
+			<?php foreach ($this->tfaform as $form): ?>
 			<?php $style = $form['method'] == $this->otpConfig->method ? 'display: block' : 'display: none'; ?>
 			<div id="com_users_twofactor_<?php echo $form['method'] ?>" style="<?php echo $style; ?>">
 				<?php echo $form['form'] ?>
diff --git a/administrator/templates/hathor/html/com_postinstall/messages/default.php b/administrator/templates/hathor/html/com_postinstall/messages/default.php
index 98bbca301fbcc..441097064f744 100644
--- a/administrator/templates/hathor/html/com_postinstall/messages/default.php
+++ b/administrator/templates/hathor/html/com_postinstall/messages/default.php
@@ -39,7 +39,7 @@
 ?>
 	<h2><?php echo JText::_('COM_POSTINSTALL_LBL_MESSAGES') ?></h2>
 <?php endif; ?>
-	<?php foreach($this->items as $item): ?>
+	<?php foreach ($this->items as $item): ?>
 	<fieldset>
 		<legend><?php echo JText::_($item->title_key) ?></legend>
 		<p class="small">
diff --git a/administrator/templates/hathor/html/com_templates/template/default.php b/administrator/templates/hathor/html/com_templates/template/default.php
index 1df2079e16e0a..490b4c2f9f4a9 100644
--- a/administrator/templates/hathor/html/com_templates/template/default.php
+++ b/administrator/templates/hathor/html/com_templates/template/default.php
@@ -56,7 +56,7 @@
 		$(this).addClass('selected');
 	});
 });");
-if($this->type == 'image')
+if ($this->type == 'image')
 {
 	JFactory::getDocument()->addScriptDeclaration("
 		jQuery(document).ready(function() {
@@ -113,7 +113,7 @@ function clearCoords()
 		overflow-x: auto;
 	}
 ");
-if($this->type == 'font')
+if ($this->type == 'font')
 {
 	JFactory::getDocument()->addStyleDeclaration(
 			"/* Styles for font preview */
@@ -282,7 +282,7 @@ function clearCoords()
 		</form>
 	<?php endif; ?>
 
-	<?php if($this->type == 'home'): ?>
+	<?php if ($this->type == 'home'): ?>
 		<form action="<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="adminForm" id="adminForm" class="form-horizontal">
 			<input type="hidden" name="task" value="" />
 			<?php echo JHtml::_('form.token'); ?>
@@ -297,7 +297,7 @@ function clearCoords()
 			</div>
 		</form>
 	<?php endif; ?>
-	<?php if($this->type == 'file'): ?>
+	<?php if ($this->type == 'file'): ?>
 		<form action="<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="adminForm" id="adminForm" class="form-horizontal">
 			<fieldset class="adminform">
 				<legend><?php echo JText::_('COM_TEMPLATES_SOURCE_CODE');?></legend>
@@ -315,7 +315,7 @@ function clearCoords()
 			</fieldset>
 		</form>
 	<?php endif; ?>
-	<?php if($this->type == 'image'): ?>
+	<?php if ($this->type == 'image'): ?>
 		<div id="image-box"><img id="image-crop" src="<?php echo $this->image['address'] . '?' . time(); ?>" /></div>
 		<form action="<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="adminForm" id="adminForm">
 			<input type ="hidden" id="x" name="x" />
@@ -326,7 +326,7 @@ function clearCoords()
 			<?php echo JHtml::_('form.token'); ?>
 		</form>
 	<?php endif; ?>
-	<?php if($this->type == 'archive'): ?>
+	<?php if ($this->type == 'archive'): ?>
 		<legend><?php echo JText::_('COM_TEMPLATES_FILE_CONTENT_PREVIEW'); ?></legend>
 		<form action="<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="adminForm" id="adminForm" class="form-horizontal">
 			<fieldset>
@@ -348,7 +348,7 @@ function clearCoords()
 
 		</form>
 	<?php endif; ?>
-	<?php if($this->type == 'font'): ?>
+	<?php if ($this->type == 'font'): ?>
 		<div class="font-preview">
 			<form action="<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="adminForm" id="adminForm" class="form-horizontal">
 				<fieldset class="adminform">
@@ -415,16 +415,16 @@ function clearCoords()
 
 <div class="width-40 fltrt">
 
-	<?php if($this->type != 'home'): ?>
+	<?php if ($this->type != 'home'): ?>
 		<fieldset class="adminform">
 			<legend><?php echo JText::_('COM_TEMPLATES_FILE_INFO');?></legend>
-			<?php if($this->type == 'file'): ?>
+			<?php if ($this->type == 'file'): ?>
 				<p><?php echo JText::sprintf('COM_TEMPLATES_TEMPLATE_FILENAME', $this->source->filename, $this->template->element); ?></p>
 			<?php endif; ?>
-			<?php if($this->type == 'image'): ?>
+			<?php if ($this->type == 'image'): ?>
 				<p><?php echo JText::sprintf('COM_TEMPLATES_TEMPLATE_FILENAME', $this->image['path'], $this->template->element); ?></p>
 			<?php endif; ?>
-			<?php if($this->type == 'font'): ?>
+			<?php if ($this->type == 'font'): ?>
 				<p><?php echo JText::sprintf('COM_TEMPLATES_TEMPLATE_FILENAME', $this->font['rel_path'], $this->template->element); ?></p>
 			<?php endif; ?>
 		</fieldset>
@@ -462,7 +462,7 @@ function clearCoords()
 	<?php  echo JHtml::_('sliders.panel', JText::_('COM_TEMPLATES_OVERRIDES_MODULES'), 'override-module'); ?>
 	<fieldset class="panelform">
 		<ul class="adminformlist">
-			<?php foreach($this->overridesList['modules'] as $module): ?>
+			<?php foreach ($this->overridesList['modules'] as $module): ?>
 				<li>
 					<a href="<?php echo JRoute::_('index.php?option=com_templates&view=template&task=template.overrides&folder=' . $module->path . '&id=' . $input->getInt('id') . '&file=' . $this->file); ?>">
 						<span class="icon-copy"></span>&nbsp;<?php echo $module->name; ?>
@@ -495,7 +495,7 @@ function clearCoords()
 	<?php  echo JHtml::_('sliders.panel', JText::_('COM_TEMPLATES_OVERRIDES_LAYOUTS'), 'override-layout'); ?>
 	<fieldset class="panelform">
 		<ul class="adminformlist">
-			<?php foreach($this->overridesList['layouts'] as $layout): ?>
+			<?php foreach ($this->overridesList['layouts'] as $layout): ?>
 				<li>
 					<a href="<?php echo JRoute::_('index.php?option=com_templates&view=template&task=template.overrides&folder=' . $layout->path . '&id=' . $input->getInt('id') . '&file=' . $this->file); ?>">
 						<span class="icon-copy"></span>&nbsp;<?php echo $layout->name; ?>
diff --git a/administrator/templates/hathor/html/com_templates/template/default_folders.php b/administrator/templates/hathor/html/com_templates/template/default_folders.php
index 6af67ce4e350d..28ffe1a75fb1d 100644
--- a/administrator/templates/hathor/html/com_templates/template/default_folders.php
+++ b/administrator/templates/hathor/html/com_templates/template/default_folders.php
@@ -12,8 +12,8 @@
 ?>
 
 <ul class='nav nav-list directory-tree'>
-	<?php foreach($this->files as $key => $value): ?>
-		<?php if(is_array($value)): ?>
+	<?php foreach ($this->files as $key => $value): ?>
+		<?php if (is_array($value)): ?>
 			<li class="folder-select">
 				<a class='folder-url nowrap' data-id='<?php echo base64_encode($key); ?>' href=''>
 					<span class='icon-folder-close'>&nbsp;<?php $explodeArray = explode('/', $key); echo end($explodeArray); ?></span>
diff --git a/administrator/templates/hathor/html/com_users/user/edit.php b/administrator/templates/hathor/html/com_users/user/edit.php
index 8a767dff6a5b9..3f13a1643006c 100644
--- a/administrator/templates/hathor/html/com_users/user/edit.php
+++ b/administrator/templates/hathor/html/com_users/user/edit.php
@@ -101,7 +101,7 @@
 			</div>
 		</div>
 		<div id="com_users_twofactor_forms_container">
-			<?php foreach($this->tfaform as $form): ?>
+			<?php foreach ($this->tfaform as $form): ?>
 			<?php $style = $form['method'] == $this->otpConfig->method ? 'display: block' : 'display: none'; ?>
 			<div id="com_users_twofactor_<?php echo $form['method'] ?>" style="<?php echo $style; ?>">
 				<?php echo $form['form'] ?>
diff --git a/components/com_contact/views/categories/tmpl/default_items.php b/components/com_contact/views/categories/tmpl/default_items.php
index 041ea24a2f232..9110e678637ac 100644
--- a/components/com_contact/views/categories/tmpl/default_items.php
+++ b/components/com_contact/views/categories/tmpl/default_items.php
@@ -14,7 +14,7 @@
 $class = ' class="first"';
 if ($this->maxLevelcat != 0 && count($this->items[$this->parent->id]) > 0) :
 ?>
-	<?php foreach($this->items[$this->parent->id] as $id => $item) : ?>
+	<?php foreach ($this->items[$this->parent->id] as $id => $item) : ?>
 		<?php
 		if ($this->params->get('show_empty_categories_cat') || $item->numitems || count($item->getChildren())) :
 			if (!isset($this->items[$this->parent->id][$id + 1]))
diff --git a/components/com_content/views/categories/tmpl/default_items.php b/components/com_content/views/categories/tmpl/default_items.php
index d524c4c5fdff3..148f8eef8b3c0 100644
--- a/components/com_content/views/categories/tmpl/default_items.php
+++ b/components/com_content/views/categories/tmpl/default_items.php
@@ -16,7 +16,7 @@
 
 if (count($this->items[$this->parent->id]) > 0 && $this->maxLevelcat != 0) :
 ?>
-	<?php foreach($this->items[$this->parent->id] as $id => $item) : ?>
+	<?php foreach ($this->items[$this->parent->id] as $id => $item) : ?>
 		<?php
 		if ($this->params->get('show_empty_categories_cat') || $item->numitems || count($item->getChildren())) :
 		if (!isset($this->items[$this->parent->id][$id + 1]))
diff --git a/components/com_finder/views/search/view.html.php b/components/com_finder/views/search/view.html.php
index ba725b9830a4d..8dfe988378859 100644
--- a/components/com_finder/views/search/view.html.php
+++ b/components/com_finder/views/search/view.html.php
@@ -74,7 +74,7 @@ public function display($tpl = null)
 		if (strpos($this->query->input, '"'))
 		{
 			// Get the application router.
-			$router =& $app::getRouter();
+			$router = &$app::getRouter();
 
 			// Fix the q variable in the URL.
 			if ($router->getVar('q') !== $this->query->input)
diff --git a/components/com_newsfeeds/views/categories/tmpl/default_items.php b/components/com_newsfeeds/views/categories/tmpl/default_items.php
index be131feb2b098..fff6a01dda698 100644
--- a/components/com_newsfeeds/views/categories/tmpl/default_items.php
+++ b/components/com_newsfeeds/views/categories/tmpl/default_items.php
@@ -14,7 +14,7 @@
 $class = ' class="first"';
 if (count($this->items[$this->parent->id]) > 0 && $this->maxLevelcat != 0) :
 ?>
-	<?php foreach($this->items[$this->parent->id] as $id => $item) : ?>
+	<?php foreach ($this->items[$this->parent->id] as $id => $item) : ?>
 		<?php
 		if ($this->params->get('show_empty_categories_cat') || $item->numitems || count($item->getChildren())) :
 			if (!isset($this->items[$this->parent->id][$id + 1]))
diff --git a/components/com_tags/views/tags/view.html.php b/components/com_tags/views/tags/view.html.php
index dc8a7d1e23725..8a01ee638f2be 100644
--- a/components/com_tags/views/tags/view.html.php
+++ b/components/com_tags/views/tags/view.html.php
@@ -122,7 +122,7 @@ public function display($tpl = null)
 				}
 			}
 		}
-		elseif(!empty($items[0]))
+		elseif (!empty($items[0]))
 		{
 			// Merge so that tag params take priority
 			$temp->merge($items[0]->params);
diff --git a/components/com_users/views/profile/tmpl/edit.php b/components/com_users/views/profile/tmpl/edit.php
index 01e06f4ba0fe4..ecd48f737817b 100644
--- a/components/com_users/views/profile/tmpl/edit.php
+++ b/components/com_users/views/profile/tmpl/edit.php
@@ -100,7 +100,7 @@
 				</div>
 			</div>
 			<div id="com_users_twofactor_forms_container">
-				<?php foreach($this->twofactorform as $form) : ?>
+				<?php foreach ($this->twofactorform as $form) : ?>
 				<?php $style = $form['method'] == $this->otpConfig->method ? 'display: block' : 'display: none'; ?>
 				<div id="com_users_twofactor_<?php echo $form['method']; ?>" style="<?php echo $style; ?>">
 					<?php echo $form['form']; ?>
diff --git a/installation/view/summary/tmpl/default.php b/installation/view/summary/tmpl/default.php
index f85356bc1acfd..b955ff9d7a545 100644
--- a/installation/view/summary/tmpl/default.php
+++ b/installation/view/summary/tmpl/default.php
@@ -224,7 +224,7 @@
 							</span>
 						</td>
 					</tr>
-					<?php if($this->options['ftp_enable']) : ?>
+					<?php if ($this->options['ftp_enable']) : ?>
 					<tr>
 						<td class="item">
 							<?php echo JText::_('INSTL_FTP_USER_LABEL'); ?>
diff --git a/layouts/joomla/edit/frontediting_modules.php b/layouts/joomla/edit/frontediting_modules.php
index 477d7a0180612..601e7ef6d95a1 100644
--- a/layouts/joomla/edit/frontediting_modules.php
+++ b/layouts/joomla/edit/frontediting_modules.php
@@ -11,7 +11,7 @@
 
 // JLayout for standard handling of the edit modules:
 
-$moduleHtml   =& $displayData['moduleHtml'];
+$moduleHtml   = &$displayData['moduleHtml'];
 $mod          = $displayData['module'];
 $position     = $displayData['position'];
 $menusEditing = $displayData['menusediting'];
diff --git a/layouts/joomla/form/field/subform/default.php b/layouts/joomla/form/field/subform/default.php
index 9c645ce9bbe35..69b8bdf20c5b2 100644
--- a/layouts/joomla/form/field/subform/default.php
+++ b/layouts/joomla/form/field/subform/default.php
@@ -30,7 +30,7 @@
 ?>
 
 <div class="subform-wrapper">
-<?php foreach($form->getGroup('') as $field): ?>
+<?php foreach ($form->getGroup('') as $field): ?>
 	<?php echo $field->renderField(); ?>
 <?php endforeach; ?>
 </div>
diff --git a/layouts/joomla/form/field/subform/repeatable-table.php b/layouts/joomla/form/field/subform/repeatable-table.php
index d5babf2df7d26..74aeba7e3c41c 100644
--- a/layouts/joomla/form/field/subform/repeatable-table.php
+++ b/layouts/joomla/form/field/subform/repeatable-table.php
@@ -38,7 +38,7 @@
 
 if (!empty($groupByFieldset))
 {
-	foreach($tmpl->getFieldsets() as $fieldset) {
+	foreach ($tmpl->getFieldsets() as $fieldset) {
 		$table_head .= '<th>' . JText::_($fieldset->label);
 
 		if (!empty($fieldset->description))
@@ -53,7 +53,7 @@
 }
 else
 {
-	foreach($tmpl->getGroup('') as $field) {
+	foreach ($tmpl->getGroup('') as $field) {
 		$table_head .= '<th>' . strip_tags($field->label);
 		$table_head .= '<br /><small style="font-weight:normal">' . JText::_($field->description) . '</small>';
 		$table_head .= '</th>';
@@ -88,7 +88,7 @@
 			</thead>
 			<tbody>
 			<?php
-			foreach($forms as $k => $form):
+			foreach ($forms as $k => $form):
 				echo $this->sublayout($sublayout, array('form' => $form, 'basegroup' => $fieldname, 'group' => $fieldname . $k, 'buttons' => $buttons));
 			endforeach;
 			?>
diff --git a/layouts/joomla/form/field/subform/repeatable-table/section-byfieldsets.php b/layouts/joomla/form/field/subform/repeatable-table/section-byfieldsets.php
index 353c10adf37a0..4b7ebc08791e7 100644
--- a/layouts/joomla/form/field/subform/repeatable-table/section-byfieldsets.php
+++ b/layouts/joomla/form/field/subform/repeatable-table/section-byfieldsets.php
@@ -22,9 +22,9 @@
 ?>
 
 <tr class="subform-repeatable-group" data-base-name="<?php echo $basegroup; ?>" data-group="<?php echo $group; ?>">
-	<?php foreach($form->getFieldsets() as $fieldset): ?>
+	<?php foreach ($form->getFieldsets() as $fieldset): ?>
 	<td class="<?php if (!empty($fieldset->class)){ echo $fieldset->class; } ?>">
-		<?php foreach($form->getFieldset($fieldset->name) as $field): ?>
+		<?php foreach ($form->getFieldset($fieldset->name) as $field): ?>
 			<?php echo $field->renderField(); ?>
 		<?php endforeach; ?>
 	</td>
diff --git a/layouts/joomla/form/field/subform/repeatable-table/section.php b/layouts/joomla/form/field/subform/repeatable-table/section.php
index 10c40a38f74c0..6c42714f540d4 100644
--- a/layouts/joomla/form/field/subform/repeatable-table/section.php
+++ b/layouts/joomla/form/field/subform/repeatable-table/section.php
@@ -22,7 +22,7 @@
 ?>
 
 <tr class="subform-repeatable-group" data-base-name="<?php echo $basegroup; ?>" data-group="<?php echo $group; ?>">
-	<?php foreach($form->getGroup('') as $field): ?>
+	<?php foreach ($form->getGroup('') as $field): ?>
 	<td>
 		<?php echo $field->renderField(); ?>
 	</td>
diff --git a/layouts/joomla/form/field/subform/repeatable.php b/layouts/joomla/form/field/subform/repeatable.php
index d465b129eb1cd..9dc1ba83505ac 100644
--- a/layouts/joomla/form/field/subform/repeatable.php
+++ b/layouts/joomla/form/field/subform/repeatable.php
@@ -49,7 +49,7 @@
 			</div>
 			<?php endif; ?>
 		<?php
-		foreach($forms as $k => $form):
+		foreach ($forms as $k => $form):
 			echo $this->sublayout($sublayout, array('form' => $form, 'basegroup' => $fieldname, 'group' => $fieldname . $k, 'buttons' => $buttons));
 		endforeach;
 		?>
diff --git a/layouts/joomla/form/field/subform/repeatable/section-byfieldsets.php b/layouts/joomla/form/field/subform/repeatable/section-byfieldsets.php
index 90e6cd4051b69..f42906fd7c91b 100644
--- a/layouts/joomla/form/field/subform/repeatable/section-byfieldsets.php
+++ b/layouts/joomla/form/field/subform/repeatable/section-byfieldsets.php
@@ -31,12 +31,12 @@
 	</div>
 	<?php endif; ?>
 	<div class="row-fluid">
-<?php foreach($form->getFieldsets() as $fieldset): ?>
+<?php foreach ($form->getFieldsets() as $fieldset): ?>
 <fieldset class="<?php if (!empty($fieldset->class)){ echo $fieldset->class; } ?>">
 	<?php if (!empty($fieldset->label)):?>
 	<legend><?php echo JText::_($fieldset->label); ?></legend>
 	<?php endif; ?>
-<?php foreach($form->getFieldset($fieldset->name) as $field): ?>
+<?php foreach ($form->getFieldset($fieldset->name) as $field): ?>
 	<?php echo $field->renderField(); ?>
 <?php endforeach; ?>
 </fieldset>
diff --git a/layouts/joomla/form/field/subform/repeatable/section.php b/layouts/joomla/form/field/subform/repeatable/section.php
index 6f14ffc22fe11..3d3b5c216a353 100644
--- a/layouts/joomla/form/field/subform/repeatable/section.php
+++ b/layouts/joomla/form/field/subform/repeatable/section.php
@@ -32,7 +32,7 @@
 	</div>
 	<?php endif; ?>
 
-<?php foreach($form->getGroup('') as $field): ?>
+<?php foreach ($form->getGroup('') as $field): ?>
 	<?php echo $field->renderField(); ?>
 <?php endforeach; ?>
 </div>
diff --git a/templates/beez3/html/com_content/category/blog_item.php b/templates/beez3/html/com_content/category/blog_item.php
index 71fbe6fffcb18..404246c7763be 100644
--- a/templates/beez3/html/com_content/category/blog_item.php
+++ b/templates/beez3/html/com_content/category/blog_item.php
@@ -8,7 +8,7 @@
  */
 defined('_JEXEC') or die;
 
-$params =& $this->item->params;
+$params = &$this->item->params;
 $images = json_decode($this->item->images);
 $app = JFactory::getApplication();
 $canEdit = $this->item->params->get('access-edit');
diff --git a/templates/beez3/html/com_content/category/blog_links.php b/templates/beez3/html/com_content/category/blog_links.php
index cc40fc2e008f7..71b377968e693 100644
--- a/templates/beez3/html/com_content/category/blog_links.php
+++ b/templates/beez3/html/com_content/category/blog_links.php
@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 
-$params =& $this->item->params;
+$params = &$this->item->params;
 $app = JFactory::getApplication();
 
 JHtml::addIncludePath(JPATH_COMPONENT . '/helpers');
diff --git a/templates/protostar/error.php b/templates/protostar/error.php
index a4fecd31e28d7..7592615d93efe 100644
--- a/templates/protostar/error.php
+++ b/templates/protostar/error.php
@@ -25,7 +25,7 @@
 $itemid   = $app->input->getCmd('Itemid', '');
 $sitename = $app->get('sitename');
 
-if($task == "edit" || $layout == "form" )
+if ($task == "edit" || $layout == "form" )
 {
 	$fullWidth = 1;
 }
diff --git a/templates/protostar/index.php b/templates/protostar/index.php
index b4192eef17001..0da6954a000c6 100644
--- a/templates/protostar/index.php
+++ b/templates/protostar/index.php
@@ -28,7 +28,7 @@
 $itemid   = $app->input->getCmd('Itemid', '');
 $sitename = $app->get('sitename');
 
-if($task == "edit" || $layout == "form" )
+if ($task == "edit" || $layout == "form" )
 {
 	$fullWidth = 1;
 }
diff --git a/tests/unit/core/helper/helper.php b/tests/unit/core/helper/helper.php
index 63af3c919fd85..80ed811e93006 100644
--- a/tests/unit/core/helper/helper.php
+++ b/tests/unit/core/helper/helper.php
@@ -68,14 +68,14 @@ public static function registerDeprecationHandler()
 				$class  = isset($trace[$i]['object']) ? get_class($trace[$i]['object']) : $trace[$i]['class'];
 				$method = $trace[$i]['function'];
 
-				$ref =& $deprecations[$group][$msg]['count'];
+				$ref = &$deprecations[$group][$msg]['count'];
 				$ref++;
-				$ref =& $deprecations[$group][$msg][$class . '::' . $method];
+				$ref = &$deprecations[$group][$msg][$class . '::' . $method];
 				$ref++;
 			}
 			else
 			{
-				$ref =& $deprecations[$group][$msg]['count'];
+				$ref = &$deprecations[$group][$msg]['count'];
 				$ref++;
 			}
 
diff --git a/tests/unit/suites/libraries/cms/pagination/JPaginationTest.php b/tests/unit/suites/libraries/cms/pagination/JPaginationTest.php
index 6346e7a6b9264..bcf169011a117 100644
--- a/tests/unit/suites/libraries/cms/pagination/JPaginationTest.php
+++ b/tests/unit/suites/libraries/cms/pagination/JPaginationTest.php
@@ -832,7 +832,7 @@ public function testSet($property, $value, $expected)
 		{
 			$result = TestReflection::getValue($pagination, $property);
 		}
-		elseif(strpos($property, '.'))
+		elseif (strpos($property, '.'))
 		{
 			$prop = explode('.', $property);
 			$prop[1] = ucfirst($prop[1]);
diff --git a/tests/unit/suites/libraries/joomla/archive/JArchiveTestCase.php b/tests/unit/suites/libraries/joomla/archive/JArchiveTestCase.php
index 91f3679e1c731..e62e6a54eed3e 100644
--- a/tests/unit/suites/libraries/joomla/archive/JArchiveTestCase.php
+++ b/tests/unit/suites/libraries/joomla/archive/JArchiveTestCase.php
@@ -62,7 +62,7 @@ protected function tearDown()
 		if (is_dir($this->outputPath))
 		{
 			// delete files in output directory
-			foreach(glob("{$this->outputPath}/*") as $file)
+			foreach (glob("{$this->outputPath}/*") as $file)
 			{
 				unlink($file);
 			}