coding style: fixed spaces & use statements order

dg · dg · commit 962e0c303573 · 2017-07-11T13:45:04.000+02:00
diff --git a/src/Bridges/CacheDI/CacheExtension.php b/src/Bridges/CacheDI/CacheExtension.php
@@ -70,5 +70,4 @@ private function checkTempDir($dir)
 		rmdir("$dir/$uniq");
 		return $isWritable;
 	}
-
 }
diff --git a/src/Bridges/CacheLatte/CacheMacro.php b/src/Bridges/CacheLatte/CacheMacro.php
@@ -7,9 +7,9 @@
 
 namespace Nette\Bridges\CacheLatte;
 
+use Latte;
 use Nette;
 use Nette\Caching\Cache;
-use Latte;
 
 
 /**
@@ -139,5 +139,4 @@ public static function endCache(&$parents, array $args = NULL)
 			$helper->end();
 		}
 	}
-
 }
diff --git a/src/Caching/Cache.php b/src/Caching/Cache.php
@@ -370,5 +370,4 @@ private static function checkFile($file, $time)
 	{
 		return @filemtime($file) == $time; // @ - stat may fail
 	}
-
 }
diff --git a/src/Caching/IBulkReader.php b/src/Caching/IBulkReader.php
@@ -20,5 +20,4 @@ interface IBulkReader
 	 * @return array key => value pairs, missing items are omitted
 	 */
 	function bulkRead(array $keys);
-
 }
diff --git a/src/Caching/IStorage.php b/src/Caching/IStorage.php
@@ -49,5 +49,4 @@ function remove($key);
 	 * @return void
 	 */
 	function clean(array $conditions);
-
 }
diff --git a/src/Caching/OutputHelper.php b/src/Caching/OutputHelper.php
@@ -47,5 +47,4 @@ public function end(array $dependencies = NULL)
 		$this->cache->save($this->key, ob_get_flush(), (array) $dependencies + (array) $this->dependencies);
 		$this->cache = NULL;
 	}
-
 }
diff --git a/src/Caching/Storages/DevNullStorage.php b/src/Caching/Storages/DevNullStorage.php
@@ -66,5 +66,4 @@ public function remove($key)
 	public function clean(array $conditions)
 	{
 	}
-
 }
diff --git a/src/Caching/Storages/FileStorage.php b/src/Caching/Storages/FileStorage.php
@@ -399,5 +399,4 @@ private static function delete($file, $handle = NULL)
 			@unlink($file); // @ - file may not already exist
 		}
 	}
-
 }
diff --git a/src/Caching/Storages/IJournal.php b/src/Caching/Storages/IJournal.php
@@ -22,12 +22,10 @@ interface IJournal
 	 */
 	function write($key, array $dependencies);
 
-
 	/**
 	 * Cleans entries from journal.
 	 * @param  array
 	 * @return array|NULL of removed items or NULL when performing a full cleanup
 	 */
 	function clean(array $conditions);
-
 }
diff --git a/src/Caching/Storages/MemcachedStorage.php b/src/Caching/Storages/MemcachedStorage.php
@@ -187,5 +187,4 @@ public function clean(array $conditions)
 			}
 		}
 	}
-
 }
diff --git a/src/Caching/Storages/MemoryStorage.php b/src/Caching/Storages/MemoryStorage.php
@@ -76,5 +76,4 @@ public function clean(array $conditions)
 			$this->data = [];
 		}
 	}
-
 }
diff --git a/src/Caching/Storages/NewMemcachedStorage.php b/src/Caching/Storages/NewMemcachedStorage.php
@@ -220,5 +220,4 @@ public function clean(array $conditions)
 			}
 		}
 	}
-
 }
diff --git a/src/Caching/Storages/SQLiteJournal.php b/src/Caching/Storages/SQLiteJournal.php
@@ -154,5 +154,4 @@ public function clean(array $conditions)
 
 		return $keys;
 	}
-
 }
diff --git a/src/Caching/Storages/SQLiteStorage.php b/src/Caching/Storages/SQLiteStorage.php
@@ -165,5 +165,4 @@ public function clean(array $conditions)
 			$this->pdo->prepare($sql)->execute($args);
 		}
 	}
-
 }
diff --git a/tests/Bridges.DI/CacheExtension.phpt b/tests/Bridges.DI/CacheExtension.phpt
@@ -4,8 +4,8 @@
  * Test: CacheExtension.
  */
 
-use Nette\DI;
 use Nette\Bridges\CacheDI\CacheExtension;
+use Nette\DI;
 use Tester\Assert;
 
 
