improved coding style

Author: dg

src/Bridges/CacheLatte/CacheMacro.php

@@ -7,8 +7,8 @@
 
 namespace Nette\Bridges\CacheLatte;
 
-use Nette,
-	Latte;
+use Nette;
+use Latte;
 
 
 /**

src/Caching/Cache.php

@@ -7,8 +7,8 @@
 
 namespace Nette\Caching;
 
-use Nette,
-	Nette\Utils\Callback;
+use Nette;
+use Nette\Utils\Callback;
 
 
 /**
@@ -79,7 +79,7 @@ public function getNamespace()
 	/**
 	 * Returns new nested cache object.
 	 * @param  string
-	 * @return Cache
+	 * @return self
 	 */
 	public function derive($namespace)
 	{
@@ -98,7 +98,7 @@ public function load($key, $fallback = NULL)
 	{
 		$data = $this->storage->read($this->generateKey($key));
 		if ($data === NULL && $fallback) {
-			return $this->save($key, function(& $dependencies) use ($fallback) {
+			return $this->save($key, function (& $dependencies) use ($fallback) {
 				return call_user_func_array($fallback, array(& $dependencies));
 			});
 		}
@@ -145,8 +145,8 @@ public function save($key, $data, array $dependencies = NULL)
 	private function completeDependencies($dp, $data)
 	{
 		// convert expire into relative amount of seconds
-		if (isset($dp[Cache::EXPIRATION])) {
-			$dp[Cache::EXPIRATION] = Nette\Utils\DateTime::from($dp[Cache::EXPIRATION])->format('U') - time();
+		if (isset($dp[self::EXPIRATION])) {
+			$dp[self::EXPIRATION] = Nette\Utils\DateTime::from($dp[self::EXPIRATION])->format('U') - time();
 		}
 
 		// convert FILES into CALLBACKS
@@ -214,7 +214,7 @@ public function call($function)
 		if (is_array($function) && is_object($function[0])) {
 			$key[0][0] = get_class($function[0]);
 		}
-		return $this->load($key, function() use ($function, $key) {
+		return $this->load($key, function () use ($function, $key) {
 			return Callback::invokeArgs($function, array_slice($key, 1));
 		});
 	}
@@ -229,7 +229,7 @@ public function call($function)
 	public function wrap($function, array $dependencies = NULL)
 	{
 		$cache = $this;
-		return function() use ($cache, $function, $dependencies) {
+		return function () use ($cache, $function, $dependencies) {
 			$key = array($function, func_get_args());
 			if (is_array($function) && is_object($function[0])) {
 				$key[0][0] = get_class($function[0]);

src/Caching/Storages/FileJournal.php

@@ -7,8 +7,8 @@
 
 namespace Nette\Caching\Storages;
 
-use Nette,
-	Nette\Caching\Cache;
+use Nette;
+use Nette\Caching\Cache;
 
 
 /**
@@ -22,13 +22,13 @@ class FileJournal extends Nette\Object implements IJournal
 	const FILE = 'btfj.dat';
 
 	/** 4 bytes file header magic (btfj) */
-	const FILE_MAGIC  = 0x6274666A;
+	const FILE_MAGIC = 0x6274666A;
 
 	/** 4 bytes index node magic (inde) */
 	const INDEX_MAGIC = 0x696E6465;
 
 	/** 4 bytes data node magic (data) */
-	const DATA_MAGIC  = 0x64617461;
+	const DATA_MAGIC = 0x64617461;
 
 	/** Node size in bytes */
 	const NODE_SIZE = 4096;
@@ -40,7 +40,7 @@ class FileJournal extends Nette\Object implements IJournal
 	const HEADER_SIZE = 4096;
 
 	/** Size of 32 bit integer in bytes. INT32_SIZE = 32 / 8 :-) */
-	const INT32_SIZE  = 4;
+	const INT32_SIZE = 4;
 
 	const INFO = 'i',
 		TYPE = 't', // TAGS, PRIORITY or DATA
@@ -92,10 +92,10 @@ class FileJournal extends Nette\Object implements IJournal
 
 	/** @var array */
 	private static $startNode = array(
-		self::TAGS     => 0,
+		self::TAGS => 0,
 		self::PRIORITY => 1,
-		self::ENTRIES  => 2,
-		self::DATA     => 3,
+		self::ENTRIES => 2,
+		self::DATA => 3,
 	);
 
 
@@ -190,7 +190,7 @@ public function write($key, array $dependencies)
 					self::INFO => array(
 						self::LAST_INDEX => ($freeDataNode << self::BITROT),
 						self::TYPE => self::DATA,
-					)
+					),
 				);
 			}
 
@@ -249,7 +249,7 @@ public function clean(array $conditions)
 		$toDelete = array(
 			self::TAGS => array(),
 			self::PRIORITY => array(),
-			self::ENTRIES => array()
+			self::ENTRIES => array(),
 		);
 
 		$entries = array();
@@ -297,7 +297,7 @@ private function cleanTags(array $tags, array & $toDelete)
 
 	/**
 	 * Cleans entries from journal by priority.
-	 * @param  integer
+	 * @param  int
 	 * @param  array
 	 * @return array of removed items
 	 */
@@ -560,7 +560,7 @@ private function cleanIndexData($nextNodeId, array $links, & $masterNodeLink)
 
 	/**
 	 * Get node from journal.
-	 * @param  integer
+	 * @param  int
 	 * @return array
 	 */
 	private function getNode($id)
@@ -606,7 +606,7 @@ private function getNode($id)
 
 	/**
 	 * Save node to cache.
-	 * @param  integer
+	 * @param  int
 	 * @param  array
 	 * @return void
 	 */
@@ -706,7 +706,7 @@ private function commit()
 
 	/**
 	 * Prepare node to journal file structure.
-	 * @param  integer
+	 * @param  int
 	 * @param  array|bool
 	 * @return bool Successfully committed
 	 */
@@ -750,7 +750,7 @@ private function prepareNode($id, $node)
 
 	/**
 	 * Commit node string to journal file.
-	 * @param  integer
+	 * @param  int
 	 * @param  string
 	 * @return void
 	 */
@@ -788,7 +788,7 @@ private function findIndexNode($type, $search, $childId = NULL, $prevId = NULL)
 							self::PREV_NODE => -1,
 							self::END => -1,
 							self::MAX => -1,
-						)
+						),
 					),
 					$parentId,
 				); // Init empty node
@@ -818,8 +818,8 @@ private function findIndexNode($type, $search, $childId = NULL, $prevId = NULL)
 
 	/**
 	 * Find complete free node.
-	 * @param  integer
-	 * @return array|integer Node ID
+	 * @param  int
+	 * @return array|int Node ID
 	 */
 	private function findFreeNode($count = 1)
 	{
@@ -858,8 +858,8 @@ private function findFreeNode($count = 1)
 
 	/**
 	 * Find free data node that has $size bytes of free space.
-	 * @param  integer size in bytes
-	 * @return integer Node ID
+	 * @param  int size in bytes
+	 * @return int Node ID
 	 */
 	private function findFreeDataNode($size)
 	{
@@ -904,7 +904,7 @@ private function findFreeDataNode($size)
 
 	/**
 	 * Bisect node or when has only one key, move part to data node.
-	 * @param  integer Node ID
+	 * @param  int Node ID
 	 * @param  array Node
 	 * @return void
 	 */
@@ -993,7 +993,7 @@ private function bisectNode($id, array $node)
 			);
 			$this->saveNode($id, $second);
 
-			list(,, $parent) = $this->findIndexNode($nodeInfo[self::TYPE], $halfKey);
+			list(, , $parent) = $this->findIndexNode($nodeInfo[self::TYPE], $halfKey);
 			$parentNode = $this->getNode($parent);
 			if ($parentNode === FALSE) {
 				if (self::$debug) {
@@ -1021,7 +1021,7 @@ private function headerCommit()
 
 	/**
 	 * Remove node from journal file.
-	 * @param  integer
+	 * @param  int
 	 * @return void
 	 */
 	private function deleteNode($id)
@@ -1087,7 +1087,7 @@ private function lock()
 
 
 	/**
-	 * Open btfj.dat file (or create it if not exists) and load metainformation
+	 * Open btfj.dat file (or create it if not exists) and load metainformation.
 	 * @throws Nette\InvalidStateException
 	 */
 	private function prepare()
@@ -1104,7 +1104,7 @@ private function prepare()
 				$written = fwrite($init, pack('N2', self::FILE_MAGIC, $this->lastNode));
 				fclose($init);
 				if ($written !== self::INT32_SIZE * 2) {
-					throw new Nette\InvalidStateException("Cannot write journal header.");
+					throw new Nette\InvalidStateException('Cannot write journal header.');
 				}
 			}
 		}
@@ -1149,8 +1149,7 @@ private function unlock()
 
 
 	/**
-	 * @param  int $nodeId
-	 * @param  array $nodeData
+	 * @param  int
 	 * @return int
 	 * @throws Nette\InvalidStateException
 	 */
@@ -1175,7 +1174,7 @@ private function findNextFreeKey($nodeId, array & $nodeData)
 
 	/**
 	 * Append $append to $array.
-	 * This function is much faster then $array = array_merge($array, $append)
+	 * This function is much faster than $array = array_merge($array, $append)
 	 * @param  array
 	 * @param  array
 	 * @return void
@@ -1190,7 +1189,7 @@ private function arrayAppend(array & $array, array $append)
 
 	/**
 	 * Append $append to $array with preserve keys.
-	 * This function is much faster then $array = $array + $append
+	 * This function is much faster than $array = $array + $append
 	 * @param  array
 	 * @param  array
 	 * @return void
@@ -1201,4 +1200,5 @@ private function arrayAppendKeys(array & $array, array $append)
 			$array[$key] = $value;
 		}
 	}
+
 }

src/Caching/Storages/FileStorage.php

@@ -7,8 +7,8 @@
 
 namespace Nette\Caching\Storages;
 
-use Nette,
-	Nette\Caching\Cache;
+use Nette;
+use Nette\Caching\Cache;
 
 
 /**

src/Caching/Storages/IJournal.php

@@ -20,16 +20,16 @@ interface IJournal
 
 	/**
 	 * Writes entry information into the journal.
-	 * @param  string $key
-	 * @param  array  $dependencies
+	 * @param  string
+	 * @param  array
 	 * @return void
 	 */
 	function write($key, array $dependencies);
 
 
 	/**
 	 * Cleans entries from journal.
-	 * @param  array  $conditions
+	 * @param  array
 	 * @return array of removed items or NULL when performing a full cleanup
 	 */
 	function clean(array $conditions);

src/Caching/Storages/MemcachedStorage.php

@@ -7,8 +7,8 @@
 
 namespace Nette\Caching\Storages;
 
-use Nette,
-	Nette\Caching\Cache;
+use Nette;
+use Nette\Caching\Cache;
 
 
 /**

src/Caching/Storages/SQLiteStorage.php

@@ -7,8 +7,8 @@
 
 namespace Nette\Caching\Storages;
 
-use Nette,
-	Nette\Caching\Cache;
+use Nette;
+use Nette\Caching\Cache;
 
 
 /**

tests/Caching.Latte/CacheMacro.cache.phpt

@@ -4,8 +4,8 @@
  * Test: {cache ...}
  */
 
-use Nette\Bridges\CacheLatte\CacheMacro,
-	Tester\Assert;
+use Nette\Bridges\CacheLatte\CacheMacro;
+use Tester\Assert;
 
 
 require __DIR__ . '/../bootstrap.php';

tests/Caching/Cache.load.phpt

@@ -4,8 +4,8 @@
  * Test: Nette\Caching\Cache load().
  */
 
-use Nette\Caching\Cache,
-	Tester\Assert;
+use Nette\Caching\Cache;
+use Tester\Assert;
 
 
 require __DIR__ . '/../bootstrap.php';
@@ -17,12 +17,12 @@ require __DIR__ . '/Cache.inc';
 $storage = new TestStorage();
 $cache = new Cache($storage, 'ns');
 
-$value = $cache->load('key', function() {
+$value = $cache->load('key', function () {
 	return 'value';
 });
 Assert::equal('value', $value);
 
-$data = $cache->load('key', function() {
+$data = $cache->load('key', function () {
 	return "won't load this value"; // will read from storage
 });
 Assert::equal('value', $data['data']);
@@ -33,13 +33,13 @@ $dependencies = array(Cache::TAGS => 'tag');
 $storage = new TestStorage();
 $cache = new Cache($storage, 'ns');
 
-$value = $cache->load('key', function(& $deps) use ($dependencies) {
+$value = $cache->load('key', function (& $deps) use ($dependencies) {
 	$deps = $dependencies;
 	return 'value';
 });
 Assert::equal('value', $value);
 
-$data = $cache->load('key', function() {
+$data = $cache->load('key', function () {
 	return "won't load this value"; // will read from storage
 });
 Assert::equal('value', $data['data']);