wip v8

mikerockett · Oct 15, 2023 · c89f247 · c89f247
1 parent 49f9696
commit c89f247
Show file tree

Hide file tree

Showing 16 changed files with 40 additions and 61 deletions.
diff --git a/src/Contracts/Factory.php b/src/Contracts/Factory.php
@@ -6,31 +6,22 @@
 
 use Illuminate\Contracts\Support\Renderable;
 use Symfony\Component\HttpFoundation\StreamedResponse;
-use WeasyPrint\Objects\{Config, Output, Source};
+use WeasyPrint\Objects\Config;
+use WeasyPrint\Objects\Output;
+use WeasyPrint\Objects\Source;
 
 interface Factory
 {
   public function getWeasyPrintVersion(): string;
-
   public function setConfig(Config $config): self;
-
   public function tapConfig(callable $callback): self;
-
   public function getConfig(): Config;
-
   public function prepareSource(Source|Renderable|string $source): self;
-
   public function getSource(): Source;
-
   public function addAttachment(string $pathToAttachment): Factory;
-
   public function build(): Output;
-
   public function download(string $filename, array $headers = [], bool $inline = false): StreamedResponse;
-
   public function inline(string $filename, array $headers = []): StreamedResponse;
-
   public function putFile(string $path, string $disk = null, array $options = []): bool;
-
   public function getData(): string;
 }
diff --git a/src/Objects/Config.php b/src/Objects/Config.php
@@ -5,7 +5,8 @@
 namespace WeasyPrint\Objects;
 
 use Illuminate\Contracts\Support\Arrayable;
