aharvey                                  Thu, 23 Sep 2010 04:41:14 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=303709

Log:
Fix up the vim folds in phar_object.c and add a note that the two prototypes
before Phar::__construct() are actually valid and not a mistake, per bug
#52909.

Bug: http://bugs.php.net/52909 (Assigned) ReflectionMethod::getParameters() 
return incorrect number of arguments
      
Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/phar/phar_object.c
    U   php/php-src/trunk/ext/phar/phar_object.c

Modified: php/php-src/branches/PHP_5_3/ext/phar/phar_object.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/phar/phar_object.c 2010-09-23 04:13:36 UTC 
(rev 303708)
+++ php/php-src/branches/PHP_5_3/ext/phar/phar_object.c 2010-09-23 04:41:14 UTC 
(rev 303709)
@@ -1251,8 +1251,12 @@

 /* {{{ proto void Phar::__construct(string fname [, int flags [, string 
alias]])
  * Construct a Phar archive object
- * {{{ proto void PharData::__construct(string fname [[, int flags [, string 
alias]], int file format = Phar::TAR])
+ *
+ * proto void PharData::__construct(string fname [[, int flags [, string 
alias]], int file format = Phar::TAR])
  * Construct a PharData archive object
+ *
+ * This function is used as the constructor for both the Phar and PharData
+ * classes, hence the two prototypes above.
  */
 PHP_METHOD(Phar, __construct)
 {

Modified: php/php-src/trunk/ext/phar/phar_object.c
===================================================================
--- php/php-src/trunk/ext/phar/phar_object.c    2010-09-23 04:13:36 UTC (rev 
303708)
+++ php/php-src/trunk/ext/phar/phar_object.c    2010-09-23 04:41:14 UTC (rev 
303709)
@@ -1251,8 +1251,12 @@

 /* {{{ proto void Phar::__construct(string fname [, int flags [, string 
alias]])
  * Construct a Phar archive object
- * {{{ proto void PharData::__construct(string fname [[, int flags [, string 
alias]], int file format = Phar::TAR])
+ *
+ * proto void PharData::__construct(string fname [[, int flags [, string 
alias]], int file format = Phar::TAR])
  * Construct a PharData archive object
+ *
+ * This function is used as the constructor for both the Phar and PharData
+ * classes, hence the two prototypes above.
  */
 PHP_METHOD(Phar, __construct)
 {

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to