Re: [PHP-DOC] [ANNOUNCE] PhD 0.3.0 Released!
On Jul 24, 2008, at 10:53 PM, Brett Bieber wrote: pear uninstall __uri/phd pear install doc.php.net/phd-beta BINGO! Thanks for the lessons (and for PhD)! Ted S-R
Re: [PHP-DOC] [ANNOUNCE] PhD 0.3.0 Released!
On Thu, Jul 24, 2008 at 4:46 PM, G. T. Stresen-Reuter <[EMAIL PROTECTED]> wrote: > Getting there... see below... Are you sure you want to go down this path > with me? Your help is greatly appreciated, but if I poke around enough I'll > eventually get it installed... > > On Jul 24, 2008, at 10:40 PM, Hannes Magnusson wrote: > >> On Thu, Jul 24, 2008 at 23:37, G. T. Stresen-Reuter >> <[EMAIL PROTECTED]> wrote: >>> >>> On Jul 24, 2008, at 10:20 PM, Hannes Magnusson wrote: >>> > I'm pretty sure I'm running either 0.2.6 or 0.2.7... Any way I can find > out > for sure? phd -V gives you the installed version. >>> >>> /usr/local/php5/bin/phd -V >>> [23:35:40] PhD version: 0.2.3 >>> [23:35:40] Copyright (c) 2008 The PHP Documentation Group >> >> Try pear uninstall'ing it and then install: >> [EMAIL PROTECTED]:~$ sudo pear uninstall doc.php.net/phd-beta >> uninstall ok: channel://doc.php.net/PhD-0.3.0 >> [EMAIL PROTECTED]:~$ sudo pear install doc.php.net/phd-beta >> downloading PhD-0.3.0.tgz ... >> Starting to download PhD-0.3.0.tgz (39,686 bytes) >> ..done: 39,686 bytes >> install ok: channel://doc.php.net/PhD-0.3.0 >> > > That seemed to work, but... here's the terminal output: > > tedsr$ sudo /usr/local/php5/bin/pear uninstall doc.php.net/phd-beta > Password: > uninstall ok: channel://doc.php.net/PhD-0.2.3 > tedsr$ sudo /usr/local/php5/bin/pear install doc.php.net/phd-beta > downloading PhD-0.3.0.tgz ... > Starting to download PhD-0.3.0.tgz (39,686 bytes) > ..done: 39,686 bytes > ERROR: doc.php.net/PhD: conflicting files found: > phd/formats/xhtml.php (__uri/phd) > phd/include/PhDFormat.class.php (__uri/phd) >phd/include/PhDTheme.class.php (__uri/phd) > phd/include/PhDHelper.class.php (__uri/phd) > phd/include/PhDReader.class.php (__uri/phd) > phd/include/PhDPartialReader.class.php (__uri/phd) > phd/include/langs/bg.xml (__uri/phd) > phd/include/langs/cs.xml (__uri/phd) > phd/include/langs/de.xml (__uri/phd) > phd/include/langs/en.xml (__uri/phd) > phd/include/langs/it.xml (__uri/phd) > phd/include/langs/ja.xml (__uri/phd) > phd/include/langs/pl.xml (__uri/phd) > phd/include/langs/pt_BR.xml (__uri/phd) > phd/include/langs/ro.xml (__uri/phd) >phd/themes/php/bightml.php (__uri/phd) >phd/themes/php/chunkedhtml.php (__uri/phd) > phd/themes/php/phpdotnet.php (__uri/phd) > phd/themes/php/phpweb.php (__uri/phd) >phd/config.php (__uri/phd) > phd/LICENSE (__uri/phd) > phd/mktoc.php (__uri/phd) > phd/TODO.RENDERER (__uri/phd) > > I suspect there is a --force option for pear, but not sure how to invoke it > (nor if it is appropriate in this context). Ah, sorry, re-reading this --- you still have the package installed from __uri which will conflict with the files from the doc.php.net channel --- that's what the issue is here. pear uninstall __uri/phd pear install doc.php.net/phd-beta and if it doesn't work, bang it in there with -f ! :-) Hope that helps. -- Brett Bieber http://saltybeagle.com/
Re: [PHP-DOC] [ANNOUNCE] PhD 0.3.0 Released!
On Thu, Jul 24, 2008 at 4:46 PM, G. T. Stresen-Reuter <[EMAIL PROTECTED]> wrote: > Getting there... see below... Are you sure you want to go down this path > with me? Your help is greatly appreciated, but if I poke around enough I'll > eventually get it installed... > > On Jul 24, 2008, at 10:40 PM, Hannes Magnusson wrote: > >> On Thu, Jul 24, 2008 at 23:37, G. T. Stresen-Reuter >> <[EMAIL PROTECTED]> wrote: >>> >>> On Jul 24, 2008, at 10:20 PM, Hannes Magnusson wrote: >>> > I'm pretty sure I'm running either 0.2.6 or 0.2.7... Any way I can find > out > for sure? phd -V gives you the installed version. >>> >>> /usr/local/php5/bin/phd -V >>> [23:35:40] PhD version: 0.2.3 >>> [23:35:40] Copyright (c) 2008 The PHP Documentation Group >> >> Try pear uninstall'ing it and then install: >> [EMAIL PROTECTED]:~$ sudo pear uninstall doc.php.net/phd-beta >> uninstall ok: channel://doc.php.net/PhD-0.3.0 >> [EMAIL PROTECTED]:~$ sudo pear install doc.php.net/phd-beta >> downloading PhD-0.3.0.tgz ... >> Starting to download PhD-0.3.0.tgz (39,686 bytes) >> ..done: 39,686 bytes >> install ok: channel://doc.php.net/PhD-0.3.0 >> > > That seemed to work, but... here's the terminal output: > > tedsr$ sudo /usr/local/php5/bin/pear uninstall doc.php.net/phd-beta > Password: > uninstall ok: channel://doc.php.net/PhD-0.2.3 > tedsr$ sudo /usr/local/php5/bin/pear install doc.php.net/phd-beta > downloading PhD-0.3.0.tgz ... > Starting to download PhD-0.3.0.tgz (39,686 bytes) > ..done: 39,686 bytes > ERROR: doc.php.net/PhD: conflicting files found: > phd/formats/xhtml.php (__uri/phd) > phd/include/PhDFormat.class.php (__uri/phd) >phd/include/PhDTheme.class.php (__uri/phd) > phd/include/PhDHelper.class.php (__uri/phd) > phd/include/PhDReader.class.php (__uri/phd) > phd/include/PhDPartialReader.class.php (__uri/phd) > phd/include/langs/bg.xml (__uri/phd) > phd/include/langs/cs.xml (__uri/phd) > phd/include/langs/de.xml (__uri/phd) > phd/include/langs/en.xml (__uri/phd) > phd/include/langs/it.xml (__uri/phd) > phd/include/langs/ja.xml (__uri/phd) > phd/include/langs/pl.xml (__uri/phd) > phd/include/langs/pt_BR.xml (__uri/phd) > phd/include/langs/ro.xml (__uri/phd) >phd/themes/php/bightml.php (__uri/phd) >phd/themes/php/chunkedhtml.php (__uri/phd) > phd/themes/php/phpdotnet.php (__uri/phd) > phd/themes/php/phpweb.php (__uri/phd) >phd/config.php (__uri/phd) > phd/LICENSE (__uri/phd) > phd/mktoc.php (__uri/phd) > phd/TODO.RENDERER (__uri/phd) > > I suspect there is a --force option for pear, but not sure how to invoke it > (nor if it is appropriate in this context). Looks like you've got a couple pear installations working on one directory! -f is the force option. You can do: sudo /usr/local/php5/bin/pear install -f doc.php.net/phd-beta or sudo /usr/local/php5/bin/pear upgrade -f doc.php.net/phd-beta -- Brett Bieber http://saltybeagle.com/
Re: [PHP-DOC] [ANNOUNCE] PhD 0.3.0 Released!
Getting there... see below... Are you sure you want to go down this path with me? Your help is greatly appreciated, but if I poke around enough I'll eventually get it installed... On Jul 24, 2008, at 10:40 PM, Hannes Magnusson wrote: On Thu, Jul 24, 2008 at 23:37, G. T. Stresen-Reuter <[EMAIL PROTECTED]> wrote: On Jul 24, 2008, at 10:20 PM, Hannes Magnusson wrote: I'm pretty sure I'm running either 0.2.6 or 0.2.7... Any way I can find out for sure? phd -V gives you the installed version. /usr/local/php5/bin/phd -V [23:35:40] PhD version: 0.2.3 [23:35:40] Copyright (c) 2008 The PHP Documentation Group Try pear uninstall'ing it and then install: [EMAIL PROTECTED]:~$ sudo pear uninstall doc.php.net/phd-beta uninstall ok: channel://doc.php.net/PhD-0.3.0 [EMAIL PROTECTED]:~$ sudo pear install doc.php.net/phd-beta downloading PhD-0.3.0.tgz ... Starting to download PhD-0.3.0.tgz (39,686 bytes) ..done: 39,686 bytes install ok: channel://doc.php.net/PhD-0.3.0 That seemed to work, but... here's the terminal output: tedsr$ sudo /usr/local/php5/bin/pear uninstall doc.php.net/phd-beta Password: uninstall ok: channel://doc.php.net/PhD-0.2.3 tedsr$ sudo /usr/local/php5/bin/pear install doc.php.net/phd-beta downloading PhD-0.3.0.tgz ... Starting to download PhD-0.3.0.tgz (39,686 bytes) ..done: 39,686 bytes ERROR: doc.php.net/PhD: conflicting files found: phd/formats/xhtml.php (__uri/phd) phd/include/PhDFormat.class.php (__uri/phd) phd/include/PhDTheme.class.php (__uri/phd) phd/include/PhDHelper.class.php (__uri/phd) phd/include/PhDReader.class.php (__uri/phd) phd/include/PhDPartialReader.class.php (__uri/phd) phd/include/langs/bg.xml (__uri/phd) phd/include/langs/cs.xml (__uri/phd) phd/include/langs/de.xml (__uri/phd) phd/include/langs/en.xml (__uri/phd) phd/include/langs/it.xml (__uri/phd) phd/include/langs/ja.xml (__uri/phd) phd/include/langs/pl.xml (__uri/phd) phd/include/langs/pt_BR.xml (__uri/phd) phd/include/langs/ro.xml (__uri/phd) phd/themes/php/bightml.php (__uri/phd) phd/themes/php/chunkedhtml.php (__uri/phd) phd/themes/php/phpdotnet.php (__uri/phd) phd/themes/php/phpweb.php (__uri/phd) phd/config.php (__uri/phd) phd/LICENSE (__uri/phd) phd/mktoc.php (__uri/phd) phd/TODO.RENDERER (__uri/phd) I suspect there is a --force option for pear, but not sure how to invoke it (nor if it is appropriate in this context). Ted S-R
Re: [PHP-DOC] [ANNOUNCE] PhD 0.3.0 Released!
On Thu, Jul 24, 2008 at 4:10 PM, G. T. Stresen-Reuter <[EMAIL PROTECTED]> wrote: > On Jul 24, 2008, at 9:54 PM, Hannes Magnusson wrote: > >> Hi all! >> >> Next minor release of PhD, 0.3.0, has been released! >> For a full release history, see http://doc.php.net/phd/ >> >> To upgrade from previous releases: >>pear upgrade doc.php.net/phd-beta > > Hi Hannes, > > I'm looking forward to trying out the new version, however, when I tried: > > pear upgrade doc.php.net/phd-beta > > I got the following result: > > Nothing to upgrade You can run: pear info doc.php.net/phd also, pear clear-cache then try installing/upgrading pear upgrade doc.php.net/phd-beta The install/upgrade worked fine for me. Congrats on the new release! -- Brett Bieber http://saltybeagle.com/
Re: [PHP-DOC] [ANNOUNCE] PhD 0.3.0 Released!
On Thu, Jul 24, 2008 at 23:37, G. T. Stresen-Reuter <[EMAIL PROTECTED]> wrote: > > On Jul 24, 2008, at 10:20 PM, Hannes Magnusson wrote: > >>> I'm pretty sure I'm running either 0.2.6 or 0.2.7... Any way I can find >>> out >>> for sure? >> >> phd -V gives you the installed version. > > /usr/local/php5/bin/phd -V > [23:35:40] PhD version: 0.2.3 > [23:35:40] Copyright (c) 2008 The PHP Documentation Group Try pear uninstall'ing it and then install: [EMAIL PROTECTED]:~$ sudo pear uninstall doc.php.net/phd-beta uninstall ok: channel://doc.php.net/PhD-0.3.0 [EMAIL PROTECTED]:~$ sudo pear install doc.php.net/phd-beta downloading PhD-0.3.0.tgz ... Starting to download PhD-0.3.0.tgz (39,686 bytes) ..done: 39,686 bytes install ok: channel://doc.php.net/PhD-0.3.0 -Hannes
Re: [PHP-DOC] [ANNOUNCE] PhD 0.3.0 Released!
On Jul 24, 2008, at 10:20 PM, Hannes Magnusson wrote: I'm pretty sure I'm running either 0.2.6 or 0.2.7... Any way I can find out for sure? phd -V gives you the installed version. /usr/local/php5/bin/phd -V [23:35:40] PhD version: 0.2.3 [23:35:40] Copyright (c) 2008 The PHP Documentation Group Very weird. Almost certainly an issue with my pear installation. Thanks for confirming that it does work, though. At least I know there's hope! Ted S-R
Re: [PHP-DOC] [ANNOUNCE] PhD 0.3.0 Released!
On Thu, Jul 24, 2008 at 23:10, G. T. Stresen-Reuter <[EMAIL PROTECTED]> wrote: > On Jul 24, 2008, at 9:54 PM, Hannes Magnusson wrote: > >> Hi all! >> >> Next minor release of PhD, 0.3.0, has been released! >> For a full release history, see http://doc.php.net/phd/ >> >> To upgrade from previous releases: >>pear upgrade doc.php.net/phd-beta > > Hi Hannes, > > I'm looking forward to trying out the new version, however, when I tried: > > pear upgrade doc.php.net/phd-beta > > I got the following result: > > Nothing to upgrade Thats interesting. Worked fine for me [tm] few minutes ago: [EMAIL PROTECTED] bjori]$ phd -V [17:09:49] PhD version: 0.2.3 [17:09:49] Copyright (c) 2008 The PHP Documentation Group [EMAIL PROTECTED] bjori]$ sudo pear upgrade doc.php.net/phd-beta Password: downloading PhD-0.3.0.tgz ... Starting to download PhD-0.3.0.tgz (39,686 bytes) ..done: 39,686 bytes upgrade ok: channel://doc.php.net/PhD-0.3.0 [EMAIL PROTECTED] bjori]$ phd -V [17:11:03 - E_WARNING] /usr/local/share/pear/phd/config.php:205 getopt(): No support for long options in this build PhD version: 0.3.0 Copyright (c) 2008 The PHP Documentation Group > > I'm pretty sure I'm running either 0.2.6 or 0.2.7... Any way I can find out > for sure? phd -V gives you the installed version. -Hannes
Re: [PHP-DOC] [ANNOUNCE] PhD 0.3.0 Released!
On Jul 24, 2008, at 9:54 PM, Hannes Magnusson wrote: Hi all! Next minor release of PhD, 0.3.0, has been released! For a full release history, see http://doc.php.net/phd/ To upgrade from previous releases: pear upgrade doc.php.net/phd-beta Hi Hannes, I'm looking forward to trying out the new version, however, when I tried: pear upgrade doc.php.net/phd-beta I got the following result: Nothing to upgrade I'm pretty sure I'm running either 0.2.6 or 0.2.7... Any way I can find out for sure? Thanks in advance. Ted Stresen-Reuter
[PHP-DOC] [ANNOUNCE] PhD 0.3.0 Released!
Hi all! Next minor release of PhD, 0.3.0, has been released! For a full release history, see http://doc.php.net/phd/ To upgrade from previous releases: pear upgrade doc.php.net/phd-beta To install for the first time: pear channel-discover doc.php.net pear install doc.php.net/phd-beta The reason for the minor release bump is a good amount of new output formats/themes by our Google Summer of Code student Rudy Nappée. Rudy has has done a great job this summer and is working on even more formats these days :D The new output formats/themes are (Rudy): - CHM (-t chmsource) - KDevelop TOC (-t phpkdevelop) - Unix man pages (-f manpage -t phpfunctions) The only other change in this release is a support for the recent phpdoc:exception addition to the phpdoc/docbook DTD. I hope people can take the time and check out the new formats! For people interested in following Rudy's work on PhD check out his blog at http://loudi-soc.blogspot.com/ -Hannes
[PHP-DOC] cvs: php-src(PHP_5_3) /ext/oci8 oci8.c php_oci8.h
sixdThu Jul 24 15:24:14 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/oci8 oci8.c php_oci8.h
Log:
MFH
1. Fix macro version test for constants
2. [DOC] Increase oci8.default_prefetch to 100. Better out of box
experience. Consistent woth PDO_OCI
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8.c?r1=1.269.2.16.2.38.2.19&r2=1.269.2.16.2.38.2.20&diff_format=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.269.2.16.2.38.2.19
php-src/ext/oci8/oci8.c:1.269.2.16.2.38.2.20
--- php-src/ext/oci8/oci8.c:1.269.2.16.2.38.2.19Thu Jul 17 00:36:02 2008
+++ php-src/ext/oci8/oci8.c Thu Jul 24 15:24:14 2008
@@ -26,7 +26,7 @@
+--+
*/
-/* $Id: oci8.c,v 1.269.2.16.2.38.2.19 2008/07/17 00:36:02 sixd Exp $ */
+/* $Id: oci8.c,v 1.269.2.16.2.38.2.20 2008/07/24 15:24:14 sixd Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1046,7 +1046,7 @@
STD_PHP_INI_ENTRY( "oci8.ping_interval", "60",
PHP_INI_SYSTEM, ONUPDATELONGFUNC, ping_interval,
zend_oci_globals, oci_globals)
STD_PHP_INI_BOOLEAN("oci8.privileged_connect", "0",
PHP_INI_SYSTEM, OnUpdateBool, privileged_connect,
zend_oci_globals, oci_globals)
STD_PHP_INI_ENTRY( "oci8.statement_cache_size","20",
PHP_INI_SYSTEM, ONUPDATELONGFUNC, statement_cache_size,
zend_oci_globals, oci_globals)
- STD_PHP_INI_ENTRY( "oci8.default_prefetch","10",
PHP_INI_SYSTEM, ONUPDATELONGFUNC, default_prefetch,
zend_oci_globals, oci_globals)
+ STD_PHP_INI_ENTRY( "oci8.default_prefetch","100",
PHP_INI_SYSTEM, ONUPDATELONGFUNC, default_prefetch,
zend_oci_globals, oci_globals)
STD_PHP_INI_BOOLEAN("oci8.old_oci_close_semantics", "0",
PHP_INI_SYSTEM, OnUpdateBool,
old_oci_close_semantics,zend_oci_globals, oci_globals)
STD_PHP_INI_ENTRY( "oci8.connection_class","",
PHP_INI_ALL,OnUpdateString, connection_class,
zend_oci_globals, oci_globals)
STD_PHP_INI_BOOLEAN("oci8.events",
"0",PHP_INI_SYSTEM, OnUpdateBool, events,
zend_oci_globals, oci_globals)
@@ -1208,7 +1208,7 @@
REGISTER_LONG_CONSTANT("SQLT_LBI",SQLT_LBI, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("SQLT_BIN",SQLT_BIN, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("SQLT_ODT",SQLT_ODT, CONST_CS |
CONST_PERSISTENT);
-#if defined(HAVE_OCI_INSTANT_CLIENT) || (defined(OCI_MAJOR_VERSION) &&
OCI_MAJOR_VERSION > 10)
+#if defined(HAVE_OCI_INSTANT_CLIENT) || (defined(OCI_MAJOR_VERSION) &&
OCI_MAJOR_VERSION >= 10)
REGISTER_LONG_CONSTANT("SQLT_BDOUBLE",SQLT_BDOUBLE, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("SQLT_BFLOAT",SQLT_BFLOAT, CONST_CS |
CONST_PERSISTENT);
#endif
@@ -1311,7 +1311,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "OCI8 Support", "enabled");
php_info_print_table_row(2, "Version", PHP_OCI8_VERSION);
- php_info_print_table_row(2, "Revision", "$Revision:
1.269.2.16.2.38.2.19 $");
+ php_info_print_table_row(2, "Revision", "$Revision:
1.269.2.16.2.38.2.20 $");
snprintf(buf, sizeof(buf), "%ld", OCI_G(num_persistent));
php_info_print_table_row(2, "Active Persistent Connections", buf);
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/php_oci8.h?r1=1.36.2.2.2.1.2.7&r2=1.36.2.2.2.1.2.8&diff_format=u
Index: php-src/ext/oci8/php_oci8.h
diff -u php-src/ext/oci8/php_oci8.h:1.36.2.2.2.1.2.7
php-src/ext/oci8/php_oci8.h:1.36.2.2.2.1.2.8
--- php-src/ext/oci8/php_oci8.h:1.36.2.2.2.1.2.7Thu Jun 19 19:56:11 2008
+++ php-src/ext/oci8/php_oci8.h Thu Jul 24 15:24:14 2008
@@ -25,7 +25,7 @@
+--+
*/
-/* $Id: php_oci8.h,v 1.36.2.2.2.1.2.7 2008/06/19 19:56:11 sixd Exp $ */
+/* $Id: php_oci8.h,v 1.36.2.2.2.1.2.8 2008/07/24 15:24:14 sixd Exp $ */
#if HAVE_OCI8
# ifndef PHP_OCI8_H
@@ -46,7 +46,7 @@
*/
#undef PHP_OCI8_VERSION
#endif
-#define PHP_OCI8_VERSION "1.3.3"
+#define PHP_OCI8_VERSION "1.3.4-dev"
extern zend_module_entry oci8_module_entry;
#define phpext_oci8_ptr &oci8_module_entry
[PHP-DOC] cvs: php-src /ext/oci8 oci8.c php_oci8.h
sixdThu Jul 24 15:23:30 2008 UTC
Modified files:
/php-src/ext/oci8 oci8.c php_oci8.h
Log:
1. Fix macro version test for constants
2. [DOC] Increase oci8.default_prefetch to 100. Better out of box
experience. Consistent woth PDO_OCI
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8.c?r1=1.352&r2=1.353&diff_format=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.352 php-src/ext/oci8/oci8.c:1.353
--- php-src/ext/oci8/oci8.c:1.352 Wed Jul 16 23:54:42 2008
+++ php-src/ext/oci8/oci8.c Thu Jul 24 15:23:29 2008
@@ -26,7 +26,7 @@
+--+
*/
-/* $Id: oci8.c,v 1.352 2008/07/16 23:54:42 sixd Exp $ */
+/* $Id: oci8.c,v 1.353 2008/07/24 15:23:29 sixd Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -915,7 +915,7 @@
STD_PHP_INI_ENTRY( "oci8.ping_interval", "60",
PHP_INI_SYSTEM, ONUPDATELONGFUNC, ping_interval,
zend_oci_globals, oci_globals)
STD_PHP_INI_BOOLEAN("oci8.privileged_connect", "0",
PHP_INI_SYSTEM, OnUpdateBool, privileged_connect,
zend_oci_globals, oci_globals)
STD_PHP_INI_ENTRY( "oci8.statement_cache_size","20",
PHP_INI_SYSTEM, ONUPDATELONGFUNC, statement_cache_size,
zend_oci_globals, oci_globals)
- STD_PHP_INI_ENTRY( "oci8.default_prefetch","10",
PHP_INI_SYSTEM, ONUPDATELONGFUNC, default_prefetch,
zend_oci_globals, oci_globals)
+ STD_PHP_INI_ENTRY( "oci8.default_prefetch","100",
PHP_INI_SYSTEM, ONUPDATELONGFUNC, default_prefetch,
zend_oci_globals, oci_globals)
STD_PHP_INI_BOOLEAN("oci8.old_oci_close_semantics", "0",
PHP_INI_SYSTEM, OnUpdateBool,
old_oci_close_semantics,zend_oci_globals, oci_globals)
STD_PHP_INI_ENTRY( "oci8.connection_class","",
PHP_INI_ALL,OnUpdateUTF8String, connection_class,
zend_oci_globals, oci_globals)
STD_PHP_INI_BOOLEAN("oci8.events",
"0",PHP_INI_SYSTEM, OnUpdateBool, events,
zend_oci_globals, oci_globals)
@@ -1066,7 +1066,7 @@
REGISTER_LONG_CONSTANT("SQLT_LBI",SQLT_LBI, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("SQLT_BIN",SQLT_BIN, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("SQLT_ODT",SQLT_ODT, CONST_CS |
CONST_PERSISTENT);
-#if defined(HAVE_OCI_INSTANT_CLIENT) || (defined(OCI_MAJOR_VERSION) &&
OCI_MAJOR_VERSION > 10)
+#if defined(HAVE_OCI_INSTANT_CLIENT) || (defined(OCI_MAJOR_VERSION) &&
OCI_MAJOR_VERSION >= 10)
REGISTER_LONG_CONSTANT("SQLT_BDOUBLE",SQLT_BDOUBLE, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("SQLT_BFLOAT",SQLT_BFLOAT, CONST_CS |
CONST_PERSISTENT);
#endif
@@ -1169,7 +1169,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "OCI8 Support", "enabled");
php_info_print_table_row(2, "Version", PHP_OCI8_VERSION);
- php_info_print_table_row(2, "Revision", "$Revision: 1.352 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.353 $");
snprintf(buf, sizeof(buf), "%ld", OCI_G(num_persistent));
php_info_print_table_row(2, "Active Persistent Connections", buf);
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/php_oci8.h?r1=1.47&r2=1.48&diff_format=u
Index: php-src/ext/oci8/php_oci8.h
diff -u php-src/ext/oci8/php_oci8.h:1.47 php-src/ext/oci8/php_oci8.h:1.48
--- php-src/ext/oci8/php_oci8.h:1.47Thu Jun 19 20:24:00 2008
+++ php-src/ext/oci8/php_oci8.h Thu Jul 24 15:23:29 2008
@@ -25,7 +25,7 @@
+--+
*/
-/* $Id: php_oci8.h,v 1.47 2008/06/19 20:24:00 sixd Exp $ */
+/* $Id: php_oci8.h,v 1.48 2008/07/24 15:23:29 sixd Exp $ */
#if HAVE_OCI8
# ifndef PHP_OCI8_H
@@ -39,7 +39,7 @@
/*
* The version of the OCI8 extension.
*/
-#define PHP_OCI8_VERSION "1.3.3"
+#define PHP_OCI8_VERSION "1.3.4-dev"
extern zend_module_entry oci8_module_entry;
#define phpext_oci8_ptr &oci8_module_entry
Re: [PHP-DOC] Re: [PATCH] Solving the exception problem (s without s)
2008/7/24 Hannes Magnusson <[EMAIL PROTECTED]> > On Thu, Jul 24, 2008 at 11:31, Richard Quadling > <[EMAIL PROTECTED]> wrote: > > > > > > > > > > 2008/7/23 Hannes Magnusson <[EMAIL PROTECTED]> > >> > >> Last chance for objections... committing in 10.. 9.. :) > >> > >> -Hannes > >> > >> On Mon, Jul 21, 2008 at 21:45, Hannes Magnusson > >> <[EMAIL PROTECTED]> wrote: > >> > Hi all > >> > > >> > Attached is a patch to the Docbook DTD which introduces a > >> > phpdoc:exception element inside elements. > >> > > >> > is defined exactly like except that > >> > is optional for . > >> > > >> > This solves some of the problems we have, namely the problem of > >> > classes, exceptions and extensions that do not define any > >> > methods/functions. > >> > > >> > Included in the patch is a fix for HaruException and PDOException. > >> > Furthermore a patch for PhD(0_2) is attached to support the new > >> > element. > >> > > >> > If there are no objections I'd like to commit this sometime in the > >> > next couple of days... > >> > > >> > -Hannes > >> > > > > > Initially, we did say that our docs would be DB5. And I remember you > saying > > in IRC that DocBook5 + some extensions !== DocBook5. > > Indeed. But we simply do not have another way to solve this problem > and rather then waiting another year I decided to fixed it. > Besides, we've been talking about this for a long long time. This > commit will probably set precedence for future enhancements like this, > which we should had done long time ago. > > > > How about putting it to DB.org themselves? Like I did for the grouped > > parameter mechanism? That got accepted and will allow us to describe our > > optional parameters correctly (though PhD will need amending to cope with > > it). > > Exception/Class/Extension/.. references do not exist in the Docbook > grammar. Adding only a single element is not enough for docbook. It > would require lot more thought and time and discussion to design a > proper programming language documentation grammar. > > -Hannes > Thank you for explaining. -- - Richard Quadling Zend Certified Engineer : http://zend.com/zce.php?c=ZEND002498&r=213474731 "Standing on the shoulders of some very clever giants!"
Re: [PHP-DOC] Re: [PATCH] Solving the exception problem (s without s)
On Thu, Jul 24, 2008 at 11:31, Richard Quadling <[EMAIL PROTECTED]> wrote: > > > > > 2008/7/23 Hannes Magnusson <[EMAIL PROTECTED]> >> >> Last chance for objections... committing in 10.. 9.. :) >> >> -Hannes >> >> On Mon, Jul 21, 2008 at 21:45, Hannes Magnusson >> <[EMAIL PROTECTED]> wrote: >> > Hi all >> > >> > Attached is a patch to the Docbook DTD which introduces a >> > phpdoc:exception element inside elements. >> > >> > is defined exactly like except that >> > is optional for . >> > >> > This solves some of the problems we have, namely the problem of >> > classes, exceptions and extensions that do not define any >> > methods/functions. >> > >> > Included in the patch is a fix for HaruException and PDOException. >> > Furthermore a patch for PhD(0_2) is attached to support the new >> > element. >> > >> > If there are no objections I'd like to commit this sometime in the >> > next couple of days... >> > >> > -Hannes >> > > > Initially, we did say that our docs would be DB5. And I remember you saying > in IRC that DocBook5 + some extensions !== DocBook5. Indeed. But we simply do not have another way to solve this problem and rather then waiting another year I decided to fixed it. Besides, we've been talking about this for a long long time. This commit will probably set precedence for future enhancements like this, which we should had done long time ago. > How about putting it to DB.org themselves? Like I did for the grouped > parameter mechanism? That got accepted and will allow us to describe our > optional parameters correctly (though PhD will need amending to cope with > it). Exception/Class/Extension/.. references do not exist in the Docbook grammar. Adding only a single element is not enough for docbook. It would require lot more thought and time and discussion to design a proper programming language documentation grammar. -Hannes
Re: [PHP-DOC] Re: [PATCH] Solving the exception problem (s without s)
2008/7/23 Hannes Magnusson <[EMAIL PROTECTED]> > Last chance for objections... committing in 10.. 9.. :) > > -Hannes > > On Mon, Jul 21, 2008 at 21:45, Hannes Magnusson > <[EMAIL PROTECTED]> wrote: > > Hi all > > > > Attached is a patch to the Docbook DTD which introduces a > > phpdoc:exception element inside elements. > > > > is defined exactly like except that > > is optional for . > > > > This solves some of the problems we have, namely the problem of > > classes, exceptions and extensions that do not define any > > methods/functions. > > > > Included in the patch is a fix for HaruException and PDOException. > > Furthermore a patch for PhD(0_2) is attached to support the new > > element. > > > > If there are no objections I'd like to commit this sometime in the > > next couple of days... > > > > -Hannes > > > Initially, we did say that our docs would be DB5. And I remember you saying in IRC that DocBook5 + some extensions !== DocBook5. But, if it solves a problem for us and it is sufficiently easy to maintain when DB5 upgrades, then fine. How about putting it to DB.org themselves? Like I did for the grouped parameter mechanism? That got accepted and will allow us to describe our optional parameters correctly (though PhD will need amending to cope with it). Richard. -- - Richard Quadling Zend Certified Engineer : http://zend.com/zce.php?c=ZEND002498&r=213474731 "Standing on the shoulders of some very clever giants!"
