Skip to content

Commit 75ada33

Browse files
kg-botkg-bot
authored
Merge pull request #20 from kg-bot/analysis-q1KZ3w
Apply fixes from StyleCI
2 parents 6da752e + e651d7d commit 75ada33

File tree

1 file changed

+72
-86
lines changed

1 file changed

+72
-86
lines changed

‎src/Classes/ExportLocalizations.php

Lines changed: 72 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class ExportLocalizations implements \JsonSerializable
3131
/**
3232
* @var string
3333
*/
34-
protected $excludePath = DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR;
34+
protected $excludePath = DIRECTORY_SEPARATOR.'vendor'.DIRECTORY_SEPARATOR;
3535

3636
/**
3737
* @var string
@@ -46,30 +46,30 @@ class ExportLocalizations implements \JsonSerializable
4646
public function export()
4747
{
4848
// Check if value is cached and set array to cached version
49-
if ( Cache::has( config( 'laravel-localization.caches.key' ) ) ) {
50-
$this->strings = Cache::get( config( 'laravel-localization.caches.key' ) );
49+
if (Cache::has(config('laravel-localization.caches.key'))) {
50+
$this->strings = Cache::get(config('laravel-localization.caches.key'));
5151

5252
return $this;
5353
}
5454

5555
// Collect language files and build array with translations
56-
$files = $this->findLanguageFiles( resource_path( 'lang' ) );
56+
$files = $this->findLanguageFiles(resource_path('lang'));
5757

5858
// Parse translations and create final array
59-
array_walk( $files[ 'lang' ], [ $this, 'parseLangFiles' ] );
60-
array_walk( $files[ 'vendor' ], [ $this, 'parseVendorFiles' ] );
61-
array_walk( $files[ 'json' ], [ $this, 'parseJsonFiles' ] );
59+
array_walk($files['lang'], [$this, 'parseLangFiles']);
60+
array_walk($files['vendor'], [$this, 'parseVendorFiles']);
61+
array_walk($files['json'], [$this, 'parseJsonFiles']);
6262

6363
// Trigger event for final translated array
64-
event( new LaravelLocalizationExported( $this->strings ) );
64+
event(new LaravelLocalizationExported($this->strings));
6565

6666
// If timeout > 0 save array to cache
67-
if ( config( 'laravel-localization.caches.timeout', 0 ) > 0 ) {
68-
Cache::store( config( 'laravel-localization.caches.driver', 'file' ) )
67+
if (config('laravel-localization.caches.timeout', 0) > 0) {
68+
Cache::store(config('laravel-localization.caches.driver', 'file'))
6969
->put(
70-
config( 'laravel-localization.caches.key', 'localization.array' ),
70+
config('laravel-localization.caches.key', 'localization.array'),
7171
$this->strings,
72-
config( 'laravel-localization.caches.timeout', 60 )
72+
config('laravel-localization.caches.timeout', 60)
7373
);
7474
}
7575

@@ -83,61 +83,58 @@ public function export()
8383
*
8484
* @return array
8585
*/
86-
protected function findLanguageFiles( $path )
86+
protected function findLanguageFiles($path)
8787
{
8888
// Loop through directories
89-
$dirIterator = new \RecursiveDirectoryIterator( $path, \RecursiveDirectoryIterator::SKIP_DOTS );
90-
$recIterator = new \RecursiveIteratorIterator( $dirIterator );
89+
$dirIterator = new \RecursiveDirectoryIterator($path, \RecursiveDirectoryIterator::SKIP_DOTS);
90+
$recIterator = new \RecursiveIteratorIterator($dirIterator);
9191

9292
// Fetch only php files - skip others
9393
$phpFiles = array_values(
94-
array_map( 'current',
94+
array_map('current',
9595
iterator_to_array(
96-
new \RegexIterator( $recIterator, $this->phpRegex, \RecursiveRegexIterator::GET_MATCH )
96+
new \RegexIterator($recIterator, $this->phpRegex, \RecursiveRegexIterator::GET_MATCH)
9797
)
9898
)
9999
);
100100

101101
$jsonFiles = array_values(
102-
array_map( 'current',
102+
array_map('current',
103103
iterator_to_array(
104-
new \RegexIterator( $recIterator, $this->jsonRegex, \RecursiveRegexIterator::GET_MATCH )
104+
new \RegexIterator($recIterator, $this->jsonRegex, \RecursiveRegexIterator::GET_MATCH)
105105
)
106106
)
107107
);
108108

109-
$files = array_merge( $phpFiles, $jsonFiles );
110-
109+
$files = array_merge($phpFiles, $jsonFiles);
111110

112111
// Sort array by filepath
113-
sort( $files );
112+
sort($files);
114113

115114
// Remove full path from items
116-
array_walk( $files, function ( &$item ) {
117-
$item = str_replace( resource_path( 'lang' ), '', $item );
118-
} );
115+
array_walk($files, function (&$item) {
116+
$item = str_replace(resource_path('lang'), '', $item);
117+
});
119118

120119
// Fetch non-vendor files from filtered php files
121-
$nonVendorFiles = array_filter( $files, function ( $file ) {
122-
return strpos( $file, $this->excludePath ) === false && strpos( $file, '.json' ) === false;
123-
} );
120+
$nonVendorFiles = array_filter($files, function ($file) {
121+
return strpos($file, $this->excludePath) === false && strpos($file, '.json') === false;
122+
});
124123

125124
// Fetch vendor files from filtered php files
126-
$vendorFiles = array_filter( array_diff( $files, $nonVendorFiles ), function ( $file ) {
127-
128-
return strpos( $file, 'json' ) === false;
129-
} );
125+
$vendorFiles = array_filter(array_diff($files, $nonVendorFiles), function ($file) {
126+
return strpos($file, 'json') === false;
127+
});
130128

131129
// Fetch .json files from filtered files
132-
$jsonFiles = array_filter( $files, function ( $file ) {
133-
return strpos( $file, '.json' ) !== false;
134-
} );
135-
130+
$jsonFiles = array_filter($files, function ($file) {
131+
return strpos($file, '.json') !== false;
132+
});
136133

137134
return [
138-
'lang' => array_values( $nonVendorFiles ),
139-
'vendor' => array_values( $vendorFiles ),
140-
'json' => array_values( $jsonFiles ),
135+
'lang' => array_values($nonVendorFiles),
136+
'vendor' => array_values($vendorFiles),
137+
'json' => array_values($jsonFiles),
141138
];
142139
}
143140

@@ -170,30 +167,22 @@ public function toArray()
170167
*
171168
* @return array
172169
*/
173-
public function toFlat( $prefix = '.' )
170+
public function toFlat($prefix = '.')
174171
{
175172
$results = [];
176-
foreach ( $this->strings as $lang => $strings ) {
177-
178-
if ( $lang !== 'json' ) {
179-
180-
foreach ( $strings as $lang_array => $lang_messages ) {
181-
$key = $lang . $prefix . $lang_array;
182-
$results[ $key ] = $lang_messages;
173+
foreach ($this->strings as $lang => $strings) {
174+
if ($lang !== 'json') {
175+
foreach ($strings as $lang_array => $lang_messages) {
176+
$key = $lang.$prefix.$lang_array;
177+
$results[$key] = $lang_messages;
183178
}
184-
185179
} else {
186-
187-
foreach ( $strings as $json_lang => $json_strings ) {
188-
189-
$key = $json_lang . $prefix . '__JSON__';
190-
if ( array_key_exists( $key, $results ) ) {
191-
192-
$results[ $key ] = $json_strings;
193-
180+
foreach ($strings as $json_lang => $json_strings) {
181+
$key = $json_lang.$prefix.'__JSON__';
182+
if (array_key_exists($key, $results)) {
183+
$results[$key] = $json_strings;
194184
} else {
195-
196-
$results[ $key ] = $json_strings;
185+
$results[$key] = $json_strings;
197186
}
198187
/*foreach ( $json_strings as $jsLang => $json_messages ) {
199188
$key = 'json' . $prefix . $json_lang . $prefix . $jsLang;
@@ -213,29 +202,29 @@ public function toFlat( $prefix = '.' )
213202
*/
214203
public function toCollection()
215204
{
216-
return collect( $this->strings );
205+
return collect($this->strings);
217206
}
218207

219208
/**
220209
* Method to parse language files.
221210
*
222211
* @param string $file
223212
*/
224-
protected function parseLangFiles( $file )
213+
protected function parseLangFiles($file)
225214
{
226215
// Base package name without file ending
227-
$packageName = basename( $file, '.php' );
216+
$packageName = basename($file, '.php');
228217

229218
// Get package, language and file contents from language file
230219
// /<language_code>/(<package/)<filename>.php
231-
$language = explode( DIRECTORY_SEPARATOR, $file )[ 1 ];
232-
$fileContents = require resource_path( 'lang' ) . DIRECTORY_SEPARATOR . $file;
220+
$language = explode(DIRECTORY_SEPARATOR, $file)[1];
221+
$fileContents = require resource_path('lang').DIRECTORY_SEPARATOR.$file;
233222

234223
// Check if language already exists in array
235-
if ( array_key_exists( $language, $this->strings ) ) {
236-
$this->strings[ $language ][ $packageName ] = $fileContents;
224+
if (array_key_exists($language, $this->strings)) {
225+
$this->strings[$language][$packageName] = $fileContents;
237226
} else {
238-
$this->strings[ $language ] = [
227+
$this->strings[$language] = [
239228
$packageName => $fileContents,
240229
];
241230
}
@@ -246,27 +235,27 @@ protected function parseLangFiles( $file )
246235
*
247236
* @param string $file
248237
*/
249-
protected function parseVendorFiles( $file )
238+
protected function parseVendorFiles($file)
250239
{
251240
// Base package name without file ending
252-
$packageName = basename( $file, '.php' );
241+
$packageName = basename($file, '.php');
253242

254243
// Get package, language and file contents from language file
255244
// /vendor/<package>/<language_code>/<filename>.php
256-
$package = explode( DIRECTORY_SEPARATOR, $file )[ 2 ];
257-
$language = explode( DIRECTORY_SEPARATOR, $file )[ 3 ];
258-
$fileContents = require resource_path( 'lang' ) . DIRECTORY_SEPARATOR . $file;
245+
$package = explode(DIRECTORY_SEPARATOR, $file)[2];
246+
$language = explode(DIRECTORY_SEPARATOR, $file)[3];
247+
$fileContents = require resource_path('lang').DIRECTORY_SEPARATOR.$file;
259248

260249
// Check if language already exists in array
261-
if ( array_key_exists( $language, $this->strings ) ) {
250+
if (array_key_exists($language, $this->strings)) {
262251
// Check if package already exists in language
263-
if ( array_key_exists( $package, $this->strings[ $language ] ) ) {
264-
$this->strings[ $language ][ $package ][ $packageName ] = $fileContents;
252+
if (array_key_exists($package, $this->strings[$language])) {
253+
$this->strings[$language][$package][$packageName] = $fileContents;
265254
} else {
266-
$this->strings[ $language ][ $package ] = [ $packageName => $fileContents ];
255+
$this->strings[$language][$package] = [$packageName => $fileContents];
267256
}
268257
} else {
269-
$this->strings[ $language ] = [
258+
$this->strings[$language] = [
270259

271260
$package => [
272261

@@ -276,25 +265,22 @@ protected function parseVendorFiles( $file )
276265
}
277266
}
278267

279-
protected function parseJsonFiles( $file )
268+
protected function parseJsonFiles($file)
280269
{
281270
// Base package name without file ending
282-
$language = basename( $file, '.json' );
271+
$language = basename($file, '.json');
283272

284273
// Get package, language and file contents from language file
285274
// /<language_code>/(<package/)<filename>.php
286-
$fileContents = json_decode( file_get_contents( resource_path( 'lang' ) . $file ) );
275+
$fileContents = json_decode(file_get_contents(resource_path('lang').$file));
287276

288277
// Check if language already exists in array
289-
if ( array_key_exists( 'json', $this->strings ) ) {
290-
291-
if ( array_key_exists( $language, $this->strings[ 'json' ] ) ) {
292-
293-
$this->strings[ 'json' ][ $language ] = $fileContents;
294-
278+
if (array_key_exists('json', $this->strings)) {
279+
if (array_key_exists($language, $this->strings['json'])) {
280+
$this->strings['json'][$language] = $fileContents;
295281
}
296282
} else {
297-
$this->strings[ 'json' ] = [
283+
$this->strings['json'] = [
298284

299285
$language => $fileContents,
300286
];

0 commit comments

Comments
 (0)