Skip to content

Commit ae2a766

Browse files
authored
[console] Remove site cache file. (#15)
1 parent b3a6161 commit ae2a766

File tree

1 file changed

+27
-29
lines changed

1 file changed

+27
-29
lines changed

src/Extender.php

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -89,25 +89,29 @@ public function processPackages(Event $event)
8989

9090
if (file_exists($configFile)) {
9191
unlink($configFile);
92-
$this->io->write('<info>Removing config cache file:</info>' . $configFile);
92+
$this->io->write('<info>Removing config cache file:</info>');
93+
$this->io->write($configFile);
9394
}
9495

9596
if (file_exists($servicesFile)) {
9697
unlink($servicesFile);
97-
$this->io->write('<info>Removing services cache file:</info>' . $servicesFile);
98+
$this->io->write('<info>Removing packages services cache file:</info>');
99+
$this->io->write($servicesFile);
98100
}
99101

100102
if (file_exists($servicesUninstallFile)) {
101103
unlink($servicesUninstallFile);
102-
$this->io->write('<info>Removing services cache file:</info>' . $servicesUninstallFile);
104+
$this->io->write('<info>Removing packages services cache file:</info>');
105+
$this->io->write($servicesUninstallFile);
103106
}
104107

105108
if ($configData = $extenderManager->getConfigData()) {
106109
file_put_contents(
107110
$configFile,
108111
Yaml::dump($configData, 6, 2)
109112
);
110-
$this->io->write('<info>Creating config cache file:</info>' . $configFile);
113+
$this->io->write('<info>Creating packages config cache file:</info>');
114+
$this->io->write($configFile);
111115
}
112116

113117
$servicesData = $extenderManager->getServicesData();
@@ -116,7 +120,8 @@ public function processPackages(Event $event)
116120
$servicesFile,
117121
Yaml::dump($servicesData['install'], 4, 2)
118122
);
119-
$this->io->write('<info>Creating services cache file: </info>' . $servicesFile);
123+
$this->io->write('<info>Creating packages services cache file: </info>');
124+
$this->io->write($servicesFile);
120125
}
121126

122127
$servicesData = $extenderManager->getServicesData();
@@ -125,36 +130,29 @@ public function processPackages(Event $event)
125130
$servicesUninstallFile,
126131
Yaml::dump($servicesData['uninstall'], 4, 2)
127132
);
128-
$this->io->write('<info>Creating services cache file: </info>' . $servicesUninstallFile);
133+
$this->io->write('<info>Creating packages services cache file: </info>');
134+
$this->io->write($servicesUninstallFile);
129135
}
130136

131-
$this->removeCacheFiles();
137+
$this->removeCacheFiles($directory);
132138
}
133139

134-
protected function removeCacheFiles()
140+
protected function removeCacheFiles($directory)
135141
{
136-
if (is_dir(getcwd().'/console/cache/')) {
137-
try {
138-
$finder = new Finder();
139-
$finder->files()
140-
->in(getcwd() . '/console/cache/')
141-
->ignoreUnreadableDirs();
142-
143-
foreach ($finder as $file) {
144-
unlink($file->getPathName());
145-
}
146-
147-
$finder->directories()
148-
->in(getcwd() . '/console/cache/')
149-
->ignoreUnreadableDirs();
150-
151-
foreach ($finder as $directory) {
152-
rmdir($directory);
153-
}
154-
155-
} catch (\InvalidArgumentException $argumentException) {
156-
$this->io->write('<info>Cache files can not be deleted</info>');
142+
try {
143+
$finder = new Finder();
144+
$finder->files()
145+
->in($directory)
146+
->name('*-console.services.yml')
147+
->ignoreUnreadableDirs();
148+
149+
foreach ($finder as $file) {
150+
$this->io->write('<info>Removing site services cache file:</info>');
151+
$this->io->write($file->getPathName());
152+
unlink($file->getPathName());
157153
}
154+
} catch (\InvalidArgumentException $argumentException) {
155+
$this->io->write('<info>Cache file can not be deleted</info>');
158156
}
159157
}
160158
}

0 commit comments

Comments
 (0)