updated tests

Author: oscarotero

CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [4.1.2] - Unreleased
+### Added
+- Added the `ignored_errors` settings to ignore some curls errors instead throw an exception [#355]
+
+### Fixed
+- Ignored linkedData errors [#356]
+
 ## [4.1.1] - 2020-04-24
 ### Added
 - Updated oembed endpoints from `oembed.com`
@@ -44,6 +51,9 @@ Full library refactoring.
 
 [#345]: https://github.com/oscarotero/Embed/issues/345
 [#346]: https://github.com/oscarotero/Embed/issues/346
+[#355]: https://github.com/oscarotero/Embed/issues/355
+[#356]: https://github.com/oscarotero/Embed/issues/356
 
+[4.1.2]: https://github.com/oscarotero/Embed/compare/v4.1.1...HEAD
 [4.1.1]: https://github.com/oscarotero/Embed/compare/v4.1.0...v4.1.1
 [4.1.0]: https://github.com/oscarotero/Embed/compare/v4.0.0...v4.1.0

README.md

@@ -316,7 +316,10 @@ use Embed\Http\Crawler;
 use Embed\Http\CurlClient;
 
 $client = new CurlClient();
-$client->setSettings(['cookies_path' => $cookies_path]);
+$client->setSettings([
+    'cookies_path' => $cookies_path,
+    'ignored_errors' => [18]
+]);
 
 $embed = new Embed(new Crawler($client));
 ```

src/Http/CurlDispatcher.php

@@ -18,6 +18,7 @@ final class CurlDispatcher
     private array $headers = [];
     private $body;
     private ?int $error = null;
+    private array $settings;
 
     /**
      * @return ResponseInterface[]
@@ -78,6 +79,7 @@ private function __construct(array $settings, RequestInterface $request)
     {
         $this->request = $request;
         $this->curl = curl_init((string) $request->getUri());
+        $this->settings = $settings;
 
         $cookies = $settings['cookies_path'] ?? str_replace('//', '/', sys_get_temp_dir().'/embed-cookies.txt');
 
@@ -140,6 +142,12 @@ private function exec(ResponseFactoryInterface $responseFactory): ResponseInterf
 
     private function error(string $message, int $code)
     {
+        $ignored = $this->settings['ignored_errors'] ?? null;
+
+        if ($ignored === true || (is_array($ignored) && in_array($code, $ignored))) {
+            return;
+        }
+
         throw new NetworkException($message, $code, $this->request);
     }
 

tests/cache/500px.com.photo-138251239-taganay-park-by-daniel-kordan.php

@@ -22,10 +22,10 @@
             'default-src \'self\' https:; base-uri \'self\'; block-all-mixed-content; child-src \'self\' https: blob:; connect-src \'self\' wss: https: blob:; font-src \'self\' data: https:; form-action \'self\' forms.hsforms.com www.facebook.com; frame-ancestors \'self\' app.optimizely.com *.eventbrite.com video214.com animoto.com; img-src \'self\' data: https: blob: android-webview-video-poster:; manifest-src \'self\'; media-src \'self\' https: data: blob:; object-src \'self\' www.paypalobjects.com d150hyw1dtprld.cloudfront.net; prefetch-src \'self\' https:; script-src \'self\' https: data: \'unsafe-inline\' \'unsafe-eval\'; style-src \'self\' https: \'unsafe-inline\'; upgrade-insecure-requests; worker-src \'self\' blob:; report-uri https://sentry.io/api/1401029/security/?sentry_key=b94ac67e5c014425a0fe8cb868528601'
         ],
         'date' => [
-            'Sat, 22 Feb 2020 23:46:43 GMT'
+            'Wed, 20 May 2020 17:53:09 GMT'
         ],
         'etag' => [
-            'W/"79b8b73f64cfcfd22eda671b8c3f384d"'
+            'W/"128c48bd9bf19eef7a2f498d8b3fd06f"'
         ],
         'referrer-policy' => [
             'origin-when-cross-origin'
@@ -43,7 +43,7 @@
             'web2-http.production.svc.cluster.local:8000/*'
         ],
         'x-envoy-upstream-service-time' => [
-            '242'
+            '209'
         ],
         'x-frame-options' => [
             'ALLOW-FROM https://app.optimizely.com'
@@ -52,10 +52,10 @@
             'none'
         ],
         'x-request-id' => [
-            '4c802b3885e00d2fa2e267ae3cca1bbb'
+            'f1a95949ccad0e42051f89bd3b309786'
         ],
         'x-runtime' => [
-            '0.240879'
+            '0.207826'
         ],
         'x-served-by' => [
             'nginx-ingress-controller-68b4bf9c-zn7p5'
@@ -67,19 +67,22 @@
             'Miss from cloudfront'
         ],
         'via' => [
-            '1.1 4a41a68aa92d1d4a548f11fe8c9bc79e.cloudfront.net (CloudFront)'
+            '1.1 950bb8c57b98d41ce5118fe9b4561e37.cloudfront.net (CloudFront)'
         ],
         'x-amz-cf-pop' => [
             'MAD51-C1'
         ],
         'x-amz-cf-id' => [
-            'Jkm3d-rGX_dDqCI1kLNG3l4v4jnbJ111Tdck_sMW6nGtahW1egQM3g=='
+            'oWpBURK5bOSttReEaYL0aM8cnKzXafKw1O80S7RgyH_51EaiV0sHSA=='
         ],
         'Content-Location' => [
             'https://animoto.com/oembeds/create.json?automated=true&options=start_hq&url=https%3A%2F%2Fanimoto.com%2Fplay%2FGjsJ1gu0WDRfr4pGw12xZQ'
+        ],
+        'X-Request-Time' => [
+            '0.631 ms'
         ]
     ],
     'statusCode' => 200,
     'reasonPhrase' => 'OK',
-    'body' => '{"version":1.0,"provider_name":"Animoto","provider_url":"https://animoto.com/","type":"video","author_name":null,"title":"taco bell","description":"","thumbnail_url":"https://d2m23yiuv18ohn.cloudfront.net/Video/GjsJ1gu0WDRfr4pGw12xZQ/cover_648x360.jpg","thumbnail_height":360,"thumbnail_width":648,"icon_url":"https://d2m23yiuv18ohn.cloudfront.net/Video/GjsJ1gu0WDRfr4pGw12xZQ/cover_224x126.jpg","icon_height":54,"icon_width":54,"width":640,"height":360,"cache_age":604800,"video_url":"https://d150hyw1dtprld.cloudfront.net/swf/w.swf?w=swf/production/vp1&e=1582415203&f=GjsJ1gu0WDRfr4pGw12xZQ&d=0&m=b&r=360p&i=m&asset_domain=s3-p.animoto.com&animoto_domain=animoto.com&options=start_hq","html":"<iframe id=\\"vp1GjsJ1\\" title=\\"Video Player\\" width=\\"640\\" height=\\"360\\" frameborder=\\"0\\" src=\\"https://s3.amazonaws.com/embed.animoto.com/play.html?w=swf/production/vp1&e=1582415203&f=GjsJ1gu0WDRfr4pGw12xZQ&d=0&m=b&r=360p&i=m&asset_domain=s3-p.animoto.com&animoto_domain=animoto.com&options=start_hq\\" allowfullscreen></iframe>"}'
+    'body' => '{"version":1.0,"provider_name":"Animoto","provider_url":"https://animoto.com/","type":"video","author_name":null,"title":"taco bell","description":"","thumbnail_url":"https://d2m23yiuv18ohn.cloudfront.net/Video/GjsJ1gu0WDRfr4pGw12xZQ/cover_648x360.jpg","thumbnail_height":360,"thumbnail_width":648,"icon_url":"https://d2m23yiuv18ohn.cloudfront.net/Video/GjsJ1gu0WDRfr4pGw12xZQ/cover_224x126.jpg","icon_height":54,"icon_width":54,"width":640,"height":360,"cache_age":604800,"video_url":"https://d150hyw1dtprld.cloudfront.net/swf/w.swf?w=swf/production/vp1&e=1589997189&f=GjsJ1gu0WDRfr4pGw12xZQ&d=0&m=p&r=360p&i=m&asset_domain=s3-p.animoto.com&animoto_domain=animoto.com&options=start_hq","html":"<iframe id=\\"vp1GjsJ1\\" title=\\"Video Player\\" width=\\"640\\" height=\\"360\\" frameborder=\\"0\\" src=\\"https://s3.amazonaws.com/embed.animoto.com/play.html?w=swf/production/vp1&e=1589997189&f=GjsJ1gu0WDRfr4pGw12xZQ&d=0&m=p&r=360p&i=m&asset_domain=s3-p.animoto.com&animoto_domain=animoto.com&options=start_hq\\" allowfullscreen></iframe>"}'
 ];