Commit 9d954ccd authored by catch's avatar catch
Browse files

Issue #3446381 by tim.plunkett, smustgrave, sarahjean: SDC's discovery has overly lenient regex 

(cherry picked from commit f1b4d8cc)
parent 6b3c7aa5

core/lib/Drupal/Core/Plugin/Discovery/DirectoryWithMetadataDiscovery.php

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ protected function getDirectoryIterator($directory): \RecursiveIteratorIterator 
      | \FilesystemIterator::SKIP_DOTS;

    $directory_iterator = new \RecursiveDirectoryIterator($directory, $flags);

    // Detect "my_component.component.yml".

    $regex = '/^([a-z0-9_-])+.component.yml$/i';

    $regex = '/^([a-z0-9_-])+\.component\.yml$/i';

    $filter = new RegexRecursiveFilterIterator($directory_iterator, $regex);

    return new \RecursiveIteratorIterator($filter, \RecursiveIteratorIterator::LEAVES_ONLY, $flags);

  }

core/modules/system/tests/modules/sdc_test_invalid/components/my-card-with-underscore/my-card-with-underscore_component.yml

0 → 100644
+2 −0
Original line number Diff line number Diff line 
something: else

not: 'a component'