yii2mod / base

c3.php

Spacing +24 added lines, -24 removed lines

@@ -43,10 +43,10 @@ 
 
 // Autoload Codeception classes
 if (!class_exists('\\Codeception\\Codecept')) {
-    if (stream_resolve_include_path(__DIR__ . '/vendor/autoload.php')) {
-        require_once __DIR__ . '/vendor/autoload.php';
-    } elseif (file_exists(__DIR__ . '/codecept.phar')) {
-        require_once 'phar://'.__DIR__ . '/codecept.phar/autoload.php';
+    if (stream_resolve_include_path(__DIR__.'/vendor/autoload.php')) {
+        require_once __DIR__.'/vendor/autoload.php';
+    } elseif (file_exists(__DIR__.'/codecept.phar')) {
+        require_once 'phar://'.__DIR__.'/codecept.phar/autoload.php';
     } elseif (stream_resolve_include_path('Codeception/autoload.php')) {
         require_once 'Codeception/autoload.php';
     } else {
@@ -55,9 +55,9 @@ 
 }
 
 // Load Codeception Config
-$config_file = realpath(__DIR__) . DIRECTORY_SEPARATOR . 'codeception.yml';
+$config_file = realpath(__DIR__).DIRECTORY_SEPARATOR.'codeception.yml';
 if (isset($_SERVER['HTTP_X_CODECEPTION_CODECOVERAGE_CONFIG'])) {
-    $config_file = realpath(__DIR__) . DIRECTORY_SEPARATOR . $_SERVER['HTTP_X_CODECEPTION_CODECOVERAGE_CONFIG'];
+    $config_file = realpath(__DIR__).DIRECTORY_SEPARATOR.$_SERVER['HTTP_X_CODECEPTION_CODECOVERAGE_CONFIG'];
 }
 if (!file_exists($config_file)) {
     __c3_error(sprintf("Codeception config file '%s' not found", $config_file));
@@ -73,31 +73,31 @@ 
     // workaround for 'zend_mm_heap corrupted' problem
     gc_disable();
 
-    if ((integer)ini_get('memory_limit') < 384) {
+    if ((integer) ini_get('memory_limit') < 384) {
         ini_set('memory_limit', '384M');
     }
 
-    define('C3_CODECOVERAGE_MEDIATE_STORAGE', Codeception\Configuration::logDir() . 'c3tmp');
+    define('C3_CODECOVERAGE_MEDIATE_STORAGE', Codeception\Configuration::logDir().'c3tmp');
     define('C3_CODECOVERAGE_PROJECT_ROOT', Codeception\Configuration::projectDir());
     define('C3_CODECOVERAGE_TESTNAME', $_SERVER['HTTP_X_CODECEPTION_CODECOVERAGE']);
 
     function __c3_build_html_report(PHP_CodeCoverage $codeCoverage, $path)
     {
         $writer = new PHP_CodeCoverage_Report_HTML();
-        $writer->process($codeCoverage, $path . 'html');
+        $writer->process($codeCoverage, $path.'html');
 
-        if (file_exists($path . '.tar')) {
-            unlink($path . '.tar');
+        if (file_exists($path.'.tar')) {
+            unlink($path.'.tar');
         }
 
-        $phar = new PharData($path . '.tar');
+        $phar = new PharData($path.'.tar');
         $phar->setSignatureAlgorithm(Phar::SHA1);
-        $files = $phar->buildFromDirectory($path . 'html');
+        $files = $phar->buildFromDirectory($path.'html');
         array_map('unlink', $files);
 
         if (in_array('GZ', Phar::getSupportedCompression())) {
-            if (file_exists($path . '.tar.gz')) {
-                unlink($path . '.tar.gz');
+            if (file_exists($path.'.tar.gz')) {
+                unlink($path.'.tar.gz');
             }
 
             $phar->compress(\Phar::GZ);
@@ -105,19 +105,19 @@ 
             // close the file so that we can rename it
             unset($phar);
 
-            unlink($path . '.tar');
-            rename($path . '.tar.gz', $path . '.tar');
+            unlink($path.'.tar');
+            rename($path.'.tar.gz', $path.'.tar');
         }
 
-        return $path . '.tar';
+        return $path.'.tar';
     }
 
     function __c3_build_clover_report(PHP_CodeCoverage $codeCoverage, $path)
     {
         $writer = new PHP_CodeCoverage_Report_Clover();
-        $writer->process($codeCoverage, $path . '.clover.xml');
+        $writer->process($codeCoverage, $path.'.clover.xml');
 
-        return $path . '.clover.xml';
+        return $path.'.clover.xml';
     }
 
     function __c3_send_file($filename)
@@ -178,16 +178,16 @@ 
 
 if (!is_dir(C3_CODECOVERAGE_MEDIATE_STORAGE)) {
     if (mkdir(C3_CODECOVERAGE_MEDIATE_STORAGE, 0777, true) === false) {
-        __c3_error('Failed to create directory "' . C3_CODECOVERAGE_MEDIATE_STORAGE . '"');
+        __c3_error('Failed to create directory "'.C3_CODECOVERAGE_MEDIATE_STORAGE.'"');
     }
 }
 
 // evaluate base path for c3-related files
-$path = realpath(C3_CODECOVERAGE_MEDIATE_STORAGE) . DIRECTORY_SEPARATOR . 'codecoverage';
+$path = realpath(C3_CODECOVERAGE_MEDIATE_STORAGE).DIRECTORY_SEPARATOR.'codecoverage';
 
 $requested_c3_report = (strpos($_SERVER['REQUEST_URI'], 'c3/report') !== false);
 
-$complete_report = $current_report = $path . '.serialized';
+$complete_report = $current_report = $path.'.serialized';
 if ($requested_c3_report) {
     set_time_limit(0);
 
@@ -229,7 +229,7 @@ 
     $codeCoverage->start(C3_CODECOVERAGE_TESTNAME);
     if (!array_key_exists('HTTP_X_CODECEPTION_CODECOVERAGE_DEBUG', $_SERVER)) { 
         register_shutdown_function(
-            function () use ($codeCoverage, $current_report) {
+            function() use ($codeCoverage, $current_report) {
                 $codeCoverage->stop();
                 file_put_contents($current_report, serialize($codeCoverage));
             }

config/console.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-Yii::setAlias('@tests', dirname(__DIR__) . '/tests');
+Yii::setAlias('@tests', dirname(__DIR__).'/tests');
 Yii::setAlias('@webroot', dirname(__DIR__));
 
 $config = [

models/UserModel.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
             ['email', 'unique', 'message' => 'This email address has already been taken.'],
             ['username', 'unique', 'message' => 'This username has already been taken.'],
             ['username', 'string', 'min' => 2, 'max' => 30],
-            ['email','email'],
+            ['email', 'email'],
             ['password', 'string', 'min' => 6, 'max' => 24],
             ['password', 'required', 'on' => 'createUser'],
         ], parent::rules());

modules/admin/views/layouts/column2.php

Spacing +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
         'options' => ['class' => 'navbar-nav navbar-right'],
         'items' => [
             ['label' => '<i class="glyphicon glyphicon-globe"></i> Public Area', 'url' => ['/']],
-            ['label' => '<i class="glyphicon glyphicon-off"></i> Logout (' . Yii::$app->user->identity->username . ')',
+            ['label' => '<i class="glyphicon glyphicon-off"></i> Logout ('.Yii::$app->user->identity->username.')',
                 'url' => ['/site/logout'],
                 'linkOptions' => ['data-method' => 'post'],
             ]

modules/admin/views/user/index.php

Spacing +3 added lines, -3 removed lines

@@ -36,11 +36,11 @@ 
                 'class' => EditableColumn::className(),
                 'attribute' => 'status',
                 'url' => ['edit-user'],
-                'value' => function ($model) {
+                'value' => function($model) {
                     return UserStatus::getLabel($model->status);
                 },
                 'type' => 'select',
-                'editableOptions' => function ($model) {
+                'editableOptions' => function($model) {
                     return [
                         'source' => Json::encode(UserStatus::listData()),
                         'value' => $model->status,
@@ -52,7 +52,7 @@ 
             [
                 'attribute' => 'createdAt',
                 'label' => 'Created date',
-                'value' => function ($model) {
+                'value' => function($model) {
                     return date("d-M-Y", $model->createdAt);
                 },
                 'filter' => false,

requirements.php

Spacing +5 added lines, -5 removed lines

@@ -11,16 +11,16 @@ 
  */
 
 // you may need to adjust this path to the correct Yii framework path
-$frameworkPath = dirname(__FILE__) . '/vendor/yiisoft/yii2';
+$frameworkPath = dirname(__FILE__).'/vendor/yiisoft/yii2';
 
 if (!is_dir($frameworkPath)) {
     echo '<h1>Error</h1>';
     echo '<p><strong>The path to yii framework seems to be incorrect.</strong></p>';
-    echo '<p>You need to install Yii framework via composer or adjust the framework path in file <abbr title="' . __FILE__ . '">' . basename(__FILE__) . '</abbr>.</p>';
-    echo '<p>Please refer to the <abbr title="' . dirname(__FILE__) . '/README.md">README</abbr> on how to install Yii.</p>';
+    echo '<p>You need to install Yii framework via composer or adjust the framework path in file <abbr title="'.__FILE__.'">'.basename(__FILE__).'</abbr>.</p>';
+    echo '<p>Please refer to the <abbr title="'.dirname(__FILE__).'/README.md">README</abbr> on how to install Yii.</p>';
 }
 
-require_once($frameworkPath . '/requirements/YiiRequirementChecker.php');
+require_once($frameworkPath.'/requirements/YiiRequirementChecker.php');
 $requirementsChecker = new YiiRequirementChecker();
 
 /**
@@ -102,7 +102,7 @@ 
     'phpSmtp' => array(
         'name' => 'PHP mail SMTP',
         'mandatory' => false,
-        'condition' => strlen(ini_get('SMTP'))>0,
+        'condition' => strlen(ini_get('SMTP')) > 0,
         'by' => 'Email sending',
         'memo' => 'PHP mail SMTP server required',
     ),

web/index-test.php

Spacing +3 added lines, -3 removed lines

@@ -10,13 +10,13 @@
 defined('YII_DEBUG') or define('YII_DEBUG', true);
 defined('YII_ENV') or define('YII_ENV', 'test');
 
-require(__DIR__ . '/../vendor/autoload.php');
-require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require(__DIR__.'/../vendor/autoload.php');
+require(__DIR__.'/../vendor/yiisoft/yii2/Yii.php');
 
 include '../c3.php';
 
 define('MY_APP_STARTED', true);
 
-$config = require(__DIR__ . '/../tests/codeception/config/acceptance.php');
+$config = require(__DIR__.'/../tests/codeception/config/acceptance.php');
 
 (new yii\web\Application($config))->run();

web/index.php

Spacing +6 added lines, -6 removed lines

@@ -3,14 +3,14 @@
 defined('YII_DEBUG') or define('YII_DEBUG', true);
 defined('YII_ENV') or define('YII_ENV', 'dev');
 
-require(__DIR__ . '/../vendor/autoload.php');
-require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require(__DIR__.'/../vendor/autoload.php');
+require(__DIR__.'/../vendor/yiisoft/yii2/Yii.php');
 
 $config = yii\helpers\ArrayHelper::merge(
-    require(__DIR__ . '/../config/main.php'),
-    require(__DIR__ . '/../config/main.local.php'),
-    require(__DIR__ . '/../config/common.php'),
-    require(__DIR__ . '/../config/common.local.php')
+    require(__DIR__.'/../config/main.php'),
+    require(__DIR__.'/../config/main.local.php'),
+    require(__DIR__.'/../config/common.php'),
+    require(__DIR__.'/../config/common.local.php')
 );
 
 (new yii\web\Application($config))->run();

widgets/Alert.php

Spacing +3 added lines, -3 removed lines

@@ -53,17 +53,17 @@
 
         $session = \Yii::$app->getSession();
         $flashes = $session->getAllFlashes();
-        $appendCss = isset($this->options['class']) ? ' ' . $this->options['class'] : '';
+        $appendCss = isset($this->options['class']) ? ' '.$this->options['class'] : '';
 
         foreach ($flashes as $type => $data) {
             if (isset($this->alertTypes[$type])) {
                 $data = (array) $data;
                 foreach ($data as $message) {
                     /* initialize css class for each alert box */
-                    $this->options['class'] = $this->alertTypes[$type] . $appendCss;
+                    $this->options['class'] = $this->alertTypes[$type].$appendCss;
 
                     /* assign unique id to each alert box */
-                    $this->options['id'] = $this->getId() . '-' . $type;
+                    $this->options['id'] = $this->getId().'-'.$type;
 
                     echo \yii\bootstrap\Alert::widget([
                         'body' => $message,