php-pecl-mongodb: 0.5.1 (alpha)

3 files changed, 66 insertions, 162 deletions

diff --git a/REFLECTION b/REFLECTION
index 0df26f9..21f9866 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,13 +1,13 @@
-Extension [ <persistent> extension #16 mongodb version 0.5.0 ] {
+Extension [ <persistent> extension #122 mongodb version 0.5.1 ] {
 
   - INI {
-    Entry [ mongodb.debug_log <ALL> ]
+    Entry [ mongodb.debug <ALL> ]
       Current = ''
     }
   }
 
   - Constants [2] {
-    Constant [ string MONGODB_VERSION ] { 0.5.0 }
+    Constant [ string MONGODB_VERSION ] { 0.5.1 }
     Constant [ string MONGODB_STABILITY ] { alpha }
   }
 
@@ -38,7 +38,7 @@ Extension [ <persistent> extension #16 mongodb version 0.5.0 ] {
     }
   }
 
-  - Classes [36] {
+  - Classes [37] {
     Class [ <internal:mongodb> final class MongoDB\Driver\Command ] {
 
       - Constants [0] {
@@ -762,6 +762,60 @@ Extension [ <persistent> extension #16 mongodb version 0.5.0 ] {
       }
     }
 
+    Class [ <internal:mongodb> class MongoDB\Driver\UnexpectedValueException extends UnexpectedValueException implements MongoDB\Driver\Exception ] {
+
+      - Constants [0] {
+      }
+
+      - Static properties [0] {
+      }
+
+      - Static methods [0] {
+      }
+
+      - Properties [4] {
+        Property [ <default> protected $message ]
+        Property [ <default> protected $code ]
+        Property [ <default> protected $file ]
+        Property [ <default> protected $line ]
+      }
+
+      - Methods [9] {
+        Method [ <internal:Core, inherits Exception, ctor> public method __construct ] {
+
+          - Parameters [3] {
+            Parameter #0 [ <optional> $message ]
+            Parameter #1 [ <optional> $code ]
+            Parameter #2 [ <optional> $previous ]
+          }
+        }
+
+        Method [ <internal:Core, inherits Exception> final public method getMessage ] {
+        }
+
+        Method [ <internal:Core, inherits Exception> final public method getCode ] {
+        }
+
+        Method [ <internal:Core, inherits Exception> final public method getFile ] {
+        }
+
+        Method [ <internal:Core, inherits Exception> final public method getLine ] {
+        }
+
+        Method [ <internal:Core, inherits Exception> final public method getTrace ] {
+        }
+
+        Method [ <internal:Core, inherits Exception> final public method getPrevious ] {
+        }
+
+        Method [ <internal:Core, inherits Exception> final public method getTraceAsString ] {
+        }
+
+        Method [ <internal:Core, inherits Exception> public method __toString ] {
+        }
+      }
+    }
+
     Class [ <internal:mongodb> class MongoDB\Driver\InvalidArgumentException extends InvalidArgumentException implements MongoDB\Driver\Exception ] {
 
       - Constants [0] {
diff --git a/mongodb-upstream.patch b/mongodb-upstream.patch
deleted file mode 100644
index 74bfff3..0000000
--- a/mongodb-upstream.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-From a2770118b9b94d3d94a4de80e08e37bb7324ad76 Mon Sep 17 00:00:00 2001
-From: Remi Collet <fedora@famillecollet.com>
-Date: Wed, 22 Apr 2015 15:54:59 +0200
-Subject: [PATCH] PHPC-259: add --with-libbson option
-
----
- config.m4 | 82 ++++++++++++++++++++++++++++++++++++++++++---------------------
- 1 file changed, 55 insertions(+), 27 deletions(-)
-
-diff --git a/config.m4 b/config.m4
-index 59234af..bc17601 100644
---- a/config.m4
-+++ b/config.m4
-@@ -284,6 +284,31 @@ MONGOC_SOURCES_SASL=mongoc-sasl.c
-     PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb), $MONGODB_CONTRIB,            [$STD_CFLAGS $MAINTAINER_CFLAGS $COVERAGE_CFLAGS], shared_objects_mongodb, yes)
-   fi
- 
-+PHP_ARG_WITH(libbson, Use system libbson,
-+[  --with-libbson             Use system libbson], no, no)
-+
-+  if test "$PHP_LIBBSON" != "no"; then
-+    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+    AC_MSG_CHECKING(for libbson)
-+    if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libbson-1.0; then
-+      if $PKG_CONFIG libbson-1.0 --atleast-version 1.2.0; then
-+        LIBBSON_INC=`$PKG_CONFIG libbson-1.0 --cflags`
-+        LIBBSON_LIB=`$PKG_CONFIG libbson-1.0 --libs`
-+        LIBBSON_VER=`$PKG_CONFIG libbson-1.0 --modversion`
-+        AC_MSG_RESULT(version $LIBBSON_VER found)
-+      else
-+        AC_MSG_ERROR(system libbson must be upgraded to version >= 1.2.0-beta)
-+      fi
-+    else
-+      AC_MSG_ERROR(pkgconfig and libbson must be installed)
-+    fi
-+    PHP_EVAL_INCLINE($LIBBSON_INC)
-+    PHP_EVAL_LIBLINE($LIBBSON_LIB, MONGODB_SHARED_LIBADD)
-+  else
-+    PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libbson/src/yajl], $YAJL_SOURCES,            [$STD_CFLAGS $MAINTAINER_CFLAGS], shared_objects_mongodb, yes)
-+    PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libbson/src/bson], $BSON_SOURCES,            [$STD_CFLAGS $MAINTAINER_CFLAGS], shared_objects_mongodb, yes)
-+  fi
-+
- dnl libmongoc stuff {{{
-   AC_MSG_CHECKING(configuring libmongoc)
-   AC_MSG_RESULT(...)
-@@ -292,8 +317,6 @@ dnl libmongoc stuff {{{
- 
-   CPPFLAGS="$CPPFLAGS -DBSON_COMPILATION -DMONGOC_COMPILATION -DMONGOC_TRACE"
- 
--  PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libbson/src/yajl], $YAJL_SOURCES,            [$STD_CFLAGS $MAINTAINER_CFLAGS], shared_objects_mongodb, yes)
--  PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libbson/src/bson], $BSON_SOURCES,            [$STD_CFLAGS $MAINTAINER_CFLAGS], shared_objects_mongodb, yes)
-   PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libmongoc/src/mongoc], $MONGOC_SOURCES,      [$STD_CFLAGS $MAINTAINER_CFLAGS], shared_objects_mongodb, yes)
-   PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libmongoc/src/mongoc], $MONGOC_SOURCES_SSL,  [$STD_CFLAGS $MAINTAINER_CFLAGS], shared_objects_mongodb, yes)
-   PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libmongoc/src/mongoc], $MONGOC_SOURCES_SASL, [$STD_CFLAGS $MAINTAINER_CFLAGS], shared_objects_mongodb, yes)
-@@ -379,26 +402,27 @@ dnl }}}
-   PHP_NEW_EXTENSION(mongodb,    $MONGODB_ROOT, $ext_shared,, [$STD_CFLAGS $MAINTAINER_CFLAGS $COVERAGE_CFLAGS])
-   PHP_ADD_EXTENSION_DEP(mongodb, spl)
- 
--  m4_include(src/libbson/build/autotools/CheckAtomics.m4)
--  m4_include(src/libbson/build/autotools/FindDependencies.m4)
--  m4_include(src/libbson/build/autotools/m4/ac_compile_check_sizeof.m4)
--  m4_include(src/libbson/build/autotools/m4/ac_create_stdint_h.m4)
--  AC_CREATE_STDINT_H([$srcdir/src/libbson/src/bson/bson-stdint.h])
--
-   PHP_ADD_INCLUDE([$ext_srcdir/src/BSON/])
-   PHP_ADD_INCLUDE([$ext_srcdir/src/MongoDB/])
-   PHP_ADD_INCLUDE([$ext_srcdir/src/contrib/])
--  PHP_ADD_INCLUDE([$ext_srcdir/src/libbson/src/])
--  PHP_ADD_INCLUDE([$ext_srcdir/src/libbson/src/yajl/])
--  PHP_ADD_INCLUDE([$ext_srcdir/src/libbson/src/bson/])
-   PHP_ADD_INCLUDE([$ext_srcdir/src/libmongoc/src/mongoc/])
-   PHP_ADD_BUILD_DIR([$ext_builddir/src/BSON/])
-   PHP_ADD_BUILD_DIR([$ext_builddir/src/MongoDB/])
-   PHP_ADD_BUILD_DIR([$ext_builddir/src/contrib/])
--  PHP_ADD_BUILD_DIR([$ext_builddir/src/libbson/src/])
--  PHP_ADD_BUILD_DIR([$ext_builddir/src/libbson/src/yajl/])
--  PHP_ADD_BUILD_DIR([$ext_builddir/src/libbson/src/bson/])
-   PHP_ADD_BUILD_DIR([$ext_builddir/src/libmongoc/src/mongoc/])
-+  if test "$PHP_LIBBSON" == "no"; then
-+    m4_include(src/libbson/build/autotools/CheckAtomics.m4)
-+    m4_include(src/libbson/build/autotools/FindDependencies.m4)
-+    m4_include(src/libbson/build/autotools/m4/ac_compile_check_sizeof.m4)
-+    m4_include(src/libbson/build/autotools/m4/ac_create_stdint_h.m4)
-+    AC_CREATE_STDINT_H([$srcdir/src/libbson/src/bson/bson-stdint.h])
-+    PHP_ADD_INCLUDE([$ext_srcdir/src/libbson/src/])
-+    PHP_ADD_INCLUDE([$ext_srcdir/src/libbson/src/yajl/])
-+    PHP_ADD_INCLUDE([$ext_srcdir/src/libbson/src/bson/])
-+    PHP_ADD_BUILD_DIR([$ext_builddir/src/libbson/src/])
-+    PHP_ADD_BUILD_DIR([$ext_builddir/src/libbson/src/yajl/])
-+    PHP_ADD_BUILD_DIR([$ext_builddir/src/libbson/src/bson/])
-+  fi
- 
-   dnl MONGODB_SHARED_DEPENDENCIES="mongodbdep"
-   dnl PHP_SUBST(MONGODB_SHARED_DEPENDENCIES)
-@@ -432,7 +456,6 @@ dnl }}}
-   AC_SUBST(BSON_HAVE_SNPRINTF)
- 
-   m4_include(src/libmongoc/build/autotools/Versions.m4)
--  m4_include(src/libbson/build/autotools/Versions.m4)
- MONGOC_MAJOR_VERSION=mongoc_major_version
- MONGOC_MINOR_VERSION=mongoc_minor_version
- MONGOC_MICRO_VERSION=mongoc_micro_version
-@@ -443,20 +466,24 @@ AC_SUBST(MONGOC_MINOR_VERSION)
- AC_SUBST(MONGOC_MICRO_VERSION)
- AC_SUBST(MONGOC_API_VERSION)
- AC_SUBST(MONGOC_VERSION)
--BSON_MAJOR_VERSION=bson_major_version
--BSON_MINOR_VERSION=bson_minor_version
--BSON_MICRO_VERSION=bson_micro_version
--BSON_API_VERSION=1.0
--BSON_VERSION=bson_version
--AC_SUBST(BSON_MAJOR_VERSION)
--AC_SUBST(BSON_MINOR_VERSION)
--AC_SUBST(BSON_MICRO_VERSION)
--AC_SUBST(BSON_API_VERSION)
--AC_SUBST(BSON_VERSION)
-   AC_OUTPUT($srcdir/src/libmongoc/src/mongoc/mongoc-config.h)
-   AC_OUTPUT($srcdir/src/libmongoc/src/mongoc/mongoc-version.h)
--  AC_OUTPUT($srcdir/src/libbson/src/bson/bson-config.h)
--  AC_OUTPUT($srcdir/src/libbson/src/bson/bson-version.h)
-+
-+  if test "$PHP_LIBBSON" == "no"; then
-+    m4_include(src/libbson/build/autotools/Versions.m4)
-+    BSON_MAJOR_VERSION=bson_major_version
-+    BSON_MINOR_VERSION=bson_minor_version
-+    BSON_MICRO_VERSION=bson_micro_version
-+    BSON_API_VERSION=1.0
-+    BSON_VERSION=bson_version
-+    AC_SUBST(BSON_MAJOR_VERSION)
-+    AC_SUBST(BSON_MINOR_VERSION)
-+    AC_SUBST(BSON_MICRO_VERSION)
-+    AC_SUBST(BSON_API_VERSION)
-+    AC_SUBST(BSON_VERSION)
-+    AC_OUTPUT($srcdir/src/libbson/src/bson/bson-config.h)
-+    AC_OUTPUT($srcdir/src/libbson/src/bson/bson-version.h)
-+  fi
- 
-   dnl This must come after PHP_NEW_EXTENSION, otherwise the srcdir won't be set
-   PHP_ADD_MAKEFILE_FRAGMENT
-@@ -469,6 +496,7 @@ Build configuration:
-   Extra CFLAGS                                     : $STD_CFLAGS $EXTRA_CFLAGS
-   Developers flags (slow)                          : $MAINTAINER_CFLAGS
-   Code Coverage flags (extra slow)                 : $COVERAGE_CFLAGS
-+  System libbson                                   : $PHP_LIBBSON
-   LDFLAGS                                          : $LDFLAGS
-   EXTRA_LDFLAGS                                    : $EXTRA_LDFLAGS
-   MONGODB_SHARED_LIBADD                            : $MONGODB_SHARED_LIBADD
diff --git a/php-pecl-mongodb.spec b/php-pecl-mongodb.spec
index b273f1d..ef71136 100644
--- a/php-pecl-mongodb.spec
+++ b/php-pecl-mongodb.spec
@@ -21,16 +21,13 @@
 
 Summary:        MongoDB driver for PHP
 Name:           %{?scl_prefix}php-pecl-%{pecl_name}
