Merge remote-tracking branch 'origin/master' into dev

    ],

    'components' => [

        'request' => [

            'cookieValidationKey' => 'bbpNZlHAOLcTL_O8Hs-093LSyLklLrEa',

            'parsers' => [

                'application/json' => 'yii\web\JsonParser',

            ]

            // !!! insert a secret key in the following (if it is empty) - this is required by cookie validation

            'cookieValidationKey' => 'OsrMbvjpP9SCngWzSP4-2HnMMSFODuBl',

        ],

        'cache' => [

            'class' => 'yii\caching\FileCache',

            ],

        ],

        'db' => $db,

        /*

        'urlManager' => [

            'enablePrettyUrl' => true,

            'enableStrictParsing' => false,

            'showScriptName' => false,

            'rules' => [

                ['class' => 'yii\rest\UrlRule', 'controller' => 'api'],

            ],

        ]

    ],

    'controllerMap' => [

        'api' => [

            'class' => 'app\controllers\ApiController',

        ],

        */

    ],

    'params' => $params,

];