Merge pull request #105 from silinternational/legacy-develop

Release `legacy.2.0`
silinternational · Jun 13, 2018 · 3c1fac7 · 3c1fac7
2 parents 4e640ee + f8549ca
commit 3c1fac7
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 32 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -39,9 +39,6 @@ Vagrant.configure(2) do |config|
   # View the documentation for the provider you are using for more
   # information on available options.
 
-  # Set synced folder permissions
-  config.vm.synced_folder "./", "/vagrant", :mount_options => [ "dmode=755,fmode=755," ], owner: 33, group: 33
-
   # This provisioner runs on the first `vagrant up`.
   config.vm.provision "install", type: "shell", inline: <<-SHELL
     # Add Docker apt repository

diff --git a/application/composer.json b/application/composer.json
@@ -12,7 +12,7 @@
   ],
   "require": {
     "php": ">=5.4.0",
-    "yiisoft/yii2": "2.0.11.2",
+    "yiisoft/yii2": "~2.0.15",
     "yiisoft/yii2-swiftmailer": "*",
     "yiisoft/yii2-gii": "*",
     "silinternational/php-env": "^2.1.0",

diff --git a/application/composer.lock b/application/composer.lock
diff --git a/application/frontend/config/main.php b/application/frontend/config/main.php
@@ -4,6 +4,7 @@
 
 /* Get frontend-specific config settings from ENV vars or set defaults. */
 $frontCookieSecure = Env::get('FRONT_COOKIE_SECURE', true);
+$cookieValidationKey = Env::get('COOKIE_VALIDATION_KEY');
 
 $sessionLifetime = 1800; // 30 minutes
 
@@ -36,6 +37,8 @@
             'errorAction' => 'site/error',
         ],
         'request' => [
+            'cookieValidationKey' => $cookieValidationKey,
+            'enableCookieValidation' => !empty($cookieValidationKey),
             'enableCsrfValidation' => false,
             'parsers' => [
                 'application/json' => 'yii\web\JsonParser',

diff --git a/application/tests/api/FixtureHelper.php b/application/tests/api/FixtureHelper.php
@@ -37,6 +37,7 @@ class FixtureHelper extends Module
      */
     public function _beforeSuite($settings = [])
     {
+        $this->unloadFixtures();
         $this->loadFixtures();
     }
 

diff --git a/local.env.dist b/local.env.dist
@@ -12,6 +12,7 @@ RECAPTCHA_SITE_KEY=
 RECAPTCHA_SECRET_KEY=
 COMPOSER_AUTH={"github-oauth":{"github.com":"tokenhere"}}
 COMPOSER_CACHE_DIR=/tmp
+COOKIE_VALIDATION_KEY=
 UI_URL=http://idp-pw.local/#
 UI_CORS_ORIGIN=http://idp-pw.local
 HELP_CENTER_URL=https://google.com/
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,6 +37,7 @@ class FixtureHelper extends Module @@
          */
         public function _beforeSuite($settings = [])
         {
+            $this->unloadFixtures();
             $this->loadFixtures();
         }
@@ Expand Down @@