@@ -190,11 +190,11 @@ function getStorageDevice(string $root): Device
190190
191191 try {
192192 $ dsn = new DSN ($ connection );
193- $ device = $ dsn ->getScheme () ?? '' ;
193+ $ device = $ dsn ->getScheme ();
194194 $ accessKey = $ dsn ->getUser () ?? '' ;
195195 $ accessSecret = $ dsn ->getPassword () ?? '' ;
196196 $ bucket = $ dsn ->getPath () ?? '' ;
197- $ region = $ dsn ->getParam ('region ' ) ?? '' ;
197+ $ region = $ dsn ->getParam ('region ' );
198198 } catch (\Exception $ e ) {
199199 Console::warning ($ e ->getMessage () . 'Invalid DSN. Defaulting to Local device. ' );
200200 }
@@ -215,43 +215,43 @@ function getStorageDevice(string $root): Device
215215 return new Local ($ root );
216216 }
217217 } else {
218- switch (strtolower (App::getEnv ('OPR_EXECUTOR_STORAGE_DEVICE ' , Storage::DEVICE_LOCAL ))) {
218+ switch (strtolower (App::getEnv ('OPR_EXECUTOR_STORAGE_DEVICE ' , Storage::DEVICE_LOCAL ) ?? '' )) {
219219 case Storage::DEVICE_LOCAL :
220220 default :
221221 return new Local ($ root );
222222 case Storage::DEVICE_S3 :
223- $ s3AccessKey = App::getEnv ('OPR_EXECUTOR_STORAGE_S3_ACCESS_KEY ' , '' );
224- $ s3SecretKey = App::getEnv ('OPR_EXECUTOR_STORAGE_S3_SECRET ' , '' );
225- $ s3Region = App::getEnv ('OPR_EXECUTOR_STORAGE_S3_REGION ' , '' );
226- $ s3Bucket = App::getEnv ('OPR_EXECUTOR_STORAGE_S3_BUCKET ' , '' );
223+ $ s3AccessKey = App::getEnv ('OPR_EXECUTOR_STORAGE_S3_ACCESS_KEY ' , '' ) ?? '' ;
224+ $ s3SecretKey = App::getEnv ('OPR_EXECUTOR_STORAGE_S3_SECRET ' , '' ) ?? '' ;
225+ $ s3Region = App::getEnv ('OPR_EXECUTOR_STORAGE_S3_REGION ' , '' ) ?? '' ;
226+ $ s3Bucket = App::getEnv ('OPR_EXECUTOR_STORAGE_S3_BUCKET ' , '' ) ?? '' ;
227227 $ s3Acl = 'private ' ;
228228 return new S3 ($ root , $ s3AccessKey , $ s3SecretKey , $ s3Bucket , $ s3Region , $ s3Acl );
229229 case Storage::DEVICE_DO_SPACES :
230- $ doSpacesAccessKey = App::getEnv ('OPR_EXECUTOR_STORAGE_DO_SPACES_ACCESS_KEY ' , '' );
231- $ doSpacesSecretKey = App::getEnv ('OPR_EXECUTOR_STORAGE_DO_SPACES_SECRET ' , '' );
232- $ doSpacesRegion = App::getEnv ('OPR_EXECUTOR_STORAGE_DO_SPACES_REGION ' , '' );
233- $ doSpacesBucket = App::getEnv ('OPR_EXECUTOR_STORAGE_DO_SPACES_BUCKET ' , '' );
230+ $ doSpacesAccessKey = App::getEnv ('OPR_EXECUTOR_STORAGE_DO_SPACES_ACCESS_KEY ' , '' ) ?? '' ;
231+ $ doSpacesSecretKey = App::getEnv ('OPR_EXECUTOR_STORAGE_DO_SPACES_SECRET ' , '' ) ?? '' ;
232+ $ doSpacesRegion = App::getEnv ('OPR_EXECUTOR_STORAGE_DO_SPACES_REGION ' , '' ) ?? '' ;
233+ $ doSpacesBucket = App::getEnv ('OPR_EXECUTOR_STORAGE_DO_SPACES_BUCKET ' , '' ) ?? '' ;
234234 $ doSpacesAcl = 'private ' ;
235235 return new DOSpaces ($ root , $ doSpacesAccessKey , $ doSpacesSecretKey , $ doSpacesBucket , $ doSpacesRegion , $ doSpacesAcl );
236236 case Storage::DEVICE_BACKBLAZE :
237- $ backblazeAccessKey = App::getEnv ('OPR_EXECUTOR_STORAGE_BACKBLAZE_ACCESS_KEY ' , '' );
238- $ backblazeSecretKey = App::getEnv ('OPR_EXECUTOR_STORAGE_BACKBLAZE_SECRET ' , '' );
239- $ backblazeRegion = App::getEnv ('OPR_EXECUTOR_STORAGE_BACKBLAZE_REGION ' , '' );
240- $ backblazeBucket = App::getEnv ('OPR_EXECUTOR_STORAGE_BACKBLAZE_BUCKET ' , '' );
237+ $ backblazeAccessKey = App::getEnv ('OPR_EXECUTOR_STORAGE_BACKBLAZE_ACCESS_KEY ' , '' ) ?? '' ;
238+ $ backblazeSecretKey = App::getEnv ('OPR_EXECUTOR_STORAGE_BACKBLAZE_SECRET ' , '' ) ?? '' ;
239+ $ backblazeRegion = App::getEnv ('OPR_EXECUTOR_STORAGE_BACKBLAZE_REGION ' , '' ) ?? '' ;
240+ $ backblazeBucket = App::getEnv ('OPR_EXECUTOR_STORAGE_BACKBLAZE_BUCKET ' , '' ) ?? '' ;
241241 $ backblazeAcl = 'private ' ;
242242 return new Backblaze ($ root , $ backblazeAccessKey , $ backblazeSecretKey , $ backblazeBucket , $ backblazeRegion , $ backblazeAcl );
243243 case Storage::DEVICE_LINODE :
244- $ linodeAccessKey = App::getEnv ('OPR_EXECUTOR_STORAGE_LINODE_ACCESS_KEY ' , '' );
245- $ linodeSecretKey = App::getEnv ('OPR_EXECUTOR_STORAGE_LINODE_SECRET ' , '' );
246- $ linodeRegion = App::getEnv ('OPR_EXECUTOR_STORAGE_LINODE_REGION ' , '' );
247- $ linodeBucket = App::getEnv ('OPR_EXECUTOR_STORAGE_LINODE_BUCKET ' , '' );
244+ $ linodeAccessKey = App::getEnv ('OPR_EXECUTOR_STORAGE_LINODE_ACCESS_KEY ' , '' ) ?? '' ;
245+ $ linodeSecretKey = App::getEnv ('OPR_EXECUTOR_STORAGE_LINODE_SECRET ' , '' ) ?? '' ;
246+ $ linodeRegion = App::getEnv ('OPR_EXECUTOR_STORAGE_LINODE_REGION ' , '' ) ?? '' ;
247+ $ linodeBucket = App::getEnv ('OPR_EXECUTOR_STORAGE_LINODE_BUCKET ' , '' ) ?? '' ;
248248 $ linodeAcl = 'private ' ;
249249 return new Linode ($ root , $ linodeAccessKey , $ linodeSecretKey , $ linodeBucket , $ linodeRegion , $ linodeAcl );
250250 case Storage::DEVICE_WASABI :
251- $ wasabiAccessKey = App::getEnv ('OPR_EXECUTOR_STORAGE_WASABI_ACCESS_KEY ' , '' );
252- $ wasabiSecretKey = App::getEnv ('OPR_EXECUTOR_STORAGE_WASABI_SECRET ' , '' );
253- $ wasabiRegion = App::getEnv ('OPR_EXECUTOR_STORAGE_WASABI_REGION ' , '' );
254- $ wasabiBucket = App::getEnv ('OPR_EXECUTOR_STORAGE_WASABI_BUCKET ' , '' );
251+ $ wasabiAccessKey = App::getEnv ('OPR_EXECUTOR_STORAGE_WASABI_ACCESS_KEY ' , '' ) ?? '' ;
252+ $ wasabiSecretKey = App::getEnv ('OPR_EXECUTOR_STORAGE_WASABI_SECRET ' , '' ) ?? '' ;
253+ $ wasabiRegion = App::getEnv ('OPR_EXECUTOR_STORAGE_WASABI_REGION ' , '' ) ?? '' ;
254+ $ wasabiBucket = App::getEnv ('OPR_EXECUTOR_STORAGE_WASABI_BUCKET ' , '' ) ?? '' ;
255255 $ wasabiAcl = 'private ' ;
256256 return new Wasabi ($ root , $ wasabiAccessKey , $ wasabiSecretKey , $ wasabiBucket , $ wasabiRegion , $ wasabiAcl );
257257 }
0 commit comments