-Version:        0.5.0
-Release:        2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Version:        0.5.1
+Release:        1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
 License:        BSD
 Group:          Development/Languages
 URL:            http://pecl.php.net/package/%{pecl_name}
 Source0:        http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
 
-# See https://jira.mongodb.org/browse/PHPC-259
-Patch0:         %{pecl_name}-upstream.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  %{?scl_prefix}php-devel
 BuildRequires:  %{?scl_prefix}php-pear
@@ -87,13 +84,9 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 mv %{pecl_name}-%{version} NTS
 
 # Don't install/register tests
-sed -e 's/role="test"/role="src"/' \
-    -e '/name="scripts/s/role="doc"/role="src"/' \
-    -e '/Vagrantfile/s/role="doc"/role="src"/' \
-    -i package.xml
+sed -e 's/role="test"/role="src"/' -i package.xml
 
 cd NTS
-%patch0 -p1 -b .upstream
 
 # Sanity check, really often broken
 extver=$(sed -n '/#define MONGODB_VERSION_S/{s/.* "//;s/".*$//;p}' php_phongo.h)
@@ -114,7 +107,7 @@ cat << 'EOF' | tee %{ini_name}
 extension=%{pecl_name}.so
 
 ; Configuration
-;mongodb.debug_log=''
+;mongodb.debug=''
 EOF
 
 
@@ -222,8 +215,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Apr 25 2015 Remi Collet <remi@fedoraproject.org> - 0.5.1-1
+- Update to 0.5.1 (alpha)
+
 * Thu Apr 23 2015 Remi Collet <remi@fedoraproject.org> - 0.5.0-2
 - build with system libbson
+- open https://jira.mongodb.org/browse/PHPC-259
 
 * Wed Apr 22 2015 Remi Collet <remi@fedoraproject.org> - 0.5.0-1
 - initial package, version 0.5.0 (alpha)
\ No newline at end of file