codemasher / wildstar-database

src/AIDXReader.php

Spacing +8 added lines, -8 removed lines

@@ -17,7 +17,7 @@ 
 /**
  * @property array $dirs
  */
-class AIDXReader extends PACKReaderAbstract{
+class AIDXReader extends PACKReaderAbstract {
 
 	/** @var array */
 	protected $dirs;
@@ -33,7 +33,7 @@ 
 			\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');
 		}
 
@@ -62,12 +62,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 ArchiveDirectory(\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 ArchiveFile(
 				\unpack('LNameOffset/LFlags/QFiletime/QSizeUncompressed/QSizeCompressed/a20Hash/x4', \fread($this->fh, 56)),
 				$parent
@@ -82,17 +82,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);
 			}
 		}

src/AARCReader.php

Spacing +3 added lines, -3 removed lines

@@ -12,7 +12,7 @@ 
 
 namespace codemasher\WildstarDB;
 
-class AARCReader extends PACKReaderAbstract{
+class AARCReader extends PACKReaderAbstract {
 
 	/**
 	 * @throws \codemasher\WildstarDB\WSDBException
@@ -25,7 +25,7 @@ 
 			\fread($this->fh, 16)
 		);
 
-		if($rootInfo['ArchiveType'] !== "\x43\x52\x41\x41"){ // CRAA
+		if ($rootInfo['ArchiveType'] !== "\x43\x52\x41\x41") { // CRAA
 			throw new WSDBException('invalid AARC');
 		}
 
@@ -35,7 +35,7 @@ 
 		\fseek($this->fh, $blockInfo['Offset']);
 
 		// read the data block info (4+20+8 = 32 bytes)
-		for($i = 0; $i < $rootInfo['Blockcount']; $i++){
+		for ($i = 0; $i < $rootInfo['Blockcount']; $i++) {
 			$data = unpack('LIndex/a20Hash/QSizeCompressed', \fread($this->fh, 32));
 			$hash = \bin2hex($data['Hash']);
 			unset($data['Hash']);

src/ReaderAbstract.php

Spacing +20 added lines, -20 removed lines

@@ -78,9 +78,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');
 		}
 
@@ -90,9 +90,9 @@ 
 	/**
 	 * @return void
 	 */
-	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');
+	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');
 
 		$this->close();
 	}
@@ -102,7 +102,7 @@ 
 	 */
 	public function close():ReaderInterface{
 
-		if(\is_resource($this->fh)){
+		if (\is_resource($this->fh)) {
 			\fclose($this->fh);
 
 			$this->fh = null;
@@ -122,7 +122,7 @@ 
 	 *
 	 * @return mixed|null
 	 */
-	public function __get(string $name){
+	public function __get(string $name) {
 		return \property_exists($this, $name) && $name !== 'fh' ? $this->{$name} : null;
 	}
 
@@ -136,7 +136,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');
 		}
 
@@ -146,7 +146,7 @@ 
 
 		$this->logger->info('loading: '.$this->file);
 
-		if(\strlen($header) !== $this->headerSize){
+		if (\strlen($header) !== $this->headerSize) {
 			throw new WSDBException('cannot read header');
 		}
 
@@ -168,7 +168,7 @@ 
 	 */
 	protected function checkData():void{
 
-		if(empty($this->data)){
+		if (empty($this->data)) {
 			throw new WSDBException('empty data, run ReaderInterface::read() first');
 		}
 
@@ -183,7 +183,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');
 		}
 
@@ -203,7 +203,7 @@ 
 
 		$json = \json_encode($this->data, $jsonOptions);
 
-		if($file !== null){
+		if ($file !== null) {
 			$this->saveToFile($json, $file);
 		}
 
@@ -225,7 +225,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);
 		}
 
@@ -235,7 +235,7 @@ 
 
 		\fclose($mh);
 
-		if($file !== null){
+		if ($file !== null) {
 			$this->saveToFile($csv, $file);
 		}
 
@@ -255,10 +255,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']]);
@@ -268,7 +268,7 @@ 
 
 		$xml = $sxe->asXML();
 
-		if($file !== null){
+		if ($file !== null) {
 			$this->saveToFile($xml, $file);
 		}
 
@@ -288,9 +288,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;
@@ -304,7 +304,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/ArchiveExtractor.php

Braces +4 added lines, -8 removed lines

@@ -175,15 +175,12 @@ 
 		// $Flags is supposed to be a bitmask
 		if($file->Flags === 1){ // no compression
 			// nada
-		}
-		elseif($file->Flags === 3){ // deflate (probably unsed)
+		} elseif($file->Flags === 3){ // deflate (probably unsed)
 			$content = \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
 			$content = \xzdecode(\substr($content, 0, 5).\pack('Q', $file->SizeUncompressed).\substr($content, 5));
-		}
-		else{
+		} else{
 			throw new WSDBException('invalid file flag');
 		}
 
@@ -193,8 +190,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('size discrepancy for '.$dest.', expected '.$file->SizeUncompressed.' got '.$bytesWritten);

Spacing +20 added lines, -20 removed lines

@@ -20,7 +20,7 @@ 
 
 use Psr\Log\{LoggerAwareInterface, LoggerAwareTrait, LoggerInterface, NullLogger};
 
-class ArchiveExtractor implements LoggerAwareInterface{
+class ArchiveExtractor implements LoggerAwareInterface {
 	use LoggerAwareTrait;
 
 	public const ARCHIVES = ['ClientData', 'ClientDataDE', 'ClientDataEN', 'ClientDataFR'];
@@ -49,9 +49,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!');
 		}
 
@@ -70,7 +70,7 @@ 
 	public function open(string $index):ArchiveExtractor{
 		$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)');
 		}
 
@@ -92,14 +92,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
@@ -107,7 +107,7 @@ 
 		}
 
 		// destination exists but isn't writable?
-		if(!\is_writable($this->destination)){
+		if (!\is_writable($this->destination)) {
 			throw new WSDBException('destination is not writable');
 		}
 
@@ -115,7 +115,7 @@ 
 		$this->warnings = [];
 		$this->errors   = [];
 
-		foreach($this->AIDX->data as $item){
+		foreach ($this->AIDX->data as $item) {
 			$this->read($item);
 		}
 
@@ -131,12 +131,12 @@ 
 	 */
 	protected function read(ArchiveItemAbstract $item):void{
 
-		if($item instanceof ArchiveDirectory){
+		if ($item instanceof ArchiveDirectory) {
 
-			foreach($item->Content as $dir){
+			foreach ($item->Content as $dir) {
 				$dest = $this->destination.$dir->Parent;
 
-				if(!\file_exists($dest)){
+				if (!\file_exists($dest)) {
 					\mkdir($dest, 0777, true);
 				}
 
@@ -157,7 +157,7 @@ 
 	protected function extractFile(ArchiveFile $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;
 		}
@@ -169,33 +169,33 @@ 
 		$content = \fread($this->fh, $block['Size']);
 
 		// hash the read data
-		if(\sha1($content) !== $file->Hash){
+		if (\sha1($content) !== $file->Hash) {
 			throw new WSDBException('corrupt data, invalid hash: '.\sha1($content).' (expected '.$file->Hash.' for '.$file->Name.')');
 		}
 
 		// $Flags is supposed to be a bitmask
-		if($file->Flags === 1){ // no compression
+		if ($file->Flags === 1) { // no compression
 			// nada
 		}
-		elseif($file->Flags === 3){ // deflate (probably unsed)
+		elseif ($file->Flags === 3) { // deflate (probably unsed)
 			$content = \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
 			$content = \xzdecode(\substr($content, 0, 5).\pack('Q', $file->SizeUncompressed).\substr($content, 5));
 		}
-		else{
+		else {
 			throw new WSDBException('invalid file flag');
 		}
 
 		$bytesWritten = \file_put_contents($dest, $content);
 
-		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('size discrepancy for '.$dest.', expected '.$file->SizeUncompressed.' got '.$bytesWritten);