BehaviorLocator looks in dev packages too

FXdSP · Mar 4, 2021 · 143b262 · 143b262
1 parent 394a6ce
commit 143b262
Show file tree

Hide file tree

Showing 4 changed files with 588 additions and 21 deletions.
diff --git a/src/Propel/Generator/Util/BehaviorLocator.php b/src/Propel/Generator/Util/BehaviorLocator.php
@@ -132,7 +132,7 @@ public function getBehaviors()
             if ($lock === null) {
                 $this->behaviors = [];
             } else {
-                $this->behaviors = $this->loadBehaviors($lock);
+                $this->behaviors = $this->loadBehaviorsFromLockFile($lock);
             }
 
             // find behavior in composer.json (useful when developing a behavior)
@@ -198,20 +198,23 @@ private function getCoreBehavior($name)
     }
 
     /**
-     * Finds all behaviors by parsing composer.lock file
+     * Finds all behaviors in composer.lock file
      *
      * @param \Symfony\Component\Finder\SplFileInfo $composerLock
      *
      * @return array
      */
-    private function loadBehaviors($composerLock)
+    private function loadBehaviorsFromLockFile(SplFileInfo $composerLock): array
     {
         $behaviors = [];
 
         $json = json_decode($composerLock->getContents(), true);
 
-        if (isset($json['packages'])) {
-            foreach ($json['packages'] as $package) {
+        foreach (['packages', 'packages-dev'] as $packageSectionName) {
+            if (!isset($json[$packageSectionName])) {
+                continue;
+            }
+            foreach ($json[$packageSectionName] as $package) {
                 $behavior = $this->loadBehavior($package);
 
                 if ($behavior !== null) {

diff --git a/tests/Fixtures/behavior-installer/composer.lock b/tests/Fixtures/behavior-installer/composer.lock
diff --git a/tests/Propel/Tests/Generator/Behavior/BehaviorLocatorTest.php b/tests/Propel/Tests/Generator/Behavior/BehaviorLocatorTest.php
@@ -34,32 +34,26 @@ protected function setUp(): void
      */
     public function testBehaviorLocatorWithComposerLock()
     {
-        $configOptions['propel']['paths']['composerDir'] = __DIR__ . '/../../../../Fixtures/behavior-installer';
-        $config = new QuickGeneratorConfig($configOptions);
-        $locator = new BehaviorLocator($config);
-
-        // test found behaviors
+        $locator = $this->getLocatorForLocation(__DIR__ . '/../../../../Fixtures/behavior-installer');
         $behaviors = $locator->getBehaviors();
-        $this->assertSame(1, count($behaviors));
 
-        $this->assertTrue(array_key_exists('l10n', $behaviors));
-        $this->assertSame('gossi/propel-l10n-behavior', $behaviors['l10n']['package']);
+        $this->assertCount(2, $behaviors);
 
-        // test class name
-        $this->assertSame('\\gossi\\propel\\behavior\\l10n\\L10nBehavior', $locator->getBehavior('l10n'));
+        $this->assertArrayHasKey('l10n', $behaviors);
+        $this->assertEquals('gossi/propel-l10n-behavior', $behaviors['l10n']['package']);
+        $this->assertEquals('\\gossi\\propel\\behavior\\l10n\\L10nBehavior', $locator->getBehavior('l10n'));
+
+        $this->assertArrayHasKey('le-dev-behavior', $behaviors);
     }
 
     /**
      * @return void
      */
     public function testBehaviorLocatorWithComposerJson()
     {
-        $configOptions['propel']['paths']['composerDir'] = __DIR__ . '/../../../../Fixtures/behavior-development';
-        $config = new QuickGeneratorConfig($configOptions);
-        $locator = new BehaviorLocator($config);
-
-        // test found behaviors
+        $locator = $this->getLocatorForLocation(__DIR__ . '/../../../../Fixtures/behavior-development');
         $behaviors = $locator->getBehaviors();
+
         $this->assertSame(1, count($behaviors));
 
         $this->assertTrue(array_key_exists('collection', $behaviors));
@@ -68,4 +62,30 @@ public function testBehaviorLocatorWithComposerJson()
         // test class name
         $this->assertSame('\\Propel\\Behavior\\Collection\\CollectionBehavior', $locator->getBehavior('collection'));
     }
+
+    /**
+     * @return void
+     */
+    public function testBehaviorLocatorSkipsMissingSectionsInLockfile()
+    {
+        $locator = $this->getLocatorForLocation(__DIR__ . '/../../Resources/dummy_composer_lock_without_packages-dev');
+        $behaviors = $locator->getBehaviors();
+
+        $this->assertIsArray($behaviors);
+        $this->assertCount(1, $behaviors);
+        $this->assertArrayHasKey('l10n', $behaviors);
+    }
+
+    /**
+     * @param string $composerDirPath
+     *
+     * @return \Propel\Generator\Util\BehaviorLocator behaviors
+     */
+    private function getLocatorForLocation(string $composerDirPath)
+    {
+        $configOptions['propel']['paths']['composerDir'] = $composerDirPath;
+        $config = new QuickGeneratorConfig($configOptions);
+
+        return new BehaviorLocator($config);
+    }
 }