Merge pull request #2228 from Cameri/3.0

3.0 Replaced array() with [] in lib/Cake/Cache/Engine
cakephp · Oct 29, 2013 · 80f2fb6 · 80f2fb6
2 parents dc1542f + b8123bd
commit 80f2fb6
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 39 deletions.
diff --git a/Cake/Cache/Engine/ApcEngine.php b/Cake/Cache/Engine/ApcEngine.php
@@ -29,7 +29,7 @@ class ApcEngine extends CacheEngine {
  *
  * @var array
  */
-	protected $_compiledGroupNames = array();
+	protected $_compiledGroupNames = [];
 
 /**
  * Initialize the Cache Engine
@@ -39,7 +39,7 @@ class ApcEngine extends CacheEngine {
  * @param array $settings array of setting for the engine
  * @return boolean True if the engine has been successfully initialized, false if not
  */
-	public function init($settings = array()) {
+	public function init($settings = []) {
 		if (!isset($settings['prefix'])) {
 			$settings['prefix'] = Inflector::slug(APP_DIR) . '_';
 		}
@@ -158,7 +158,7 @@ public function groups() {
 			ksort($groups);
 		}
 
-		$result = array();
+		$result = [];
 		$groups = array_values($groups);
 		foreach ($this->settings['groups'] as $i => $group) {
 			$result[] = $group . $groups[$i];

diff --git a/Cake/Cache/Engine/FileEngine.php b/Cake/Cache/Engine/FileEngine.php
@@ -55,7 +55,7 @@ class FileEngine extends CacheEngine {
  * @var array
  * @see CacheEngine::__defaults
  */
-	public $settings = array();
+	public $settings = [];
 
 /**
  * True unless FileEngine::__active(); fails
@@ -72,15 +72,15 @@ class FileEngine extends CacheEngine {
  * @param array $settings array of setting for the engine
  * @return boolean True if the engine has been successfully initialized, false if not
  */
-	public function init($settings = array()) {
-		$settings += array(
+	public function init($settings = []) {
+		$settings += [
 			'path' => CACHE,
 			'prefix' => 'cake_',
 			'lock' => true,
 			'serialize' => true,
 			'isWindows' => false,
 			'mask' => 0664
-		);
+		];
 		parent::init($settings);
 
 		if (DS === '\\') {
@@ -365,7 +365,7 @@ protected function _setKey($key, $createKey = false) {
 			if (!$exists && !chmod($this->_File->getPathname(), (int)$this->settings['mask'])) {
 				trigger_error(__d(
 					'cake_dev', 'Could not apply permission mask "%s" on cache file "%s"',
-					array($this->_File->getPathname(), $this->settings['mask'])), E_USER_WARNING);
+					[$this->_File->getPathname(), $this->settings['mask']]), E_USER_WARNING);
 			}
 		}
 		return true;
@@ -403,7 +403,7 @@ public function key($key) {
 			return false;
 		}
 
-		$key = Inflector::underscore(str_replace(array(DS, '/', '.', '<', '>', '?', ':', '|', '*', '"'), '_', strval($key)));
+		$key = Inflector::underscore(str_replace([DS, '/', '.', '<', '>', '?', ':', '|', '*', '"'], '_', strval($key)));
 		return $key;
 	}
 

diff --git a/Cake/Cache/Engine/MemcachedEngine.php b/Cake/Cache/Engine/MemcachedEngine.php
@@ -53,7 +53,7 @@ class MemcachedEngine extends CacheEngine {
  *
  * @var array
  */
-	public $settings = array();
+	public $settings = [];
 
 /**
  * List of available serializer engines
@@ -62,41 +62,41 @@ class MemcachedEngine extends CacheEngine {
  *
  * @var array
  */
-	protected $_serializers = array(
+	protected $_serializers = [
 		'igbinary' => Memcached::SERIALIZER_IGBINARY,
 		'json' => Memcached::SERIALIZER_JSON,
 		'php' => Memcached::SERIALIZER_PHP
-	);
+	];
 
 /**
  * Initialize the Cache Engine
  *
  * Called automatically by the cache frontend
- * To reinitialize the settings call Cache::engine('EngineName', [optional] settings = array());
+ * To reinitialize the settings call Cache::engine('EngineName', [optional] settings = []);
  *
  * @param array $settings array of setting for the engine
  * @return boolean True if the engine has been successfully initialized, false if not
  * @throws Cake\Error\Exception when you try use authentication without Memcached compiled with SASL support
  */
-	public function init($settings = array()) {
+	public function init($settings = []) {
 		if (!class_exists('Memcached')) {
 			return false;
 		}
 		if (!isset($settings['prefix'])) {
 			$settings['prefix'] = Inflector::slug(APP_DIR) . '_';
 		}
-		$settings += array(
-			'servers' => array('127.0.0.1'),
+		$settings += [
+			'servers' => ['127.0.0.1'],
 			'compress' => false,
 			'persistent' => false,
 			'login' => null,
 			'password' => null,
 			'serialize' => 'php'
-		);
+		];
 		parent::init($settings);
 
 		if (!is_array($this->settings['servers'])) {
-			$this->settings['servers'] = array($this->settings['servers']);
+			$this->settings['servers'] = [$this->settings['servers']];
 		}
 
 		if (isset($this->_Memcached)) {
@@ -110,7 +110,7 @@ public function init($settings = array()) {
 			return true;
 		}
 
-		$servers = array();
+		$servers = [];
 		foreach ($this->settings['servers'] as $server) {
 			$servers[] = $this->_parseServerString($server);
 		}
@@ -171,7 +171,7 @@ protected function _setOptions() {
  */
 	protected function _parseServerString($server) {
 		if ($server[0] === 'u') {
-			return array($server, 0);
+			return [$server, 0];
 		}
 		if (substr($server, 0, 1) === '[') {
 			$position = strpos($server, ']:');
@@ -187,7 +187,7 @@ protected function _parseServerString($server) {
 			$host = substr($server, 0, $position);
 			$port = substr($server, $position + 1);
 		}
-		return array($host, (int)$port);
+		return [$host, (int)$port];
 	}
 
 /**
@@ -300,7 +300,7 @@ public function groups() {
 			ksort($groups);
 		}
 
-		$result = array();
+		$result = [];
 		$groups = array_values($groups);
 		foreach ($this->settings['groups'] as $i => $group) {
 			$result[] = $group . $groups[$i];

diff --git a/Cake/Cache/Engine/RedisEngine.php b/Cake/Cache/Engine/RedisEngine.php
@@ -40,29 +40,29 @@ class RedisEngine extends CacheEngine {
  *
  * @var array
  */
-	public $settings = array();
+	public $settings = [];
 
 /**
  * Initialize the Cache Engine
  *
  * Called automatically by the cache frontend
- * To reinitialize the settings call Cache::engine('EngineName', [optional] settings = array());
+ * To reinitialize the settings call Cache::engine('EngineName', [optional] settings = []);
  *
  * @param array $settings array of setting for the engine
  * @return boolean True if the engine has been successfully initialized, false if not
  */
-	public function init($settings = array()) {
+	public function init($settings = []) {
 		if (!class_exists('Redis')) {
 			return false;
 		}
-		parent::init(array_merge(array(
+		parent::init(array_merge([
 			'prefix' => null,
 			'server' => '127.0.0.1',
 			'port' => 6379,
 			'password' => false,
 			'timeout' => 0,
 			'persistent' => true
-			), $settings)
+			], $settings)
 		);
 
 		return $this->_connect();
@@ -183,7 +183,7 @@ public function clear($check) {
  * @return array
  */
 	public function groups() {
-		$result = array();
+		$result = [];
 		foreach ($this->settings['groups'] as $group) {
 			$value = $this->_Redis->get($this->settings['prefix'] . $group);
 			if (!$value) {

diff --git a/Cake/Cache/Engine/WincacheEngine.php b/Cake/Cache/Engine/WincacheEngine.php
@@ -30,7 +30,7 @@ class WincacheEngine extends CacheEngine {
  *
  * @var array
  */
-	protected $_compiledGroupNames = array();
+	protected $_compiledGroupNames = [];
 
 /**
  * Initialize the Cache Engine
@@ -42,7 +42,7 @@ class WincacheEngine extends CacheEngine {
  * @return boolean True if the engine has been successfully initialized, false if not
  * @see CacheEngine::__defaults
  */
-	public function init($settings = array()) {
+	public function init($settings = []) {
 		if (!isset($settings['prefix'])) {
 			$settings['prefix'] = Inflector::slug(APP_DIR) . '_';
 		}
@@ -165,7 +165,7 @@ public function groups() {
 			ksort($groups);
 		}
 
-		$result = array();
+		$result = [];
 		$groups = array_values($groups);
 		foreach ($this->settings['groups'] as $i => $group) {
 			$result[] = $group . $groups[$i];

diff --git a/Cake/Cache/Engine/XcacheEngine.php b/Cake/Cache/Engine/XcacheEngine.php
@@ -35,24 +35,24 @@ class XcacheEngine extends CacheEngine {
  *
  * @var array
  */
-	public $settings = array();
+	public $settings = [];
 
 /**
  * Initialize the Cache Engine
  *
  * Called automatically by the cache frontend
- * To reinitialize the settings call Cache::engine('EngineName', [optional] settings = array());
+ * To reinitialize the settings call Cache::engine('EngineName', [optional] settings = []);
  *
  * @param array $settings array of setting for the engine
  * @return boolean True if the engine has been successfully initialized, false if not
  */
-	public function init($settings = array()) {
+	public function init($settings = []) {
 		if (php_sapi_name() !== 'cli') {
-			parent::init(array_merge(array(
+			parent::init(array_merge([
 				'prefix' => Inflector::slug(APP_DIR) . '_',
 				'PHP_AUTH_USER' => 'user',
 				'PHP_AUTH_PW' => 'password'
-				), $settings)
+				], $settings)
 			);
 			return function_exists('xcache_info');
 		}
@@ -149,7 +149,7 @@ public function clear($check) {
  * @return array
  */
 	public function groups() {
-		$result = array();
+		$result = [];
 		foreach ($this->settings['groups'] as $group) {
 			$value = xcache_get($this->settings['prefix'] . $group);
 			if (!$value) {
@@ -182,8 +182,8 @@ public function clearGroup($group) {
  * @return void
  */
 	protected function _auth($reverse = false) {
-		static $backup = array();
-		$keys = array('PHP_AUTH_USER' => 'user', 'PHP_AUTH_PW' => 'password');
+		static $backup = [];
+		$keys = ['PHP_AUTH_USER' => 'user', 'PHP_AUTH_PW' => 'password'];
 		foreach ($keys as $key => $setting) {
 			if ($reverse) {
 				if (isset($backup[$key])) {