Skip to content

Commit 4b15fc4

Browse files
committed
Remove duplicated services.
1 parent f1d3f76 commit 4b15fc4

2 files changed

Lines changed: 10 additions & 12 deletions

File tree

src/Extender.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public function processPackages(PackageEvent $event)
6767

6868
$configFile = $directory . '/extend.console.config.yml';
6969
$servicesFile = $directory . '/extend.console.services.yml';
70-
$servicesUnistallFile = $directory . '/extend.console.uninstall.services.yml';
70+
$servicesUninstallFile = $directory . '/extend.console.uninstall.services.yml';
7171

7272
if (file_exists($configFile)) {
7373
unlink($configFile);
@@ -79,9 +79,9 @@ public function processPackages(PackageEvent $event)
7979
$this->io->write('<info>Removing services cache file:</info>' . $servicesFile);
8080
}
8181

82-
if (file_exists($servicesUnistallFile)) {
83-
unlink($servicesUnistallFile);
84-
$this->io->write('<info>Removing services cache file:</info>' . $servicesUnistallFile);
82+
if (file_exists($servicesUninstallFile)) {
83+
unlink($servicesUninstallFile);
84+
$this->io->write('<info>Removing services cache file:</info>' . $servicesUninstallFile);
8585
}
8686

8787
if ($configData = $extenderManager->getConfigData()) {
@@ -104,10 +104,10 @@ public function processPackages(PackageEvent $event)
104104
$servicesData = $extenderManager->getServicesData();
105105
if ($servicesData && array_key_exists('uninstall', $servicesData)) {
106106
file_put_contents(
107-
$servicesUnistallFile,
107+
$servicesUninstallFile,
108108
Yaml::dump($servicesData['uninstall'], 4, 2)
109109
);
110-
$this->io->write('<info>Creating services cache file: </info>' . $servicesUnistallFile);
110+
$this->io->write('<info>Creating services cache file: </info>' . $servicesUninstallFile);
111111
}
112112
}
113113
}

src/ExtenderManager.php

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,13 @@ public function addServicesFile($servicesFile)
7070
$servicesData = $this->parseData($servicesFile);
7171
if ($this->isValidServicesData($servicesData)) {
7272
foreach ($servicesData['services'] as $key => $definition) {
73+
7374
if (!array_key_exists('tags', $definition)) {
7475
continue;
7576
}
77+
7678
$bootstrap = 'install';
79+
7780
foreach ($definition['tags'] as $tags) {
7881
if (!array_key_exists('name', $tags)) {
7982
continue;
@@ -84,12 +87,7 @@ public function addServicesFile($servicesFile)
8487
}
8588
}
8689

87-
$packageService[$bootstrap]['services'][$key] = $definition;
88-
89-
$this->servicesData = array_merge_recursive(
90-
$packageService,
91-
$this->servicesData
92-
);
90+
$this->servicesData[$bootstrap]['services'][$key] = $definition;
9391
}
9492
}
9593
}

0 commit comments

Comments
 (0)