diff --git a/.gitignore b/.gitignore
index 9b3d10dcedab6..9f283cf83d385 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,14 @@
/phpunit.xml
/tests/system/webdriver/tests/logs/
/tests/system/servers/configdef.php
+codecept.phar
+tests/codeception/_output/*
+tests/codeception/vendor/*
+tests/codeception/testingsite*
+tests/codeception/tests/acceptance.suite.yml
+tests/codeception/tests/acceptance/*Tester.php
+tests/codeception/tests/functional/*Tester.php
+tests/codeception/tests/unit/*Tester.php
# phpDocumentor Logs #
phpdoc-*
diff --git a/administrator/components/com_admin/helpers/html/directory.php b/administrator/components/com_admin/helpers/html/directory.php
index 34243641609b0..70eb5e0df9dfe 100644
--- a/administrator/components/com_admin/helpers/html/directory.php
+++ b/administrator/components/com_admin/helpers/html/directory.php
@@ -29,10 +29,8 @@ public static function writable($writable)
{
return '' . JText::_('COM_ADMIN_WRITABLE') . '';
}
- else
- {
- return '' . JText::_('COM_ADMIN_UNWRITABLE') . '';
- }
+
+ return '' . JText::_('COM_ADMIN_UNWRITABLE') . '';
}
/**
@@ -46,22 +44,13 @@ public static function writable($writable)
*/
public static function message($dir, $message, $visible = true)
{
- if ($visible)
- {
- $output = $dir;
- }
- else
- {
- $output = '';
- }
+ $output = $visible ? $dir : '';
if (empty($message))
{
return $output;
}
- else
- {
- return $output . ' ' . JText::_($message) . '';
- }
+
+ return $output . ' ' . JText::_($message) . '';
}
}
diff --git a/administrator/components/com_admin/helpers/html/phpsetting.php b/administrator/components/com_admin/helpers/html/phpsetting.php
index 425d7b45e765c..312c15c4b94c7 100644
--- a/administrator/components/com_admin/helpers/html/phpsetting.php
+++ b/administrator/components/com_admin/helpers/html/phpsetting.php
@@ -25,14 +25,7 @@ abstract class JHtmlPhpSetting
*/
public static function boolean($val)
{
- if ($val)
- {
- return JText::_('JON');
- }
- else
- {
- return JText::_('JOFF');
- }
+ return JText::_($val ? 'JON' : 'JOFF');
}
/**
@@ -44,14 +37,7 @@ public static function boolean($val)
*/
public static function set($val)
{
- if ($val)
- {
- return JText::_('JYES');
- }
- else
- {
- return JText::_('JNO');
- }
+ return JText::_($val ? 'JYES' : 'JNO');
}
/**
@@ -63,14 +49,7 @@ public static function set($val)
*/
public static function string($val)
{
- if (empty($val))
- {
- return JText::_('JNONE');
- }
- else
- {
- return $val;
- }
+ return !empty($val) ? $val : JText::_('JNONE');
}
/**
diff --git a/administrator/components/com_admin/helpers/html/system.php b/administrator/components/com_admin/helpers/html/system.php
index 4189c9c5859c1..33b7a840d5cca 100644
--- a/administrator/components/com_admin/helpers/html/system.php
+++ b/administrator/components/com_admin/helpers/html/system.php
@@ -25,13 +25,6 @@ abstract class JHtmlSystem
*/
public static function server($val)
{
- if (empty($val))
- {
- return JText::_('COM_ADMIN_NA');
- }
- else
- {
- return $val;
- }
+ return !empty($val) ? $val : JText::_('COM_ADMIN_NA');
}
}
diff --git a/administrator/components/com_admin/models/help.php b/administrator/components/com_admin/models/help.php
index 23497cd9775bb..763fe6353355d 100644
--- a/administrator/components/com_admin/models/help.php
+++ b/administrator/components/com_admin/models/help.php
@@ -127,68 +127,72 @@ public function getLangTag()
*/
public function &getToc()
{
- if (is_null($this->toc))
+ if (!is_null($this->toc))
{
- // Get vars
- $lang_tag = $this->getLangTag();
- $help_search = $this->getHelpSearch();
+ return $this->toc;
+ }
- // New style - Check for a TOC JSON file
- if (file_exists(JPATH_BASE . '/help/' . $lang_tag . '/toc.json'))
- {
- $data = json_decode(file_get_contents(JPATH_BASE . '/help/' . $lang_tag . '/toc.json'));
+ // Get vars
+ $lang_tag = $this->getLangTag();
+ $help_search = $this->getHelpSearch();
- // Loop through the data array
- foreach ($data as $key => $value)
- {
- $this->toc[$key] = JText::_('COM_ADMIN_HELP_' . $value);
- }
- }
- else
+ // New style - Check for a TOC JSON file
+ if (file_exists(JPATH_BASE . '/help/' . $lang_tag . '/toc.json'))
+ {
+ $data = json_decode(file_get_contents(JPATH_BASE . '/help/' . $lang_tag . '/toc.json'));
+
+ // Loop through the data array
+ foreach ($data as $key => $value)
{
- // Get Help files
- jimport('joomla.filesystem.folder');
- $files = JFolder::files(JPATH_BASE . '/help/' . $lang_tag, '\.xml$|\.html$');
- $this->toc = array();
-
- foreach ($files as $file)
- {
- $buffer = file_get_contents(JPATH_BASE . '/help/' . $lang_tag . '/' . $file);
-
- if (preg_match('#(.*?)#', $buffer, $m))
- {
- $title = trim($m[1]);
-
- if ($title)
- {
- // Translate the page title
- $title = JText::_($title);
-
- // Strip the extension
- $file = preg_replace('#\.xml$|\.html$#', '', $file);
-
- if ($help_search)
- {
- if (JString::strpos(JString::strtolower(strip_tags($buffer)), JString::strtolower($help_search)) !== false)
- {
- // Add an item in the Table of Contents
- $this->toc[$file] = $title;
- }
- }
- else
- {
- // Add an item in the Table of Contents
- $this->toc[$file] = $title;
- }
- }
- }
- }
+ $this->toc[$key] = JText::_('COM_ADMIN_HELP_' . $value);
}
// Sort the Table of Contents
asort($this->toc);
+
+ return $this->toc;
+ }
+
+ // Get Help files
+ jimport('joomla.filesystem.folder');
+ $files = JFolder::files(JPATH_BASE . '/help/' . $lang_tag, '\.xml$|\.html$');
+ $this->toc = array();
+
+ foreach ($files as $file)
+ {
+ $buffer = file_get_contents(JPATH_BASE . '/help/' . $lang_tag . '/' . $file);
+
+ if (!preg_match('#(.*?)#', $buffer, $m))
+ {
+ continue;
+ }
+
+ $title = trim($m[1]);
+
+ if (!$title)
+ {
+ continue;
+ }
+
+ // Translate the page title
+ $title = JText::_($title);
+
+ // Strip the extension
+ $file = preg_replace('#\.xml$|\.html$#', '', $file);
+
+ if ($help_search
+ && JString::strpos(JString::strtolower(strip_tags($buffer)), JString::strtolower($help_search)) === false)
+ {
+ continue;
+ }
+
+ // Add an item in the Table of Contents
+ $this->toc[$file] = $title;
}
+ // Sort the Table of Contents
+ asort($this->toc);
+
return $this->toc;
}
diff --git a/administrator/components/com_admin/models/sysinfo.php b/administrator/components/com_admin/models/sysinfo.php
index 3d5905eaa1a59..324e352b6872a 100644
--- a/administrator/components/com_admin/models/sysinfo.php
+++ b/administrator/components/com_admin/models/sysinfo.php
@@ -67,27 +67,29 @@ class AdminModelSysInfo extends JModelLegacy
*/
public function &getPhpSettings()
{
- if (is_null($this->php_settings))
+ if (!is_null($this->php_settings))
{
- $this->php_settings = array();
- $this->php_settings['safe_mode'] = ini_get('safe_mode') == '1';
- $this->php_settings['display_errors'] = ini_get('display_errors') == '1';
- $this->php_settings['short_open_tag'] = ini_get('short_open_tag') == '1';
- $this->php_settings['file_uploads'] = ini_get('file_uploads') == '1';
- $this->php_settings['magic_quotes_gpc'] = ini_get('magic_quotes_gpc') == '1';
- $this->php_settings['register_globals'] = ini_get('register_globals') == '1';
- $this->php_settings['output_buffering'] = (bool) ini_get('output_buffering');
- $this->php_settings['open_basedir'] = ini_get('open_basedir');
- $this->php_settings['session.save_path'] = ini_get('session.save_path');
- $this->php_settings['session.auto_start'] = ini_get('session.auto_start');
- $this->php_settings['disable_functions'] = ini_get('disable_functions');
- $this->php_settings['xml'] = extension_loaded('xml');
- $this->php_settings['zlib'] = extension_loaded('zlib');
- $this->php_settings['zip'] = function_exists('zip_open') && function_exists('zip_read');
- $this->php_settings['mbstring'] = extension_loaded('mbstring');
- $this->php_settings['iconv'] = function_exists('iconv');
+ return $this->php_settings;
}
+ $this->php_settings = array();
+ $this->php_settings['safe_mode'] = ini_get('safe_mode') == '1';
+ $this->php_settings['display_errors'] = ini_get('display_errors') == '1';
+ $this->php_settings['short_open_tag'] = ini_get('short_open_tag') == '1';
+ $this->php_settings['file_uploads'] = ini_get('file_uploads') == '1';
+ $this->php_settings['magic_quotes_gpc'] = ini_get('magic_quotes_gpc') == '1';
+ $this->php_settings['register_globals'] = ini_get('register_globals') == '1';
+ $this->php_settings['output_buffering'] = (bool) ini_get('output_buffering');
+ $this->php_settings['open_basedir'] = ini_get('open_basedir');
+ $this->php_settings['session.save_path'] = ini_get('session.save_path');
+ $this->php_settings['session.auto_start'] = ini_get('session.auto_start');
+ $this->php_settings['disable_functions'] = ini_get('disable_functions');
+ $this->php_settings['xml'] = extension_loaded('xml');
+ $this->php_settings['zlib'] = extension_loaded('zlib');
+ $this->php_settings['zip'] = function_exists('zip_open') && function_exists('zip_read');
+ $this->php_settings['mbstring'] = extension_loaded('mbstring');
+ $this->php_settings['iconv'] = function_exists('iconv');
+
return $this->php_settings;
}
@@ -100,16 +102,18 @@ public function &getPhpSettings()
*/
public function &getConfig()
{
- if (is_null($this->config))
+ if (!is_null($this->config))
{
- $registry = new Registry(new JConfig);
- $this->config = $registry->toArray();
- $hidden = array('host', 'user', 'password', 'ftp_user', 'ftp_pass', 'smtpuser', 'smtppass');
+ return $this->config;
+ }
- foreach ($hidden as $key)
- {
- $this->config[$key] = 'xxxxxx';
- }
+ $registry = new Registry(new JConfig);
+ $this->config = $registry->toArray();
+ $hidden = array('host', 'user', 'password', 'ftp_user', 'ftp_pass', 'smtpuser', 'smtppass');
+
+ foreach ($hidden as $key)
+ {
+ $this->config[$key] = 'xxxxxx';
}
return $this->config;
@@ -124,33 +128,26 @@ public function &getConfig()
*/
public function &getInfo()
{
- if (is_null($this->info))
+ if (!is_null($this->info))
{
- $this->info = array();
- $version = new JVersion;
- $platform = new JPlatform;
- $db = JFactory::getDbo();
-
- if (isset($_SERVER['SERVER_SOFTWARE']))
- {
- $sf = $_SERVER['SERVER_SOFTWARE'];
- }
- else
- {
- $sf = getenv('SERVER_SOFTWARE');
- }
-
- $this->info['php'] = php_uname();
- $this->info['dbversion'] = $db->getVersion();
- $this->info['dbcollation'] = $db->getCollation();
- $this->info['phpversion'] = phpversion();
- $this->info['server'] = $sf;
- $this->info['sapi_name'] = php_sapi_name();
- $this->info['version'] = $version->getLongVersion();
- $this->info['platform'] = $platform->getLongVersion();
- $this->info['useragent'] = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : "";
+ return $this->info;
}
+ $this->info = array();
+ $version = new JVersion;
+ $platform = new JPlatform;
+ $db = JFactory::getDbo();
+
+ $this->info['php'] = php_uname();
+ $this->info['dbversion'] = $db->getVersion();
+ $this->info['dbcollation'] = $db->getCollation();
+ $this->info['phpversion'] = phpversion();
+ $this->info['server'] = isset($_SERVER['SERVER_SOFTWARE']) ? $_SERVER['SERVER_SOFTWARE'] : getenv('SERVER_SOFTWARE');
+ $this->info['sapi_name'] = php_sapi_name();
+ $this->info['version'] = $version->getLongVersion();
+ $this->info['platform'] = $platform->getLongVersion();
+ $this->info['useragent'] = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : "";
+
return $this->info;
}
@@ -163,9 +160,7 @@ public function &getInfo()
*/
public function phpinfoEnabled()
{
- $disabled = explode(',', ini_get('disable_functions'));
-
- return !in_array('phpinfo', $disabled);
+ return !in_array('phpinfo', explode(',', ini_get('disable_functions')));
}
/**
@@ -177,28 +172,33 @@ public function phpinfoEnabled()
*/
public function &getPHPInfo()
{
- if (is_null($this->php_info) && $this->phpinfoEnabled())
+ if (!$this->phpinfoEnabled())
{
- ob_start();
- date_default_timezone_set('UTC');
- phpinfo(INFO_GENERAL | INFO_CONFIGURATION | INFO_MODULES);
- $phpInfo = ob_get_contents();
- ob_end_clean();
- preg_match_all('#]*>(.*)#siU', $phpInfo, $output);
- $output = preg_replace('#