Merge remote-tracking branch 'origin/main'

Kallef Alexandre · Kallef Alexandre · commit e46e339d3510 · 2022-09-06T11:50:35.000-03:00
# Conflicts:
#	src/Elements/ManifestItem.php
diff --git a/src/Helpers/Str.php b/src/Helpers/Str.php
@@ -8,4 +8,4 @@ public static function slugify($text = null, $divider = '-'): string
     {
         return strtolower(trim(preg_replace('/[^A-Za-z0-9-]+/', $divider, $text)));
     }
-}
+}
diff --git a/src/Traits/AssetTrait.php b/src/Traits/AssetTrait.php
@@ -20,6 +20,7 @@ trait AssetTrait
     public function addCss(Css $css, string $relativePath = null): self
     {
         $this->appendCss($css, $relativePath);
+
         return $this;
     }
 
@@ -34,11 +35,11 @@ public function createCss(string $filename, string $relativePath = null): Css
     public function appendLink(File $file, string $rel = null, string $type = null, array $attributes = [], string $relativePath = null): self
     {
         $this->links[$file->getRealPath()] = [
-            'rel'          => $rel,
-            'type'         => $type,
-            'attributes'   => $attributes,
-            'file'         => $file,
-            'relativePath' => $relativePath
+            'rel' => $rel,
+            'type' => $type,
+            'attributes' => $attributes,
+            'file' => $file,
+            'relativePath' => $relativePath,
         ];
 
         return $this;
@@ -47,6 +48,7 @@ public function appendLink(File $file, string $rel = null, string $type = null,
     public function appendCss(Css $css, string $relativePath = null): self
     {
         $this->appendLink($css, 'stylesheet', 'text/css', [], $relativePath);
+
         return $this;
     }
 
diff --git a/tests/EpubTest.php b/tests/EpubTest.php
@@ -37,4 +37,4 @@ public function testMakeSimpleEpub(): void
 
         $this->assertIsString('');
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,4 @@ public static function slugify($text = null, $divider = '-'): string`
`8`	`8`	`{`
`9`	`9`	`return strtolower(trim(preg_replace('/[^A-Za-z0-9-]+/', $divider, $text)));`
`10`	`10`	`}`
`11`		`-}`
	`11`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ trait AssetTrait`
`20`	`20`	`public function addCss(Css $css, string $relativePath = null): self`
`21`	`21`	`{`
`22`	`22`	`$this->appendCss($css, $relativePath);`
	`23`	`+`
`23`	`24`	`return $this;`
`24`	`25`	`}`
`25`	`26`
`@@ -34,11 +35,11 @@ public function createCss(string $filename, string $relativePath = null): Css`
`34`	`35`	`public function appendLink(File $file, string $rel = null, string $type = null, array $attributes = [], string $relativePath = null): self`
`35`	`36`	`{`
`36`	`37`	`$this->links[$file->getRealPath()] = [`
`37`		`- 'rel' => $rel,`
`38`		`- 'type' => $type,`
`39`		`- 'attributes' => $attributes,`
`40`		`- 'file' => $file,`
`41`		`- 'relativePath' => $relativePath`
	`38`	`+ 'rel' => $rel,`
	`39`	`+ 'type' => $type,`
	`40`	`+ 'attributes' => $attributes,`
	`41`	`+ 'file' => $file,`
	`42`	`+ 'relativePath' => $relativePath,`
`42`	`43`	`];`
`43`	`44`
`44`	`45`	`return $this;`
`@@ -47,6 +48,7 @@ public function appendLink(File $file, string $rel = null, string $type = null,`
`47`	`48`	`public function appendCss(Css $css, string $relativePath = null): self`
`48`	`49`	`{`
`49`	`50`	`$this->appendLink($css, 'stylesheet', 'text/css', [], $relativePath);`
	`51`	`+`
`50`	`52`	`return $this;`
`51`	`53`	`}`
`52`	`54`
Original file line number	Diff line number	Diff line change
`@@ -37,4 +37,4 @@ public function testMakeSimpleEpub(): void`
`37`	`37`
`38`	`38`	`$this->assertIsString('');`
`39`	`39`	`}`
`40`		`-}`
	`40`	`+}`