Merge 4.x into 5.x

sonata-project · Jul 16, 2024 · 0e2c4a9 · 0e2c4a9
2 parents 5c406a0 + 01da961
commit 0e2c4a9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/rector.php b/rector.php
@@ -19,7 +19,6 @@
 
 use Rector\Config\RectorConfig;
 use Rector\Php70\Rector\FunctionLike\ExceptionHandlerTypehintRector;
-use Rector\PHPUnit\CodeQuality\Rector\Class_\AddSeeTestAnnotationRector;
 use Rector\PHPUnit\CodeQuality\Rector\Class_\PreferPHPUnitThisCallRector;
 use Rector\PHPUnit\Set\PHPUnitSetList;
 use Rector\Set\ValueObject\LevelSetList;
@@ -40,7 +39,6 @@
     $rectorConfig->importShortClasses(false);
     $rectorConfig->skip([
         ExceptionHandlerTypehintRector::class,
-        AddSeeTestAnnotationRector::class,
         PreferPHPUnitThisCallRector::class,
     ]);
 };
diff --git a/src/Provider/YouTubeProvider.php b/src/Provider/YouTubeProvider.php
@@ -259,13 +259,11 @@ private function fixBinaryContent(MediaInterface $media): void
             return;
         }
 
-        $isMatching = preg_match(
+        if (1 === preg_match(
             '{^(?:https?://)?(?:www\.)?(?:m\.)?(?:youtu\.be/|youtube\.com/(?:(?:watch)?\?(?:.*&)?v(?:i)?=|(?:embed|v|vi|user)/))(?<video_id>[^\#\?&\'>]+)}',
             $media->getBinaryContent(),
             $matches
-        );
-
-        if (false !== $isMatching) {
+        )) {
             $media->setBinaryContent($matches['video_id']);
         }
     }