PHP 7.1

Author: Eugene Terentev

.env.dist

@@ -14,7 +14,7 @@ DB_USERNAME      = ysk_dbu
 DB_PASSWORD      = ysk_pass
 DB_TABLE_PREFIX  =
 
-TEST_DB_DSN           = mysql:host=localhost;port=3306;dbname=yii2-starter-kit-test
+TEST_DB_DSN           = mysql:host=db;port=3306;dbname=yii2-starter-kit-test
 TEST_DB_USERNAME      = root
 TEST_DB_PASSWORD      = root
 

.travis.yml

@@ -1,44 +1,31 @@
-language: php
+sudo: true
+dist: trusty
 
-php:
-  - 7.0
-
-# faster builds on new travis setup not using sudo
-sudo: false
+env:
+  - COMPOSE_FILE=docker/travis.yml
 
 services:
-  - mysql
+  - docker
 
 # cache vendor dirs
 cache:
   directories:
-    - $HOME/.composer/cache
     - vendor
 
-install:
-  - travis_retry phpenv config-rm xdebug.ini
-  - travis_retry composer self-update && composer --version
-  - travis_retry composer install --dev --prefer-source --no-interaction
-
-# setup application:
-  - |
-    cp .env.dist .env
-    sed -i s/yii2-starter-kit\.dev/localhost:8080/ .env
+before_install:
+  - docker-compose up --force-recreate -d
 
-  - |
-    cd tests/codeception/backend && codecept build
-    cd ../common && codecept build
-    cd ../console && codecept build
-    cd ../frontend && codecept build
-    cd ../../../
+install:
+  - cp .env.dist .env
+  - sed -i s/yii2-starter-kit-test/yii2-starter-kit/ .env
+  - docker-compose exec -T app composer install --dev --prefer-source --no-interaction
+  - docker-compose exec -T app ./vendor/bin/codecept build
+  - sleep 10 # waiting for mysql to start accepting connections
 
 before_script:
-  - mysql -e 'CREATE DATABASE `yii2-starter-kit`;';
-  - php tests/codeception/bin/yii app/setup --interactive=0
-  - php tests/codeception/bin/yii app/truncate --interactive=0
+  - docker-compose exec -T app php console/yii app/setup --interactive=0
+  - docker-compose exec -T app php console/yii app/truncate --interactive=0
 
 script:
-  - |
-    php -S localhost:8080 > /dev/null 2>&1 &
-    cd tests
-    ./../vendor/bin/codecept run --debug
+  - docker-compose exec -T app php -S 127.0.0.1:8080 > /dev/null 2>&1 &
+  - docker-compose exec -T app ./vendor/bin/codecept run --debug

backend/web/index-test.php

@@ -17,6 +17,14 @@
 require(__DIR__ . '/../../common/config/bootstrap.php');
 require(__DIR__ . '/../config/bootstrap.php');
 
-$config = require(__DIR__ . '/../../tests/config/backend/acceptance.php');
+$config = yii\helpers\ArrayHelper::merge(
+    require(__DIR__ . '/../../common/config/base.php'),
+    require(__DIR__ . '/../../common/config/web.php'),
+    require(__DIR__ . '/../config/base.php'),
+    require(__DIR__ . '/../config/web.php'),
+    require(__DIR__ . '/../../tests/config/base.php'),
+    require(__DIR__ . '/../../tests/config/common/acceptance.php'),
+    require(__DIR__ . '/../../tests/config/backend/acceptance.php')
+);
 
 (new yii\web\Application($config))->run();

common/helpers.php

@@ -36,19 +36,6 @@ function redirect($url, $statusCode = 302)
     return Yii::$app->controller->redirect($url, $statusCode);
 }
 
