Merge remote-tracking branch 'remotes/upstream/staging' into modules.…

…events
joomla · Mar 5, 2015 · d97411a · d97411a
2 parents 0f76a6d + 3e1fa38
commit d97411a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 23 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,11 +16,11 @@ services:
   - redis-server
 
 before_script:
-  # - composer self-update
   # - composer update
-  - sh -c "if [ '$TRAVIS_PHP_VERSION' != '7.0' ]; then pyrus install -f pear/PHP_CodeSniffer-1.5.5; fi"
-  - sh -c "if [ '$TRAVIS_PHP_VERSION' != '7.0' ]; then pyrus install -f pear/Cache_Lite; fi"
-  - sh -c "if [ '$TRAVIS_PHP_VERSION' != '7.0' ]; then phpenv rehash; fi"
+  # Install PHPCS to validate code standards
+  - composer require squizlabs/php_codesniffer 1.5.6
+  # Install Cache_Lite for testing
+  - composer require pear/cache_lite 1.7.16
   # Set up databases for testing
   - mysql -e 'create database joomla_ut;'
   - mysql joomla_ut < tests/unit/schema/mysql.sql
@@ -35,7 +35,7 @@ before_script:
 
 script:
   - phpunit --configuration travisci-phpunit.xml
-  - sh -c "if [ '$TRAVIS_PHP_VERSION' != '7.0' ]; then phpcs --report=full --extensions=php -p --standard=build/phpcs/Joomla .; fi"
+  - sh -c "if [ '$TRAVIS_PHP_VERSION' != '7.0' ]; then libraries/vendor/bin/phpcs --report=full --extensions=php -p --standard=build/phpcs/Joomla .; fi"
 
 branches:
   except:

diff --git a/administrator/components/com_installer/helpers/html/manage.php b/administrator/components/com_installer/helpers/html/manage.php
@@ -12,9 +12,7 @@
 /**
  * Installer HTML class.
  *
- * @package     Joomla.Administrator
- * @subpackage  com_installer
- * @since       2.5
+ * @since  2.5
  */
 abstract class InstallerHtmlManage
 {
@@ -35,32 +33,32 @@ abstract class InstallerHtmlManage
 	public static function state($value, $i, $enabled = true, $checkbox = 'cb')
 	{
 		$states	= array(
-			2	=> array(
+			2 => array(
 				'',
 				'COM_INSTALLER_EXTENSION_PROTECTED',
 				'',
 				'COM_INSTALLER_EXTENSION_PROTECTED',
 				true,
 				'protected',
-				'protected'
+				'protected',
 			),
-			1	=> array(
+			1 => array(
 				'unpublish',
 				'COM_INSTALLER_EXTENSION_ENABLED',
 				'COM_INSTALLER_EXTENSION_DISABLE',
 				'COM_INSTALLER_EXTENSION_ENABLED',
 				true,
 				'publish',
-				'publish'
+				'publish',
 			),
-			0	=> array(
+			0 => array(
 				'publish',
 				'COM_INSTALLER_EXTENSION_DISABLED',
 				'COM_INSTALLER_EXTENSION_ENABLE',
 				'COM_INSTALLER_EXTENSION_DISABLED',
 				true,
 				'unpublish',
-				'unpublish'
+				'unpublish',
 			),
 		);
 

diff --git a/libraries/joomla/cache/storage/cachelite.php b/libraries/joomla/cache/storage/cachelite.php
@@ -74,7 +74,10 @@ public function __construct($options = array())
 	 */
 	protected function initCache($cloptions)
 	{
-		require_once 'Cache/Lite.php';
+		if (!class_exists('Cache_Lite'))
+		{
+			require_once 'Cache/Lite.php';
+		}
 
 		self::$CacheLiteInstance = new Cache_Lite($cloptions);
 
@@ -326,13 +329,6 @@ public static function isSupported()
 	{
 		@include_once 'Cache/Lite.php';
 
-		if (class_exists('Cache_Lite'))
-		{
-			return true;
-		}
-		else
-		{
-			return false;
-		}
+		return class_exists('Cache_Lite');
 	}
 }