Skip to content

Commit 0bcb845

Browse files
authored
Update extend-extension-manager class. (#14)
1 parent 3eb2872 commit 0bcb845

File tree

2 files changed

+8
-51
lines changed

2 files changed

+8
-51
lines changed

src/Plugin/ScriptHandler.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,11 @@ public static function dump(Event $event)
2727
$directory = realpath(__DIR__.'/../../');
2828
$configFile = __DIR__.'/../../console.config.yml';
2929
$servicesFile = __DIR__.'/../../console.services.yml';
30-
$composerFile = __DIR__.'/../../composer.json';
3130

3231
$extendExtensionManager->addConfigFile($configFile);
3332
$extendExtensionManager->addServicesFile($servicesFile);
34-
$extendExtensionManager->processComposerFile($directory, $composerFile);
3533
$extendExtensionManager->processProjectPackages($directory);
3634

37-
// $packages = array_keys($event->getComposer()->getPackage()->getRequires());
38-
// $extendExtensionManager->processPackages($directory, $packages);
39-
4035
if ($configData = $extendExtensionManager->getConfigData()) {
4136
file_put_contents(
4237
$directory . '/extend.console.config.yml',

src/Utils/ExtendExtensionManager.php

Lines changed: 8 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -112,64 +112,26 @@ public function processProjectPackages($directory)
112112
$finder = new Finder();
113113
$finder->files()
114114
->name('composer.json')
115+
->contains('drupal-console-library')
115116
->in($directory);
116117

117118
foreach ($finder as $file) {
118-
echo $file->getPathName() . PHP_EOL;
119+
$this->processComposerFile($file->getPathName());
119120
}
120121
}
121122

122123
/**
123-
* @param $directory
124124
* @param $composerFile
125125
*/
126-
public function processComposerFile($directory, $composerFile)
126+
private function processComposerFile($composerFile)
127127
{
128-
if (!is_file($composerFile)) {
129-
return;
130-
}
131-
132-
$composerContent = json_decode(file_get_contents($composerFile), true);
133-
if (!$composerContent) {
134-
return;
135-
}
136-
137-
if (!array_key_exists('require', $composerContent)) {
138-
return;
139-
}
128+
$packageDirectory = dirname($composerFile);
140129

141-
$packages = $composerContent['require'];
130+
$configFile = $packageDirectory.'/console.config.yml';
131+
$this->addConfigFile($configFile);
142132

143-
if (!$packages) {
144-
return;
145-
}
146-
147-
$this->processPackages($directory, $packages);
148-
}
149-
150-
/**
151-
* @param $directory
152-
* @param $packages
153-
*/
154-
public function processPackages($directory, $packages)
155-
{
156-
foreach ($packages as $package) {
157-
$packageDirectory = $directory.'/vendor/'.$package;
158-
if (!is_dir($packageDirectory)) {
159-
continue;
160-
}
161-
162-
$composerFile = $packageDirectory.'/composer.json';
163-
if (!$this->isValidPackageType($composerFile)) {
164-
continue;
165-
}
166-
167-
$configFile = $packageDirectory.'/console.config.yml';
168-
$this->addConfigFile($configFile);
169-
170-
$servicesFile = $packageDirectory.'/console.services.yml';
171-
$this->addServicesFile($servicesFile);
172-
}
133+
$servicesFile = $packageDirectory.'/console.services.yml';
134+
$this->addServicesFile($servicesFile);
173135
}
174136

175137
/**

0 commit comments

Comments
 (0)