@@ -112,64 +112,26 @@ public function processProjectPackages($directory)
112
112
$ finder = new Finder ();
113
113
$ finder ->files ()
114
114
->name ('composer.json ' )
115
+ ->contains ('drupal-console-library ' )
115
116
->in ($ directory );
116
117
117
118
foreach ($ finder as $ file ) {
118
- echo $ file ->getPathName () . PHP_EOL ;
119
+ $ this -> processComposerFile ( $ file ->getPathName ()) ;
119
120
}
120
121
}
121
122
122
123
/**
123
- * @param $directory
124
124
* @param $composerFile
125
125
*/
126
- public function processComposerFile ($ directory , $ composerFile )
126
+ private function processComposerFile ($ composerFile )
127
127
{
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 );
140
129
141
- $ packages = $ composerContent ['require ' ];
130
+ $ configFile = $ packageDirectory .'/console.config.yml ' ;
131
+ $ this ->addConfigFile ($ configFile );
142
132
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 );
173
135
}
174
136
175
137
/**
0 commit comments