codemasher / wildstar-database

src/WSDBException.php

Spacing +1 added lines, -1 removed lines

@@ -12,4 +12,4 @@
 
 namespace codemasher\WildstarDB;
 
-class WSDBException extends \Exception{}
+class WSDBException extends \Exception {}

src/includes.php

Spacing +1 added lines, -1 removed lines

@@ -9,6 +9,6 @@
 
 namespace codemasher\WildstarDB;
 
-if(!defined('WSDB_FUNCTIONS')){
+if (!defined('WSDB_FUNCTIONS')) {
 	require_once __DIR__.'/functions.php';
 }

src/functions.php

Spacing +12 added lines, -12 removed lines

@@ -19,15 +19,15 @@ 
  *
  * @return array|string|false
  */
-function uint32($i, bool $endianness = null){
+function uint32($i, bool $endianness = null) {
 
-	if($endianness === true){ // big-endian
+	if ($endianness === true) { // big-endian
 		$f = 'N';
 	}
-	elseif($endianness === false){ // little-endian
+	elseif ($endianness === false) { // little-endian
 		$f = 'V';
 	}
-	else{ // machine byte order
+	else { // machine byte order
 		$f = 'L';
 	}
 
@@ -42,15 +42,15 @@ 
  *
  * @return array|string|false
  */
-function uint64($i, bool $endianness = null){
+function uint64($i, bool $endianness = null) {
 
-	if($endianness === true){ // big-endian
+	if ($endianness === true) { // big-endian
 		$f = 'J';
 	}
-	elseif($endianness === false){ // little-endian
+	elseif ($endianness === false) { // little-endian
 		$f = 'P';
 	}
-	else{ // machine byte order
+	else { // machine byte order
 		$f = 'Q';
 	}
 
@@ -65,15 +65,15 @@ 
  *
  * @return array|string|false
  */
-function float($i, bool $endianness = null){
+function float($i, bool $endianness = null) {
 
-	if($endianness === true){ // big-endian
+	if ($endianness === true) { // big-endian
 		$f = 'G';
 	}
-	elseif($endianness === false){ // little-endian
+	elseif ($endianness === false) { // little-endian
 		$f = 'g';
 	}
-	else{ // machine byte order
+	else { // machine byte order
 		$f = 'f';
 	}
 

cli/common-cli.php

Spacing +2 added lines, -2 removed lines

@@ -35,9 +35,9 @@
 	'password' => $env->DB_PASSWORD,
 ];
 
-$logger = new class() extends AbstractLogger{
+$logger = new class() extends AbstractLogger {
 
-	public function log($level, $message, array $context = []){
+	public function log($level, $message, array $context = []) {
 		echo sprintf('[%s][%s] %s', date('Y-m-d H:i:s'), substr($level, 0, 4), trim($message))."\n";
 	}
 

cli/map-build.php

Spacing +9 added lines, -9 removed lines

@@ -45,10 +45,10 @@ 
 
 $outpath = __DIR__.'/maps';
 
-foreach(new DirectoryIterator($wildstar_path.'/Patch/ClientData/Map') as $dir){
+foreach (new DirectoryIterator($wildstar_path.'/Patch/ClientData/Map') as $dir) {
 	$map = $dir->getFilename();
 
-	if(!$dir->isDir() || $dir->isDot() || (!empty($include_maps) && !in_array($map, $include_maps))){
+	if (!$dir->isDir() || $dir->isDot() || (!empty($include_maps) && !in_array($map, $include_maps))) {
 		continue;
 	}
 
@@ -58,9 +58,9 @@ 
 	$xmax     = 0;
 	$ymax     = 0;
 
-	foreach(new DirectoryIterator($dir->getPathname()) as $file){
+	foreach (new DirectoryIterator($dir->getPathname()) as $file) {
 
-		if($file->getExtension() !== 'bmp'){
+		if ($file->getExtension() !== 'bmp') {
 			continue;
 		}
 
@@ -69,14 +69,14 @@ 
 		$y   = hexdec($hex[0]);
 
 		// exclude some empty tiles to not exaggerate map/image size
-		if(
+		if (
 			($map === 'Eastern' && $y < 3)
 			|| ($map === 'AdventureMalgrave' && ($x > 80 || $y < 65))
 			|| ($map === 'NewCentral' && ($x > 80 || $y < 3))
 			|| ($map === 'MordechaiReturns' && $y < 6)
 			|| (in_array($map, ['Western', 'AdventureLevianBay']) && ($x > 74 || $y < 46 || $y > 74))
 			|| ($map === 'HalonRingNew' && ($x > 56 || $y > 66))
-		){
+		) {
 			continue;
 		}
 
@@ -88,7 +88,7 @@ 
 		$textures[$y][$x] = $file->getRealPath();
 	}
 
-	if(empty($textures)){
+	if (empty($textures)) {
 		continue;
 	}
 
@@ -96,8 +96,8 @@ 
 	$im->newImage(($xmax - $xmin + 1) * 512, ($ymax - $ymin + 1) * 512, '#757575');
 	$im->setImageFormat('png');
 
-	foreach($textures as $y => $col){
-		foreach($col as $x => $file){
+	foreach ($textures as $y => $col) {
+		foreach ($col as $x => $file) {
 			$im->compositeImage(new Imagick($file), Imagick::COMPOSITE_OVER, ($x - $xmin) * 512, ($y - $ymin) * 512);
 			$logger->info($file);
 		}

cli/map-tile.php

Spacing +3 added lines, -3 removed lines

@@ -66,15 +66,15 @@
 $optimizer = (new OptimizerFactory($optimizer_settings, $logger))->get($tilerOptions->tile_format);
 $map_tiler = new Imagetiler($tilerOptions, $optimizer, $logger);
 
-foreach($maps as $mapdir => $map){
+foreach ($maps as $mapdir => $map) {
 
-	try{
+	try {
 		$map_tiler->process(
 			__DIR__.'/maps/'.$map,
 			__DIR__.'/../public/tiles/'.$mapdir
 		);
 	}
-	catch(ImagetilerException $e){
+	catch (ImagetilerException $e) {
 		echo $e->getMessage();
 		echo $e->getTraceAsString();
 	}

src/Archive/Extractor.php

Spacing +19 added lines, -19 removed lines

@@ -34,7 +34,7 @@ 
 
 use const DIRECTORY_SEPARATOR;
 
-class Extractor implements LoggerAwareInterface{
+class Extractor implements LoggerAwareInterface {
 	use LoggerAwareTrait;
 
 	public const ARCHIVES = ['ClientData', 'ClientDataDE', 'ClientDataEN', 'ClientDataFR'];
@@ -61,9 +61,9 @@ 
 	 *
 	 * @throws \codemasher\WildstarDB\WSDBException
 	 */
-	public function __construct(LoggerInterface $logger){
+	public function __construct(LoggerInterface $logger) {
 
-		if(!extension_loaded('xz')){
+		if (!extension_loaded('xz')) {
 			throw new WSDBException('required extension xz missing!');
 		}
 
@@ -84,7 +84,7 @@ 
 	public function open(string $index):Extractor{
 		$this->archivename = str_replace(['.index', '.archive'], '', basename($index));
 
-		if(!in_array($this->archivename, $this::ARCHIVES)){
+		if (!in_array($this->archivename, $this::ARCHIVES)) {
 			throw new WSDBException('invalid archive file (Steam Wildstar not supported)');
 		}
 
@@ -106,14 +106,14 @@ 
 		$this->destination = rtrim($destination ?? $this->archivepath, '\\/');
 
 		// does the destination parent exist?
-		if(!$this->destination || !file_exists(dirname($this->destination))){
+		if (!$this->destination || !file_exists(dirname($this->destination))) {
 			throw new WSDBException('invalid destination: '.$this->destination);
 		}
 
 		// destination does not exist?
-		if(!file_exists($this->destination)){
+		if (!file_exists($this->destination)) {
 			// is the parent writable?
-			if(!is_writable(dirname($this->destination))){
+			if (!is_writable(dirname($this->destination))) {
 				throw new WSDBException('destination parent is not writable');
 			}
 			// create it
@@ -121,13 +121,13 @@ 
 		}
 
 		// destination exists but isn't writable?
-		if(!is_writable($this->destination)){
+		if (!is_writable($this->destination)) {
 			throw new WSDBException('destination is not writable');
 		}
 
 		$this->warnings = [];
 
-		foreach($this->AIDX->data as $item){
+		foreach ($this->AIDX->data as $item) {
 			$this->read($item);
 		}
 
@@ -141,11 +141,11 @@ 
 	 */
 	protected function read(ItemAbstract $item):void{
 
-		if($item instanceof Directory){
+		if ($item instanceof Directory) {
 
-			foreach($item->Content as $dir){
+			foreach ($item->Content as $dir) {
 
-				if(!file_exists($this->destination.$dir->Parent)){
+				if (!file_exists($this->destination.$dir->Parent)) {
 					mkdir($this->destination.$dir->Parent, 0777, true);
 				}
 
@@ -167,7 +167,7 @@ 
 	protected function extractFile(File $file):void{
 		$dest = $this->destination.$file->Parent.$file->Name;
 
-		if(file_exists($dest)){ // @todo: overwrite option
+		if (file_exists($dest)) { // @todo: overwrite option
 			$this->logger->notice('file already exists: '.$dest);
 
 			return;
@@ -179,12 +179,12 @@ 
 			$this->getContent($file, $block['Offset'], $block['Size'])
 		);
 
-		if($bytesWritten === false){
+		if ($bytesWritten === false) {
 #			$this->errors[$file->Hash] = $file;
 			$this->logger->error('error writing '.$dest);
 
 		}
-		elseif($bytesWritten !== $file->SizeUncompressed){
+		elseif ($bytesWritten !== $file->SizeUncompressed) {
 #			$this->warnings[$file->Hash] = $file;
 			// throw new WSDBException
 			$this->logger->warning(
@@ -211,20 +211,20 @@ 
 		fclose($fh);
 
 		// hash the read data
-		if(sha1($content) !== $file->Hash){
+		if (sha1($content) !== $file->Hash) {
 			throw new WSDBException(
 				sprintf('corrupt data, invalid hash: %1$s (expected %2$s for %3$s)', sha1($content), $file->Hash, $file->Name)
 			);
 		}
 
 		// $Flags is supposed to be a bitmask
-		if($file->Flags === 1){ // no compression
+		if ($file->Flags === 1) { // no compression
 			return $content;
 		}
-		elseif($file->Flags === 3){ // deflate (probably unsed)
+		elseif ($file->Flags === 3) { // deflate (probably unsed)
 			return gzinflate($content);
 		}
-		elseif($file->Flags === 5){ // lzma (requires ext-xz)
+		elseif ($file->Flags === 5) { // lzma (requires ext-xz)
 			// https://bitbucket.org/mugadr_m/wildstar-studio/issues/23
 			return xzdecode(substr($content, 0, 5).pack('Q', $file->SizeUncompressed).substr($content, 5));
 		}

src/Archive/LTEXReader.php

Spacing +6 added lines, -6 removed lines

@@ -24,7 +24,7 @@ 
 /**
  * @property string $prettyname
  */
-final class LTEXReader extends ReaderAbstract{
+final class LTEXReader extends ReaderAbstract {
 
 	// https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-lcid/a9eac961-e77d-41a6-90a5-ce1a8b0cdb9c
 	private const LCID = [
@@ -56,7 +56,7 @@ 
 	public function read(string $filename):ReaderInterface{
 		$this->loadFile($filename);
 
-		if($this->header['Signature'] !== "\x58\x45\x54\x4c"){ // XETL
+		if ($this->header['Signature'] !== "\x58\x45\x54\x4c") { // XETL
 			throw new WSDBException('invalid LTEX');
 		}
 
@@ -65,7 +65,7 @@ 
 		$this->prettyname = $this->decodeString(fread($this->fh, $this->header['LongNameStringLength'] * 2));
 		$this->name       = 'LocalizedText_'.$this::LCID[$this->header['LCID']];
 		$this->cols       = [
-			['name' => 'ID',            'header' => ['DataType' =>   3]],
+			['name' => 'ID', 'header' => ['DataType' =>   3]],
 			['name' => 'LocalizedText', 'header' => ['DataType' => 130]],
 		];
 
@@ -84,7 +84,7 @@ 
 
 		$this->data = array_fill(0, $this->header['EntryCount'], null);
 
-		foreach($this->data as $i => $_){
+		foreach ($this->data as $i => $_) {
 			// get the id and offset for the data block
 			$c = unpack('Lid/Loffset', fread($this->fh, 8));
 			// save the current position
@@ -95,11 +95,11 @@ 
 
 			$v = '';
 			// read until we hit a double nul or the void
-			do{
+			do {
 				$s = fread($this->fh, 2);
 				$v .= $s;
 			}
-			while($s !== "\x00\x00" && $s !== '');
+			while ($s !== "\x00\x00" && $s !== '');
 
 			$this->data[$i] = ['ID' => $c['id'], 'LocalizedText' => $this->decodeString($v)];
 

src/Archive/ReaderInterface.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 
 use chillerlan\Database\Database;
 
-interface ReaderInterface{
+interface ReaderInterface {
 
 	/**
 	 * @param string $name