yii2mod / base

c3.php

Doc Comments +4 added lines

@@ -31,6 +31,10 @@
 }
 
 if (!function_exists('__c3_error')) {
+
+    /**
+     * @param string $message
+     */
     function __c3_error($message)
     {
 /*        file_put_contents(C3_CODECOVERAGE_MEDIATE_STORAGE . DIRECTORY_SEPARATOR . 'error.txt', $message);

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));
             }

modules/admin/controllers/UserController.php

Doc Comments +2 added lines, -2 removed lines

@@ -50,7 +50,7 @@ 
 
     /**
      * Lists all users.
-     * @return mixed
+     * @return string
      */
     public function actionIndex()
     {
@@ -109,7 +109,7 @@ 
      * Deletes an existing UserModel model.
      * If deletion is successful, the browser will be redirected to the 'index' page.
      * @param integer $id
-     * @return mixed
+     * @return \yii\web\Response
      */
     public function actionDelete($id)
     {

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 = [

migrations/m130524_201442_init.php

Spacing +31 added lines, -31 removed lines

@@ -22,14 +22,14 @@ 
         //Create user table
         $this->createTable('{{%User}}', [
             'id' => Schema::TYPE_PK,
-            'username' => Schema::TYPE_STRING . ' NOT NULL',
-            'authKey' => Schema::TYPE_STRING . '(32) NOT NULL',
-            'passwordHash' => Schema::TYPE_STRING . ' NOT NULL',
+            'username' => Schema::TYPE_STRING.' NOT NULL',
+            'authKey' => Schema::TYPE_STRING.'(32) NOT NULL',
+            'passwordHash' => Schema::TYPE_STRING.' NOT NULL',
             'passwordResetToken' => Schema::TYPE_STRING,
-            'email' => Schema::TYPE_STRING . ' NOT NULL',
-            'status' => Schema::TYPE_SMALLINT . ' NOT NULL DEFAULT 10',
-            'createdAt' => Schema::TYPE_INTEGER . ' NOT NULL',
-            'updatedAt' => Schema::TYPE_INTEGER . ' NOT NULL',
+            'email' => Schema::TYPE_STRING.' NOT NULL',
+            'status' => Schema::TYPE_SMALLINT.' NOT NULL DEFAULT 10',
+            'createdAt' => Schema::TYPE_INTEGER.' NOT NULL',
+            'updatedAt' => Schema::TYPE_INTEGER.' NOT NULL',
             'lastLogin' => Schema::TYPE_INTEGER,
         ], $tableOptions);
 
@@ -42,15 +42,15 @@ 
         //Create Cms table
         $this->createTable('{{%Cms}}', [
             'id' => Schema::TYPE_PK,
-            'url' => Schema::TYPE_STRING . '(255)',
-            'title' => Schema::TYPE_STRING . '(255)',
+            'url' => Schema::TYPE_STRING.'(255)',
+            'title' => Schema::TYPE_STRING.'(255)',
             'content' => Schema::TYPE_TEXT,
             'status' => Schema::TYPE_SMALLINT,
             'metaTitle' => Schema::TYPE_TEXT,
             'metaDescription' => Schema::TYPE_TEXT,
             'metaKeywords' => Schema::TYPE_TEXT,
-            'createdAt' => Schema::TYPE_INTEGER . ' NOT NULL',
-            'updatedAt' => Schema::TYPE_INTEGER . ' NOT NULL',
+            'createdAt' => Schema::TYPE_INTEGER.' NOT NULL',
+            'updatedAt' => Schema::TYPE_INTEGER.' NOT NULL',
         ], $tableOptions);
 
         //Insert pages in CMS table
@@ -98,7 +98,7 @@ 
         ]);
 
       $this->createTable('{{%AuthRule}}', [
-            'name' => Schema::TYPE_STRING . '(64) NOT NULL',
+            'name' => Schema::TYPE_STRING.'(64) NOT NULL',
             'data' => Schema::TYPE_TEXT,
             'created_at' => Schema::TYPE_INTEGER,
             'updated_at' => Schema::TYPE_INTEGER,
@@ -106,45 +106,45 @@ 
         ], $tableOptions);
         
         $this->createTable('{{%AuthItem}}', [
-            'name' => Schema::TYPE_STRING . '(64) NOT NULL',
-            'type' => Schema::TYPE_INTEGER . ' NOT NULL',
+            'name' => Schema::TYPE_STRING.'(64) NOT NULL',
+            'type' => Schema::TYPE_INTEGER.' NOT NULL',
             'description' => Schema::TYPE_TEXT,
-            'rule_name' => Schema::TYPE_STRING . '(64)',
+            'rule_name' => Schema::TYPE_STRING.'(64)',
             'data' => Schema::TYPE_TEXT,
             'created_at' => Schema::TYPE_INTEGER,
             'updated_at' => Schema::TYPE_INTEGER,
             'PRIMARY KEY (name)',
-            'FOREIGN KEY (rule_name) REFERENCES ' . '{{%AuthRule}}' . ' (name) ON DELETE SET NULL ON UPDATE CASCADE',
+            'FOREIGN KEY (rule_name) REFERENCES '.'{{%AuthRule}}'.' (name) ON DELETE SET NULL ON UPDATE CASCADE',
         ], $tableOptions);
         
         $this->createIndex('idx-auth_item-type', '{{%AuthItem}}', 'type');
         
         $this->createTable('{{%AuthItemChild}}', [
-            'parent' => Schema::TYPE_STRING . '(64) NOT NULL',
-            'child' => Schema::TYPE_STRING . '(64) NOT NULL',
+            'parent' => Schema::TYPE_STRING.'(64) NOT NULL',
+            'child' => Schema::TYPE_STRING.'(64) NOT NULL',
             'PRIMARY KEY (parent, child)',
-            'FOREIGN KEY (parent) REFERENCES ' . '{{%AuthItem}}' . ' (name) ON DELETE CASCADE ON UPDATE CASCADE',
-            'FOREIGN KEY (child) REFERENCES ' . '{{%AuthItem}}' . ' (name) ON DELETE CASCADE ON UPDATE CASCADE',
+            'FOREIGN KEY (parent) REFERENCES '.'{{%AuthItem}}'.' (name) ON DELETE CASCADE ON UPDATE CASCADE',
+            'FOREIGN KEY (child) REFERENCES '.'{{%AuthItem}}'.' (name) ON DELETE CASCADE ON UPDATE CASCADE',
         ], $tableOptions);
         
         $this->createTable('{{%AuthAssignment}}', [
-            'item_name' => Schema::TYPE_STRING . '(64) NOT NULL',
-            'user_id' => Schema::TYPE_INTEGER . ' NOT NULL',
+            'item_name' => Schema::TYPE_STRING.'(64) NOT NULL',
+            'user_id' => Schema::TYPE_INTEGER.' NOT NULL',
             'created_at' => Schema::TYPE_INTEGER,
             'PRIMARY KEY (item_name, user_id)',
-            'FOREIGN KEY (item_name) REFERENCES ' . '{{%AuthItem}}' . ' (name) ON DELETE CASCADE ON UPDATE CASCADE',
+            'FOREIGN KEY (item_name) REFERENCES '.'{{%AuthItem}}'.' (name) ON DELETE CASCADE ON UPDATE CASCADE',
         ], $tableOptions);
 
         // Create Cron Shedule table
-        $this->createTable('{{%CronSchedule}}',[
+        $this->createTable('{{%CronSchedule}}', [
                 'id' => Schema::TYPE_PK,
-                'jobCode' => Schema::TYPE_STRING . '(255) NULL DEFAULT NULL',
-                'status' => Schema::TYPE_SMALLINT . ' NOT NULL',
-                'messages' => Schema::TYPE_TEXT . ' NULL',
-                'dateCreated' => Schema::TYPE_TIMESTAMP . ' NULL DEFAULT NULL',
-                'dateScheduled' => Schema::TYPE_TIMESTAMP . ' NULL DEFAULT NULL',
-                'dateExecuted' => Schema::TYPE_TIMESTAMP . ' NULL DEFAULT NULL',
-                'dateFinished' => Schema::TYPE_TIMESTAMP . ' NULL DEFAULT NULL',
+                'jobCode' => Schema::TYPE_STRING.'(255) NULL DEFAULT NULL',
+                'status' => Schema::TYPE_SMALLINT.' NOT NULL',
+                'messages' => Schema::TYPE_TEXT.' NULL',
+                'dateCreated' => Schema::TYPE_TIMESTAMP.' NULL DEFAULT NULL',
+                'dateScheduled' => Schema::TYPE_TIMESTAMP.' NULL DEFAULT NULL',
+                'dateExecuted' => Schema::TYPE_TIMESTAMP.' NULL DEFAULT NULL',
+                'dateFinished' => Schema::TYPE_TIMESTAMP.' NULL DEFAULT NULL',
             ],
             $tableOptions
         );

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,

modules/admin/views/user/update.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 /* @var $this yii\web\View */
 /* @var $model app\models\UserModel */
 
-$this->title = 'Update User: ' . ' ' . $model->id;
+$this->title = 'Update User: '.' '.$model->id;
 $this->params['breadcrumbs'][] = ['label' => 'Users', 'url' => ['index']];
 $this->params['breadcrumbs'][] = 'Update';
 ?>

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',
     ),