@@ -89,25 +89,29 @@ public function processPackages(Event $event)
89
89
90
90
if (file_exists ($ configFile )) {
91
91
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 );
93
94
}
94
95
95
96
if (file_exists ($ servicesFile )) {
96
97
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 );
98
100
}
99
101
100
102
if (file_exists ($ servicesUninstallFile )) {
101
103
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 );
103
106
}
104
107
105
108
if ($ configData = $ extenderManager ->getConfigData ()) {
106
109
file_put_contents (
107
110
$ configFile ,
108
111
Yaml::dump ($ configData , 6 , 2 )
109
112
);
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 );
111
115
}
112
116
113
117
$ servicesData = $ extenderManager ->getServicesData ();
@@ -116,7 +120,8 @@ public function processPackages(Event $event)
116
120
$ servicesFile ,
117
121
Yaml::dump ($ servicesData ['install ' ], 4 , 2 )
118
122
);
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 );
120
125
}
121
126
122
127
$ servicesData = $ extenderManager ->getServicesData ();
@@ -125,36 +130,29 @@ public function processPackages(Event $event)
125
130
$ servicesUninstallFile ,
126
131
Yaml::dump ($ servicesData ['uninstall ' ], 4 , 2 )
127
132
);
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 );
129
135
}
130
136
131
- $ this ->removeCacheFiles ();
137
+ $ this ->removeCacheFiles ($ directory );
132
138
}
133
139
134
- protected function removeCacheFiles ()
140
+ protected function removeCacheFiles ($ directory )
135
141
{
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 ());
157
153
}
154
+ } catch (\InvalidArgumentException $ argumentException ) {
155
+ $ this ->io ->write ('<info>Cache file can not be deleted</info> ' );
158
156
}
159
157
}
160
158
}
0 commit comments