Merge pull request #1822 from spevans/pr_sr_9322

Author: swift-ci

Foundation/DateFormatter.swift

@@ -62,6 +62,12 @@ open class DateFormatter : Formatter {
             }
             return res._swiftObject
         }
+
+        // range.length is updated with the last position of the input string that was parsed
+        guard range.length == string.length else {
+            // The whole string was not parsed
+            return nil
+        }
         return date
     }
 

TestFoundation/TestDateFormatter.swift

@@ -26,6 +26,7 @@ class TestDateFormatter: XCTestCase {
             ("test_setTimeZoneToNil", test_setTimeZoneToNil),
             ("test_setTimeZone", test_setTimeZone),
             ("test_expectedTimeZone", test_expectedTimeZone),
+            ("test_dateFrom", test_dateFrom),
         ]
     }
 
@@ -409,4 +410,19 @@ class TestDateFormatter: XCTestCase {
         f.timeZone = losAngeles
         XCTAssertEqual(f.string(from: now), losAngeles.abbreviation())
     }
+
+    func test_dateFrom() throws {
+        let formatter = DateFormatter()
+        formatter.timeZone = TimeZone(identifier: "UTC")
+        formatter.dateFormat = "yyyy-MM-dd"
+
+        XCTAssertNil(formatter.date(from: "2018-03-09T10:25:16+01:00"))
+        let d1 = try formatter.date(from: "2018-03-09").unwrapped()
+        XCTAssertEqual(d1.description, "2018-03-09 00:00:00 +0000")
+
+        formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ssZZZZZ"
+        XCTAssertNil(formatter.date(from: "2018-03-09"))
+        let d2 = try formatter.date(from: "2018-03-09T10:25:16+01:00").unwrapped()
+        XCTAssertEqual(d2.description, "2018-03-09 09:25:16 +0000")
+    }
 }