Merge branch 'release/5.10.x' into release/5.11.x

config/common.php

@@ -164,8 +164,8 @@ $common = [
         'backend.browserSupport' => [
             'Chrome' => 87,
             'Edge' => false,
-            'Safari' => false,
-            'MobileSafari' => false,
+            'Safari' => 14,
+            'MobileSafari' => 14,
             'Firefox' => 88,
             'Opera' => false,
             'Vivaldi' => false,
@@ -285,7 +285,7 @@ $common = [
             'ssl' => getenv('FTP_BUCKET_SSL') ?: 0,
             'passive' => 1,
             'timeout' => 10,
-            'transferMode' => FTP_BINARY,
+            'transferMode' => defined("FTP_BINARY") ? FTP_BINARY : null,
             'enableTimestampsOnUnixListings' => true
         ],
         'i18n' => [

src/composer.phd5.json

@@ -16,11 +16,11 @@
         "dmstr/yii2-redirect-module": "^0.3.1",
         "dmstr/yii2-filefly-module": "^1.6.0",
         "dmstr/yii2-filemanager-widgets": "^1.2.0",
-        "dmstr/yii2-pages-module": "^2.5.5",
+        "dmstr/yii2-pages-module": "^2.5.7",
         "dmstr/yii2-prototype-module": "^2.2.5",
         "dmstr/yii2-publication-module": "^1.2.3",
         "dmstr/yii2-resque-module": "^2.0.0",
-        "dmstr/yii2-widgets2-module": "^2.7.0",
+        "dmstr/yii2-widgets2-module": "^2.7.1",
         "dmstr/yii2-willnorris-imageproxy": "^1.0.0",
         "dmstr/yii2-web": ">=1.1.1",
         "ignatenkovnikita/yii2-queuemanager": "^0.1.0",

src/views/layouts/main.php

@@ -100,7 +100,7 @@ if (Yii::$app->settings->get('enableTwigNavbar', 'app.layout', false)) {
     'options' => [
         'dismissQueue' => true,
         'size' => 'medium',
-        'location' => Yii::$app->settings->getOrSet('growl.location', 'br', 'frontend', 'string') ?? 'br',
+        'location' => Yii::$app->settings->get('growl.location', 'frontend', 'br'),
         'timeout' => 4000,
     ],
 ]) ?>

tests/codeception/e2e/app/en/LanguagesEnCest.php

@@ -23,6 +23,6 @@ class LanguagesEnCest
         $I->seeElement('.site-error');
 
         $I->amOnPage('/en-us');
-        $I->see('Not Found');
+        $I->seeElement('.site-error');
     }
 }

tests/codeception/e2e/app/en/SignupCest.php

@@ -24,7 +24,7 @@ class SignupCest
             $I->amOnPage('/user/login');
             $I->dontSeeLink("Don't have an account? Sign up!", '/en/user/register');
             $I->amOnPage('/user/register');
-            $I->see('Not Found (#404)');
+            $I->seeElement('.site-error');
         }
     }
 }

tests/codeception/e2e/extensions/UserCreateCest.php

@@ -12,7 +12,7 @@ class UserCreateCest
     public function tryToTest(E2eTester $I)
     {
         $faker = Factory::create();
-        $username = $faker->userName;
+        $username = $faker->userName();
 
         $I->wantTo('ensure that User module works');
 
@@ -22,9 +22,9 @@ class UserCreateCest
         $I->amGoingTo('try to view and create snippets');
         $I->amOnPage('/user/admin/create');
 
-        $I->fillField('#user-email', $faker->email);
+        $I->fillField('#user-email', $faker->email());
         $I->fillField('#user-username', $username);
-        $I->fillField('#user-password', $faker->password);
+        $I->fillField('#user-password', $faker->password());
 
         $I->click('button[type="submit"]');