@@ -369,7 +369,7 @@ discard block |
||
| 369 | 369 | case LIBXML_ERR_WARNING: |
| 370 | 370 | $return .= "Warning $error->code: "; |
| 371 | 371 | break; |
| 372 | - case LIBXML_ERR_ERROR: |
|
| 372 | + case LIBXML_ERR_ERROR: |
|
| 373 | 373 | $return .= "Error $error->code: "; |
| 374 | 374 | break; |
| 375 | 375 | case LIBXML_ERR_FATAL: |
@@ -378,8 +378,8 @@ discard block |
||
| 378 | 378 | } |
| 379 | 379 | |
| 380 | 380 | $return .= trim($error->message) . |
| 381 | - "\n Line: $error->line" . |
|
| 382 | - "\n Column: $error->column"; |
|
| 381 | + "\n Line: $error->line" . |
|
| 382 | + "\n Column: $error->column"; |
|
| 383 | 383 | |
| 384 | 384 | if ($error->file) { |
| 385 | 385 | $return .= "\n File: $error->file"; |
@@ -166,7 +166,7 @@ discard block |
||
| 166 | 166 | { |
| 167 | 167 | $ct_file = $this->ReadOpenXmlFile('[Content_Types].xml', 'object'); |
| 168 | 168 | |
| 169 | - if (! ($ct_file instanceof \Traversable)) { |
|
| 169 | + if (!($ct_file instanceof \Traversable)) { |
|
| 170 | 170 | throw new Exception('Cannot traverse through [Content_Types].xml.'); |
| 171 | 171 | } |
| 172 | 172 | |
@@ -182,7 +182,7 @@ discard block |
||
| 182 | 182 | |
| 183 | 183 | //if content type for jpg has not been set, add it to xml |
| 184 | 184 | // and save xml to file and add it to the archive |
| 185 | - if (! $ct_already_set) { |
|
| 185 | + if (!$ct_already_set) { |
|
| 186 | 186 | $sxe = $ct_file->addChild('Default'); |
| 187 | 187 | $sxe->addAttribute('Extension', $imageCt); |
| 188 | 188 | $sxe->addAttribute('ContentType', 'image/'.$imageCt); |
@@ -313,7 +313,7 @@ discard block |
||
| 313 | 313 | libxml_use_internal_errors(true); |
| 314 | 314 | $main_file = simplexml_load_string($this->word_doc); |
| 315 | 315 | |
| 316 | - if(gettype($main_file) == "object") |
|
| 316 | + if (gettype($main_file) == "object") |
|
| 317 | 317 | { |
| 318 | 318 | $this->Log('Merge Images into Template'); |
| 319 | 319 | |
@@ -362,8 +362,8 @@ discard block |
||
| 362 | 362 | */ |
| 363 | 363 | protected function display_xml_error($error, $xml) |
| 364 | 364 | { |
| 365 | - $return = $xml[$error->line - 1] . "\n"; |
|
| 366 | - $return .= str_repeat('-', $error->column) . "^\n"; |
|
| 365 | + $return = $xml[$error->line - 1]."\n"; |
|
| 366 | + $return .= str_repeat('-', $error->column)."^\n"; |
|
| 367 | 367 | |
| 368 | 368 | switch ($error->level) { |
| 369 | 369 | case LIBXML_ERR_WARNING: |
@@ -377,8 +377,8 @@ discard block |
||
| 377 | 377 | break; |
| 378 | 378 | } |
| 379 | 379 | |
| 380 | - $return .= trim($error->message) . |
|
| 381 | - "\n Line: $error->line" . |
|
| 380 | + $return .= trim($error->message). |
|
| 381 | + "\n Line: $error->line". |
|
| 382 | 382 | "\n Column: $error->column"; |
| 383 | 383 | |
| 384 | 384 | if ($error->file) { |
@@ -421,7 +421,7 @@ discard block |
||
| 421 | 421 | $valid = true; |
| 422 | 422 | |
| 423 | 423 | //TODO: create a better url validity check |
| 424 | - if (! trim(str_replace(['http', 'https', ':', ' '], '', $url)) || $url == str_replace('http', '', $url)) { |
|
| 424 | + if (!trim(str_replace(['http', 'https', ':', ' '], '', $url)) || $url == str_replace('http', '', $url)) { |
|
| 425 | 425 | $valid = false; |
| 426 | 426 | } |
| 427 | 427 | $mode = 'url'; |
@@ -444,7 +444,7 @@ discard block |
||
| 444 | 444 | $valid = true; |
| 445 | 445 | |
| 446 | 446 | //check if path starts with storage path |
| 447 | - if (! starts_with($path, storage_path())) { |
|
| 447 | + if (!starts_with($path, storage_path())) { |
|
| 448 | 448 | $valid = false; |
| 449 | 449 | } |
| 450 | 450 | $mode = 'path'; |
@@ -482,7 +482,7 @@ discard block |
||
| 482 | 482 | //wait until process is ready |
| 483 | 483 | } |
| 484 | 484 | // executes after the command finishes |
| 485 | - if (! $process->isSuccessful()) { |
|
| 485 | + if (!$process->isSuccessful()) { |
|
| 486 | 486 | throw new \Symfony\Component\Process\Exception\ProcessFailedException($process); |
| 487 | 487 | } else { |
| 488 | 488 | $path_parts = pathinfo($this->StoragePath($this->local_path.$this->template_file_name)); |
@@ -341,8 +341,7 @@ |
||
| 341 | 341 | } else { |
| 342 | 342 | throw new Exception('Cannot generate xml for word/document.xml.'); |
| 343 | 343 | } |
| 344 | - } |
|
| 345 | - else |
|
| 344 | + } else |
|
| 346 | 345 | { |
| 347 | 346 | $xmlerror = ''; |
| 348 | 347 | $errors = libxml_get_errors(); |