Merge branch '5.5' into 5.6

laravel · Mar 4, 2018 · 7e8c844 · 7e8c844
2 parents fe634d6 + 13d7640
commit 7e8c844
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/CHANGELOG-5.5.md b/CHANGELOG-5.5.md
@@ -1,5 +1,14 @@
 # Release Notes for 5.5.x
 
+## v5.5.36 (2018-03-01)
+
+### Changed
+- Upgrade Parsedown to 1.7.0 ([14adb99](https://github.com/laravel/framework/commit/14adb9958729ea778767b9269df485e399fd6178))
+
+### Fixed
+- Fixed `PostgresGrammar::whereTime()` casting ([#23318](https://github.com/laravel/framework/pull/23318))
+
+
 ## v5.5.35 (2018-02-22)
 
 ### Fixed

diff --git a/src/Illuminate/Mail/composer.json b/src/Illuminate/Mail/composer.json
@@ -15,7 +15,7 @@
     ],
     "require": {
         "php": "^7.1.3",
-        "erusev/parsedown": "~1.6",
+        "erusev/parsedown": "~1.7",
         "illuminate/container": "5.6.*",
         "illuminate/contracts": "5.6.*",
         "illuminate/support": "5.6.*",

diff --git a/tests/Database/DatabaseQueryBuilderTest.php b/tests/Database/DatabaseQueryBuilderTest.php
@@ -388,6 +388,14 @@ public function testWhereYearPostgres()
         $this->assertEquals([0 => 2014], $builder->getBindings());
     }
 
+    public function testWhereTimePostgres()
+    {
+        $builder = $this->getPostgresBuilder();
+        $builder->select('*')->from('users')->whereTime('created_at', '>=', '22:00');
+        $this->assertEquals('select * from "users" where "created_at"::time >= ?', $builder->toSql());
+        $this->assertEquals([0 => '22:00'], $builder->getBindings());
+    }
+
     public function testWhereDaySqlite()
     {
         $builder = $this->getSQLiteBuilder();