diff options
| author | StevenWdV <stevenwdv@gmail.com> | 2022-02-09 00:40:38 +0100 |
|---|---|---|
| committer | StevenWdV <stevenwdv@gmail.com> | 2022-02-09 00:40:38 +0100 |
| commit | 2aad9b6ae61337ef94b05adc377a9ad2cbaa8eb8 (patch) | |
| tree | 022c006cfac7a60fd0ab8896fac3991cf34b8fce /wrappers/php | |
| parent | b60ecf2fe5ddfe506e02093286b3931873187e91 (diff) | |
Add Android wrapper, remove plain Java Maven wrapper.
Fix some overrides in Makefiles.
Diffstat (limited to 'wrappers/php')
| -rw-r--r-- | wrappers/php/Makefile | 9 | ||||
| -rw-r--r-- | wrappers/php/src/Discovery.php | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/wrappers/php/Makefile b/wrappers/php/Makefile index 5384d92..f24eee7 100644 --- a/wrappers/php/Makefile +++ b/wrappers/php/Makefile @@ -10,12 +10,12 @@ ifeq ($(COPY_LIB),1) COPY_LIB_DIR ?= lib endif ifneq ($(COPY_LIB_DIR),) -COPY_LIB_DIR := $(COPY_LIB_DIR)/ +override COPY_LIB_DIR := $(COPY_LIB_DIR)/ endif # Strip / replace elements confusing PHP's limited C parser: __SIZE_TYPE__, _Complex, extern "C" # Also add FFI_LIB library name, see https://www.php.net/manual/en/ffi.load -install-header: .try_build_lib +install-header: .try-build-lib mkdir -p src/headers sed --null-data \ -e 's/DO NOT EDIT/Modified for PHP/' \ @@ -47,4 +47,7 @@ install-dev-dependencies: $(COMPOSER) check-platform-reqs clean: - rm -rf vendor/ .phpunit* src/headers/*.h lib/* + rm -rf .phpunit* src/headers/*.h lib/* +ifeq ($(CLEAN_ALL),1) + rm -rf vendor/ +endif diff --git a/wrappers/php/src/Discovery.php b/wrappers/php/src/Discovery.php index 322d621..99464f9 100644 --- a/wrappers/php/src/Discovery.php +++ b/wrappers/php/src/Discovery.php @@ -32,8 +32,8 @@ final class Discovery * @param string $signedJson Signed .json file contents. * @param string $expectedFileName The file type to be verified, one of "server_list.json" or * "organization_list.json". - * @param int $minSignTime Minimum time for signature. Should be set to at least the time of the previous - * signature. + * @param int $minSignTime Minimum time for signature (UNIX timestamp, seconds). Should be set to at least + * the time of the previous signature. * @return void * @throws InvalidArgumentException If expectedFileName is not one of the allowed values. * @throws VerifyException If signature verification fails. |