Merge branch '4'

silverstripe · Apr 1, 2020 · 88eabc7 · 88eabc7
2 parents 740e1aa + 5bf2ac8
commit 88eabc7
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 7 deletions.
diff --git a/docs/en/02_Developer_Guides/01_Templates/02_Common_Variables.md b/docs/en/02_Developer_Guides/01_Templates/02_Common_Variables.md
@@ -56,7 +56,7 @@ Returns the currently logged in [Member](api:SilverStripe\Security\Member) insta
 
 ```ss
 <% if $CurrentMember %>
-  Welcome Back, $CurrentMember.FirstName
+  Welcome back, $CurrentMember.FirstName
 <% end_if %>
 ```
 

diff --git a/docs/en/02_Developer_Guides/06_Testing/How_Tos/01_Write_a_FunctionalTest.md b/docs/en/02_Developer_Guides/06_Testing/How_Tos/01_Write_a_FunctionalTest.md
@@ -47,7 +47,7 @@ class HomePageTest extends FunctionalTest
         $page = $this->get('home/');
 
         $this->assertExactHTMLMatchBySelector("#Welcome", [
-            'Welcome Back'
+            'Welcome back'
         ]);
     }
 }

diff --git a/docs/en/02_Developer_Guides/13_i18n/index.md b/docs/en/02_Developer_Guides/13_i18n/index.md
@@ -244,7 +244,7 @@ en:
     SINGULARNAME: 'object'
     PLURALNAME: 'objects'
     PLURALS:
-      one: 'An object',
+      one: 'An object'
       other: '{count} objects'
 ```
 

diff --git a/lang/en.yml b/lang/en.yml
@@ -276,7 +276,7 @@ en:
     SURNAME: Surname
     VALIDATIONADMINLOSTACCESS: 'Cannot remove all admin groups from your profile'
     ValidationIdentifierFailed: 'Can''t overwrite existing member #{id} with identical identifier ({name} = {value}))'
-    WELCOMEBACK: 'Welcome Back, {firstname}'
+    WELCOMEBACK: 'Welcome back, {firstname}'
     YOUROLDPASSWORD: 'Your old password'
     belongs_many_many_Groups: Groups
     db_Locale: 'Interface Locale'

diff --git a/src/Dev/MigrationTask.php b/src/Dev/MigrationTask.php
@@ -55,7 +55,7 @@ class MigrationTask extends BuildTask
 
     protected $title = "Database Migrations";
 
-    protected $description = "Provide atomic database changes (not implemented yet)";
+    protected $description = "Provide atomic database changes (subclass this and implement yourself)";
 
     public function run($request)
     {

diff --git a/src/Security/Member.php b/src/Security/Member.php
@@ -793,7 +793,7 @@ public static function currentUser()
      *
      * E.g.
      * <code>
-     * Member::logInAs(Security::findAnAdministrator(), function() {
+     * Member::actAs(Security::findAnAdministrator(), function() {
      *     $record->write();
      * });
      * </code>

diff --git a/src/Security/MemberAuthenticator/LoginHandler.php b/src/Security/MemberAuthenticator/LoginHandler.php
@@ -201,7 +201,7 @@ protected function redirectAfterSuccessfulLogin()
             // Welcome message
             $message = _t(
                 'SilverStripe\\Security\\Member.WELCOMEBACK',
-                'Welcome Back, {firstname}',
+                'Welcome back, {firstname}',
                 ['firstname' => $member->FirstName]
             );
             Security::singleton()->setSessionMessage($message, ValidationResult::TYPE_GOOD);

diff --git a/src/View/Parsers/Diff.php b/src/View/Parsers/Diff.php
@@ -174,6 +174,7 @@ public static function getHTMLChunks($content)
             $content = $content ? "true" : "false";
         }
         if (is_array($content)) {
+            $content = array_filter($content, 'is_scalar');
             // Convert array to CSV
             $content = implode(',', $content);
         }

diff --git a/tests/php/View/Parsers/DiffTest.php b/tests/php/View/Parsers/DiffTest.php
@@ -77,4 +77,14 @@ public function testLegacyEachStatement()
 
         $this->assertRegExp($expected, $actual);
     }
+
+    public function testDiffArray()
+    {
+        $from = ['Lorem', ['array here please ignore'], 'ipsum dolor'];
+        $to = 'Lorem,ipsum';
+        $expected = "/^Lorem,ipsum *<del>dolor<\/del> *$/";
+        $actual = Diff::compareHTML($from, $to);
+
+        $this->assertRegExp($expected, $actual);
+    }
 }