codemasher / wildstar-database

examples/DTBL.php

Spacing +4 added lines, -4 removed lines

@@ -23,20 +23,20 @@
 $reader   = new DTBLReader($logger);
 $iterator = new RecursiveDirectoryIterator(__DIR__.'/tbl', FilesystemIterator::SKIP_DOTS);
 
-foreach(new RecursiveIteratorIterator($iterator) as $finfo){
+foreach (new RecursiveIteratorIterator($iterator) as $finfo) {
 
-	if($finfo->getExtension() !== 'tbl'){
+	if ($finfo->getExtension() !== 'tbl') {
 		$logger->notice($finfo->getFilename().' is probably not a DTBL');
 		continue;
 	}
 
-	try{
+	try {
 		$reader->read($finfo->getRealPath());
 		$reader->toDB($db);
 
 		$logger->info('success: '.$finfo->getFilename());
 	}
-	catch(\Exception $e){
+	catch (\Exception $e) {
 		$logger->error($finfo->getFilename().': '.$e->getMessage());
 	}
 

Braces +1 added lines, -2 removed lines

@@ -35,8 +35,7 @@
 		$reader->toDB($db);
 
 		$logger->info('success: '.$finfo->getFilename());
-	}
-	catch(\Exception $e){
+	} catch(\Exception $e){
 		$logger->error($finfo->getFilename().': '.$e->getMessage());
 	}
 

examples/common.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 	'minLogLevel' => 'info',
 ];
 
-$options = new class($o) extends SettingsContainerAbstract{
+$options = new class($o) extends SettingsContainerAbstract {
 	use DatabaseOptionsTrait, LogOptionsTrait;
 };
 

src/DTBLReader.php

Spacing +31 added lines, -31 removed lines

@@ -25,7 +25,7 @@ 
  * @property array  $cols
  * @property array  $data
  */
-class DTBLReader{
+class DTBLReader {
 	use LoggerAwareTrait;
 
 	protected const FORMAT_HEADER = 'a4Signature/LVersion/QTableNameLength/QUnknown1/QRecordSize/QFieldCount/QDescriptionOffset/QRecordCount/QFullRecordSize/QEntryOffset/QNextId/QIDLookupOffset/QUnknown2';
@@ -68,9 +68,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');
 		}
 
@@ -80,9 +80,9 @@ 
 	/**
 	 * @return void
 	 */
-	public function __destruct(){
+	public function __destruct() {
 
-		if(is_resource($this->fh)){
+		if (is_resource($this->fh)) {
 			fclose($this->fh);
 		}
 
@@ -93,7 +93,7 @@ 
 	 *
 	 * @return mixed|null
 	 */
-	public function __get(string $name){
+	public function __get(string $name) {
 		return property_exists($this, $name) && $name !== 'fh' ? $this->{$name} : null;
 	}
 
@@ -118,7 +118,7 @@ 
 		$this->cols = [];
 		$this->data = [];
 
-		if(strlen($header) !== 0x60){
+		if (strlen($header) !== 0x60) {
 			throw new WSDBException('cannot read DTBL header');
 		}
 
@@ -127,7 +127,7 @@ 
 		$this->logger->info('fields: '.$this->header['FieldCount'].', rows: '.$this->header['RecordCount']);
 
 
-		if($this->header['Signature'] !== "\x4c\x42\x54\x44"){ // LBTD
+		if ($this->header['Signature'] !== "\x4c\x42\x54\x44") { // LBTD
 			throw new WSDBException('invalid DTBL');
 		}
 
@@ -135,17 +135,17 @@ 
 
 		fseek($this->fh, $this->header['DescriptionOffset'] + 0x60);
 
-		for($i = 0; $i < $this->header['FieldCount']; $i++){
+		for ($i = 0; $i < $this->header['FieldCount']; $i++) {
 			$this->cols[$i]['header'] = unpack($this::FORMAT_COLUMN, fread($this->fh, 0x18));
 		}
 
 		$offset = $this->header['FieldCount'] * 0x18 + $this->header['DescriptionOffset'] + 0x60;
 
-		if($this->header['FieldCount'] % 2){
+		if ($this->header['FieldCount'] % 2) {
 			$offset += 8;
 		}
 
-		foreach($this->cols as $i => $col){
+		foreach ($this->cols as $i => $col) {
 			fseek($this->fh, $offset + $col['header']['NameOffset']);
 
 			$this->cols[$i]['name'] = $this->decodeString(fread($this->fh, $col['header']['NameLength'] * 2));
@@ -161,7 +161,7 @@ 
 	 */
 	public function read(string $dtbl):DTBLReader{
 
-		if(!is_file($dtbl) || !is_readable($dtbl)){
+		if (!is_file($dtbl) || !is_readable($dtbl)) {
 			throw new WSDBException('DTBL not readable');
 		}
 
@@ -173,19 +173,19 @@ 
 
 		fseek($this->fh, $offset);
 
-		for($i = 0; $i < $this->header['RecordCount']; $i++){
+		for ($i = 0; $i < $this->header['RecordCount']; $i++) {
 			$data = fread($this->fh, $this->header['RecordSize']);
 			$row  = [];
 			$j    = 0;
 			$skip = false;
 
-			foreach($this->cols as $c => $col){
+			foreach ($this->cols as $c => $col) {
 
-				if($skip === true && ($c > 0 && $this->cols[$c - 1]['header']['DataType'] === 130) && $col['header']['DataType'] !== 130){
+				if ($skip === true && ($c > 0 && $this->cols[$c - 1]['header']['DataType'] === 130) && $col['header']['DataType'] !== 130) {
 					$j += 4;
 				}
 
-				switch($col['header']['DataType']){
+				switch ($col['header']['DataType']) {
 					case 3:  // uint32
 					case 11: // booleans (stored as uint32 0/1)
 						$v = unpack('L', substr($data, $j, 4))[1]; $j += 4; break;
@@ -204,12 +204,12 @@ 
 							$j += 8;
 							$v = '';
 
-							do{
+							do {
 								$s = fread($this->fh, 2);
 
 								$v .= $s;
 							}
-							while($s !== "\x00\x00" && $s !== '');
+							while ($s !== "\x00\x00" && $s !== '');
 
 							$v = $this->decodeString($v);
 							fseek($this->fh, $p);
@@ -222,7 +222,7 @@ 
 				$row[$col['name']] = $v;
 			}
 
-			if(count($row) !== $this->header['FieldCount']){
+			if (count($row) !== $this->header['FieldCount']) {
 				throw new WSDBException('invalid field count');
 			}
 
@@ -231,7 +231,7 @@ 
 
 		fclose($this->fh);
 
-		if(count($this->data) !== $this->header['RecordCount']){
+		if (count($this->data) !== $this->header['RecordCount']) {
 			throw new WSDBException('invalid row count');
 		}
 
@@ -244,7 +244,7 @@ 
 	 */
 	protected function checkData():void{
 
-		if(empty($this->data)){
+		if (empty($this->data)) {
 			throw new WSDBException('empty data, run DTBLReader::read() first');
 		}
 
@@ -259,7 +259,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');
 		}
 
@@ -277,7 +277,7 @@ 
 
 		$json = json_encode($this->data, $jsonOptions);
 
-		if($file !== null){
+		if ($file !== null) {
 			$this->saveToFile($json, $file);
 		}
 
@@ -299,7 +299,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);
 		}
 
@@ -309,7 +309,7 @@ 
 
 		fclose($mh);
 
-		if($file !== null){
+		if ($file !== null) {
 			$this->saveToFile($csv, $file);
 		}
 
@@ -330,10 +330,10 @@ 
 
 		$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']]);
@@ -343,7 +343,7 @@ 
 
 		$xml = $sxe->asXML();
 
-		if($file !== null){
+		if ($file !== null) {
 			$this->saveToFile($xml, $file);
 		}
 
@@ -362,9 +362,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;
@@ -376,7 +376,7 @@ 
 
 		$createTable->query();
 
-		if(count($this->data) < 1){
+		if (count($this->data) < 1) {
 			$this->logger->notice('no records available for table '.$this->name);
 			return;
 		}

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 {}