codemasher / wildstar-database

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();
 	}

Braces +1 added lines, -2 removed lines

@@ -73,8 +73,7 @@
 			__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));
 		}

Braces +3 added lines, -6 removed lines

@@ -183,8 +183,7 @@ 
 #			$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(
@@ -220,11 +219,9 @@ 
 		// $Flags is supposed to be a bitmask
 		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

Indentation +2 added lines, -2 removed lines

@@ -39,8 +39,8 @@
 	 * @internal
 	 */
 	protected $FORMAT_HEADER = 'a4Signature/LVersion/LLanguage/LLCID/QTagNameStringLength/QTagNameStringPtr'.
-	                           '/QShortNameStringLength/QShortNameStringPtr/QLongNameStringLength/QLongNameStringPtr'.
-	                           '/QEntryCount/QEntryIndexPtr/QNameStoreLength/QNameStorePtr';
+							   '/QShortNameStringLength/QShortNameStringPtr/QLongNameStringLength/QLongNameStringPtr'.
+							   '/QEntryCount/QEntryIndexPtr/QNameStoreLength/QNameStorePtr';
 
 	/**
 	 * @var string

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/ReaderAbstract.php

Spacing +18 added lines, -18 removed lines

@@ -85,9 +85,9 @@ 
 	 *
 	 * @throws \codemasher\WildstarDB\WSDBException
 	 */