diff --git a/tests/Bridges.Latte/CacheMacro.createCache.phpt b/tests/Bridges.Latte/CacheMacro.createCache.phpt
@@ -5,9 +5,9 @@
  */
 
 use Nette\Bridges\CacheLatte\CacheMacro;
-use Tester\Assert;
-use Nette\Caching\Storages\DevNullStorage;
 use Nette\Caching\Cache;
+use Nette\Caching\Storages\DevNullStorage;
+use Tester\Assert;
 
 
 require __DIR__ . '/../bootstrap.php';
diff --git a/tests/Caching/Cache.load.phpt b/tests/Caching/Cache.load.phpt
@@ -47,12 +47,14 @@ Assert::equal($dependencies, $data['dependencies']);
 
 
 // load twice with fallback, pass dependencies
-function fallback(&$deps) {
+function fallback(&$deps)
+{
 	global $dependencies;
 	$deps = $dependencies;
 	return 'value';
 }
 
+
 $value = $cache->load('key2', 'fallback');
 Assert::equal('value', $value);
 $data = $cache->load('key2');
diff --git a/tests/Caching/Cache.php b/tests/Caching/Cache.php
@@ -7,11 +7,13 @@ class TestStorage implements IStorage
 {
 	private $data = [];
 
+
 	public function read($key)
 	{
 		return isset($this->data[$key]) ? $this->data[$key] : NULL;
 	}
 
+
 	public function write($key, $data, array $dependencies)
 	{
 		$this->data[$key] = [
@@ -20,11 +22,20 @@ public function write($key, $data, array $dependencies)
 		];
 	}
 
-	public function lock($key) {}
 
-	public function remove($key) {}
+	public function lock($key)
+	{
+	}
+
+
+	public function remove($key)
+	{
+	}
+
 
-	public function clean(array $conditions) {}
+	public function clean(array $conditions)
+	{
+	}
 }
 
 class BulkReadTestStorage extends TestStorage implements IBulkReader
@@ -41,5 +52,4 @@ function bulkRead(array $keys)
 
 		return $result;
 	}
-
 }
diff --git a/tests/Storages/FileStorage.call.phpt b/tests/Storages/FileStorage.call.phpt
@@ -20,6 +20,7 @@ class Mock
 		return $x + $y;
 	}
 
+
 	function __sleep()
 	{
 		throw new Exception;
diff --git a/tests/Storages/FileStorage.clean-all.phpt b/tests/Storages/FileStorage.clean-all.phpt
@@ -4,8 +4,8 @@
  * Test: Nette\Caching\Storages\FileStorage clean with Cache::ALL
  */
 
-use Nette\Caching\Storages\FileStorage;
 use Nette\Caching\Cache;
+use Nette\Caching\Storages\FileStorage;
 use Tester\Assert;
 
 
diff --git a/tests/Storages/FileStorage.namespace.phpt b/tests/Storages/FileStorage.namespace.phpt
@@ -4,8 +4,8 @@
  * Test: Nette\Caching\Storages\FileStorage & namespace test.
  */
 
-use Nette\Caching\Storages\FileStorage;
 use Nette\Caching\Cache;
+use Nette\Caching\Storages\FileStorage;
 use Tester\Assert;
 
 
diff --git a/tests/Storages/FileStorage.priority.phpt b/tests/Storages/FileStorage.priority.phpt
@@ -4,9 +4,9 @@
  * Test: Nette\Caching\Storages\FileStorage priority test.
  */
 
+use Nette\Caching\Cache;
 use Nette\Caching\Storages\FileStorage;
 use Nette\Caching\Storages\SQLiteJournal;
-use Nette\Caching\Cache;
 use Tester\Assert;
 
 
diff --git a/tests/Storages/FileStorage.sliding.phpt b/tests/Storages/FileStorage.sliding.phpt
@@ -31,7 +31,6 @@ for ($i = '0'; $i < '5'; $i++) {
 	clearstatcache();
 
 	Assert::truthy($cache->load($key));
-
 }
 
 // Sleeping few seconds...
diff --git a/tests/Storages/FileStorage.tags.phpt b/tests/Storages/FileStorage.tags.phpt
@@ -4,9 +4,9 @@
  * Test: Nette\Caching\Storages\FileStorage tags dependency test.
  */
 
+use Nette\Caching\Cache;
 use Nette\Caching\Storages\FileStorage;
 use Nette\Caching\Storages\SQLiteJournal;
-use Nette\Caching\Cache;
 use Tester\Assert;
 
 
diff --git a/tests/Storages/FileStorage.wrap.phpt b/tests/Storages/FileStorage.wrap.phpt
@@ -18,6 +18,7 @@ function mockFunction($x, $y)
 	return $x + $y;
 }
 
