Merge branch '2.3'

.travis.yml

@@ -8,7 +8,7 @@ before_install:
 
 env:
   global:
-    - COMPOSER_ROOT_VERSION="2.0.x-dev"
+    - COMPOSER_ROOT_VERSION="2.3.x-dev"
     - DISPLAY=":99"
     - XVFBARGS=":99 -ac -screen 0 1024x768x16"
     - SS_BASE_URL="http://localhost:8080/"
@@ -17,15 +17,17 @@ env:
 matrix:
   include:
     - php: 5.6
-      env: DB=MYSQL INSTALLER_VERSION=4.0.x-dev PHPCS_TEST=1 PHPUNIT_TEST=1
+      env: DB=MYSQL INSTALLER_VERSION=4.4.x-dev PHPCS_TEST=1 PHPUNIT_TEST=1
     - php: 7.0
-      env: DB=PGSQL INSTALLER_VERSION=4.1.x-dev PHPUNIT_TEST=1
+      env: DB=PGSQL INSTALLER_VERSION=4.4.x-dev PHPUNIT_TEST=1
     - php: 7.1
-      env: DB=MYSQL INSTALLER_VERSION=4.1.x-dev BEHAT_TEST=1
+      env: DB=MYSQL INSTALLER_VERSION=4.4.x-dev BEHAT_TEST=1
     - php: 7.2
-      env: DB=MYSQL INSTALLER_VERSION=4.2.x-dev PHPUNIT_COVERAGE_TEST=1
+      env: DB=MYSQL INSTALLER_VERSION=4.4.x-dev PHPUNIT_COVERAGE_TEST=1
     - php: 7.2
       env: DB=MYSQL INSTALLER_VERSION=4.x-dev BEHAT_TEST=1
+    - php: 7.3
+      env: DB=MYSQL INSTALLER_VERSION=4.4.x-dev PHPUNIT_TEST=1
 
 before_script:
   # Extra $PATH
@@ -39,7 +41,7 @@ before_script:
   # Install composer
   - composer validate
   - composer require silverstripe/installer:"$INSTALLER_VERSION" silverstripe/recipe-testing:^1 --no-update
-  - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.0.x-dev; fi
+  - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.2.x-dev; fi
   - composer install --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
 
   # Behat bootstrapping

composer.json

@@ -15,12 +15,12 @@
         }
     ],
     "require": {
-        "silverstripe/framework": "^4",
-        "silverstripe/cms": "^4",
-        "silverstripe/admin": "^1",
-        "silverstripe/asset-admin": "^1",
-        "silverstripe/errorpage": "^1",
-        "silverstripe/versioned": "^1"
+        "silverstripe/framework": "^4.4@dev",
+        "silverstripe/cms": "^4.4@dev",
+        "silverstripe/admin": "^1.4@dev",
+        "silverstripe/asset-admin": "^1.4@dev",
+        "silverstripe/errorpage": "^1.4@dev",
+        "silverstripe/versioned": "^1.4@dev"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.7",

src/Extensions/LeftAndMainSubsites.php

@@ -221,9 +221,11 @@ class LeftAndMainSubsites extends LeftAndMainExtension
         // Admin can access everything, no point in checking.
         $member = Security::getCurrentUser();
         if ($member
-            && (Permission::checkMember($member, 'ADMIN') // 'Full administrative rights'
-                || Permission::checkMember($member, 'CMS_ACCESS_LeftAndMain') // 'Access to all CMS sections'
-            )
+            && (Permission::checkMember($member, [
+                'ADMIN', // Full administrative rights
+                'CMS_ACCESS_LeftAndMain', // Access to all CMS sections
+                'CMS_ACCESS_CMSMain', // Access to CMS controllers
+            ]))
         ) {
             return true;
         }

tests/behat/features/insert-content-link.feature

@@ -0,0 +1,29 @@
+# See https://github.com/silverstripe/silverstripe-subsites/issues/357
+Feature: Insert an internal link into content
+  As a CMS user
+  I can insert internal links into my content
+  So that I can direct users to different parts of my website
+
+  Background:
+    Given a "subsite" "Subsite B"
+    And a "page" "My page" with "URLSegment"="my-page", "Content"="My page content"
+    And a "page" "Another page" with "URLSegment"="another-page", "Content"="My other page content"
+    And I am logged in with "CMS_ACCESS_CMSMain" permissions
+    Then I go to "admin/pages"
+    And I click on "My page" in the tree
+
+  @javascript
+  Scenario: I can insert an internal link
+    # See "insert-a-link.feature" from silverstripe/cms
+    When I select "My page" in the "Content" HTML field
+    And I press the "Insert link" HTML field button
+    And I click "Page on this site" in the ".mce-menu" element
+    Then I should see an "form#Form_editorInternalLink" element
+    When I click "(Choose Page)" in the ".Select-multi-value-wrapper" element
+    And I click "Another page" in the ".treedropdownfield__menu" element
+    And I fill in "my desc" for "Link description"
+    And I press the "Insert" button
+    Then the "Content" HTML field should contain "<a title="my desc" href="[sitetree_link"
+    And the "Content" HTML field should contain "My page</a>"
+    # Required to avoid "unsaved changes" browser dialog
+    Then I press the "Save" button