Merge pull request #394 from strarsis/php8-compat

oscarotero · web-flow · commit c678c21d591f · 2020-10-20T12:47:14.000+02:00
Rename match function for PHP 8 compatibility
diff --git a/src/Adapters/Archive/Detectors/Code.php b/src/Adapters/Archive/Detectors/Code.php
@@ -6,7 +6,7 @@
 use Embed\Detectors\Code as Detector;
 use Embed\EmbedCode;
 use function Embed\html;
-use function Embed\match;
+use function Embed\matchPath;
 
 class Code extends Detector
 {
@@ -15,7 +15,7 @@ public function detect(): ?EmbedCode
         $uri = $this->extractor->getUri();
         $path = $uri->getPath();
 
-        if (!match('/details/*', $path)) {
+        if (!matchPath('/details/*', $path)) {
             return null;
         }
 
diff --git a/src/Adapters/CadenaSer/Detectors/Code.php b/src/Adapters/CadenaSer/Detectors/Code.php
@@ -7,7 +7,7 @@
 use Embed\Detectors\Code as Detector;
 use Embed\EmbedCode;
 use function Embed\html;
-use function Embed\match;
+use function Embed\matchPath;
 
 class Code extends Detector
 {
@@ -21,7 +21,7 @@ private function fallback(): ?EmbedCode
     {
         $uri = $this->extractor->getUri();
 
-        if (!match('/audio/*', $uri->getPath())) {
+        if (!matchPath('/audio/*', $uri->getPath())) {
             return null;
         }
 
diff --git a/src/Adapters/Flickr/Detectors/Code.php b/src/Adapters/Flickr/Detectors/Code.php
@@ -7,7 +7,7 @@
 use Embed\Detectors\Code as Detector;
 use Embed\EmbedCode;
 use function Embed\html;
-use function Embed\match;
+use function Embed\matchPath;
 
 class Code extends Detector
 {
@@ -21,7 +21,7 @@ private function fallback(): ?EmbedCode
     {
         $uri = $this->extractor->getUri();
 
-        if (!match('/photos/*', $uri->getPath())) {
+        if (!matchPath('/photos/*', $uri->getPath())) {
             return null;
         }
 
diff --git a/src/Adapters/Github/Detectors/Code.php b/src/Adapters/Github/Detectors/Code.php
@@ -6,7 +6,7 @@
 use Embed\Detectors\Code as Detector;
 use Embed\EmbedCode;
 use function Embed\html;
-use function Embed\match;
+use function Embed\matchPath;
 
 class Code extends Detector
 {
@@ -21,7 +21,7 @@ private function fallback(): ?EmbedCode
         $uri = $this->extractor->getUri();
         $path = $uri->getPath();
 
-        if (!match('/*/*/blob/*', $path)) {
+        if (!matchPath('/*/*/blob/*', $path)) {
             return null;
         }
 
diff --git a/src/Adapters/ImageShack/Api.php b/src/Adapters/ImageShack/Api.php
@@ -5,7 +5,7 @@
 
 use function Embed\getDirectory;
 use Embed\HttpApiTrait;
-use function Embed\match;
+use function Embed\matchPath;
 
 class Api
 {
@@ -15,10 +15,10 @@ protected function fetchData(): array
     {
         $uri = $this->extractor->getUri();
 
-        if (!match('/i/*', $uri->getPath())) {
+        if (!matchPath('/i/*', $uri->getPath())) {
             $uri = $this->extractor->getRequest()->getUri();
 
-            if (!match('/i/*', $uri->getPath())) {
+            if (!matchPath('/i/*', $uri->getPath())) {
                 return [];
             }
         }
diff --git a/src/Adapters/Pinterest/Detectors/Code.php b/src/Adapters/Pinterest/Detectors/Code.php
@@ -6,7 +6,7 @@
 use Embed\Detectors\Code as Detector;
 use Embed\EmbedCode;
 use function Embed\html;
-use function Embed\match;
+use function Embed\matchPath;
 
 class Code extends Detector
 {
@@ -20,7 +20,7 @@ private function fallback(): ?EmbedCode
     {
         $uri = $this->extractor->getUri();
 
-        if (!match('/pin/*', $uri->getPath())) {
+        if (!matchPath('/pin/*', $uri->getPath())) {
             return null;
         }
 
diff --git a/src/Adapters/Sassmeister/Detectors/Code.php b/src/Adapters/Sassmeister/Detectors/Code.php
@@ -6,7 +6,7 @@
 use Embed\Detectors\Code as Detector;
 use Embed\EmbedCode;
 use function Embed\html;
-use function Embed\match;
+use function Embed\matchPath;
 
 class Code extends Detector
 {
@@ -20,7 +20,7 @@ private function fallback(): ?EmbedCode
     {
         $uri = $this->extractor->getUri();
 
-        if (!match('/gist/*', $uri->getPath())) {
+        if (!matchPath('/gist/*', $uri->getPath())) {
             return null;
         }
 
diff --git a/src/Adapters/Snipplr/Detectors/Code.php b/src/Adapters/Snipplr/Detectors/Code.php
@@ -6,7 +6,7 @@
 use Embed\Detectors\Code as Detector;
 use Embed\EmbedCode;
 use function Embed\html;
-use function Embed\match;
+use function Embed\matchPath;
 
 class Code extends Detector
 {
@@ -20,7 +20,7 @@ private function fallback(): ?EmbedCode
     {
         $uri = $this->extractor->getUri();
 
-        if (!match('/view/*', $uri->getPath())) {
+        if (!matchPath('/view/*', $uri->getPath())) {
             return null;
         }
 
diff --git a/src/Adapters/Wikipedia/Api.php b/src/Adapters/Wikipedia/Api.php
@@ -5,7 +5,7 @@
 
 use function Embed\getDirectory;
 use Embed\HttpApiTrait;
-use function Embed\match;
+use function Embed\matchPath;
 
 class Api
 {
@@ -15,7 +15,7 @@ protected function fetchData(): array
     {
         $uri = $this->extractor->getUri();
 
-        if (!match('/wiki/*', $uri->getPath())) {
+        if (!matchPath('/wiki/*', $uri->getPath())) {
             return [];
         }
 
diff --git a/src/Adapters/Youtube/Detectors/Feeds.php b/src/Adapters/Youtube/Detectors/Feeds.php
@@ -5,7 +5,7 @@
 
 use Embed\Detectors\Feeds as Detector;
 use function Embed\getDirectory;
-use function Embed\match;
+use function Embed\matchPath;
 use Psr\Http\Message\UriInterface;
 
 class Feeds extends Detector
@@ -23,7 +23,7 @@ private function fallback(): array
     {
         $uri = $this->extractor->getUri();
 
-        if (!match('/channel/*', $uri->getPath())) {
+        if (!matchPath('/channel/*', $uri->getPath())) {
             return [];
         }
 
diff --git a/src/functions.php b/src/functions.php
@@ -116,7 +116,7 @@ function cleanPath(string $path): string
     return $path;
 }
 
-function match(string $pattern, string $subject): bool
+function matchPath(string $pattern, string $subject): bool
 {
     $pattern = str_replace('\\*', '.*', preg_quote($pattern, '|'));
 

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`use Embed\Detectors\Code as Detector;`
`7`	`7`	`use Embed\EmbedCode;`
`8`	`8`	`use function Embed\html;`
`9`		`-use function Embed\match;`
	`9`	`+use function Embed\matchPath;`
`10`	`10`
`11`	`11`	`class Code extends Detector`
`12`	`12`	`{`
`@@ -15,7 +15,7 @@ public function detect(): ?EmbedCode`
`15`	`15`	`$uri = $this->extractor->getUri();`
`16`	`16`	`$path = $uri->getPath();`
`17`	`17`
`18`		`- if (!match('/details/*', $path)) {`
	`18`	`+ if (!matchPath('/details/*', $path)) {`
`19`	`19`	`return null;`
`20`	`20`	`}`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`use Embed\Detectors\Code as Detector;`
`8`	`8`	`use Embed\EmbedCode;`
`9`	`9`	`use function Embed\html;`
`10`		`-use function Embed\match;`
	`10`	`+use function Embed\matchPath;`
`11`	`11`
`12`	`12`	`class Code extends Detector`
`13`	`13`	`{`
`@@ -21,7 +21,7 @@ private function fallback(): ?EmbedCode`
`21`	`21`	`{`
`22`	`22`	`$uri = $this->extractor->getUri();`
`23`	`23`
`24`		`- if (!match('/audio/*', $uri->getPath())) {`
	`24`	`+ if (!matchPath('/audio/*', $uri->getPath())) {`
`25`	`25`	`return null;`
`26`	`26`	`}`
`27`	`27`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`use function Embed\getDirectory;`
`7`	`7`	`use Embed\HttpApiTrait;`
`8`		`-use function Embed\match;`
	`8`	`+use function Embed\matchPath;`
`9`	`9`
`10`	`10`	`class Api`
`11`	`11`	`{`
`@@ -15,10 +15,10 @@ protected function fetchData(): array`
`15`	`15`	`{`
`16`	`16`	`$uri = $this->extractor->getUri();`
`17`	`17`
`18`		`- if (!match('/i/*', $uri->getPath())) {`
	`18`	`+ if (!matchPath('/i/*', $uri->getPath())) {`
`19`	`19`	`$uri = $this->extractor->getRequest()->getUri();`
`20`	`20`
`21`		`- if (!match('/i/*', $uri->getPath())) {`
	`21`	`+ if (!matchPath('/i/*', $uri->getPath())) {`
`22`	`22`	`return [];`
`23`	`23`	`}`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`use Embed\Detectors\Feeds as Detector;`
`7`	`7`	`use function Embed\getDirectory;`
`8`		`-use function Embed\match;`
	`8`	`+use function Embed\matchPath;`
`9`	`9`	`use Psr\Http\Message\UriInterface;`
`10`	`10`
`11`	`11`	`class Feeds extends Detector`
`@@ -23,7 +23,7 @@ private function fallback(): array`
`23`	`23`	`{`
`24`	`24`	`$uri = $this->extractor->getUri();`
`25`	`25`
`26`		`- if (!match('/channel/*', $uri->getPath())) {`
	`26`	`+ if (!matchPath('/channel/*', $uri->getPath())) {`
`27`	`27`	`return [];`
`28`	`28`	`}`
`29`	`29`