+
 class Test
 {
 	function mockMethod($x, $y)
diff --git a/tests/Storages/IJournalTestCase.php b/tests/Storages/IJournalTestCase.php
@@ -286,5 +286,4 @@ final public function testRemoveItemWithMultipleTags()
 			'b',
 		], $res);
 	}
-
 }
diff --git a/tests/Storages/Memcached.expiration.phpt b/tests/Storages/Memcached.expiration.phpt
@@ -4,8 +4,8 @@
  * Test: Nette\Caching\Storages\MemcachedStorage expiration test.
  */
 
-use Nette\Caching\Storages\MemcachedStorage;
 use Nette\Caching\Cache;
+use Nette\Caching\Storages\MemcachedStorage;
 use Tester\Assert;
 
 
diff --git a/tests/Storages/Memcached.files.phpt b/tests/Storages/Memcached.files.phpt
@@ -4,8 +4,8 @@
  * Test: Nette\Caching\Storages\MemcachedStorage files dependency test.
  */
 
-use Nette\Caching\Storages\MemcachedStorage;
 use Nette\Caching\Cache;
+use Nette\Caching\Storages\MemcachedStorage;
 use Tester\Assert;
 
 
diff --git a/tests/Storages/Memcached.priority.phpt b/tests/Storages/Memcached.priority.phpt
@@ -4,9 +4,9 @@
  * Test: Nette\Caching\Storages\MemcachedStorage priority test.
  */
 
+use Nette\Caching\Cache;
 use Nette\Caching\Storages\MemcachedStorage;
 use Nette\Caching\Storages\SQLiteJournal;
-use Nette\Caching\Cache;
 use Tester\Assert;
 
 
diff --git a/tests/Storages/Memcached.sliding.phpt b/tests/Storages/Memcached.sliding.phpt
@@ -4,8 +4,8 @@
  * Test: Nette\Caching\Storages\MemcachedStorage sliding expiration test.
  */
 
-use Nette\Caching\Storages\MemcachedStorage;
 use Nette\Caching\Cache;
+use Nette\Caching\Storages\MemcachedStorage;
 use Tester\Assert;
 
 
@@ -37,7 +37,6 @@ for ($i = 0; $i < 5; $i++) {
 	sleep(1);
 
 	Assert::truthy($cache->load($key));
-
 }
 
 // Sleeping few seconds...
diff --git a/tests/Storages/Memcached.tags.phpt b/tests/Storages/Memcached.tags.phpt
@@ -4,9 +4,9 @@
  * Test: Nette\Caching\Storages\MemcachedStorage tags dependency test.
  */
 
+use Nette\Caching\Cache;
 use Nette\Caching\Storages\MemcachedStorage;
 use Nette\Caching\Storages\SQLiteJournal;
-use Nette\Caching\Cache;
 use Tester\Assert;
 
 
diff --git a/tests/Storages/NewMemcached.bulkRead.phpt b/tests/Storages/NewMemcached.bulkRead.phpt
@@ -4,8 +4,8 @@
  * Test: Nette\Caching\Storages\NewMemcachedStorage and bulkRead
  */
 
-use Nette\Caching\Storages\NewMemcachedStorage;
 use Nette\Caching\Cache;
+use Nette\Caching\Storages\NewMemcachedStorage;
 use Tester\Assert;
 
 
diff --git a/tests/Storages/NewMemcached.expiration.phpt b/tests/Storages/NewMemcached.expiration.phpt
@@ -4,8 +4,8 @@
  * Test: Nette\Caching\Storages\NewMemcachedStorage expiration test.
  */
 
-use Nette\Caching\Storages\NewMemcachedStorage;
 use Nette\Caching\Cache;
+use Nette\Caching\Storages\NewMemcachedStorage;
 use Tester\Assert;
 
 
diff --git a/tests/Storages/NewMemcached.files.phpt b/tests/Storages/NewMemcached.files.phpt
@@ -4,8 +4,8 @@
  * Test: Nette\Caching\Storages\NewMemcachedStorage files dependency test.
  */
 
-use Nette\Caching\Storages\NewMemcachedStorage;
 use Nette\Caching\Cache;
+use Nette\Caching\Storages\NewMemcachedStorage;
 use Tester\Assert;
 
 
diff --git a/tests/Storages/NewMemcached.priority.phpt b/tests/Storages/NewMemcached.priority.phpt
@@ -4,9 +4,9 @@
  * Test: Nette\Caching\Storages\NewMemcachedStorage priority test.
  */
 
