[php-geos] 01/03: Imported Upstream version 1.0.0~rc3
Bas Couwenberg
sebastic at debian.org
Thu Dec 15 21:27:10 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository php-geos.
commit 7f250350038e350939c903b2adf5c16ff8ba6ed4
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Thu Dec 15 22:26:00 2016 +0100
Imported Upstream version 1.0.0~rc3
---
.drone.yml | 19 +++-
config.m4 | 9 +-
docker/build-test/Dockerfile.alpine | 166 ++++++++++++++++++++++++++++++----
docker/build-test/Dockerfile.trisquel | 152 ++++++++++++++++++++++++++++---
docker/build-test/Makefile | 6 +-
tests/001_Geometry.phpt | 126 +++++++++++++-------------
tests/002_WKTWriter.phpt | 12 +--
7 files changed, 377 insertions(+), 113 deletions(-)
diff --git a/.drone.yml b/.drone.yml
index b5bdb23..8252d5a 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -2,14 +2,25 @@
pipeline:
build:
image: docker.kbt.io/php-geos/build-test:trisquel
+ pull: true
commands:
- - export PATH=${PHP_BIN}:${PATH}
+ - export PATH=${PHP_BIN}:${GEOS_BIN}:${PATH}
- php --version
- - ./autogen.sh
+ # Always use newest phpize or we'll be hit by
+ # false negatives on make check, see
+ # https://git.osgeo.org/gogs/geos/php-geos/issues/16
+ - /opt/php-7.1.0/bin/phpize
- ./configure
- make
- make check
matrix:
PHP_BIN:
- - /opt/php-7.0.7/bin/
- - /usr/bin/ # this is php5
+ - /opt/php-5.4.9/bin/
+ - /opt/php-5.5.38/bin/
+ - /opt/php-5.6.28/bin/
+ - /opt/php-7.0.13/bin/
+ - /opt/php-7.1.0/bin/
+ GEOS_BIN:
+ - /opt/geos-3.4.3/bin/
+ - /opt/geos-3.5.1/bin/
+ - /opt/geos-3.6.0/bin/
diff --git a/config.m4 b/config.m4
index 71b1461..13cf05a 100644
--- a/config.m4
+++ b/config.m4
@@ -22,12 +22,7 @@ if test "$PHP_GEOS" != "no"; then
GEOS_CONFIG="$PHP_GEOS_CONFIG"
fi
else
- for i in /opt/local/bin /opt/bin /usr/local/bin /usr/bin ""; do
- if test -x $i/geos-config; then
- GEOS_CONFIG="$i/geos-config"
- break;
- fi
- done
+ AC_PATH_PROG(GEOS_CONFIG, geos-config)
fi
if test -n "$GEOS_CONFIG"; then
@@ -91,7 +86,7 @@ if test "$PHP_GEOS" != "no"; then
AC_TRY_COMPILE(geos_c.h, GEOS_PREC_KEEP_COLLAPSED, AC_DEFINE(HAVE_GEOS_PREC_KEEP_COLLAPSED,1,[Whether we have GEOS_PREC_KEEP_COLLAPSED]))
CFLAGS=$old_CFLAGS
- LDFLAGS=$old_LDFLAGS
+ dnl LDFLAGS=$old_LDFLAGS
PHP_ADD_LIBRARY(geos_c, 1, GEOS_SHARED_LIBADD)
PHP_ADD_MAKEFILE_FRAGMENT(Makefile.frag)
diff --git a/docker/build-test/Dockerfile.alpine b/docker/build-test/Dockerfile.alpine
index 1f6c755..59ab02f 100644
--- a/docker/build-test/Dockerfile.alpine
+++ b/docker/build-test/Dockerfile.alpine
@@ -1,22 +1,148 @@
FROM index.docker.io/alpine:latest
-RUN apk add --update make && rm -rf /var/cache/apk/*
-RUN apk add --update gcc && rm -rf /var/cache/apk/*
-# Splitting install of php5-dev in steps to reduce memory requirements
-RUN apk add --update ncurses-terminfo-base && rm -rf /var/cache/apk/*
-RUN apk add --update ncurses-terminfo && rm -rf /var/cache/apk/*
-RUN apk add --update pcre && rm -rf /var/cache/apk/*
-RUN apk add --update php5-common && rm -rf /var/cache/apk/*
-RUN apk add --update readline && rm -rf /var/cache/apk/*
-RUN apk add --update libxml2 && rm -rf /var/cache/apk/*
-RUN apk add --update libpcre16 && rm -rf /var/cache/apk/*
-RUN apk add --update libpcre32 && rm -rf /var/cache/apk/*
-RUN apk add --update pcre-dev && rm -rf /var/cache/apk/*
-RUN apk add --update php5-cli && rm -rf /var/cache/apk/*
-RUN apk add --update php5-dev && rm -rf /var/cache/apk/*
-
-# Autoconf brings in perl
-RUN apk add --update autoconf && rm -rf /var/cache/apk/*
-
-#RUN apk add --update autoconf && rm -rf /var/cache/apk/*
-#RUN apk add --update git
+RUN apk add --update \
+ build-base \
+ && rm -rf /var/cache/apk/*
+RUN apk add --update \
+ curl \
+ && rm -rf /var/cache/apk/*
+
+RUN apk add --update \
+ autoconf \
+ && rm -rf /var/cache/apk/*
+
+# PHP-5.4.9
+RUN curl -so php-5.4.9.tar.bz2 \
+ http://museum.php.net/php5/php-5.4.9.tar.bz2
+RUN tar xjf php-5.4.9.tar.bz2
+RUN cd php-5.4.9 && \
+ ./configure --prefix=/opt/php-5.4.9 \
+ --enable-debug \
+ --disable-all \
+ --disable-cgi \
+ --disable-dom \
+ --disable-libxml \
+ --disable-simplexml \
+ --disable-xml \
+ --disable-xmlreader \
+ --disable-xmlwriter \
+ --without-pear && \
+ make install
+RUN cd .. && rm -rf php-5.4.9*
+RUN strip /opt/php-5.4.9/bin/php
+
+# PHP-5.5.38
+RUN curl -so php-5.5.38.tar.bz2 \
+ http://www.php.net/distributions/php-5.5.38.tar.bz2
+RUN tar xjf php-5.5.38.tar.bz2
+RUN cd php-5.5.38 && \
+ ./configure --prefix=/opt/php-5.5.38 \
+ --enable-debug \
+ --disable-all \
+ --disable-cgi \
+ --disable-dom \
+ --disable-libxml \
+ --disable-simplexml \
+ --disable-xml \
+ --disable-xmlreader \
+ --disable-xmlwriter \
+ --without-pear && \
+ make install
+RUN cd .. && rm -rf php-5.5.38*
+RUN strip /opt/php-5.5.38/bin/php
+
+# PHP-5.6.28
+RUN curl -so php-5.6.28.tar.bz2 \
+ http://www.php.net/distributions/php-5.6.28.tar.bz2
+RUN tar xjf php-5.6.28.tar.bz2
+RUN cd php-5.6.28 && \
+ ./configure --prefix=/opt/php-5.6.28 \
+ --enable-debug \
+ --disable-all \
+ --disable-cgi \
+ --disable-dom \
+ --disable-libxml \
+ --disable-simplexml \
+ --disable-xml \
+ --disable-xmlreader \
+ --disable-xmlwriter \
+ --without-pear && \
+ make install
+RUN cd .. && rm -rf php-5.6.28*
+RUN strip /opt/php-5.6.28/bin/php
+
+# PHP-7.0.13
+RUN curl -so php-7.0.13.tar.bz2 \
+ http://www.php.net/distributions/php-7.0.13.tar.bz2
+RUN tar xjf php-7.0.13.tar.bz2
+RUN cd php-7.0.13 && \
+ ./configure --prefix=/opt/php-7.0.13 \
+ --enable-debug \
+ --disable-all \
+ --disable-cgi \
+ --disable-dom \
+ --disable-libxml \
+ --disable-simplexml \
+ --disable-xml \
+ --disable-xmlreader \
+ --disable-xmlwriter \
+ --without-pear && \
+ make install
+RUN cd .. && rm -rf php-7.0.13*
+RUN rm /opt/php-7.0.13/bin/phpdbg
+RUN strip /opt/php-7.0.13/bin/php
+
+# PHP-7.1.0
+RUN curl -so php-7.1.0.tar.bz2 \
+ http://www.php.net/distributions/php-7.1.0.tar.bz2
+RUN tar xjf php-7.1.0.tar.bz2
+RUN cd php-7.1.0 && \
+ ./configure --prefix=/opt/php-7.1.0 \
+ --enable-debug \
+ --disable-all \
+ --disable-cgi \
+ --disable-dom \
+ --disable-libxml \
+ --disable-simplexml \
+ --disable-xml \
+ --disable-xmlreader \
+ --disable-xmlwriter \
+ --without-pear && \
+ make install
+RUN cd .. && rm -rf php-7.1.0*
+RUN rm /opt/php-7.1.0/bin/phpdbg
+RUN strip /opt/php-7.1.0/bin/php
+
+
+# GEOS-3.4.3
+RUN curl -so geos-3.4.3.tar.bz2 \
+ http://download.osgeo.org/geos/geos-3.4.3.tar.bz2
+RUN tar xjf geos-3.4.3.tar.bz2
+RUN cd geos-3.4.3 && \
+ ./configure --prefix=/opt/geos-3.4.3 \
+ --disable-swig \
+ --disable-static \
+ && make install-strip
+RUN cd .. && rm -rf geos-3.4.3*
+
+# GEOS-3.5.1
+RUN curl -so geos-3.5.1.tar.bz2 \
+ http://download.osgeo.org/geos/geos-3.5.1.tar.bz2
+RUN tar xjf geos-3.5.1.tar.bz2
+RUN cd geos-3.5.1 && \
+ ./configure --prefix=/opt/geos-3.5.1 \
+ --disable-swig \
+ --disable-static \
+ && make install-strip
+RUN cd .. && rm -rf geos-3.5.1*
+
+# GEOS-3.6.0
+RUN curl -so geos-3.6.0.tar.bz2 \
+ http://download.osgeo.org/geos/geos-3.6.0.tar.bz2
+RUN tar xjf geos-3.6.0.tar.bz2
+RUN cd geos-3.6.0 && \
+ ./configure --prefix=/opt/geos-3.6.0 \
+ --disable-swig \
+ --disable-static \
+ && make install-strip
+RUN cd .. && rm -rf geos-3.6.0*
diff --git a/docker/build-test/Dockerfile.trisquel b/docker/build-test/Dockerfile.trisquel
index c1e73b9..30bceaa 100644
--- a/docker/build-test/Dockerfile.trisquel
+++ b/docker/build-test/Dockerfile.trisquel
@@ -1,12 +1,142 @@
FROM kpengboy/trisquel
-RUN apt-get update -qq && apt-get install -y build-essential
-RUN apt-get update -qq && apt-get install -y autoconf
-RUN apt-get update -qq && apt-get install -y php5-dev
-RUN apt-get update -qq && apt-get install -y libgeos-dev
-RUN curl -o php-7.0.7.tar.bz2 http://ar2.php.net/distributions/php-7.0.7.tar.bz2
-RUN tar xjf php-7.0.7.tar.bz2
-RUN apt-get update -qq && apt-get install -y libxml2-dev
-RUN cd php-7.0.7 && \
- ./configure --prefix=/opt/php-7.0.7 --enable-debug && \
- make install
-RUN cd .. && rm -rf php-7.0.7*
+RUN apt-get update -qq && apt-get install -y \
+ autoconf \
+ build-essential \
+ curl
+
+
+# PHP-5.4.9
+RUN curl -so php-5.4.9.tar.bz2 \
+ http://museum.php.net/php5/php-5.4.9.tar.bz2
+RUN tar xjf php-5.4.9.tar.bz2
+RUN cd php-5.4.9 && \
+ ./configure --prefix=/opt/php-5.4.9 \
+ --enable-debug \
+ --disable-all \
+ --disable-cgi \
+ --disable-dom \
+ --disable-libxml \
+ --disable-simplexml \
+ --disable-xml \
+ --disable-xmlreader \
+ --disable-xmlwriter \
+ --without-pear && \
+ make install
+RUN cd .. && rm -rf php-5.4.9*
+RUN strip /opt/php-5.4.9/bin/php
+
+# PHP-5.5.38
+RUN curl -so php-5.5.38.tar.bz2 \
+ http://www.php.net/distributions/php-5.5.38.tar.bz2
+RUN tar xjf php-5.5.38.tar.bz2
+RUN cd php-5.5.38 && \
+ ./configure --prefix=/opt/php-5.5.38 \
+ --enable-debug \
+ --disable-all \
+ --disable-cgi \
+ --disable-dom \
+ --disable-libxml \
+ --disable-simplexml \
+ --disable-xml \
+ --disable-xmlreader \
+ --disable-xmlwriter \
+ --without-pear && \
+ make install
+RUN cd .. && rm -rf php-5.5.38*
+RUN strip /opt/php-5.5.38/bin/php
+
+# PHP-5.6.28
+RUN curl -so php-5.6.28.tar.bz2 \
+ http://www.php.net/distributions/php-5.6.28.tar.bz2
+RUN tar xjf php-5.6.28.tar.bz2
+RUN cd php-5.6.28 && \
+ ./configure --prefix=/opt/php-5.6.28 \
+ --enable-debug \
+ --disable-all \
+ --disable-cgi \
+ --disable-dom \
+ --disable-libxml \
+ --disable-simplexml \
+ --disable-xml \
+ --disable-xmlreader \
+ --disable-xmlwriter \
+ --without-pear && \
+ make install
+RUN cd .. && rm -rf php-5.6.28*
+RUN strip /opt/php-5.6.28/bin/php
+
+# PHP-7.0.13
+RUN curl -so php-7.0.13.tar.bz2 \
+ http://www.php.net/distributions/php-7.0.13.tar.bz2
+RUN tar xjf php-7.0.13.tar.bz2
+RUN cd php-7.0.13 && \
+ ./configure --prefix=/opt/php-7.0.13 \
+ --enable-debug \
+ --disable-all \
+ --disable-cgi \
+ --disable-dom \
+ --disable-libxml \
+ --disable-simplexml \
+ --disable-xml \
+ --disable-xmlreader \
+ --disable-xmlwriter \
+ --without-pear && \
+ make install
+RUN cd .. && rm -rf php-7.0.13*
+RUN rm /opt/php-7.0.13/bin/phpdbg
+RUN strip /opt/php-7.0.13/bin/php
+
+# PHP-7.1.0
+RUN curl -so php-7.1.0.tar.bz2 \
+ http://www.php.net/distributions/php-7.1.0.tar.bz2
+RUN tar xjf php-7.1.0.tar.bz2
+RUN cd php-7.1.0 && \
+ ./configure --prefix=/opt/php-7.1.0 \
+ --enable-debug \
+ --disable-all \
+ --disable-cgi \
+ --disable-dom \
+ --disable-libxml \
+ --disable-simplexml \
+ --disable-xml \
+ --disable-xmlreader \
+ --disable-xmlwriter \
+ --without-pear && \
+ make install
+RUN cd .. && rm -rf php-7.1.0*
+RUN rm /opt/php-7.1.0/bin/phpdbg
+RUN strip /opt/php-7.1.0/bin/php
+
+
+# GEOS-3.4.3
+RUN curl -so geos-3.4.3.tar.bz2 \
+ http://download.osgeo.org/geos/geos-3.4.3.tar.bz2
+RUN tar xjf geos-3.4.3.tar.bz2
+RUN cd geos-3.4.3 && \
+ ./configure --prefix=/opt/geos-3.4.3 \
+ --disable-swig \
+ --disable-static \
+ && make install-strip
+RUN cd .. && rm -rf geos-3.4.3*
+
+# GEOS-3.5.1
+RUN curl -so geos-3.5.1.tar.bz2 \
+ http://download.osgeo.org/geos/geos-3.5.1.tar.bz2
+RUN tar xjf geos-3.5.1.tar.bz2
+RUN cd geos-3.5.1 && \
+ ./configure --prefix=/opt/geos-3.5.1 \
+ --disable-swig \
+ --disable-static \
+ && make install-strip
+RUN cd .. && rm -rf geos-3.5.1*
+
+# GEOS-3.6.0
+RUN curl -so geos-3.6.0.tar.bz2 \
+ http://download.osgeo.org/geos/geos-3.6.0.tar.bz2
+RUN tar xjf geos-3.6.0.tar.bz2
+RUN cd geos-3.6.0 && \
+ ./configure --prefix=/opt/geos-3.6.0 \
+ --disable-swig \
+ --disable-static \
+ && make install-strip
+RUN cd .. && rm -rf geos-3.6.0*
diff --git a/docker/build-test/Makefile b/docker/build-test/Makefile
index e28c853..42362ac 100644
--- a/docker/build-test/Makefile
+++ b/docker/build-test/Makefile
@@ -2,18 +2,20 @@ DOCKER=docker
REGISTRY=docker.kbt.io
NAME=$(REGISTRY)/php-geos/build-test
+BUILDOPTS=--build-arg http_proxy=$${http_proxy}
+
all: alpine trisquel
push: alpine-push trisquel-push
alpine:
- $(DOCKER) build -t $(NAME):alpine - < Dockerfile.alpine
+ $(DOCKER) build $(BUILDOPTS) -t $(NAME):alpine - < Dockerfile.alpine
alpine-push:
$(DOCKER) push $(NAME):alpine
trisquel:
- $(DOCKER) build -t $(NAME):trisquel - < Dockerfile.trisquel
+ $(DOCKER) build $(BUILDOPTS) -t $(NAME):trisquel - < Dockerfile.trisquel
trisquel-push:
$(DOCKER) push $(NAME):trisquel
diff --git a/tests/001_Geometry.phpt b/tests/001_Geometry.phpt
index ef7a0cb..5715348 100644
--- a/tests/001_Geometry.phpt
+++ b/tests/001_Geometry.phpt
@@ -15,11 +15,11 @@ class GeometryTest extends GEOSTest
$writer = new GEOSWKTWriter();
- if (method_exists(GEOSWKTWriter::class, 'setTrim')) {
+ if (method_exists("GEOSWKTWriter", 'setTrim')) {
$writer->setTrim(TRUE);
}
- if (method_exists(GEOSWKTWriter::class, 'setOutputDimension')) {
+ if (method_exists("GEOSWKTWriter", 'setOutputDimension')) {
$writer->setOutputDimension(3);
}
@@ -91,7 +91,7 @@ class GeometryTest extends GEOSTest
$reader = new GEOSWKTReader();
$writer = new GEOSWKTWriter();
- if (method_exists(GEOSWKTWriter::class, 'setTrim')) {
+ if (method_exists("GEOSWKTWriter", 'setTrim')) {
$writer->setTrim(TRUE);
}
@@ -135,7 +135,7 @@ class GeometryTest extends GEOSTest
$reader = new GEOSWKTReader();
$writer = new GEOSWKTWriter();
- if (method_exists(GEOSWKTWriter::class, 'setRoundingPrecision')) {
+ if (method_exists("GEOSWKTWriter", 'setRoundingPrecision')) {
$writer->setRoundingPrecision(0);
}
@@ -240,7 +240,7 @@ class GeometryTest extends GEOSTest
public function testGeometry_offsetCurve()
{
- if (!method_exists(GEOSGeometry::class, 'offsetCurve')) {
+ if (!method_exists("GEOSGeometry", 'offsetCurve')) {
return;
}
@@ -309,7 +309,7 @@ class GeometryTest extends GEOSTest
$reader = new GEOSWKTReader();
$writer = new GEOSWKTWriter();
- if (method_exists(GEOSWKTWriter::class, 'setRoundingPrecision')) {
+ if (method_exists("GEOSWKTWriter", 'setRoundingPrecision')) {
$writer->setRoundingPrecision(0);
}
@@ -327,7 +327,7 @@ class GeometryTest extends GEOSTest
$reader = new GEOSWKTReader();
$writer = new GEOSWKTWriter();
- if (method_exists(GEOSWKTWriter::class, 'setRoundingPrecision')) {
+ if (method_exists("GEOSWKTWriter", 'setRoundingPrecision')) {
$writer->setRoundingPrecision(0);
}
@@ -382,7 +382,7 @@ class GeometryTest extends GEOSTest
public function testGeometry_clipByRect()
{
- if (!method_exists(GEOSGeometry::class, 'clipByRect')) {
+ if (!method_exists("GEOSGeometry", 'clipByRect')) {
return;
}
@@ -415,7 +415,7 @@ class GeometryTest extends GEOSTest
$reader = new GEOSWKTReader();
$writer = new GEOSWKTWriter();
- if (method_exists(GEOSWKTWriter::class, 'setRoundingPrecision')) {
+ if (method_exists("GEOSWKTWriter", 'setRoundingPrecision')) {
$writer->setRoundingPrecision(0);
}
@@ -437,7 +437,7 @@ class GeometryTest extends GEOSTest
$reader = new GEOSWKTReader();
$writer = new GEOSWKTWriter();
- if (method_exists(GEOSWKTWriter::class, 'setRoundingPrecision')) {
+ if (method_exists("GEOSWKTWriter", 'setRoundingPrecision')) {
$writer->setRoundingPrecision(0);
}
@@ -495,7 +495,7 @@ class GeometryTest extends GEOSTest
$reader = new GEOSWKTReader();
$writer = new GEOSWKTWriter();
- if (method_exists(GEOSWKTWriter::class, 'setRoundingPrecision')) {
+ if (method_exists("GEOSWKTWriter", 'setRoundingPrecision')) {
$writer->setRoundingPrecision(0);
}
@@ -553,7 +553,7 @@ class GeometryTest extends GEOSTest
$reader = new GEOSWKTReader();
$writer = new GEOSWKTWriter();
- if (method_exists(GEOSWKTWriter::class, 'setRoundingPrecision')) {
+ if (method_exists("GEOSWKTWriter", 'setRoundingPrecision')) {
$writer->setRoundingPrecision(0);
}
@@ -575,7 +575,7 @@ class GeometryTest extends GEOSTest
$reader = new GEOSWKTReader();
$writer = new GEOSWKTWriter();
- if (method_exists(GEOSWKTWriter::class, 'setRoundingPrecision')) {
+ if (method_exists("GEOSWKTWriter", 'setRoundingPrecision')) {
$writer->setRoundingPrecision(0);
}
@@ -633,7 +633,7 @@ class GeometryTest extends GEOSTest
$reader = new GEOSWKTReader();
$writer = new GEOSWKTWriter();
- if (method_exists(GEOSWKTWriter::class, 'setRoundingPrecision')) {
+ if (method_exists("GEOSWKTWriter", 'setRoundingPrecision')) {
$writer->setRoundingPrecision(0);
}
@@ -696,7 +696,7 @@ class GeometryTest extends GEOSTest
$reader = new GEOSWKTReader();
$writer = new GEOSWKTWriter();
- if (method_exists(GEOSWKTWriter::class, 'setRoundingPrecision')) {
+ if (method_exists("GEOSWKTWriter", 'setRoundingPrecision')) {
$writer->setRoundingPrecision(0);
}
@@ -718,7 +718,7 @@ class GeometryTest extends GEOSTest
$reader = new GEOSWKTReader();
$writer = new GEOSWKTWriter();
- if (method_exists(GEOSWKTWriter::class, 'setRoundingPrecision')) {
+ if (method_exists("GEOSWKTWriter", 'setRoundingPrecision')) {
$writer->setRoundingPrecision(0);
}
@@ -740,7 +740,7 @@ class GeometryTest extends GEOSTest
$reader = new GEOSWKTReader();
$writer = new GEOSWKTWriter();
- if (method_exists(GEOSWKTWriter::class, 'setRoundingPrecision')) {
+ if (method_exists("GEOSWKTWriter", 'setRoundingPrecision')) {
$writer->setRoundingPrecision(0);
}
@@ -781,14 +781,14 @@ class GeometryTest extends GEOSTest
public function testGeometry_relateBoundaryNodeRule()
{
- if (!method_exists(GEOSGeometry::class, 'relateBoundaryNodeRule')) {
+ if (!method_exists("GEOSGeometry", 'relateBoundaryNodeRule')) {
return;
}
$reader = new GEOSWKTReader();
$writer = new GEOSWKTWriter();
- if (method_exists(GEOSWKTWriter::class, 'setRoundingPrecision')) {
+ if (method_exists("GEOSWKTWriter", 'setRoundingPrecision')) {
$writer->setRoundingPrecision(0);
}
@@ -808,7 +808,7 @@ class GeometryTest extends GEOSTest
$reader = new GEOSWKTReader();
$writer = new GEOSWKTWriter();
- if (method_exists(GEOSWKTWriter::class, 'setRoundingPrecision')) {
+ if (method_exists("GEOSWKTWriter", 'setRoundingPrecision')) {
$writer->setRoundingPrecision(0);
}
@@ -879,7 +879,7 @@ class GeometryTest extends GEOSTest
$reader = new GEOSWKTReader();
$writer = new GEOSWKTWriter();
- if (method_exists(GEOSWKTWriter::class, 'setRoundingPrecision')) {
+ if (method_exists("GEOSWKTWriter", 'setRoundingPrecision')) {
$writer->setRoundingPrecision(0);
}
@@ -908,7 +908,7 @@ class GeometryTest extends GEOSTest
$reader = new GEOSWKTReader();
$writer = new GEOSWKTWriter();
- if (method_exists(GEOSWKTWriter::class, 'setRoundingPrecision')) {
+ if (method_exists("GEOSWKTWriter", 'setRoundingPrecision')) {
$writer->setRoundingPrecision(0);
}
@@ -924,7 +924,7 @@ class GeometryTest extends GEOSTest
$reader = new GEOSWKTReader();
$writer = new GEOSWKTWriter();
- if (method_exists(GEOSWKTWriter::class, 'setRoundingPrecision')) {
+ if (method_exists("GEOSWKTWriter", 'setRoundingPrecision')) {
$writer->setRoundingPrecision(0);
}
@@ -937,14 +937,14 @@ class GeometryTest extends GEOSTest
public function testGeometry_extractUniquePoints()
{
- if (!method_exists(GEOSGeometry::class, 'extractUniquePoints')) {
+ if (!method_exists("GEOSGeometry", 'extractUniquePoints')) {
return;
}
$reader = new GEOSWKTReader();
$writer = new GEOSWKTWriter();
- if (method_exists(GEOSWKTWriter::class, 'setRoundingPrecision')) {
+ if (method_exists("GEOSWKTWriter", 'setRoundingPrecision')) {
$writer->setRoundingPrecision(0);
}
@@ -975,7 +975,7 @@ class GeometryTest extends GEOSTest
$reader = new GEOSWKTReader();
$writer = new GEOSWKTWriter();
- if (method_exists(GEOSWKTWriter::class, 'setRoundingPrecision')) {
+ if (method_exists("GEOSWKTWriter", 'setRoundingPrecision')) {
$writer->setRoundingPrecision(0);
}
@@ -992,11 +992,11 @@ class GeometryTest extends GEOSTest
$this->assertTrue( $g1->equals($g2) );
$this->assertTrue( $g1->equalsExact($g2) );
- if (method_exists(GEOSGeometry::class, 'covers')) {
+ if (method_exists("GEOSGeometry", 'covers')) {
$this->assertTrue( $g1->covers($g2) );
}
- if (method_exists(GEOSGeometry::class, 'coveredBy')) {
+ if (method_exists("GEOSGeometry", 'coveredBy')) {
$this->assertTrue( $g1->coveredBy($g2) );
}
@@ -1013,11 +1013,11 @@ class GeometryTest extends GEOSTest
$this->assertFalse( $g1->equals($g2) );
$this->assertFalse( $g1->equalsExact($g2, 10) );
- if (method_exists(GEOSGeometry::class, 'covers')) {
+ if (method_exists("GEOSGeometry", 'covers')) {
$this->assertFalse( $g1->covers($g2) );
}
- if (method_exists(GEOSGeometry::class, 'coveredBy')) {
+ if (method_exists("GEOSGeometry", 'coveredBy')) {
$this->assertTrue( $g1->coveredBy($g2) );
}
@@ -1034,11 +1034,11 @@ class GeometryTest extends GEOSTest
$this->assertFalse( $g1->equals($g2) );
$this->assertFalse( $g1->equalsExact($g2, 10) );
- if (method_exists(GEOSGeometry::class, 'covers')) {
+ if (method_exists("GEOSGeometry", 'covers')) {
$this->assertFalse( $g1->covers($g2) );
}
- if (method_exists(GEOSGeometry::class, 'coveredBy')) {
+ if (method_exists("GEOSGeometry", 'coveredBy')) {
$this->assertTrue( $g1->coveredBy($g2) );
}
@@ -1055,11 +1055,11 @@ class GeometryTest extends GEOSTest
$this->assertFalse( $g1->equals($g2) );
$this->assertFalse( $g1->equalsExact($g2, 1) );
- if (method_exists(GEOSGeometry::class, 'covers')) {
+ if (method_exists("GEOSGeometry", 'covers')) {
$this->assertFalse( $g1->covers($g2) );
}
- if (method_exists(GEOSGeometry::class, 'coveredBy')) {
+ if (method_exists("GEOSGeometry", 'coveredBy')) {
$this->assertFalse( $g1->coveredBy($g2) );
}
@@ -1076,11 +1076,11 @@ class GeometryTest extends GEOSTest
$this->assertFalse( $g1->equals($g2) );
$this->assertFalse( $g1->equalsExact($g2, 1) );
- if (method_exists(GEOSGeometry::class, 'covers')) {
+ if (method_exists("GEOSGeometry", 'covers')) {
$this->assertFalse( $g1->covers($g2) );
}
- if (method_exists(GEOSGeometry::class, 'coveredBy')) {
+ if (method_exists("GEOSGeometry", 'coveredBy')) {
$this->assertFalse( $g1->coveredBy($g2) );
}
@@ -1097,11 +1097,11 @@ class GeometryTest extends GEOSTest
$this->assertTrue( $g1->equals($g2) );
$this->assertFalse( $g1->equalsExact($g2, 1) );
- if (method_exists(GEOSGeometry::class, 'covers')) {
+ if (method_exists("GEOSGeometry", 'covers')) {
$this->assertTrue( $g1->covers($g2) );
}
- if (method_exists(GEOSGeometry::class, 'coveredBy')) {
+ if (method_exists("GEOSGeometry", 'coveredBy')) {
$this->assertTrue( $g1->coveredBy($g2) );
}
@@ -1118,11 +1118,11 @@ class GeometryTest extends GEOSTest
$this->assertFalse( $g1->equals($g2) );
$this->assertFalse( $g1->equalsExact($g2, 1) );
- if (method_exists(GEOSGeometry::class, 'covers')) {
+ if (method_exists("GEOSGeometry", 'covers')) {
$this->assertFalse( $g1->covers($g2) );
}
- if (method_exists(GEOSGeometry::class, 'coveredBy')) {
+ if (method_exists("GEOSGeometry", 'coveredBy')) {
$this->assertFalse( $g1->coveredBy($g2) );
}
@@ -1139,11 +1139,11 @@ class GeometryTest extends GEOSTest
$this->assertFalse( $g1->equals($g2) );
$this->assertFalse( $g1->equalsExact($g2, 1) );
- if (method_exists(GEOSGeometry::class, 'covers')) {
+ if (method_exists("GEOSGeometry", 'covers')) {
$this->assertFalse( $g1->covers($g2) );
}
- if (method_exists(GEOSGeometry::class, 'coveredBy')) {
+ if (method_exists("GEOSGeometry", 'coveredBy')) {
$this->assertFalse( $g1->coveredBy($g2) );
}
@@ -1160,11 +1160,11 @@ class GeometryTest extends GEOSTest
$this->assertFalse( $g1->equals($g2) );
$this->assertFalse( $g1->equalsExact($g2, 1) );
- if (method_exists(GEOSGeometry::class, 'covers')) {
+ if (method_exists("GEOSGeometry", 'covers')) {
$this->assertTrue( $g1->covers($g2) );
}
- if (method_exists(GEOSGeometry::class, 'coveredBy')) {
+ if (method_exists("GEOSGeometry", 'coveredBy')) {
$this->assertFalse( $g1->coveredBy($g2) );
}
@@ -1175,7 +1175,7 @@ class GeometryTest extends GEOSTest
$reader = new GEOSWKTReader();
$writer = new GEOSWKTWriter();
- if (method_exists(GEOSWKTWriter::class, 'setRoundingPrecision')) {
+ if (method_exists("GEOSWKTWriter", 'setRoundingPrecision')) {
$writer->setRoundingPrecision(0);
}
@@ -1206,14 +1206,14 @@ class GeometryTest extends GEOSTest
public function testGeometry_checkValidity()
{
- if (!method_exists(GEOSGeometry::class, 'checkValidity')) {
+ if (!method_exists("GEOSGeometry", 'checkValidity')) {
return;
}
$reader = new GEOSWKTReader();
$writer = new GEOSWKTWriter();
- if (method_exists(GEOSWKTWriter::class, 'setRoundingPrecision')) {
+ if (method_exists("GEOSWKTWriter", 'setRoundingPrecision')) {
$writer->setRoundingPrecision(0);
}
@@ -1295,7 +1295,7 @@ class GeometryTest extends GEOSTest
public function testGeometry_isClosed()
{
- if (!method_exists(GEOSGeometry::class, 'isClosed')) {
+ if (!method_exists("GEOSGeometry", 'isClosed')) {
return;
}
@@ -1445,7 +1445,7 @@ class GeometryTest extends GEOSTest
public function testGeometry_numPoints()
{
- if (!method_exists(GEOSGeometry::class, 'numPoints')) {
+ if (!method_exists("GEOSGeometry", 'numPoints')) {
return;
}
@@ -1466,11 +1466,11 @@ class GeometryTest extends GEOSTest
public function testGeometry_getXY()
{
- if (!method_exists(GEOSGeometry::class, 'getX')) {
+ if (!method_exists("GEOSGeometry", 'getX')) {
return;
}
- if (!method_exists(GEOSGeometry::class, 'getY')) {
+ if (!method_exists("GEOSGeometry", 'getY')) {
return;
}
@@ -1502,7 +1502,7 @@ class GeometryTest extends GEOSTest
$reader = new GEOSWKTReader();
$writer = new GEOSWKTWriter();
- if (method_exists(GEOSWKTWriter::class, 'setRoundingPrecision')) {
+ if (method_exists("GEOSWKTWriter", 'setRoundingPrecision')) {
$writer->setRoundingPrecision(0);
}
@@ -1542,7 +1542,7 @@ class GeometryTest extends GEOSTest
$reader = new GEOSWKTReader();
$writer = new GEOSWKTWriter();
- if (method_exists(GEOSWKTWriter::class, 'setRoundingPrecision')) {
+ if (method_exists("GEOSWKTWriter", 'setRoundingPrecision')) {
$writer->setRoundingPrecision(0);
}
@@ -1643,7 +1643,7 @@ class GeometryTest extends GEOSTest
public function testGeometry_coordinateDimension()
{
- if (!method_exists(GEOSGeometry::class, 'coordinateDimension')) {
+ if (!method_exists("GEOSGeometry", 'coordinateDimension')) {
return;
}
@@ -1659,7 +1659,7 @@ class GeometryTest extends GEOSTest
public function testGeometry_pointN()
{
- if (!method_exists(GEOSGeometry::class, 'pointN')) {
+ if (!method_exists("GEOSGeometry", 'pointN')) {
return;
}
@@ -1692,18 +1692,18 @@ class GeometryTest extends GEOSTest
public function testGeometry_startendPoint()
{
- if (!method_exists(GEOSGeometry::class, 'startPoint')) {
+ if (!method_exists("GEOSGeometry", 'startPoint')) {
return;
}
- if (!method_exists(GEOSGeometry::class, 'endPoint')) {
+ if (!method_exists("GEOSGeometry", 'endPoint')) {
return;
}
$reader = new GEOSWKTReader();
$writer = new GEOSWKTWriter();
- if (method_exists(GEOSWKTWriter::class, 'setRoundingPrecision')) {
+ if (method_exists("GEOSWKTWriter", 'setRoundingPrecision')) {
$writer->setRoundingPrecision(0);
}
@@ -1731,7 +1731,7 @@ class GeometryTest extends GEOSTest
$reader = new GEOSWKTReader();
$writer = new GEOSWKTWriter();
- if (method_exists(GEOSWKTWriter::class, 'setRoundingPrecision')) {
+ if (method_exists("GEOSWKTWriter", 'setRoundingPrecision')) {
$writer->setRoundingPrecision(0);
}
@@ -1797,7 +1797,7 @@ class GeometryTest extends GEOSTest
public function testGeometry_delaunayTriangulation()
{
- if (!method_exists(GEOSGeometry::class, 'delaunayTriangulation')) {
+ if (!method_exists("GEOSGeometry", 'delaunayTriangulation')) {
return;
}
@@ -1817,7 +1817,7 @@ class GeometryTest extends GEOSTest
public function testGeometry_voronoiDiagram()
{
- if (!method_exists(GEOSGeometry::class, 'voronoiDiagram')) {
+ if (!method_exists("GEOSGeometry", 'voronoiDiagram')) {
return;
}
@@ -1840,7 +1840,7 @@ class GeometryTest extends GEOSTest
public function testGeometry_snapTo()
{
- if (!method_exists(GEOSGeometry::class, 'snapTo')) {
+ if (!method_exists("GEOSGeometry", 'snapTo')) {
return;
}
@@ -1861,7 +1861,7 @@ class GeometryTest extends GEOSTest
public function testGeometry_node()
{
- if (!method_exists(GEOSGeometry::class, 'node')) {
+ if (!method_exists("GEOSGeometry", 'node')) {
return;
}
diff --git a/tests/002_WKTWriter.phpt b/tests/002_WKTWriter.phpt
index 646cf81..6bb7253 100644
--- a/tests/002_WKTWriter.phpt
+++ b/tests/002_WKTWriter.phpt
@@ -35,7 +35,7 @@ class WKTWriterTest extends GEOSTest
public function testWKTWriter_setTrim()
{
- if (!method_exists(GEOSWKTWriter::class, 'setTrim')) {
+ if (!method_exists("GEOSWKTWriter", 'setTrim')) {
return;
}
@@ -60,7 +60,7 @@ class WKTWriterTest extends GEOSTest
$r = new GEOSWKTReader();
$w = new GEOSWKTWriter();
- if (method_exists(GEOSWKTWriter::class, 'setTrim')) {
+ if (method_exists("GEOSWKTWriter", 'setTrim')) {
$w->setTrim(TRUE);
}
@@ -87,7 +87,7 @@ class WKTWriterTest extends GEOSTest
public function testWKTWriter_setRoundingPrecision()
{
- if (!method_exists(GEOSWKTWriter::class, 'setRoundingPrecision')) {
+ if (!method_exists("GEOSWKTWriter", 'setRoundingPrecision')) {
return;
}
@@ -115,7 +115,7 @@ class WKTWriterTest extends GEOSTest
public function testWKTWriter_getOutputDimension()
{
- if (!method_exists(GEOSWKTWriter::class, 'getOutputDimension')) {
+ if (!method_exists("GEOSWKTWriter", 'getOutputDimension')) {
return;
}
@@ -125,7 +125,7 @@ class WKTWriterTest extends GEOSTest
public function testWKTWriter_setOutputDimension()
{
- if (!method_exists(GEOSWKTWriter::class, 'setOutputDimension')) {
+ if (!method_exists("GEOSWKTWriter", 'setOutputDimension')) {
return;
}
@@ -164,7 +164,7 @@ class WKTWriterTest extends GEOSTest
public function testWKTWriter_setOld3D()
{
- if (!method_exists(GEOSWKTWriter::class, 'setOld3D')) {
+ if (!method_exists("GEOSWKTWriter", 'setOld3D')) {
return;
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/php-geos.git
More information about the Pkg-grass-devel
mailing list