From: Remi Collet <remi@php.net>
Date: Mon, 9 Sep 2019 12:22:24 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8aab32ff5faf8d92eb11698663c378583a652427;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  zip edxtension is now 1.15.5
  fix type consistency after 8f897f1040f00210f4a5cdd82a88a1fe3e558955
---

8aab32ff5faf8d92eb11698663c378583a652427