dmstr / phd5-app

src/commands/AppController.php

Spacing +20 added lines, -20 removed lines

@@ -32,10 +32,10 @@ 
     {
         switch ($actionID) {
             case 'config':
-                $additionalOptions = ['level'];
+                $additionalOptions = [ 'level' ];
                 break;
             default:
-                $additionalOptions = [];
+                $additionalOptions = [ ];
         }
         return ArrayHelper::merge(
             $additionalOptions,
@@ -65,14 +65,14 @@ 
     public function actionConfig($key = null)
     {
         // get config from global variable (TODO)
-        $data = $GLOBALS['config'];
+        $data = $GLOBALS[ 'config' ];
         if ($key) {
             $keys = explode('.', $key);
-            if (isset($keys[0])) {
-                $data = $GLOBALS['config'][$keys[0]];
+            if (isset($keys[ 0 ])) {
+                $data = $GLOBALS[ 'config' ][ $keys[ 0 ] ];
             }
-            if (isset($keys[1])) {
-                $data = $GLOBALS['config'][$keys[0]][$keys[1]];
+            if (isset($keys[ 1 ])) {
+                $data = $GLOBALS[ 'config' ][ $keys[ 0 ] ][ $keys[ 1 ] ];
             }
         }
         $this->stdout(VarDumper::dumpAsString($data, $this->level));
@@ -94,8 +94,8 @@ 
     public function actionVersion()
     {
         $this->stdout('Application Version: ');
-        $this->stdout(getenv('APP_NAME') . ' ');
-        $this->stdout(APP_VERSION . "\n");
+        $this->stdout(getenv('APP_NAME').' ');
+        $this->stdout(APP_VERSION."\n");
     }
 
     /**
@@ -108,12 +108,12 @@ 
         $this->stdout("=====================\n");
         $this->stdout("Initializing application\n");
 
-        $this->interactive = (bool)getenv('APP_INTERACTIVE');
+        $this->interactive = (bool) getenv('APP_INTERACTIVE');
 
         $this->stdout("\nDatabase\n");
         $this->stdout("--------\n");
-        $this->run('db/create', [getenv('DB_ENV_MYSQL_ROOT_USER'),getenv('DB_ENV_MYSQL_ROOT_PASSWORD')]);
-        $this->run('migrate/up', ['interactive' => (bool)getenv('APP_INTERACTIVE')]);
+        $this->run('db/create', [ getenv('DB_ENV_MYSQL_ROOT_USER'), getenv('DB_ENV_MYSQL_ROOT_PASSWORD') ]);
+        $this->run('migrate/up', [ 'interactive' => (bool) getenv('APP_INTERACTIVE') ]);
 
         $this->stdout("\nUser\n");
         $this->stdout("----\n");
@@ -123,7 +123,7 @@ 
                 'default' => getenv('APP_ADMIN_PASSWORD') ?: Yii::$app->security->generateRandomString(8),
             ]
         );
-        $this->run('user/create', [getenv('APP_ADMIN_EMAIL'), 'admin', $adminPassword]);
+        $this->run('user/create', [ getenv('APP_ADMIN_EMAIL'), 'admin', $adminPassword ]);
 
         $this->stdout('Initializing modules');
 
@@ -138,8 +138,8 @@ 
         $this->stdout("\nCleanup\n");
         $this->stdout("-------\n");
         $this->run('cache/flush-all');
-        $this->run('audit/cleanup', ['age' => 30, 'interactive' => (bool)getenv('APP_INTERACTIVE')]);
-        $this->run('app/clear-assets', ['interactive' => (bool)getenv('APP_INTERACTIVE')]);
+        $this->run('audit/cleanup', [ 'age' => 30, 'interactive' => (bool) getenv('APP_INTERACTIVE') ]);
+        $this->run('app/clear-assets', [ 'interactive' => (bool) getenv('APP_INTERACTIVE') ]);
     }
 
     /**
@@ -153,20 +153,20 @@ 
         $matchRegex = '"^[a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9]\?[a-z0-9]$"';
 
         // create $cmd command
-        $cmd = 'cd "' . $assets . '" && ls | grep -e ' . $matchRegex . ' | xargs rm -rf ';
+        $cmd = 'cd "'.$assets.'" && ls | grep -e '.$matchRegex.' | xargs rm -rf ';
 
         // Set command
         $command = new Command($cmd);
 
         // Prompt user
-        $delete = $this->confirm("\nDo you really want to delete web assets?", ['default' => true]);
+        $delete = $this->confirm("\nDo you really want to delete web assets?", [ 'default' => true ]);
 
         if ($delete) {
             // Try to execute $command
             if ($command->execute()) {
                 $this->stdout("Web assets have been deleted.\n\n");
             } else {
-                $this->stderr("\n" . $command->getError() . "\n");
+                $this->stderr("\n".$command->getError()."\n");
                 $this->stderr($command->getStdErr());
             }
         }
@@ -179,8 +179,8 @@ 
         $message = $mailer->compose();
         $message
             ->setTo($to)
-            ->setSubject('Test-Mail from ' . getenv('APP_NAME'))
-            ->setTextBody(getenv('APP_TITLE') . ' | ' . getenv('HOSTNAME'));
+            ->setSubject('Test-Mail from '.getenv('APP_NAME'))
+            ->setTextBody(getenv('APP_TITLE').' | '.getenv('HOSTNAME'));
 
         if ($message->send()) {
             $this->stdout('Mail sent');

web/static/status.php

Spacing +1 added lines, -1 removed lines

@@ -1,3 +1,3 @@
 <?php
 
-echo json_encode(['status.webserver'=>'OK','status.appserver'=>'OK']);
+echo json_encode([ 'status.webserver'=>'OK', 'status.appserver'=>'OK' ]);

config/assets.php

Spacing +1 added lines, -1 removed lines

@@ -91,7 +91,7 @@
         'converter' => [
             'class' => 'yii\web\AssetConverter',
             'commands' => [
-                'less' => ['css', 'nodepkg-linuxstatic lessc {from} {to} --no-color --source-map'],
+                'less' => [ 'css', 'nodepkg-linuxstatic lessc {from} {to} --no-color --source-map' ],
             ],
         ],
     ],

config/console.php

Spacing +19 added lines, -19 removed lines

@@ -16,22 +16,22 @@ 
         'db' => [
             'class' => \dmstr\console\controllers\MysqlController::class,
             'excludeTables' => [
-                getenv('DATABASE_TABLE_PREFIX') . 'auth_assignment',
-                getenv('DATABASE_TABLE_PREFIX') . 'migration',
-                getenv('DATABASE_TABLE_PREFIX') . 'user',
-                getenv('DATABASE_TABLE_PREFIX') . 'profile',
-                getenv('DATABASE_TABLE_PREFIX') . 'token',
-                getenv('DATABASE_TABLE_PREFIX') . 'social_account',
-                getenv('DATABASE_TABLE_PREFIX') . 'log',
-                getenv('DATABASE_TABLE_PREFIX') . 'session',
-                getenv('DATABASE_TABLE_PREFIX') . 'audit_data',
-                getenv('DATABASE_TABLE_PREFIX') . 'audit_entry',
-                getenv('DATABASE_TABLE_PREFIX') . 'audit_error',
-                getenv('DATABASE_TABLE_PREFIX') . 'audit_javascript',
-                getenv('DATABASE_TABLE_PREFIX') . 'audit_mail',
-                getenv('DATABASE_TABLE_PREFIX') . 'audit_trail',
-                getenv('DATABASE_TABLE_PREFIX') . 'dmstr_contact_log',
-                getenv('DATABASE_TABLE_PREFIX') . 'queue_manager',
+                getenv('DATABASE_TABLE_PREFIX').'auth_assignment',
+                getenv('DATABASE_TABLE_PREFIX').'migration',
+                getenv('DATABASE_TABLE_PREFIX').'user',
+                getenv('DATABASE_TABLE_PREFIX').'profile',
+                getenv('DATABASE_TABLE_PREFIX').'token',
+                getenv('DATABASE_TABLE_PREFIX').'social_account',
+                getenv('DATABASE_TABLE_PREFIX').'log',
+                getenv('DATABASE_TABLE_PREFIX').'session',
+                getenv('DATABASE_TABLE_PREFIX').'audit_data',
+                getenv('DATABASE_TABLE_PREFIX').'audit_entry',
+                getenv('DATABASE_TABLE_PREFIX').'audit_error',
+                getenv('DATABASE_TABLE_PREFIX').'audit_javascript',
+                getenv('DATABASE_TABLE_PREFIX').'audit_mail',
+                getenv('DATABASE_TABLE_PREFIX').'audit_trail',
+                getenv('DATABASE_TABLE_PREFIX').'dmstr_contact_log',
+                getenv('DATABASE_TABLE_PREFIX').'queue_manager',
                 'filefly_hashmap', # TODO: fix prefix in module
             ],
         ],
@@ -76,7 +76,7 @@ 
                     'class' => \yii\log\FileTarget::class,
                     'logFile' => '@runtime/logs/console.log',
                     //'levels' => ['info', 'trace'],
-                    'logVars' => [],
+                    'logVars' => [ ],
                     'dirMode' => YII_ENV_DEV ? 0777 : 0775,
                     'fileMode' => YII_ENV_DEV ? 0666 : null,
                     'enabled' => YII_DEBUG && !YII_ENV_TEST,
@@ -84,14 +84,14 @@ 
             ],
         ],
         'dbSystem' => [
-            'on ' . yii\db\Connection::EVENT_AFTER_OPEN => function ($event) {
+            'on '.yii\db\Connection::EVENT_AFTER_OPEN => function($event) {
                 if ($event->sender->driverName === 'mysql') {
                     // set session wait_timeout for this connection to mysql default value to prevent connection-timeouts
                     // in e.g. audit module while exec long-running CLI processes
                     $event->sender->createCommand(
                         'SET SESSION wait_timeout = :timeout;',
                         [
-                            ':timeout' => (int)getenv('DB_ENV_MYSQL_CLI_WAIT_TIMEOUT') ?: 28800
+                            ':timeout' => (int) getenv('DB_ENV_MYSQL_CLI_WAIT_TIMEOUT') ?: 28800
                         ]
                     )->execute();
                 }

web/index.php

Spacing +10 added lines, -10 removed lines

@@ -1,37 +1,37 @@
 <?php
 
 // Prepare environment
-$rootPath = realpath(__DIR__ . '/..');
-require($rootPath . '/vendor/autoload.php');
-require($rootPath . '/config/env.php');
+$rootPath = realpath(__DIR__.'/..');
+require($rootPath.'/vendor/autoload.php');
+require($rootPath.'/config/env.php');
 
 // Enable YII_DEBUG by key/token cookie
 if (strlen(getenv('APP_DEBUG_KEY') > 10) &&
     strlen(getenv('APP_DEBUG_TOKEN') > 10)) {
-    if (isset($_COOKIE[getenv('APP_DEBUG_KEY')]) &&
-        ($_COOKIE[getenv('APP_DEBUG_KEY')] === getenv('APP_DEBUG_TOKEN'))) {
+    if (isset($_COOKIE[ getenv('APP_DEBUG_KEY') ]) &&
+        ($_COOKIE[ getenv('APP_DEBUG_KEY') ] === getenv('APP_DEBUG_TOKEN'))) {
         putenv('YII_DEBUG=1');
     }
 }
 
 // Define framework & application constants
-defined('YII_DEBUG') or define('YII_DEBUG', (boolean)getenv('YII_DEBUG'));
+defined('YII_DEBUG') or define('YII_DEBUG', (boolean) getenv('YII_DEBUG'));
 defined('YII_ENV') or define('YII_ENV', getenv('YII_ENV'));
 defined('APP_TYPE') or define('APP_TYPE', 'web');
 
 // Load framework
-require($rootPath . '/vendor/yiisoft/yii2/Yii.php');
+require($rootPath.'/vendor/yiisoft/yii2/Yii.php');
 
 // Codeception testing routes
-if (YII_ENV_TEST && file_exists($rootPath . '/tests/c3.php')) {
+if (YII_ENV_TEST && file_exists($rootPath.'/tests/c3.php')) {
     define(
         'C3_CODECOVERAGE_ERROR_LOG_FILE',
         getenv('C3_CODECOVERAGE_ERROR_LOG_FILE')); //Optional (if not set the default c3 output dir will be used)
     define(
         'C3_CODECEPTION_CONFIG_PATH',
         getenv('C3_CODECEPTION_CONFIG_PATH')); //Optional (if not set the default c3 output dir will be used)
-    require_once $rootPath . '/tests/c3.php';
+    require_once $rootPath.'/tests/c3.php';
 }
 
 // Run application
-(new yii\web\Application(require($rootPath . '/config/main.php')))->run();
+(new yii\web\Application(require($rootPath.'/config/main.php')))->run();

config/main.php

Spacing +6 added lines, -6 removed lines

@@ -14,7 +14,7 @@ 
 use Yii;
 
 // PHP Constants
-$version = is_file(__DIR__ . '/../src/version') ? trim(file_get_contents(__DIR__ . '/../src/version')) : 'dev';
+$version = is_file(__DIR__.'/../src/version') ? trim(file_get_contents(__DIR__.'/../src/version')) : 'dev';
 defined('APP_VERSION') or define('APP_VERSION', $version);
 $projectVersion = is_file(__DIR__.'/../project/version') ? trim(file_get_contents(__DIR__.'/../project/version')) : 'vanilla';
 defined('PROJECT_VERSION') or define('PROJECT_VERSION', $projectVersion);
@@ -27,7 +27,7 @@ 
 Yii::setAlias('@webroot', '@root/web');
 
 // Use a closure to not pollute the global namespace
-return call_user_func(function () {
+return call_user_func(function() {
 
     /*function checkFile(){
         if (file_exists($file)) {
@@ -41,8 +41,8 @@ 
         "{$configDir}/".APP_TYPE.'.php' => true,
         "{$configDir}/common-".YII_ENV.'.php' => false,
         "{$configDir}/".APP_TYPE.'-'.YII_ENV.'.php' => false,
-        "{$configDir}/common-".((YII_DEBUG)?'debug':'release').'.php' => false,
-        "{$configDir}/".APP_TYPE.'-'.((YII_DEBUG)?'debug':'release').'.php' => false,
+        "{$configDir}/common-".((YII_DEBUG) ? 'debug' : 'release').'.php' => false,
+        "{$configDir}/".APP_TYPE.'-'.((YII_DEBUG) ? 'debug' : 'release').'.php' => false,
     ];
 
     if (!empty(getenv('APP_CONFIG_FILE'))) {
@@ -50,12 +50,12 @@ 
         // Merge additional configurations
         foreach ($additionalConfigFiles as $alias) {
             $file = Yii::getAlias($alias);
-            $configFiles[$file] = true;
+            $configFiles[ $file ] = true;
         }
     }
 
     // Merge configurations
-    $config = [];
+    $config = [ ];
     Yii::trace($configFiles, __METHOD__);
     foreach ($configFiles as $file => $isRequired) {
         if (!is_file($file)) {

config/common-dev.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
         'view' => [
             'renderers' => [
                 'twig' => [
-                    'extensions' => (getenv('TWIG_DEBUG_MODE')) ? [new \Twig\Extension\DebugExtension()] : null,
+                    'extensions' => (getenv('TWIG_DEBUG_MODE')) ? [ new \Twig\Extension\DebugExtension() ] : null,
                     'options' => [
                         'debug' => (getenv('TWIG_DEBUG_MODE')) ? true : false,
                     ],

config/common.php

Spacing +38 added lines, -38 removed lines

@@ -78,10 +78,10 @@ 
 $languages = explode(',', getenv('APP_LANGUAGES'));
 
 // prepare asset bundle config
-$bundles = [];
+$bundles = [ ];
 if (getenv('APP_ASSET_USE_BUNDLED')) {
     // include generated asset-bundle configuration
-    $bundles = include Yii::getAlias('@web/bundles') . '/config.php';
+    $bundles = include Yii::getAlias('@web/bundles').'/config.php';
     // disable loading of bundles skin file, when using bundled assets
     Yii::$container->set(
         AdminLteAsset::class,
@@ -98,13 +98,13 @@ 
     PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT => 0
 ];
 if (getenv('MYSQL_ATTR_SSL_CA')) {
-    $dbAttributes[PDO::MYSQL_ATTR_SSL_CA] = getenv('MYSQL_ATTR_SSL_CA');
+    $dbAttributes[ PDO::MYSQL_ATTR_SSL_CA ] = getenv('MYSQL_ATTR_SSL_CA');
 }
 
 // update Redis increment counter according to queue_manager db (workaround)
-Event::on(Queue::class, Queue::EVENT_BEFORE_PUSH, function ($event) {
+Event::on(Queue::class, Queue::EVENT_BEFORE_PUSH, function($event) {
     // added directly to the SQL query, since param binding
-    $table_name = getenv('DATABASE_TABLE_PREFIX') . 'queue_manager';
+    $table_name = getenv('DATABASE_TABLE_PREFIX').'queue_manager';
     if (Yii::$app->cache->get('queue_id_synced') !== true) {
         $lastQueueIdSql = <<<SQL
 SELECT `AUTO_INCREMENT`  
@@ -148,7 +148,7 @@ 
 $common = [
     'id' => 'app',
     'name' => getenv('APP_TITLE'),
-    'language' => $languages[0],
+    'language' => $languages[ 0 ],
     'basePath' => '@app',
     'vendorPath' => '@root/vendor',
     'runtimePath' => '@root/runtime',
@@ -166,7 +166,7 @@ 
     ],
     'params' => [
         'adminEmail' => getenv('APP_ADMIN_EMAIL'),
-        'context.menuItems' => [],
+        'context.menuItems' => [ ],
         'backend.iframe.name' => getenv('APP_PARAMS_BACKEND_IFRAME_NAME') ?: '_self',
         'backend.browserSupport' => [
             'Chrome' => 87,
@@ -182,7 +182,7 @@ 
     'container' => [
         'definitions' => [
             AuthDbManagerComponent::class => [
-                'defaultRoles' => ['Default'],
+                'defaultRoles' => [ 'Default' ],
                 'cache' => 'cache'
             ],
             AdminController::class => [
@@ -206,12 +206,12 @@ 
                     'rules' => [
                         [
                             'allow' => true,
-                            'actions' => ['index'],
-                            'roles' => ['@'],
+                            'actions' => [ 'index' ],
+                            'roles' => [ '@' ],
                         ],
                         [
                             'allow' => true,
-                            'actions' => ['show'],
+                            'actions' => [ 'show' ],
                             // allow for all logged in users
                             #'roles' => ['@'],
                             // allow only if user has 'user' grant or requested his own profile (check by user->id)
@@ -222,7 +222,7 @@ 
                                 if (\Yii::$app->user->can('user')) {
                                     return true;
                                 }
-                                if (\Yii::$app->user->id === (int)Yii::$app->request->getQueryParam('id')) {
+                                if (\Yii::$app->user->id === (int) Yii::$app->request->getQueryParam('id')) {
                                     return true;
                                 }
                                 return false;
@@ -243,7 +243,7 @@ 
             'converter' => [
                 'class' => 'yii\web\AssetConverter',
                 'commands' => [
-                    'less' => ['css', 'nodepkg-linuxstatic lessc {from} {to} --no-color --source-map'],
+                    'less' => [ 'css', 'nodepkg-linuxstatic lessc {from} {to} --no-color --source-map' ],
                 ],
             ],
         ],
@@ -308,8 +308,8 @@ 
                 'common' => [
                     'class' => Target::class,
                     'url' => 'php://stderr',
-                    'levels' => ['error', 'warning'],
-                    'logVars' => [],
+                    'levels' => [ 'error', 'warning' ],
+                    'logVars' => [ ],
                     'replaceNewline' => APP_TYPE === 'console' ? null : ''
                 ]
             ]
@@ -321,7 +321,7 @@ 
             'transport' => [
                 'scheme' => getenv('APP_MAILER_SCHEME') ?: 'smtp',
                 'host' => getenv('APP_MAILER_HOST'),
-                'port' => (int)getenv('APP_MAILER_PORT'),
+                'port' => (int) getenv('APP_MAILER_PORT'),
                 'encryption' => getenv('APP_MAILER_ENCRYPTION'),
                 'username' => getenv('APP_MAILER_USERNAME'),
                 'password' => getenv('APP_MAILER_PASSWORD')
@@ -330,7 +330,7 @@ 
                 'charset' => 'UTF-8',
                 'replyTo' => getenv('APP_MAILER_REPLY_TO'),
                 'returnPath' => getenv('APP_MAILER_RETURN_PATH'),
-                'from' => [getenv('APP_MAILER_FROM') => getenv('APP_TITLE')]
+                'from' => [ getenv('APP_MAILER_FROM') => getenv('APP_TITLE') ]
             ]
         ],
         'queue' => [
@@ -338,7 +338,7 @@ 
             'channel' => getenv('APP_QUEUE_CHANNEL'),
             'as log' => LogBehavior::class,
             'as queuemanager' => QueueManagerBehavior::class,
-            'on ' . Queue::EVENT_AFTER_ERROR => function (ExecEvent $event) {
+            'on '.Queue::EVENT_AFTER_ERROR => function(ExecEvent $event) {
                 if ($event->error instanceof Throwable) {
                     Yii::$app->getModule('audit')->exception($event->error);
                 } else {
@@ -364,9 +364,9 @@ 
         'user' => [
             'class' => User::class,
             'enableAutoLogin' => true,
-            'loginUrl' => ['/user/security/login'],
+            'loginUrl' => [ '/user/security/login' ],
             'identityClass' => UserModel::class,
-            'rootUsers' => ['admin']
+            'rootUsers' => [ 'admin' ]
         ],
         'urlManager' => [
             'class' => UrlManager::class,
@@ -402,18 +402,18 @@ 
                         'auto_reload' => true
                     ],
                     'globals' => [
-                        'Html' => ['class' => Html::class],
-                        'Json' => ['class' => Json::class],
-                        'Tree' => ['class' => Tree::class],
-                        'FA' => ['class' => FA::class],
-                        'Url' => ['class' => Url::class],
-                        'Markdown' => ['class' => Markdown::class]
+                        'Html' => [ 'class' => Html::class ],
+                        'Json' => [ 'class' => Json::class ],
+                        'Tree' => [ 'class' => Tree::class ],
+                        'FA' => [ 'class' => FA::class ],
+                        'Url' => [ 'class' => Url::class ],
+                        'Markdown' => [ 'class' => Markdown::class ]
                     ],
                     'functions' => [
-                        'image' => function ($imageSource, $preset = '') {
+                        'image' => function($imageSource, $preset = '') {
                             return ImageUrlHelper::image($imageSource, $preset);
                         },
-                        't' => function ($category, $message, $params = [], $language = null) {
+                        't' => function($category, $message, $params = [ ], $language = null) {
                             return Yii::t($category, $message, $params, $language);
                         }
                     ],
@@ -427,7 +427,7 @@ 
     'modules' => [
         'audit' => [
             'class' => AuditModule::class,
-            'accessRoles' => ['audit-module'],
+            'accessRoles' => [ 'audit-module' ],
             'layout' => $boxLayout,
             'panels' => [
                 'audit/trail' => [
@@ -529,12 +529,12 @@ 
                 [
                     'connection' => 'db',
                     'table' => '{{%hrzg_widget_template}}',
-                    'columns' => ['twig_template']
+                    'columns' => [ 'twig_template' ]
                 ],
                 [
                     'connection' => 'db',
                     'table' => '{{%twig}}',
-                    'columns' => ['value']
+                    'columns' => [ 'value' ]
                 ]
             ],
             'scanners' => [
@@ -543,8 +543,8 @@ 
                 ScannerJavaScriptFunction::class,
                 ScannerDatabase::class
             ],
-            'allowedIPs' => ['*'],
-            'roles' => ['translate-module']
+            'allowedIPs' => [ '*' ],
+            'roles' => [ 'translate-module' ]
         ],
         'user' => [
             'class' => UserModule::class,
@@ -552,12 +552,12 @@ 
             'enableGdprCompliance' => true,
             'defaultRoute' => 'admin',
             'administratorPermissionName' => 'user-module',
-            'administrators' => ['admin'],
+            'administrators' => [ 'admin' ],
             'enableFlashMessages' => false,
             'generatePasswords' => true,
             'enableRegistration' => getenv('APP_USER_ENABLE_REGISTRATION'),
             'mailParams' => [
-                'fromEmail' => [getenv('APP_MAILER_FROM')=>getenv('APP_TITLE')]
+                'fromEmail' => [ getenv('APP_MAILER_FROM')=>getenv('APP_TITLE') ]
             ],
         ],
         'widgets' => [
@@ -572,16 +572,16 @@ 
 ];
 
 if ($s3Enabled) {
-    $common['components']['fsS3'] = [
+    $common[ 'components' ][ 'fsS3' ] = [
         'class' => AwsS3Filesystem::class,
         'key' => getenv('AMAZON_S3_BUCKET_PUBLIC_KEY'),
         'secret' => getenv('AMAZON_S3_BUCKET_SECRET_KEY'),
         'bucket' => getenv('AMAZON_S3_BUCKET_NAME'),
-        'prefix' => getenv('APP_NAME') . '/public',
+        'prefix' => getenv('APP_NAME').'/public',
         'region' => getenv('AMAZON_S3_BUCKET_REGION')
     ];
 
-    $common['modules']['filefly']['filesystemComponents']['s3'] = 'fsS3';
+    $common[ 'modules' ][ 'filefly' ][ 'filesystemComponents' ][ 's3' ] = 'fsS3';
 }
 
 return $common;