Merge commit 'cc73b483' into ak

.gitlab-ci.yml

 before_script:
+  - export CI_BUILD_REF_NAME_NORMALIZED=$(echo ${CI_BUILD_REF_NAME} | tr -dc '[:alnum:]\n\r' | tr '[:upper:]' '[:lower:]')
   - export CI_APP_VOLUME=${CI_PROJECT_DIR}
-  - export COMPOSE_PROJECT_NAME=buildref${CI_BUILD_REF}${CI_BUILD_REF_NAME}
+  - export COMPOSE_PROJECT_NAME=buildref${CI_BUILD_REF}${CI_BUILD_REF_NAME_NORMALIZED}
   - mv tests/docker-compose.ci.override.yml tests/docker-compose.override.yml
   - cd tests
+  - sh ./env.sh
 
 build:
   stage: build

src/generators/crud/default/controller-rest.php

@@ -14,6 +14,7 @@ namespace <?= $generator->controllerNs ?>\api;
  */
 
 use yii\filters\AccessControl;
+use yii\helpers\ArrayHelper;
 
 class <?= $controllerClassName ?> extends \yii\rest\ActiveController
 {
@@ -24,17 +25,20 @@ class <?= $controllerClassName ?> extends \yii\rest\ActiveController
     */
     public function behaviors()
     {
-        return [
-            'access' => [
-                'class' => AccessControl::className(),
-                'rules' => [
-                    [
-                        'allow' => true,
-                        'matchCallback' => function ($rule, $action) {return \Yii::$app->user->can($this->module->id . '_' . $this->id . '_' . $action->id, ['route' => true]);},
+        return ArrayHelper::merge(
+            parent::behaviors(),
+            [
+                'access' => [
+                    'class' => AccessControl::className(),
+                    'rules' => [
+                        [
+                            'allow' => true,
+                            'matchCallback' => function ($rule, $action) {return \Yii::$app->user->can($this->module->id . '_' . $this->id . '_' . $action->id, ['route' => true]);},
+                        ]
                     ]
                 ]
             ]
-        ];
+        );
     }
 <?php endif; ?>
 }

tests/bash.sh

+#!/usr/bin/env bash
+
+set -e
+
+. ./env.sh
+
+${DOCKER_COMPOSE} run --rm php bash

tests/env.sh

+#!/usr/bin/env bash
+
+echo "Setting ENV variables..."
+
+export GIIANT_TEST_DB=${GIIANT_TEST_DB-sakila}
+export CI_APP_VOLUME=${CI_APP_VOLUME-..}
+export COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME-giiant}
+export DOCKER_COMPOSE="docker-compose --x-networking"
+
+# replace the stack name in the yml configuration for isolated CI stacks
+sed -i.bak s/giiant_/${COMPOSE_PROJECT_NAME}_/ acceptance.suite.yml

tests/init.sh

@@ -2,13 +2,7 @@
 
 set -e
 
-export GIIANT_TEST_DB=${GIIANT_TEST_DB-sakila}
-export CI_APP_VOLUME=${CI_APP_VOLUME-..}
-export COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME-giiant}
-DOCKER_COMPOSE="docker-compose --x-networking"
-
-# replace the stack name in the yml configuration for isolated CI stacks
-sed -i.bak s/giiant_/${COMPOSE_PROJECT_NAME}_/ acceptance.suite.yml
+. ./env.sh
 
 ${DOCKER_COMPOSE} kill
 ${DOCKER_COMPOSE} rm -fv

tests/run.sh

@@ -2,10 +2,7 @@
 
 set -e
 
-export GIIANT_TEST_DB=${GIIANT_TEST_DB-sakila}
-export CI_APP_VOLUME=${CI_APP_VOLUME-..}
-export COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME-giiant}
-DOCKER_COMPOSE="docker-compose --x-networking"
+. ./env.sh
 
 # replace the stack name in the yml configuration for isolated CI stacks
 sed -i.bak s/giiant_/${COMPOSE_PROJECT_NAME}_/ acceptance.suite.yml