Skip to content

Commit 810ac48

Browse files
committed
Move the php_array to contrib/ and rename to _api
The current name conflicted with PHP own php_array.h :]
1 parent 47039b3 commit 810ac48

File tree

6 files changed

+11
-5
lines changed

6 files changed

+11
-5
lines changed

Makefile.frag

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ coverage: mv-coverage lcov-local
5656

5757

5858
coveralls: mv-coverage lcov-coveralls
59-
coveralls --exclude src/libbson --exclude src/libmongoc --exclude src/contrib --exclude lib --exclude tests --exclude src/MongoDB/php_array.h --exclude src/php_array.h
59+
coveralls --exclude src/libbson --exclude src/libmongoc --exclude src/contrib --exclude lib --exclude tests
6060

6161
composer:
6262
@command -v composer >/dev/null 2>&1; \

php_phongo.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,15 @@
5151
#include <main/php_network.h>
5252
/* Debug log writing */
5353
#include <main/php_open_temporary_file.h>
54+
/* PHP array helpers */
55+
#include "src/contrib/php_array_api.h"
56+
5457
/* Our Compatability header */
5558
#include "phongo_compat.h"
5659

5760
/* Our stuffz */
5861
#include "php_phongo.h"
5962
#include "php_bson.h"
60-
#include "php_array.h"
6163
#include "src/contrib/php-ssl.h"
6264

6365
#undef MONGOC_LOG_DOMAIN

src/MongoDB/BulkWrite.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,14 @@
3737
#include <ext/standard/info.h>
3838
#include <Zend/zend_interfaces.h>
3939
#include <ext/spl/spl_iterators.h>
40+
/* PHP array helpers */
41+
#include "src/contrib/php_array_api.h"
4042
/* Our Compatability header */
4143
#include "phongo_compat.h"
4244

4345
/* Our stuffz */
4446
#include "php_phongo.h"
4547
#include "php_bson.h"
46-
#include "php_array.h"
4748

4849

4950
PHONGO_API zend_class_entry *php_phongo_bulkwrite_ce;

src/MongoDB/Manager.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,14 @@
3838
#include <Zend/zend_interfaces.h>
3939
#include <Zend/zend_hash.h>
4040
#include <ext/spl/spl_iterators.h>
41+
/* PHP array helpers */
42+
#include "src/contrib/php_array_api.h"
4143
/* Our Compatability header */
4244
#include "phongo_compat.h"
4345

4446
/* Our stuffz */
4547
#include "php_phongo.h"
4648
#include "php_bson.h"
47-
#include "php_array.h"
4849

4950

5051
PHONGO_API zend_class_entry *php_phongo_manager_ce;

src/bson.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,15 @@
3030
#include <ext/spl/spl_array.h>
3131
#include <Zend/zend_interfaces.h>
3232

33+
/* PHP array helpers */
34+
#include "src/contrib/php_array_api.h"
35+
3336
/* Our Compatability header */
3437
#include "phongo_compat.h"
3538

3639
/* Our stuffz */
3740
#include "php_phongo.h"
3841
#include "php_bson.h"
39-
#include "php_array.h"
4042

4143

4244
#define BSON_APPEND_INT32(b,key,val) \
File renamed without changes.

0 commit comments

Comments
 (0)