-	public function __construct(LoggerInterface $logger = null){
+	public function __construct(LoggerInterface $logger = null) {
 
-		if(PHP_INT_SIZE < 8){
+		if (PHP_INT_SIZE < 8) {
 			throw new WSDBException('64-bit PHP required');
 		}
 
@@ -97,7 +97,7 @@ 
 	/**
 	 * @return void
 	 */
-	public function __destruct(){
+	public function __destruct() {
 		$this->logger->info('memory usage: '.round(memory_get_usage(true) / 1048576, 3).'MB');
 		$this->logger->info('peak memory usage: '.round(memory_get_peak_usage(true) / 1048576, 3).'MB');
 
@@ -109,7 +109,7 @@ 
 	 */
 	public function close():ReaderInterface{
 
-		if(is_resource($this->fh)){
+		if (is_resource($this->fh)) {
 			fclose($this->fh);
 
 			$this->fh = null;
@@ -129,7 +129,7 @@ 
 	 *
 	 * @return mixed|null
 	 */
-	public function __get(string $name){
+	public function __get(string $name) {
 		return property_exists($this, $name) && $name !== 'fh' ? $this->{$name} : null;
 	}
 
@@ -143,7 +143,7 @@ 
 		$this->close();
 #		$filename = realpath($filename);
 
-		if(!$filename || !is_file($filename) || !is_readable($filename)){
+		if (!$filename || !is_file($filename) || !is_readable($filename)) {
 			throw new WSDBException('input file not readable');
 		}
 
@@ -153,7 +153,7 @@ 
 
 		$this->logger->info('loading: '.$this->file);
 
-		if(strlen($header) !== $this->headerSize){
+		if (strlen($header) !== $this->headerSize) {
 			throw new WSDBException('cannot read header');
 		}
 
@@ -175,7 +175,7 @@ 
 	 */
 	protected function checkData():void{
 
-		if(empty($this->data)){
+		if (empty($this->data)) {
 			throw new WSDBException('empty data, run ReaderInterface::read() first');
 		}
 
@@ -190,7 +190,7 @@ 
 	 */
 	protected function saveToFile(string $data, string $file):bool{
 
-		if(!is_writable(dirname($file))){
+		if (!is_writable(dirname($file))) {
 			throw new WSDBException('cannot write data to file: '.$file.', target directory is not writable');
 		}
 
@@ -209,7 +209,7 @@ 
 		$this->checkData();
 		$json = json_encode($this->data, $jsonOptions);
 
-		if($file !== null){
+		if ($file !== null) {
 			$this->saveToFile($json, $file);
 		}
 
@@ -231,7 +231,7 @@ 
 
 		fputcsv($mh, array_column($this->cols, 'name'), $delimiter, $enclosure, $escapeChar);
 
-		foreach($this->data as $row){
+		foreach ($this->data as $row) {
 			fputcsv($mh, array_values($row), $delimiter, $enclosure, $escapeChar);
 		}
 
@@ -241,7 +241,7 @@ 
 
 		fclose($mh);
 
-		if($file !== null){
+		if ($file !== null) {
 			$this->saveToFile($csv, $file);
 		}
 
@@ -261,10 +261,10 @@ 
 		$sxe   = new SimpleXMLElement('<?xml version="1.0" encoding="UTF-8"?><root></root>', LIBXML_BIGLINES);
 		$types = [3 => 'uint32', 4 => 'float', 11 => 'bool', 20 => 'uint64', 130 => 'string'];
 
-		foreach($this->data as $row){
+		foreach ($this->data as $row) {
 			$item = $sxe->addChild('item');
 
-			foreach(array_values($row) as $i => $value){
+			foreach (array_values($row) as $i => $value) {
 				$item
 					->addChild($this->cols[$i]['name'], $value)
 					->addAttribute('dataType', $types[$this->cols[$i]['header']['DataType']])
@@ -274,7 +274,7 @@ 
 
 		$xml = $sxe->asXML();
 
-		if($file !== null){
+		if ($file !== null) {
 			$this->saveToFile($xml, $file);
 		}
 
@@ -294,9 +294,9 @@ 
 			->ifNotExists()
 		;
 
-		foreach($this->cols as $i => $col){
+		foreach ($this->cols as $i => $col) {
 
-			switch($col['header']['DataType']){
+			switch ($col['header']['DataType']) {
 				case 3:   $createTable->int($col['name'], 10, null, null, 'UNSIGNED'); break;
 				case 4:   $createTable->decimal($col['name'], '7,3', 0); break;
 				case 11:  $createTable->field($col['name'], 'BOOLEAN'); break;
@@ -310,7 +310,7 @@ 
 
 		$createTable->query();
 
-		if(count($this->data) < 1){
+		if (count($this->data) < 1) {
 			$this->logger->notice('no records available for table '.$this->name);
 
 			return $this;

src/Archive/ItemAbstract.php

Spacing +3 added lines, -3 removed lines

@@ -12,7 +12,7 @@ 
 
 namespace codemasher\WildstarDB\Archive;
 
-abstract class ItemAbstract{
+abstract class ItemAbstract {
 
 	/** @var string */
 	public $Parent;
@@ -27,9 +27,9 @@ 
 	 * @param array  $data
 	 * @param string $parent
 	 */
-	public function __construct(array $data, string $parent){
+	public function __construct(array $data, string $parent) {
 
-		foreach($data as $property => $value){
+		foreach ($data as $property => $value) {
 			$this->{$property} = $value;
 		}
 

src/Archive/DTBLReader.php

Indentation +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 	 * @internal
 	 */
 	protected $FORMAT_HEADER = 'a4Signature/LVersion/QTableNameLength/x8/QRecordSize/QFieldCount/QDescriptionOffset'.
-	                           '/QRecordCount/QFullRecordSize/QEntryOffset/QNextId/QIDLookupOffset/x8';
+							   '/QRecordCount/QFullRecordSize/QEntryOffset/QNextId/QIDLookupOffset/x8';
 
 	/**
 	 * @var bool

Spacing +18 added lines, -18 removed lines

@@ -20,7 +20,7 @@ 
 use function array_fill, count, fread, fseek, ftell, round, substr, unpack;
 use function codemasher\WildstarDB\{float, uint32, uint64};
 
-final class DTBLReader extends ReaderAbstract{
+final class DTBLReader extends ReaderAbstract {
 
 	/**
 	 * @var string
@@ -56,14 +56,14 @@ 
 	public function read(string $filename):ReaderInterface{
 		$this->loadFile($filename);
 
-		if($this->header['Signature'] !== "\x4c\x42\x54\x44"){ // LBTD
+		if ($this->header['Signature'] !== "\x4c\x42\x54\x44") { // LBTD
 			throw new WSDBException('invalid DTBL');
 		}
 
 		$this->readColumnHeaders();
 		$this->readData();
 
-		if(count($this->data) !== $this->header['RecordCount']){
+		if (count($this->data) !== $this->header['RecordCount']) {
 			throw new WSDBException('invalid row count');
 		}
 
@@ -82,18 +82,18 @@ 
 		fseek($this->fh, $this->header['DescriptionOffset'] + $this->headerSize);
 
 		// read the column headers (4+4+8+2+2+4 = 24 bytes)
-		for($i = 0; $i < $this->header['FieldCount']; $i++){
+		for ($i = 0; $i < $this->header['FieldCount']; $i++) {
 			$this->cols[$i]['header'] = unpack('LNameLength/x4/QNameOffset/SDataType/x2/x4', fread($this->fh, 24));
 		}
 
 		$offset = $this->header['FieldCount'] * 24 + $this->header['DescriptionOffset'] + $this->headerSize;
 
-		if($this->header['FieldCount'] % 2){
+		if ($this->header['FieldCount'] % 2) {
 			$offset += 8;
 		}
 
 		// read the column names
-		foreach($this->cols as $i => $col){
+		foreach ($this->cols as $i => $col) {
 			fseek($this->fh, $offset + $col['header']['NameOffset']);
 
 			// column name (UTF-16LE: length *2)
@@ -113,16 +113,16 @@ 
 		$this->data = array_fill(0, $this->header['RecordCount'], null);
 
 		// read a row
-		foreach($this->data as $i => $_){
+		foreach ($this->data as $i => $_) {
 			$this->rowdata = fread($this->fh, $this->header['RecordSize']);
 			$this->pos     = 0;
 			$this->skip    = false;
 
 			// loop through the columns
-			foreach($this->cols as $c => $col){
+			foreach ($this->cols as $c => $col) {
 
 				// skip 4 bytes if the string offset is 0 (determined by $skip), the current type is string and the next isn't
-				if($this->skip === true && ($c > 0 && $this->cols[$c - 1]['header']['DataType'] === 130) && $col['header']['DataType'] !== 130){
+				if ($this->skip === true && ($c > 0 && $this->cols[$c - 1]['header']['DataType'] === 130) && $col['header']['DataType'] !== 130) {
 					$this->pos += 4;
 				}
 
@@ -130,7 +130,7 @@ 
 			}
 
 			// if we run into this, a horrible thing happened
-			if(count($this->data[$i]) !== $this->header['FieldCount']){
+			if (count($this->data[$i]) !== $this->header['FieldCount']) {
 				throw new WSDBException('invalid field count');
 			}
 
@@ -143,24 +143,24 @@ 
 	 *
 	 * @return int|float|string|null
 	 */
-	private function getValue(int $datatype){
+	private function getValue(int $datatype) {
 
-		switch($datatype){
+		switch ($datatype) {
 			case 3:  // uint32
 			case 11: // booleans (stored as uint32 0/1)
-				$v         = uint32(substr($this->rowdata, $this->pos, 4));
+				$v = uint32(substr($this->rowdata, $this->pos, 4));
 				$this->pos += 4;
 				break;
 			case 4:  // float
-				$v         = round(float(substr($this->rowdata, $this->pos, 4)), 3); // @todo: determine round precision
+				$v = round(float(substr($this->rowdata, $this->pos, 4)), 3); // @todo: determine round precision
 				$this->pos += 4;
 				break;
 			case 20: // uint64
-				$v         = uint64(substr($this->rowdata, $this->pos, 8));
+				$v = uint64(substr($this->rowdata, $this->pos, 8));
 				$this->pos += 8;
 				break;
 			case 130: // string (UTF-16LE)
-				$v         = $this->readString();
+				$v = $this->readString();
 				$this->pos += 8;
 				break;
 
@@ -183,11 +183,11 @@ 
 
 		$v = '';
 		// loop through the string until we hit 2 nul bytes or the void
-		do{
+		do {
 			$s = fread($this->fh, 2);
 			$v .= $s;
 		}
-		while($s !== "\x00\x00" && $s !== '');
+		while ($s !== "\x00\x00" && $s !== '');
 
 		fseek($this->fh, $p);
 

src/Archive/AIDXReader.php

Spacing +8 added lines, -8 removed lines

@@ -21,7 +21,7 @@ 
 /**
  * @property array $dirs
  */
-final class AIDXReader extends PACKReaderAbstract{
+final class AIDXReader extends PACKReaderAbstract {
 
 	private const AIDX_ROOT = 'a4ArchiveType/LVersion/LBuildnumber/LIndex';
 	private const AIDX_DATA = 'LNameOffset/LFlags/QFiletime/QSizeUncompressed/QSizeCompressed/a20Hash/x4';
@@ -37,7 +37,7 @@ 
 		// get the root info block of the AIDX file (4+4+4+4 = 16 bytes)
 		$rootInfo = unpack($this::AIDX_ROOT, fread($this->fh, 16));
 
-		if($rootInfo['ArchiveType'] !== "\x58\x44\x49\x41"){ // XDIA
+		if ($rootInfo['ArchiveType'] !== "\x58\x44\x49\x41") { // XDIA
 			throw new WSDBException('invalid AIDX');
 		}
 
@@ -66,12 +66,12 @@ 
 		$files = array_fill(0, $n['files'], null);
 
 		// create a directory object for each dir (4+4 = 8 bytes)
-		foreach($dirs as $i => $_){
+		foreach ($dirs as $i => $_) {
 			$dirs[$i] = new Directory(unpack('LNameOffset/LBlockIndex', fread($this->fh, 8)), $parent);
 		}
 
 		// create a file object for each file (4+4+8+8+8+20+4 = 56 bytes)
-		foreach($files as $i => $_){
+		foreach ($files as $i => $_) {
 			$files[$i] = new File(unpack($this::AIDX_DATA, fread($this->fh, 56)), $parent);
 		}
 
@@ -83,17 +83,17 @@ 
 		};
 
 		// apply the names to each object in the block
-		foreach($dirs as $i => $e){
+		foreach ($dirs as $i => $e) {
 			$dirs[$i]->Name = $getname($e);
 		}
 
-		foreach($files as $i => $e){
+		foreach ($files as $i => $e) {
 			$files[$i]->Name = $getname($e);
 		}
 
 		// loop through the directory stucture recursively and add the block data
-		foreach($dirs as $i => $info){
-			if(isset($this->blocktable[$info->BlockIndex])){
+		foreach ($dirs as $i => $info) {
+			if (isset($this->blocktable[$info->BlockIndex])) {
 				$dirs[$i]->Content = $this->getBlock($this->blocktable[$info->BlockIndex], $parent.$info->Name);
 			}
 		}