-/**
- * @param $form \yii\widgets\ActiveForm
- * @param $model
- * @param $attribute
- * @param array $inputOptions
- * @param array $fieldOptions
- * @return string
- */
-function activeTextinput($form, $model, $attribute, $inputOptions = [], $fieldOptions = [])
-{
-    return $form->field($model, $attribute, $fieldOptions)->textInput($inputOptions);
-}
-
 /**
  * @param string $key
  * @param mixed $default

composer.json

@@ -24,7 +24,7 @@
     "source": "https://github.com/trntv/yii2-starter-kit"
   },
   "require": {
-    "php": ">=7.0.0",
+    "php": ">=7.1.0",
     "ext-intl": "*",
     "yiisoft/yii2": "^2.0.13",
     "yiisoft/yii2-bootstrap": "^2.0.0",

console/config/console.php

@@ -5,18 +5,18 @@
     'controllerNamespace' => 'console\controllers',
     'controllerMap' => [
         'command-bus' => [
-            'class' => 'trntv\bus\console\BackgroundBusController',
+            'class' => trntv\bus\console\BackgroundBusController::class,
         ],
         'message' => [
-            'class' => 'console\controllers\ExtendedMessageController'
+            'class' => console\controllers\ExtendedMessageController::class
         ],
         'migrate' => [
-            'class' => 'yii\console\controllers\MigrateController',
+            'class' => yii\console\controllers\MigrateController::class,
             'migrationPath' => '@common/migrations/db',
             'migrationTable' => '{{%system_db_migration}}'
         ],
         'rbac-migrate' => [
-            'class' => 'console\controllers\RbacMigrateController',
+            'class' => console\controllers\RbacMigrateController::class,
             'migrationPath' => '@common/migrations/rbac/',
             'migrationTable' => '{{%system_rbac_migration}}',
             'templateFile' => '@common/rbac/views/migration.php'

console/controllers/AppController.php

@@ -12,8 +12,6 @@
  */
 class AppController extends Controller
 {
-    private static $dbName;
-    private static $db;
     public $writablePaths = [
         '@common/runtime',
         '@frontend/runtime',
@@ -33,33 +31,17 @@ class AppController extends Controller
     ];
 
     /**
-     * AppController constructor.
-     * @param string $id
-     * @param Module $module
-     * @param array $config
+     * Sets given keys to .env file
      */
-    public function __construct($id, Module $module, array $config = [])
+    public function actionSetKeys()
     {
-        self::$db = \Yii::$app->db;
-        self::$dbName = $this->getDsnAttribute(self::$db->dsn, 'dbname');
-        parent::__construct($id, $module, $config);
+        $this->setKeys($this->generateKeysPaths);
     }
 
     /**
-     * Parses DNS string to find name of database
-     * @param $name string, string to find
-     * @param $dsn string, DNS string
-     * @return null|string
+     * @throws \yii\base\InvalidRouteException
+     * @throws \yii\console\Exception
      */
-    private function getDsnAttribute($dsn, $name = 'dbname')
-    {
-        if (preg_match('/' . $name . '=([^;]*)/', $dsn, $match)) {
-            return $match[1];
-        } else {
-            return null;
-        }
-    }
-
     public function actionSetup()
     {
         $this->runAction('set-writable', ['interactive' => $this->interactive]);
@@ -71,45 +53,63 @@ public function actionSetup()
 
     /**
      * Truncates all tables in the database.
+     * @throws \yii\db\Exception
      */
     public function actionTruncate()
     {
-        if ($this->confirm('This will truncate all tables of current database [' . self::$dbName . '].')) {
-            self::$db->createCommand('SET FOREIGN_KEY_CHECKS=0')->execute();
-            $command = self::$db->createCommand("SHOW FULL TABLES WHERE TABLE_TYPE LIKE '%TABLE'");
+        $dbName = Yii::$app->db->createCommand('SELECT DATABASE()')->queryScalar();
+        if ($this->confirm('This will truncate all tables of current database [' . $dbName . '].')) {
+            Yii::$app->db->createCommand('SET FOREIGN_KEY_CHECKS=0')->execute();
+            $command = Yii::$app->db->createCommand("SHOW FULL TABLES WHERE TABLE_TYPE LIKE '%TABLE'");
             $res = $command->queryAll();
             foreach ($res as $row) {
-                $rowName = 'Tables_in_' . self::$dbName;
+                $rowName = sprintf('Tables_in_%s', $dbName);
                 $this->stdout('Truncating table ' . $row[$rowName] . PHP_EOL, Console::FG_RED);
-                self::$db->createCommand()->truncateTable($row[$rowName])->execute();
+                Yii::$app->db->createCommand()->truncateTable($row[$rowName])->execute();
             }
-            self::$db->createCommand('SET FOREIGN_KEY_CHECKS=1')->execute();
+            Yii::$app->db->createCommand('SET FOREIGN_KEY_CHECKS=1')->execute();
         }
     }
 
     /**
      * Drops all tables in the database.
+     * @throws \yii\db\Exception
      */
     public function actionDrop()
     {
-        if ($this->confirm('This will drop all tables of current database [' . self::$dbName . '].')) {
-            self::$db->createCommand("SET foreign_key_checks = 0")->execute();
-            $tables = self::$db->schema->getTableNames();
+        $dbName = Yii::$app->db->createCommand('SELECT DATABASE()')->queryScalar();
+        if ($this->confirm('This will drop all tables of current database [' . $dbName . '].')) {
+            Yii::$app->db->createCommand("SET foreign_key_checks = 0")->execute();
+            $tables = Yii::$app->db->schema->getTableNames();
             foreach ($tables as $table) {
                 $this->stdout('Dropping table ' . $table . PHP_EOL, Console::FG_RED);
-                self::$db->createCommand()->dropTable($table)->execute();
+                Yii::$app->db->createCommand()->dropTable($table)->execute();
             }
-            self::$db->createCommand("SET foreign_key_checks = 1")->execute();
+            Yii::$app->db->createCommand("SET foreign_key_checks = 1")->execute();
         }
     }
 
 
+    /**
+     * Adds write permissions
+     */
     public function actionSetWritable()
     {
         $this->setWritable($this->writablePaths);
     }
 
-    public function setWritable($paths)
+    /**
+     * Adds execute permissions
+     */
+    public function actionSetExecutable()
+    {
+        $this->setExecutable($this->executablePaths);
+    }
+
+    /**
+     * @param $paths
+     */
+    private function setWritable($paths)
     {
         foreach ($paths as $writable) {
             $writable = Yii::getAlias($writable);
@@ -118,12 +118,10 @@ public function setWritable($paths)
         }
     }
 
-    public function actionSetExecutable()
-    {
-        $this->setExecutable($this->executablePaths);
-    }
-
-    public function setExecutable($paths)
+    /**
+     * @param $paths
+     */
+    private function setExecutable($paths)
     {
         foreach ($paths as $executable) {
             $executable = Yii::getAlias($executable);
@@ -132,12 +130,10 @@ public function setExecutable($paths)
         }
     }
 
-    public function actionSetKeys()
-    {
-        $this->setKeys($this->generateKeysPaths);
-    }
-
-    public function setKeys($paths)
+    /**
+     * @param $paths
+     */
+    private function setKeys($paths)
     {
         foreach ($paths as $file) {
             $file = Yii::getAlias($file);

docker-compose.yml

@@ -29,7 +29,7 @@ services:
         - 1080:1080
 
   db:
-    image: mysql:5.7
+    image: mysql:8
     volumes:
       - /var/lib/mysql
     ports:
@@ -39,4 +39,3 @@ services:
       MYSQL_DATABASE: yii2-starter-kit
       MYSQL_USER: ysk_dbu
       MYSQL_PASSWORD: ysk_pass
-    command: ["--character-set-server=utf8mb4", "--collation-server=utf8mb4_unicode_ci"]

docker/travis.yml

@@ -0,0 +1,28 @@
+version: "3"
+
+services:
+  app:
+    build: php
+    working_dir: /app
+    volumes:
+      - ../:/app
+    depends_on:
+      - db
+
+  nginx:
+    image: nginx:1.12-alpine
+    ports:
+      - 80:80
+    volumes:
+      - ../:/app
+      - ./nginx/vhost.conf:/etc/nginx/conf.d/vhost.conf
+    depends_on:
+      - app
+
+  db:
+    image: mysql:8
+    environment:
+      MYSQL_ROOT_PASSWORD: root
+      MYSQL_DATABASE: yii2-starter-kit
+      MYSQL_USER: ysk_dbu
+      MYSQL_PASSWORD: ysk_pass

docs/console.md

@@ -23,16 +23,3 @@ Provides migrate functionality for RBAC.
 ``php console/yii rbac-migrate/up``
 
 ``php console/yii rbac-migrate/down all``
-
-### Compress assets
-You need to have yuicompressor and uglifyjs installed.
-
-```php console/yii asset/compress frontend/config/assets/compress.php frontend/config/assets/_bundles.php```
-
-then uncomment these lines in the ``frontend/config/web.php``
-```
-// Compressed assets
-//$config['components']['assetManager'] = [
-//   'bundles' => require(__DIR__ . '/assets/_bundles.php')
-//];
-```

docs/testing.md

@@ -13,17 +13,13 @@ docker-compose exec db mysql -uroot -proot -e "CREATE DATABASE \`yii2-starter-ki
 3. Adjust `.env` file to set `TEST_DB_DSN`, `TEST_DB_USER` and `TEST_DB_PASSWORD` params
 4. Setup application:
 ```
-docker-compose exec app php tests/codeception/bin/yii app/setup --interactive=0
+docker-compose exec app php tests/bin/yii app/setup --interactive=0
 ```
-5. Truncate tables before run, so we have fresh database without records.
-```
-docker-compose exec app php tests/codeception/bin/yii app/truncate
-```
-6. Start web server (do not close bash session):
+5. Start web server for acceptance tests (do not close bash session):
 ```
 docker-compose exec app php -S localhost:8080
 ```
-7. Run tests in separate window:
+6. Run tests in separate window:
 ```
 docker-compose exec app vendor/bin/codecept run
 ```