Sync upstream (2.2)

Author: daftspunk

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "october/october",
-    "description": "Built using October CMS: The Platform That Gets Back to Basics",
+    "description": "Built using October CMS: The Laravel-Based CMS Engineered For Simplicity",
     "type": "project",
     "homepage": "https://octobercms.com",
     "license": "proprietary",
@@ -10,8 +10,7 @@
         "laravel/framework": "^6.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^8.0|^9.0",
-        "meyfa/phpunit-assert-gd": "^2.0.0|^3.0.0"
+        "phpunit/phpunit": "^8.0|^9.0"
     },
     "scripts": {
         "post-root-package-install": [

config/session.php

@@ -133,7 +133,7 @@
     |
     | The session cookie path determines the path for which the cookie will
     | be regarded as available. Typically, this will be the root path of
-    | your application but you are free to change this when necessary.
+    | your application, but you are free to change this when necessary.
     |
     */
 

config/system.php

@@ -162,25 +162,6 @@
 
     'convert_line_endings' => env('CONVERT_LINE_ENDINGS', false),
 
-    /*
-    |--------------------------------------------------------------------------
-    | Base Directory Restriction
-    |--------------------------------------------------------------------------
-    |
-    | Restricts loading backend template and config files to within the base
-    | directory of the application.
-    |
-    | Warning: This should always be enabled for security reasons. However, in
-    | some cases you may need to disable this; for instance when developing
-    | plugins that are stored elsewhere in the filesystem for organizational
-    | reasons and then symlinked into the application plugins/ directory.
-    |
-    | Never have this disabled in production.
-    |
-    */
-
-    'restrict_base_dir' => env('RESTRICT_BASE_DIR', true),
-
     /*
     |--------------------------------------------------------------------------
     | Cookie Encryption

modules/backend/lang/en/lang.php

@@ -410,6 +410,8 @@
         'extension' => 'The PHP extension :name is not installed. Please install this library and activate the extension.',
         'plugin_missing' => 'The plugin :name is a dependency but is not installed. Please install this plugin.',
         'debug' => 'Debug mode is enabled. This is not recommended for production installations.',
+        'backend_uri' => 'The backend URL :name is too generic. Please set to something more unique.',
+        'backend_login' => 'An account with a generic login :name was found. Please rename this administrator account.',
     ],
     'editor' => [
         'menu_label' => 'Editor Settings',

modules/system/lang/en/lang.php

@@ -516,6 +516,10 @@
         'folder_size_items' => 'item(s)',
     ],
     'page' => [
+        'not_found' => [
+            'label' => 'Page Not Found',
+            'help' => 'The requested page cannot be found.',
+        ],
         'custom_error' => [
             'label' => 'Page Error',
             'help' => "We're sorry, but something went wrong and the page cannot be displayed.",

phpunit.xml

@@ -26,7 +26,7 @@
         <env name="CMS_ROUTE_CACHE" value="true" />
         <env name="CMS_TWIG_CACHE" value="false" />
         <env name="PLUGINS_PATH" value="modules/system/tests/fixtures/plugins" />
-        <env name="THEMES_PATH" value="modules/system/tests/fixtures/themes" />
+        <env name="THEMES_PATH" value="modules/cms/tests/fixtures/themes" />
         <env name="ENABLE_CSRF" value="false" />
         <env name="DB_CONNECTION" value="sqlite" />
         <env name="DB_DATABASE" value=":memory:" />