+use Nette\Caching\Cache;
 use Nette\Caching\Storages\NewMemcachedStorage;
 use Nette\Caching\Storages\SQLiteJournal;
-use Nette\Caching\Cache;
 use Tester\Assert;
 
 
diff --git a/tests/Storages/NewMemcached.sliding.phpt b/tests/Storages/NewMemcached.sliding.phpt
@@ -4,8 +4,8 @@
  * Test: Nette\Caching\Storages\NewMemcachedStorage sliding expiration test.
  */
 
-use Nette\Caching\Storages\NewMemcachedStorage;
 use Nette\Caching\Cache;
+use Nette\Caching\Storages\NewMemcachedStorage;
 use Tester\Assert;
 
 
diff --git a/tests/Storages/NewMemcached.tags.phpt b/tests/Storages/NewMemcached.tags.phpt
@@ -4,9 +4,9 @@
  * Test: Nette\Caching\Storages\NewMemcachedStorage tags dependency test.
  */
 
+use Nette\Caching\Cache;
 use Nette\Caching\Storages\NewMemcachedStorage;
 use Nette\Caching\Storages\SQLiteJournal;
-use Nette\Caching\Cache;
 use Tester\Assert;
 
 
diff --git a/tests/Storages/SQLiteJournal.phpt b/tests/Storages/SQLiteJournal.phpt
@@ -18,13 +18,11 @@ if (!extension_loaded('pdo_sqlite')) {
 
 class SQLiteJournalTest extends IJournalTestCase
 {
-
 	public function createJournal()
 	{
 		static $id = 0;
 		return new SQLiteJournal(TEMP_DIR . '/sqlitejournal_' . ++$id . '.sqlite');
 	}
-
 }
 
 $test = new SQLiteJournalTest;
diff --git a/tests/Storages/SQLiteStorage.tags.phpt b/tests/Storages/SQLiteStorage.tags.phpt

Original file line number	Diff line number	Diff line change
`@@ -70,5 +70,4 @@ private function checkTempDir($dir)`
`70`	`70`	`rmdir("$dir/$uniq");`
`71`	`71`	`return $isWritable;`
`72`	`72`	`}`
`73`		`-`
`74`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,9 @@`
`7`	`7`
`8`	`8`	`namespace Nette\Bridges\CacheLatte;`
`9`	`9`
	`10`	`+use Latte;`
`10`	`11`	`use Nette;`
`11`	`12`	`use Nette\Caching\Cache;`
`12`		`-use Latte;`
`13`	`13`
`14`	`14`
`15`	`15`	`/**`
`@@ -139,5 +139,4 @@ public static function endCache(&$parents, array $args = NULL)`
`139`	`139`	`$helper->end();`
`140`	`140`	`}`
`141`	`141`	`}`
`142`		`-`
`143`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -370,5 +370,4 @@ private static function checkFile($file, $time)`
`370`	`370`	`{`
`371`	`371`	`return @filemtime($file) == $time; // @ - stat may fail`
`372`	`372`	`}`
`373`		`-`
`374`	`373`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,5 +20,4 @@ interface IBulkReader`
`20`	`20`	`* @return array key => value pairs, missing items are omitted`
`21`	`21`	`*/`
`22`	`22`	`function bulkRead(array $keys);`
`23`		`-`
`24`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,5 +49,4 @@ function remove($key);`
`49`	`49`	`* @return void`
`50`	`50`	`*/`
`51`	`51`	`function clean(array $conditions);`
`52`		`-`
`53`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,5 +47,4 @@ public function end(array $dependencies = NULL)`
`47`	`47`	`$this->cache->save($this->key, ob_get_flush(), (array) $dependencies + (array) $this->dependencies);`
`48`	`48`	`$this->cache = NULL;`
`49`	`49`	`}`
`50`		`-`
`51`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,5 +66,4 @@ public function remove($key)`
`66`	`66`	`public function clean(array $conditions)`
`67`	`67`	`{`
`68`	`68`	`}`
`69`		`-`
`70`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -399,5 +399,4 @@ private static function delete($file, $handle = NULL)`
`399`	`399`	`@unlink($file); // @ - file may not already exist`
`400`	`400`	`}`
`401`	`401`	`}`
`402`		`-`
`403`	`402`	`}`
Original file line number	Diff line number	Diff line change
`@@ -187,5 +187,4 @@ public function clean(array $conditions)`
`187`	`187`	`}`
`188`	`188`	`}`
`189`	`189`	`}`
`190`		`-`
`191`	`190`	`}`