-use WeasyPrint\Enums\{PDFVariant, PDFVersion};
+use WeasyPrint\Enums\PDFVariant;
+use WeasyPrint\Enums\PDFVersion;
 
 final class Config implements Arrayable
 {

diff --git a/src/Objects/Output.php b/src/Objects/Output.php
@@ -4,7 +4,8 @@
 
 namespace WeasyPrint\Objects;
 
-use Illuminate\Support\Facades\{Response, Storage};
+use Illuminate\Support\Facades\Response;
+use Illuminate\Support\Facades\Storage;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
 final class Output

diff --git a/src/Pipeline/Stages/EnsureSourceIsSet.php b/src/Pipeline/Stages/EnsureSourceIsSet.php
@@ -5,7 +5,8 @@
 namespace WeasyPrint\Pipeline\Stages;
 
 use WeasyPrint\Exceptions\SourceNotSetException;
-use WeasyPrint\Pipeline\{BuildStage, BuildTraveler};
+use WeasyPrint\Pipeline\BuildStage;
+use WeasyPrint\Pipeline\BuildTraveler;
 
 class EnsureSourceIsSet implements BuildStage
 {

diff --git a/src/Pipeline/Stages/Execute.php b/src/Pipeline/Stages/Execute.php
@@ -4,7 +4,8 @@
 
 namespace WeasyPrint\Pipeline\Stages;
 
-use WeasyPrint\Pipeline\{BuildStage, BuildTraveler};
+use WeasyPrint\Pipeline\BuildStage;
+use WeasyPrint\Pipeline\BuildTraveler;
 
 class Execute implements BuildStage
 {

diff --git a/src/Pipeline/Stages/PersistTemporaryInput.php b/src/Pipeline/Stages/PersistTemporaryInput.php
@@ -4,7 +4,8 @@
 
 namespace WeasyPrint\Pipeline\Stages;
 
-use WeasyPrint\Pipeline\{BuildStage, BuildTraveler};
+use WeasyPrint\Pipeline\BuildStage;
+use WeasyPrint\Pipeline\BuildTraveler;
 
 class PersistTemporaryInput implements BuildStage
 {

diff --git a/src/Pipeline/Stages/PrepareBuildCommand.php b/src/Pipeline/Stages/PrepareBuildCommand.php
@@ -5,7 +5,8 @@
 namespace WeasyPrint\Pipeline\Stages;
 
 use WeasyPrint\Commands\BuildCommand;
-use WeasyPrint\Pipeline\{BuildStage, BuildTraveler};
+use WeasyPrint\Pipeline\BuildStage;
+use WeasyPrint\Pipeline\BuildTraveler;
 
 class PrepareBuildCommand implements BuildStage
 {

diff --git a/src/Pipeline/Stages/PrepareOutput.php b/src/Pipeline/Stages/PrepareOutput.php
@@ -4,9 +4,11 @@
 
 namespace WeasyPrint\Pipeline\Stages;
 
-use WeasyPrint\Exceptions\{MissingOutputFileException, OutputReadFailedException};
+use WeasyPrint\Exceptions\MissingOutputFileException;
+use WeasyPrint\Exceptions\OutputReadFailedException;
 use WeasyPrint\Objects\Output;
-use WeasyPrint\Pipeline\{BuildStage, BuildTraveler};
+use WeasyPrint\Pipeline\BuildStage;
+use WeasyPrint\Pipeline\BuildTraveler;
 
 class PrepareOutput implements BuildStage
 {

diff --git a/src/Pipeline/Stages/SetInputPath.php b/src/Pipeline/Stages/SetInputPath.php
@@ -4,7 +4,8 @@
 
 namespace WeasyPrint\Pipeline\Stages;
 
-use WeasyPrint\Pipeline\{BuildStage, BuildTraveler};
+use WeasyPrint\Pipeline\BuildStage;
+use WeasyPrint\Pipeline\BuildTraveler;
 
 class SetInputPath implements BuildStage
 {

diff --git a/src/Pipeline/Stages/SetOutputPath.php b/src/Pipeline/Stages/SetOutputPath.php
@@ -4,7 +4,8 @@
 
 namespace WeasyPrint\Pipeline\Stages;
 
-use WeasyPrint\Pipeline\{BuildStage, BuildTraveler};
+use WeasyPrint\Pipeline\BuildStage;
+use WeasyPrint\Pipeline\BuildTraveler;
 
 class SetOutputPath implements BuildStage
 {

diff --git a/src/Pipeline/Stages/UnlinkTemporaryInput.php b/src/Pipeline/Stages/UnlinkTemporaryInput.php
@@ -4,7 +4,8 @@
 
 namespace WeasyPrint\Pipeline\Stages;
 
-use WeasyPrint\Pipeline\{BuildStage, BuildTraveler};
+use WeasyPrint\Pipeline\BuildStage;
+use WeasyPrint\Pipeline\BuildTraveler;
 
 class UnlinkTemporaryInput implements BuildStage
 {

diff --git a/src/Service.php b/src/Service.php
@@ -12,8 +12,11 @@
 use WeasyPrint\Commands\VersionCommand;
 use WeasyPrint\Contracts\Factory;
 use WeasyPrint\Exceptions\MissingSourceException;
-use WeasyPrint\Objects\{Config, Output, Source};
-use WeasyPrint\Pipeline\{BuildTraveler, Stages as Pipes};
+use WeasyPrint\Objects\Config;
+use WeasyPrint\Objects\Output;
+use WeasyPrint\Objects\Source;
+use WeasyPrint\Pipeline\BuildTraveler;
+use WeasyPrint\Pipeline\Stages as Pipes;
 
 class Service implements Factory
 {

diff --git a/stout.json b/stout.json
@@ -1,36 +1,7 @@
 {
   "indent": "  ",
-  "preset": "psr12",
+  "preset": "per",
   "rules": {
-    "array_indentation": true,
-    "array_syntax": {
-      "syntax": "short"
-    },
-    "blank_line_between_import_groups": false,
-    "cast_spaces": true,
-    "class_attributes_separation": {
-      "elements": {
-        "case": "none",
-        "const": "none",
-        "method": "one",
-        "property": "only_if_meta",
-        "trait_import": "none"
-      }
-    },
-    "global_namespace_import": true,
-    "group_import": true,
-    "method_chaining_indentation": true,
-    "no_unused_imports": true,
-    "no_useless_else": true,
-    "ordered_class_elements": true,
-    "ordered_imports": true,
-    "ordered_interfaces": true,
-    "return_assignment": true,
-    "self_static_accessor": true,
-    "single_import_per_statement": false,
-    "single_line_empty_body": true,
-    "single_quote": true,
-    "ternary_to_null_coalescing": true,
-    "trailing_comma_in_multiline": true
+    "@PER-CS2.0": true
   }
 }
diff --git a/tests/ConfigTest.php b/tests/ConfigTest.php
@@ -3,7 +3,8 @@
 declare(strict_types=1);
 
 use Illuminate\Support\Env;
-use WeasyPrint\Enums\{PDFVariant, PDFVersion};
+use WeasyPrint\Enums\PDFVariant;
+use WeasyPrint\Enums\PDFVersion;
 use WeasyPrint\Objects\Config;
 use WeasyPrint\Service;
 
@@ -48,7 +49,7 @@
 });
 
 test('pdf variant can be set from environment', function (): void {
-  Env::getRepository()->set($key = 'WEASYPRINT_PDF_VARIANT', 'pdf/a-1b', );
+  Env::getRepository()->set($key = 'WEASYPRINT_PDF_VARIANT', 'pdf/a-1b');
 
   expect(PDFVariant::fromEnvironment($key))
     ->toEqual(PDFVariant::PDF_A_1B);
@@ -57,7 +58,7 @@
 });
 
 test('pdf version can be set from environment', function (): void {
-  Env::getRepository()->set($key = 'WEASYPRINT_PDF_VERSION', '1.7', );
+  Env::getRepository()->set($key = 'WEASYPRINT_PDF_VERSION', '1.7');
 
   expect(PDFVersion::fromEnvironment($key))
     ->toEqual(PDFVersion::VERSION_1_7);

diff --git a/tests/InstantiationTest.php b/tests/InstantiationTest.php
@@ -3,7 +3,8 @@
 declare(strict_types=1);
 
 use WeasyPrint\Contracts\Factory;
-use WeasyPrint\{Facade, Service};
+use WeasyPrint\Facade;
+use WeasyPrint\Service;
 
 test('can be instantiated via dependency injection', function (): void {
   expect($this->app->make(Factory::class))->toBeValidServiceInstance();

diff --git a/tests/OutputTest.php b/tests/OutputTest.php
@@ -3,7 +3,8 @@
 declare(strict_types=1);
 
 use Smalot\PdfParser\Parser;
-use Symfony\Component\HttpFoundation\{ResponseHeaderBag, StreamedResponse};
+use Symfony\Component\HttpFoundation\ResponseHeaderBag;
+use Symfony\Component\HttpFoundation\StreamedResponse;
 use WeasyPrint\Enums\PDFVersion;
 use WeasyPrint\Objects\Config;
 use WeasyPrint\Service;