diff options
| author | Remi Collet <remi@remirepo.net> | 2017-06-23 15:31:31 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2017-06-23 15:31:31 +0200 |
| commit | 741369c241e9eafffbb80b7d7a4db1303c26b9ce (patch) | |
| tree | 1bbde7b5dbd7994e2f025c62fd7ba21902d6b3f5 | |
| parent | 0ee040f14562ddf4588c2aebb85e9c73fae1e9d2 (diff) | |
add patch for 7.2
| -rw-r--r-- | REFLECTION | 108 | ||||
| -rw-r--r-- | REFLECTION-PHP7 | 1600 | ||||
| -rw-r--r-- | php-pecl-pq-php7.spec | 378 | ||||
| -rw-r--r-- | php-pecl-pq.spec | 112 | ||||
| -rw-r--r-- | pq-upstream.patch | 25 |
5 files changed, 167 insertions, 2056 deletions
@@ -1,4 +1,4 @@ -Extension [ <persistent> extension #205 pq version 1.1.1 ] { +Extension [ <persistent> extension #89 pq version 2.1.1 ] { - Dependencies { Dependency [ raphf (Required) ] @@ -48,7 +48,7 @@ Extension [ <persistent> extension #205 pq version 1.1.1 ] { Class [ <internal:pq> class pq\DateTime extends DateTime implements DateTimeInterface, JsonSerializable ] { - - Constants [11] { + - Constants [12] { Constant [ string ATOM ] { Y-m-d\TH:i:sP } Constant [ string COOKIE ] { l, d-M-Y H:i:s T } Constant [ string ISO8601 ] { Y-m-d\TH:i:sO } @@ -58,6 +58,7 @@ Extension [ <persistent> extension #205 pq version 1.1.1 ] { Constant [ string RFC1123 ] { D, d M Y H:i:s O } Constant [ string RFC2822 ] { D, d M Y H:i:s O } Constant [ string RFC3339 ] { Y-m-d\TH:i:sP } + Constant [ string RFC3339_EXTENDED ] { Y-m-d\TH:i:s.vP } Constant [ string RSS ] { D, d M Y H:i:s O } Constant [ string W3C ] { Y-m-d\TH:i:sP } } @@ -210,7 +211,7 @@ Extension [ <persistent> extension #205 pq version 1.1.1 ] { } } - Interface [ <internal:pq> interface pq\Exception ] { + Interface [ <internal:pq> interface pq\Exception extends Throwable ] { - Constants [9] { Constant [ integer INVALID_ARGUMENT ] { 0 } @@ -233,11 +234,34 @@ Extension [ <persistent> extension #205 pq version 1.1.1 ] { - Properties [0] { } - - Methods [0] { + - Methods [8] { + Method [ <internal:Core, inherits Throwable> abstract public method getMessage ] { + } + + Method [ <internal:Core, inherits Throwable> abstract public method getCode ] { + } + + Method [ <internal:Core, inherits Throwable> abstract public method getFile ] { + } + + Method [ <internal:Core, inherits Throwable> abstract public method getLine ] { + } + + Method [ <internal:Core, inherits Throwable> abstract public method getTrace ] { + } + + Method [ <internal:Core, inherits Throwable> abstract public method getPrevious ] { + } + + Method [ <internal:Core, inherits Throwable> abstract public method getTraceAsString ] { + } + + Method [ <internal:Core, inherits Throwable> abstract public method __toString ] { + } } } - Class [ <internal:pq> class pq\Exception\InvalidArgumentException extends InvalidArgumentException implements pq\Exception ] { + Class [ <internal:pq> class pq\Exception\InvalidArgumentException extends InvalidArgumentException implements Throwable, pq\Exception ] { - Constants [9] { Constant [ integer INVALID_ARGUMENT ] { 0 } @@ -277,33 +301,33 @@ Extension [ <persistent> extension #205 pq version 1.1.1 ] { Method [ <internal:Core, inherits Exception> public method __wakeup ] { } - Method [ <internal:Core, inherits Exception> final public method getMessage ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] { } - Method [ <internal:Core, inherits Exception> final public method getCode ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getCode ] { } - Method [ <internal:Core, inherits Exception> final public method getFile ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getFile ] { } - Method [ <internal:Core, inherits Exception> final public method getLine ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getLine ] { } - Method [ <internal:Core, inherits Exception> final public method getTrace ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTrace ] { } - Method [ <internal:Core, inherits Exception> final public method getPrevious ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getPrevious ] { } - Method [ <internal:Core, inherits Exception> final public method getTraceAsString ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTraceAsString ] { } - Method [ <internal:Core, inherits Exception> public method __toString ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> public method __toString ] { } } } - Class [ <internal:pq> class pq\Exception\RuntimeException extends RuntimeException implements pq\Exception ] { + Class [ <internal:pq> class pq\Exception\RuntimeException extends RuntimeException implements Throwable, pq\Exception ] { - Constants [9] { Constant [ integer INVALID_ARGUMENT ] { 0 } @@ -343,33 +367,33 @@ Extension [ <persistent> extension #205 pq version 1.1.1 ] { Method [ <internal:Core, inherits Exception> public method __wakeup ] { } - Method [ <internal:Core, inherits Exception> final public method getMessage ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] { } - Method [ <internal:Core, inherits Exception> final public method getCode ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getCode ] { } - Method [ <internal:Core, inherits Exception> final public method getFile ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getFile ] { } - Method [ <internal:Core, inherits Exception> final public method getLine ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getLine ] { } - Method [ <internal:Core, inherits Exception> final public method getTrace ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTrace ] { } - Method [ <internal:Core, inherits Exception> final public method getPrevious ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getPrevious ] { } - Method [ <internal:Core, inherits Exception> final public method getTraceAsString ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTraceAsString ] { } - Method [ <internal:Core, inherits Exception> public method __toString ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> public method __toString ] { } } } - Class [ <internal:pq> class pq\Exception\BadMethodCallException extends BadMethodCallException implements pq\Exception ] { + Class [ <internal:pq> class pq\Exception\BadMethodCallException extends BadMethodCallException implements Throwable, pq\Exception ] { - Constants [9] { Constant [ integer INVALID_ARGUMENT ] { 0 } @@ -409,33 +433,33 @@ Extension [ <persistent> extension #205 pq version 1.1.1 ] { Method [ <internal:Core, inherits Exception> public method __wakeup ] { } - Method [ <internal:Core, inherits Exception> final public method getMessage ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] { } - Method [ <internal:Core, inherits Exception> final public method getCode ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getCode ] { } - Method [ <internal:Core, inherits Exception> final public method getFile ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getFile ] { } - Method [ <internal:Core, inherits Exception> final public method getLine ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getLine ] { } - Method [ <internal:Core, inherits Exception> final public method getTrace ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTrace ] { } - Method [ <internal:Core, inherits Exception> final public method getPrevious ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getPrevious ] { } - Method [ <internal:Core, inherits Exception> final public method getTraceAsString ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTraceAsString ] { } - Method [ <internal:Core, inherits Exception> public method __toString ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> public method __toString ] { } } } - Class [ <internal:pq> class pq\Exception\DomainException extends DomainException implements pq\Exception ] { + Class [ <internal:pq> class pq\Exception\DomainException extends DomainException implements Throwable, pq\Exception ] { - Constants [9] { Constant [ integer INVALID_ARGUMENT ] { 0 } @@ -476,28 +500,28 @@ Extension [ <persistent> extension #205 pq version 1.1.1 ] { Method [ <internal:Core, inherits Exception> public method __wakeup ] { } - Method [ <internal:Core, inherits Exception> final public method getMessage ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] { } - Method [ <internal:Core, inherits Exception> final public method getCode ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getCode ] { } - Method [ <internal:Core, inherits Exception> final public method getFile ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getFile ] { } - Method [ <internal:Core, inherits Exception> final public method getLine ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getLine ] { } - Method [ <internal:Core, inherits Exception> final public method getTrace ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTrace ] { } - Method [ <internal:Core, inherits Exception> final public method getPrevious ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getPrevious ] { } - Method [ <internal:Core, inherits Exception> final public method getTraceAsString ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTraceAsString ] { } - Method [ <internal:Core, inherits Exception> public method __toString ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> public method __toString ] { } } } @@ -535,7 +559,7 @@ Extension [ <persistent> extension #205 pq version 1.1.1 ] { - Static methods [0] { } - - Properties [21] { + - Properties [23] { Property [ <default> public $status ] Property [ <default> public $transactionStatus ] Property [ <default> public $socket ] @@ -552,6 +576,8 @@ Extension [ <persistent> extension #205 pq version 1.1.1 ] { Property [ <default> public $params ] Property [ <default> public $options ] Property [ <default> public $eventHandlers ] + Property [ <default> public $listeners ] + Property [ <default> public $converters ] Property [ <default> public $defaultFetchType ] Property [ <default> public $defaultTransactionIsolation ] Property [ <default> public $defaultTransactionReadonly ] diff --git a/REFLECTION-PHP7 b/REFLECTION-PHP7 deleted file mode 100644 index b4da084..0000000 --- a/REFLECTION-PHP7 +++ /dev/null @@ -1,1600 +0,0 @@ -Extension [ <persistent> extension #89 pq version 2.1.1 ] { - - - Dependencies { - Dependency [ raphf (Required) ] - Dependency [ spl (Required) ] - Dependency [ json (Optional) ] - } - - - Classes [16] { - Interface [ <internal:pq> interface pq\Converter ] { - - - Constants [0] { - } - - - Static properties [0] { - } - - - Static methods [0] { - } - - - Properties [0] { - } - - - Methods [3] { - Method [ <internal:pq> abstract public method convertTypes ] { - - - Parameters [0] { - } - } - - Method [ <internal:pq> abstract public method convertFromString ] { - - - Parameters [2] { - Parameter #0 [ <required> $data ] - Parameter #1 [ <required> $type ] - } - } - - Method [ <internal:pq> abstract public method convertToString ] { - - - Parameters [2] { - Parameter #0 [ <required> $data ] - Parameter #1 [ <required> $type ] - } - } - } - } - - Class [ <internal:pq> class pq\DateTime extends DateTime implements DateTimeInterface, JsonSerializable ] { - - - Constants [12] { - Constant [ string ATOM ] { Y-m-d\TH:i:sP } - Constant [ string COOKIE ] { l, d-M-Y H:i:s T } - Constant [ string ISO8601 ] { Y-m-d\TH:i:sO } - Constant [ string RFC822 ] { D, d M y H:i:s O } - Constant [ string RFC850 ] { l, d-M-y H:i:s T } - Constant [ string RFC1036 ] { D, d M y H:i:s O } - Constant [ string RFC1123 ] { D, d M Y H:i:s O } - Constant [ string RFC2822 ] { D, d M Y H:i:s O } - Constant [ string RFC3339 ] { Y-m-d\TH:i:sP } - Constant [ string RFC3339_EXTENDED ] { Y-m-d\TH:i:s.vP } - Constant [ string RSS ] { D, d M Y H:i:s O } - Constant [ string W3C ] { Y-m-d\TH:i:sP } - } - - - Static properties [0] { - } - - - Static methods [3] { - Method [ <internal:pq, overwrites DateTime, prototype DateTime> static public method createFromFormat ] { - - - Parameters [3] { - Parameter #0 [ <required> $format ] - Parameter #1 [ <required> $datetime ] - Parameter #2 [ <optional> $timezone ] - } - } - - Method [ <internal:date, inherits DateTime> static public method __set_state ] { - } - - Method [ <internal:date, inherits DateTime> static public method getLastErrors ] { - - - Parameters [0] { - } - } - } - - - Properties [1] { - Property [ <default> public $format ] - } - - - Methods [17] { - Method [ <internal:pq> public method __toString ] { - - - Parameters [0] { - } - } - - Method [ <internal:pq, prototype JsonSerializable> public method jsonSerialize ] { - - - Parameters [0] { - } - } - - Method [ <internal:date, inherits DateTime, ctor> public method __construct ] { - - - Parameters [2] { - Parameter #0 [ <optional> $time ] - Parameter #1 [ <optional> $object ] - } - } - - Method [ <internal:date, inherits DateTime, prototype DateTimeInterface> public method __wakeup ] { - } - - Method [ <internal:date, inherits DateTime, prototype DateTimeInterface> public method format ] { - - - Parameters [1] { - Parameter #0 [ <required> $format ] - } - } - - Method [ <internal:date, inherits DateTime> public method modify ] { - - - Parameters [1] { - Parameter #0 [ <required> $modify ] - } - } - - Method [ <internal:date, inherits DateTime> public method add ] { - - - Parameters [1] { - Parameter #0 [ <required> $interval ] - } - } - - Method [ <internal:date, inherits DateTime> public method sub ] { - - - Parameters [1] { - Parameter #0 [ <required> $interval ] - } - } - - Method [ <internal:date, inherits DateTime, prototype DateTimeInterface> public method getTimezone ] { - - - Parameters [0] { - } - } - - Method [ <internal:date, inherits DateTime> public method setTimezone ] { - - - Parameters [1] { - Parameter #0 [ <required> $timezone ] - } - } - - Method [ <internal:date, inherits DateTime, prototype DateTimeInterface> public method getOffset ] { - - - Parameters [0] { - } - } - - Method [ <internal:date, inherits DateTime> public method setTime ] { - - - Parameters [3] { - Parameter #0 [ <required> $hour ] - Parameter #1 [ <required> $minute ] - Parameter #2 [ <optional> $second ] - } - } - - Method [ <internal:date, inherits DateTime> public method setDate ] { - - - Parameters [3] { - Parameter #0 [ <required> $year ] - Parameter #1 [ <required> $month ] - Parameter #2 [ <required> $day ] - } - } - - Method [ <internal:date, inherits DateTime> public method setISODate ] { - - - Parameters [3] { - Parameter #0 [ <required> $year ] - Parameter #1 [ <required> $week ] - Parameter #2 [ <optional> $day ] - } - } - - Method [ <internal:date, inherits DateTime> public method setTimestamp ] { - - - Parameters [1] { - Parameter #0 [ <required> $unixtimestamp ] - } - } - - Method [ <internal:date, inherits DateTime, prototype DateTimeInterface> public method getTimestamp ] { - - - Parameters [0] { - } - } - - Method [ <internal:date, inherits DateTime, prototype DateTimeInterface> public method diff ] { - - - Parameters [2] { - Parameter #0 [ <required> $object ] - Parameter #1 [ <optional> $absolute ] - } - } - } - } - - Interface [ <internal:pq> interface pq\Exception extends Throwable ] { - - - Constants [9] { - Constant [ integer INVALID_ARGUMENT ] { 0 } - Constant [ integer RUNTIME ] { 1 } - Constant [ integer CONNECTION_FAILED ] { 2 } - Constant [ integer IO ] { 3 } - Constant [ integer ESCAPE ] { 4 } - Constant [ integer BAD_METHODCALL ] { 5 } - Constant [ integer UNINITIALIZED ] { 6 } - Constant [ integer DOMAIN ] { 7 } - Constant [ integer SQL ] { 8 } - } - - - Static properties [0] { - } - - - Static methods [0] { - } - - - Properties [0] { - } - - - Methods [8] { - Method [ <internal:Core, inherits Throwable> abstract public method getMessage ] { - } - - Method [ <internal:Core, inherits Throwable> abstract public method getCode ] { - } - - Method [ <internal:Core, inherits Throwable> abstract public method getFile ] { - } - - Method [ <internal:Core, inherits Throwable> abstract public method getLine ] { - } - - Method [ <internal:Core, inherits Throwable> abstract public method getTrace ] { - } - - Method [ <internal:Core, inherits Throwable> abstract public method getPrevious ] { - } - - Method [ <internal:Core, inherits Throwable> abstract public method getTraceAsString ] { - } - - Method [ <internal:Core, inherits Throwable> abstract public method __toString ] { - } - } - } - - Class [ <internal:pq> class pq\Exception\InvalidArgumentException extends InvalidArgumentException implements Throwable, pq\Exception ] { - - - Constants [9] { - Constant [ integer INVALID_ARGUMENT ] { 0 } - Constant [ integer RUNTIME ] { 1 } - Constant [ integer CONNECTION_FAILED ] { 2 } - Constant [ integer IO ] { 3 } - Constant [ integer ESCAPE ] { 4 } - Constant [ integer BAD_METHODCALL ] { 5 } - Constant [ integer UNINITIALIZED ] { 6 } - Constant [ integer DOMAIN ] { 7 } - Constant [ integer SQL ] { 8 } - } - - - 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 [10] { - 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> public method __wakeup ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getCode ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getFile ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getLine ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTrace ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getPrevious ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTraceAsString ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> public method __toString ] { - } - } - } - - Class [ <internal:pq> class pq\Exception\RuntimeException extends RuntimeException implements Throwable, pq\Exception ] { - - - Constants [9] { - Constant [ integer INVALID_ARGUMENT ] { 0 } - Constant [ integer RUNTIME ] { 1 } - Constant [ integer CONNECTION_FAILED ] { 2 } - Constant [ integer IO ] { 3 } - Constant [ integer ESCAPE ] { 4 } - Constant [ integer BAD_METHODCALL ] { 5 } - Constant [ integer UNINITIALIZED ] { 6 } - Constant [ integer DOMAIN ] { 7 } - Constant [ integer SQL ] { 8 } - } - - - 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 [10] { - 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> public method __wakeup ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getCode ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getFile ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getLine ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTrace ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getPrevious ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTraceAsString ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> public method __toString ] { - } - } - } - - Class [ <internal:pq> class pq\Exception\BadMethodCallException extends BadMethodCallException implements Throwable, pq\Exception ] { - - - Constants [9] { - Constant [ integer INVALID_ARGUMENT ] { 0 } - Constant [ integer RUNTIME ] { 1 } - Constant [ integer CONNECTION_FAILED ] { 2 } - Constant [ integer IO ] { 3 } - Constant [ integer ESCAPE ] { 4 } - Constant [ integer BAD_METHODCALL ] { 5 } - Constant [ integer UNINITIALIZED ] { 6 } - Constant [ integer DOMAIN ] { 7 } - Constant [ integer SQL ] { 8 } - } - - - 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 [10] { - 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> public method __wakeup ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getCode ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getFile ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getLine ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTrace ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getPrevious ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTraceAsString ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> public method __toString ] { - } - } - } - - Class [ <internal:pq> class pq\Exception\DomainException extends DomainException implements Throwable, pq\Exception ] { - - - Constants [9] { - Constant [ integer INVALID_ARGUMENT ] { 0 } - Constant [ integer RUNTIME ] { 1 } - Constant [ integer CONNECTION_FAILED ] { 2 } - Constant [ integer IO ] { 3 } - Constant [ integer ESCAPE ] { 4 } - Constant [ integer BAD_METHODCALL ] { 5 } - Constant [ integer UNINITIALIZED ] { 6 } - Constant [ integer DOMAIN ] { 7 } - Constant [ integer SQL ] { 8 } - } - - - Static properties [0] { - } - - - Static methods [0] { - } - - - Properties [5] { - Property [ <default> protected $message ] - Property [ <default> protected $code ] - Property [ <default> protected $file ] - Property [ <default> protected $line ] - Property [ <default> public $sqlstate ] - } - - - Methods [10] { - 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> public method __wakeup ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getCode ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getFile ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getLine ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTrace ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getPrevious ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTraceAsString ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> public method __toString ] { - } - } - } - - Class [ <internal:pq> class pq\Connection ] { - - - Constants [22] { - Constant [ integer OK ] { 0 } - Constant [ integer BAD ] { 1 } - Constant [ integer STARTED ] { 2 } - Constant [ integer MADE ] { 3 } - Constant [ integer AWAITING_RESPONSE ] { 4 } - Constant [ integer AUTH_OK ] { 5 } - Constant [ integer SSL_STARTUP ] { 7 } - Constant [ integer SETENV ] { 6 } - Constant [ integer TRANS_IDLE ] { 0 } - Constant [ integer TRANS_ACTIVE ] { 1 } - Constant [ integer TRANS_INTRANS ] { 2 } - Constant [ integer TRANS_INERROR ] { 3 } - Constant [ integer TRANS_UNKNOWN ] { 4 } - Constant [ integer POLLING_FAILED ] { 0 } - Constant [ integer POLLING_READING ] { 1 } - Constant [ integer POLLING_WRITING ] { 2 } - Constant [ integer POLLING_OK ] { 3 } - Constant [ string EVENT_NOTICE ] { notice } - Constant [ string EVENT_RESULT ] { result } - Constant [ string EVENT_RESET ] { reset } - Constant [ integer ASYNC ] { 1 } - Constant [ integer PERSISTENT ] { 2 } - } - - - Static properties [0] { - } - - - Static methods [0] { - } - - - Properties [23] { - Property [ <default> public $status ] - Property [ <default> public $transactionStatus ] - Property [ <default> public $socket ] - Property [ <default> public $errorMessage ] - Property [ <default> public $busy ] - Property [ <default> public $encoding ] - Property [ <default> public $unbuffered ] - Property [ <default> public $nonblocking ] - Property [ <default> public $db ] - Property [ <default> public $user ] - Property [ <default> public $pass ] - Property [ <default> public $host ] - Property [ <default> public $port ] - Property [ <default> public $params ] - Property [ <default> public $options ] - Property [ <default> public $eventHandlers ] - Property [ <default> public $listeners ] - Property [ <default> public $converters ] - Property [ <default> public $defaultFetchType ] - Property [ <default> public $defaultTransactionIsolation ] - Property [ <default> public $defaultTransactionReadonly ] - Property [ <default> public $defaultTransactionDeferrable ] - Property [ <default> public $defaultAutoConvert ] - } - - - Methods [31] { - Method [ <internal:pq, ctor> public method __construct ] { - - - Parameters [2] { - Parameter #0 [ <required> $dsn ] - Parameter #1 [ <optional> $flags ] - } - } - - Method [ <internal:pq> public method reset ] { - - - Parameters [0] { - } - } - - Method [ <internal:pq> public method resetAsync ] { - - - Parameters [0] { - } - } - - Method [ <internal:pq> public method poll ] { - - - Parameters [0] { - } - } - - Method [ <internal:pq> public method flush ] { - - - Parameters [0] { - } - } - - Method [ <internal:pq> public method exec ] { - - - Parameters [1] { - Parameter #0 [ <required> $query ] - } - } - - Method [ <internal:pq> public method execAsync ] { - - - Parameters [2] { - Parameter #0 [ <required> $query ] - Parameter #1 [ <optional> $callable ] - } - } - - Method [ <internal:pq> public method execParams ] { - - - Parameters [3] { - Parameter #0 [ <required> $query ] - Parameter #1 [ <required> array $params ] - Parameter #2 [ <optional> array or NULL $types ] - } - } - - Method [ <internal:pq> public method execParamsAsync ] { - - - Parameters [4] { - Parameter #0 [ <required> $query ] - Parameter #1 [ <required> array $params ] - Parameter #2 [ <optional> array or NULL $types ] - Parameter #3 [ <optional> $callable ] - } - } - - Method [ <internal:pq> public method prepare ] { - - - Parameters [3] { - Parameter #0 [ <required> $name ] - Parameter #1 [ <required> $query ] - Parameter #2 [ <optional> array or NULL $types ] - } - } - - Method [ <internal:pq> public method prepareAsync ] { - - - Parameters [3] { - Parameter #0 [ <required> $name ] - Parameter #1 [ <required> $query ] - Parameter #2 [ <optional> array or NULL $types ] - } - } - - Method [ <internal:pq> public method declare ] { - - - Parameters [3] { - Parameter #0 [ <required> $name ] - Parameter #1 [ <required> $flags ] - Parameter #2 [ <required> $query ] - } - } - - Method [ <internal:pq> public method declareAsync ] { - - - Parameters [3] { - Parameter #0 [ <required> $name ] - Parameter #1 [ <required> $flags ] - Parameter #2 [ <optional> $query ] - } - } - - Method [ <internal:pq> public method unlisten ] { - - - Parameters [1] { - Parameter #0 [ <required> $channel ] - } - } - - Method [ <internal:pq> public method unlistenAsync ] { - - - Parameters [1] { - Parameter #0 [ <required> $channel ] - } - } - - Method [ <internal:pq> public method listen ] { - - - Parameters [2] { - Parameter #0 [ <required> $channel ] - Parameter #1 [ <required> $callable ] - } - } - - Method [ <internal:pq> public method listenAsync ] { - - - Parameters [2] { - Parameter #0 [ <optional> $channel ] - Parameter #1 [ <optional> $callable ] - } - } - - Method [ <internal:pq> public method notify ] { - - - Parameters [2] { - Parameter #0 [ <required> $channel ] - Parameter #1 [ <required> $message ] - } - } - - Method [ <internal:pq> public method notifyAsync ] { - - - Parameters [2] { - Parameter #0 [ <required> $channel ] - Parameter #1 [ <required> $message ] - } - } - - Method [ <internal:pq> public method getResult ] { - - - Parameters [0] { - } - } - - Method [ <internal:pq> public method quote ] { - - - Parameters [1] { - Parameter #0 [ <required> $string ] - } - } - - Method [ <internal:pq> public method quoteName ] { - - - Parameters [1] { - Parameter #0 [ <required> $type ] - } - } - - Method [ <internal:pq> public method escapeBytea ] { - - - Parameters [1] { - Parameter #0 [ <required> $bytea ] - } - } - - Method [ <internal:pq> public method unescapeBytea ] { - - - Parameters [1] { - Parameter #0 [ <required> $bytea ] - } - } - - Method [ <internal:pq> public method startTransaction ] { - - - Parameters [3] { - Parameter #0 [ <optional> $isolation ] - Parameter #1 [ <optional> $readonly ] - Parameter #2 [ <optional> $deferrable ] - } - } - - Method [ <internal:pq> public method startTransactionAsync ] { - - - Parameters [3] { - Parameter #0 [ <optional> $isolation ] - Parameter #1 [ <optional> $readonly ] - Parameter #2 [ <optional> $deferrable ] - } - } - - Method [ <internal:pq> public method trace ] { - - - Parameters [1] { - Parameter #0 [ <optional> $stdio_stream ] - } - } - - Method [ <internal:pq> public method off ] { - - - Parameters [1] { - Parameter #0 [ <required> $type ] - } - } - - Method [ <internal:pq> public method on ] { - - - Parameters [2] { - Parameter #0 [ <required> $type ] - Parameter #1 [ <required> $callable ] - } - } - - Method [ <internal:pq> public method setConverter ] { - - - Parameters [1] { - Parameter #0 [ <required> pq\Converter $converter ] - } - } - - Method [ <internal:pq> public method unsetConverter ] { - - - Parameters [1] { - Parameter #0 [ <required> pq\Converter $converter ] - } - } - } - } - - Class [ <internal:pq> class pq\Cancel ] { - - - Constants [0] { - } - - - Static properties [0] { - } - - - Static methods [0] { - } - - - Properties [1] { - Property [ <default> public $connection ] - } - - - Methods [2] { - Method [ <internal:pq, ctor> public method __construct ] { - - - Parameters [1] { - Parameter #0 [ <required> pq\Connection $connection ] - } - } - - Method [ <internal:pq> public method cancel ] { - - - Parameters [0] { - } - } - } - } - - Class [ <internal:pq> class pq\Types ] { - - - Constants [156] { - Constant [ integer BOOL ] { 16 } - Constant [ integer BYTEA ] { 17 } - Constant [ integer CHAR ] { 18 } - Constant [ integer NAME ] { 19 } - Constant [ integer INT8 ] { 20 } - Constant [ integer INT2 ] { 21 } - Constant [ integer INT2VECTOR ] { 22 } - Constant [ integer INT4 ] { 23 } - Constant [ integer REGPROC ] { 24 } - Constant [ integer TEXT ] { 25 } - Constant [ integer OID ] { 26 } - Constant [ integer TID ] { 27 } - Constant [ integer XID ] { 28 } - Constant [ integer CID ] { 29 } - Constant [ integer OIDVECTOR ] { 30 } - Constant [ integer PG_TYPE ] { 71 } - Constant [ integer PG_ATTRIBUTE ] { 75 } - Constant [ integer PG_PROC ] { 81 } - Constant [ integer PG_CLASS ] { 83 } - Constant [ integer JSON ] { 114 } - Constant [ integer XML ] { 142 } - Constant [ integer XMLARRAY ] { 143 } - Constant [ integer JSONARRAY ] { 199 } - Constant [ integer PG_NODE_TREE ] { 194 } - Constant [ integer SMGR ] { 210 } - Constant [ integer POINT ] { 600 } - Constant [ integer LSEG ] { 601 } - Constant [ integer PATH ] { 602 } - Constant [ integer BOX ] { 603 } - Constant [ integer POLYGON ] { 604 } - Constant [ integer LINE ] { 628 } - Constant [ integer LINEARRAY ] { 629 } - Constant [ integer FLOAT4 ] { 700 } - Constant [ integer FLOAT8 ] { 701 } - Constant [ integer ABSTIME ] { 702 } - Constant [ integer RELTIME ] { 703 } - Constant [ integer TINTERVAL ] { 704 } - Constant [ integer UNKNOWN ] { 705 } - Constant [ integer CIRCLE ] { 718 } - Constant [ integer CIRCLEARRAY ] { 719 } - Constant [ integer MONEY ] { 790 } - Constant [ integer MONEYARRAY ] { 791 } - Constant [ integer MACADDR ] { 829 } - Constant [ integer INET ] { 869 } - Constant [ integer CIDR ] { 650 } - Constant [ integer BOOLARRAY ] { 1000 } - Constant [ integer BYTEAARRAY ] { 1001 } - Constant [ integer CHARARRAY ] { 1002 } - Constant [ integer NAMEARRAY ] { 1003 } - Constant [ integer INT2ARRAY ] { 1005 } - Constant [ integer INT2VECTORARRAY ] { 1006 } - Constant [ integer INT4ARRAY ] { 1007 } - Constant [ integer REGPROCARRAY ] { 1008 } - Constant [ integer TEXTARRAY ] { 1009 } - Constant [ integer OIDARRAY ] { 1028 } - Constant [ integer TIDARRAY ] { 1010 } - Constant [ integer XIDARRAY ] { 1011 } - Constant [ integer CIDARRAY ] { 1012 } - Constant [ integer OIDVECTORARRAY ] { 1013 } - Constant [ integer BPCHARARRAY ] { 1014 } - Constant [ integer VARCHARARRAY ] { 1015 } - Constant [ integer INT8ARRAY ] { 1016 } - Constant [ integer POINTARRAY ] { 1017 } - Constant [ integer LSEGARRAY ] { 1018 } - Constant [ integer PATHARRAY ] { 1019 } - Constant [ integer BOXARRAY ] { 1020 } - Constant [ integer FLOAT4ARRAY ] { 1021 } - Constant [ integer FLOAT8ARRAY ] { 1022 } - Constant [ integer ABSTIMEARRAY ] { 1023 } - Constant [ integer RELTIMEARRAY ] { 1024 } - Constant [ integer TINTERVALARRAY ] { 1025 } - Constant [ integer POLYGONARRAY ] { 1027 } - Constant [ integer ACLITEM ] { 1033 } - Constant [ integer ACLITEMARRAY ] { 1034 } - Constant [ integer MACADDRARRAY ] { 1040 } - Constant [ integer INETARRAY ] { 1041 } - Constant [ integer CIDRARRAY ] { 651 } - Constant [ integer CSTRINGARRAY ] { 1263 } - Constant [ integer BPCHAR ] { 1042 } - Constant [ integer VARCHAR ] { 1043 } - Constant [ integer DATE ] { 1082 } - Constant [ integer TIME ] { 1083 } - Constant [ integer TIMESTAMP ] { 1114 } - Constant [ integer TIMESTAMPARRAY ] { 1115 } - Constant [ integer DATEARRAY ] { 1182 } - Constant [ integer TIMEARRAY ] { 1183 } - Constant [ integer TIMESTAMPTZ ] { 1184 } - Constant [ integer TIMESTAMPTZARRAY ] { 1185 } - Constant [ integer INTERVAL ] { 1186 } - Constant [ integer INTERVALARRAY ] { 1187 } - Constant [ integer NUMERICARRAY ] { 1231 } - Constant [ integer TIMETZ ] { 1266 } - Constant [ integer TIMETZARRAY ] { 1270 } - Constant [ integer BIT ] { 1560 } - Constant [ integer BITARRAY ] { 1561 } - Constant [ integer VARBIT ] { 1562 } - Constant [ integer VARBITARRAY ] { 1563 } - Constant [ integer NUMERIC ] { 1700 } - Constant [ integer REFCURSOR ] { 1790 } - Constant [ integer REFCURSORARRAY ] { 2201 } - Constant [ integer REGPROCEDURE ] { 2202 } - Constant [ integer REGOPER ] { 2203 } - Constant [ integer REGOPERATOR ] { 2204 } - Constant [ integer REGCLASS ] { 2205 } - Constant [ integer REGTYPE ] { 2206 } - Constant [ integer REGPROCEDUREARRAY ] { 2207 } - Constant [ integer REGOPERARRAY ] { 2208 } - Constant [ integer REGOPERATORARRAY ] { 2209 } - Constant [ integer REGCLASSARRAY ] { 2210 } - Constant [ integer REGTYPEARRAY ] { 2211 } - Constant [ integer UUID ] { 2950 } - Constant [ integer UUIDARRAY ] { 2951 } - Constant [ integer PG_LSN ] { 3220 } - Constant [ integer PG_LSNARRAY ] { 3221 } - Constant [ integer TSVECTOR ] { 3614 } - Constant [ integer GTSVECTOR ] { 3642 } - Constant [ integer TSQUERY ] { 3615 } - Constant [ integer REGCONFIG ] { 3734 } - Constant [ integer REGDICTIONARY ] { 3769 } - Constant [ integer TSVECTORARRAY ] { 3643 } - Constant [ integer GTSVECTORARRAY ] { 3644 } - Constant [ integer TSQUERYARRAY ] { 3645 } - Constant [ integer REGCONFIGARRAY ] { 3735 } - Constant [ integer REGDICTIONARYARRAY ] { 3770 } - Constant [ integer JSONB ] { 3802 } - Constant [ integer JSONBARRAY ] { 3807 } - Constant [ integer TXID_SNAPSHOT ] { 2970 } - Constant [ integer TXID_SNAPSHOTARRAY ] { 2949 } - Constant [ integer INT4RANGE ] { 3904 } - Constant [ integer INT4RANGEARRAY ] { 3905 } - Constant [ integer NUMRANGE ] { 3906 } - Constant [ integer NUMRANGEARRAY ] { 3907 } - Constant [ integer TSRANGE ] { 3908 } - Constant [ integer TSRANGEARRAY ] { 3909 } - Constant [ integer TSTZRANGE ] { 3910 } - Constant [ integer TSTZRANGEARRAY ] { 3911 } - Constant [ integer DATERANGE ] { 3912 } - Constant [ integer DATERANGEARRAY ] { 3913 } - Constant [ integer INT8RANGE ] { 3926 } - Constant [ integer INT8RANGEARRAY ] { 3927 } - Constant [ integer RECORD ] { 2249 } - Constant [ integer RECORDARRAY ] { 2287 } - Constant [ integer CSTRING ] { 2275 } - Constant [ integer ANY ] { 2276 } - Constant [ integer ANYARRAY ] { 2277 } - Constant [ integer VOID ] { 2278 } - Constant [ integer TRIGGER ] { 2279 } - Constant [ integer EVENT_TRIGGER ] { 3838 } - Constant [ integer LANGUAGE_HANDLER ] { 2280 } - Constant [ integer INTERNAL ] { 2281 } - Constant [ integer OPAQUE ] { 2282 } - Constant [ integer ANYELEMENT ] { 2283 } - Constant [ integer ANYNONARRAY ] { 2776 } - Constant [ integer ANYENUM ] { 3500 } - Constant [ integer FDW_HANDLER ] { 3115 } - Constant [ integer ANYRANGE ] { 3831 } - } - - - Static properties [0] { - } - - - Static methods [0] { - } - - - Properties [1] { - Property [ <default> public $connection ] - } - - - Methods [2] { - Method [ <internal:pq, ctor> public method __construct ] { - - - Parameters [2] { - Parameter #0 [ <required> pq\Connection $connection ] - Parameter #1 [ <optional> array or NULL $namespaces ] - } - } - - Method [ <internal:pq> public method refresh ] { - - - Parameters [1] { - Parameter #0 [ <optional> array or NULL $namespaces ] - } - } - } - } - - Class [ <internal:pq> <iterateable> class pq\Result implements Traversable, Countable ] { - - - Constants [21] { - Constant [ integer EMPTY_QUERY ] { 0 } - Constant [ integer COMMAND_OK ] { 1 } - Constant [ integer TUPLES_OK ] { 2 } - Constant [ integer COPY_OUT ] { 3 } - Constant [ integer COPY_IN ] { 4 } - Constant [ integer BAD_RESPONSE ] { 5 } - Constant [ integer NONFATAL_ERROR ] { 6 } - Constant [ integer FATAL_ERROR ] { 7 } - Constant [ integer COPY_BOTH ] { 8 } - Constant [ integer SINGLE_TUPLE ] { 9 } - Constant [ integer FETCH_ARRAY ] { 0 } - Constant [ integer FETCH_ASSOC ] { 1 } - Constant [ integer FETCH_OBJECT ] { 2 } - Constant [ integer CONV_BOOL ] { 1 } - Constant [ integer CONV_INT ] { 2 } - Constant [ integer CONV_FLOAT ] { 4 } - Constant [ integer CONV_SCALAR ] { 15 } - Constant [ integer CONV_ARRAY ] { 16 } - Constant [ integer CONV_DATETIME ] { 32 } - Constant [ integer CONV_JSON ] { 256 } - Constant [ integer CONV_ALL ] { 65535 } - } - - - Static properties [0] { - } - - - Static methods [0] { - } - - - Properties [9] { - Property [ <default> public $status ] - Property [ <default> public $statusMessage ] - Property [ <default> public $errorMessage ] - Property [ <default> public $diag ] - Property [ <default> public $numRows ] - Property [ <default> public $numCols ] - Property [ <default> public $affectedRows ] - Property [ <default> public $fetchType ] - Property [ <default> public $autoConvert ] - } - - - Methods [9] { - Method [ <internal:pq> public method bind ] { - - - Parameters [2] { - Parameter #0 [ <required> $col ] - Parameter #1 [ <required> &$ref ] - } - } - - Method [ <internal:pq> public method fetchBound ] { - - - Parameters [0] { - } - } - - Method [ <internal:pq> public method fetchRow ] { - - - Parameters [1] { - Parameter #0 [ <optional> $fetch_type ] - } - } - - Method [ <internal:pq> public method fetchCol ] { - - - Parameters [2] { - Parameter #0 [ <required> &$ref ] - Parameter #1 [ <optional> $col ] - } - } - - Method [ <internal:pq> public method fetchAll ] { - - - Parameters [1] { - Parameter #0 [ <optional> $fetch_type ] - } - } - - Method [ <internal:pq> public method fetchAllCols ] { - - - Parameters [1] { - Parameter #0 [ <optional> $col ] - } - } - - Method [ <internal:pq, prototype Countable> public method count ] { - - - Parameters [0] { - } - } - - Method [ <internal:pq> public method map ] { - - - Parameters [3] { - Parameter #0 [ <optional> $keys ] - Parameter #1 [ <optional> $vals ] - Parameter #2 [ <optional> $fetch_type ] - } - } - - Method [ <internal:pq> public method desc ] { - - - Parameters [0] { - } - } - } - } - - Class [ <internal:pq> class pq\Statement ] { - - - Constants [0] { - } - - - Static properties [0] { - } - - - Static methods [0] { - } - - - Properties [4] { - Property [ <default> public $name ] - Property [ <default> public $connection ] - Property [ <default> public $query ] - Property [ <default> public $types ] - } - - - Methods [10] { - Method [ <internal:pq, ctor> public method __construct ] { - - - Parameters [5] { - Parameter #0 [ <required> pq\Connection $connection ] - Parameter #1 [ <required> $name ] - Parameter #2 [ <required> $query ] - Parameter #3 [ <optional> array or NULL $types ] - Parameter #4 [ <optional> $async ] - } - } - - Method [ <internal:pq> public method bind ] { - - - Parameters [2] { - Parameter #0 [ <required> $param_no ] - Parameter #1 [ <required> &$param_ref ] - } - } - - Method [ <internal:pq> public method deallocate ] { - - - Parameters [0] { - } - } - - Method [ <internal:pq> public method deallocateAsync ] { - - - Parameters [0] { - } - } - - Method [ <internal:pq> public method desc ] { - - - Parameters [0] { - } - } - - Method [ <internal:pq> public method descAsync ] { - - - Parameters [1] { - Parameter #0 [ <required> $callable ] - } - } - - Method [ <internal:pq> public method exec ] { - - - Parameters [1] { - Parameter #0 [ <optional> array or NULL $params ] - } - } - - Method [ <internal:pq> public method execAsync ] { - - - Parameters [2] { - Parameter #0 [ <optional> array or NULL $params ] - Parameter #1 [ <optional> $callable ] - } - } - - Method [ <internal:pq> public method prepare ] { - - - Parameters [0] { - } - } - - Method [ <internal:pq> public method prepareAsync ] { - - - Parameters [0] { - } - } - } - } - - Class [ <internal:pq> class pq\Transaction ] { - - - Constants [3] { - Constant [ integer READ_COMMITTED ] { 0 } - Constant [ integer REPEATABLE_READ ] { 1 } - Constant [ integer SERIALIZABLE ] { 2 } - } - - - Static properties [0] { - } - - - Static methods [0] { - } - - - Properties [4] { - Property [ <default> public $connection ] - Property [ <default> public $isolation ] - Property [ <default> public $readonly ] - Property [ <default> public $deferrable ] - } - - - Methods [16] { - Method [ <internal:pq, ctor> public method __construct ] { - - - Parameters [5] { - Parameter #0 [ <required> pq\Connection $connection ] - Parameter #1 [ <optional> $async ] - Parameter #2 [ <optional> $isolation ] - Parameter #3 [ <optional> $readonly ] - Parameter #4 [ <optional> $deferrable ] - } - } - - Method [ <internal:pq> public method commit ] { - - - Parameters [0] { - } - } - - Method [ <internal:pq> public method rollback ] { - - - Parameters [0] { - } - } - - Method [ <internal:pq> public method commitAsync ] { - - - Parameters [0] { - } - } - - Method [ <internal:pq> public method rollbackAsync ] { - - - Parameters [0] { - } - } - - Method [ <internal:pq> public method savepoint ] { - - - Parameters [0] { - } - } - - Method [ <internal:pq> public method savepointAsync ] { - - - Parameters [0] { - } - } - - Method [ <internal:pq> public method exportSnapshot ] { - - - Parameters [0] { - } - } - - Method [ <internal:pq> public method exportSnapshotAsync ] { - - - Parameters [0] { - } - } - - Method [ <internal:pq> public method importSnapshot ] { - - - Parameters [1] { - Parameter #0 [ <required> $snapshot_id ] - } - } - - Method [ <internal:pq> public method importSnapshotAsync ] { - - - Parameters [1] { - Parameter #0 [ <required> $snapshot_id ] - } - } - - Method [ <internal:pq> public method openLOB ] { - - - Parameters [2] { - Parameter #0 [ <required> $oid ] - Parameter #1 [ <optional> $mode ] - } - } - - Method [ <internal:pq> public method createLOB ] { - - - Parameters [1] { - Parameter #0 [ <optional> $mode ] - } - } - - Method [ <internal:pq> public method unlinkLOB ] { - - - Parameters [1] { - Parameter #0 [ <required> $oid ] - } - } - - Method [ <internal:pq> public method importLOB ] { - - - Parameters [2] { - Parameter #0 [ <required> $local_path ] - Parameter #1 [ <optional> $oid ] - } - } - - Method [ <internal:pq> public method exportLOB ] { - - - Parameters [2] { - Parameter #0 [ <required> $oid ] - Parameter #1 [ <required> $local_path ] - } - } - } - } - - Class [ <internal:pq> class pq\Cursor ] { - - - Constants [5] { - Constant [ integer BINARY ] { 1 } - Constant [ integer INSENSITIVE ] { 2 } - Constant [ integer WITH_HOLD ] { 4 } - Constant [ integer SCROLL ] { 16 } - Constant [ integer NO_SCROLL ] { 32 } - } - - - Static properties [0] { - } - - - Static methods [0] { - } - - - Properties [4] { - Property [ <default> public $name ] - Property [ <default> public $connection ] - Property [ <default> public $query ] - Property [ <default> public $flags ] - } - - - Methods [9] { - Method [ <internal:pq, ctor> public method __construct ] { - - - Parameters [5] { - Parameter #0 [ <required> pq\Connection $connection ] - Parameter #1 [ <required> $name ] - Parameter #2 [ <required> $flags ] - Parameter #3 [ <required> $query ] - Parameter #4 [ <optional> $async ] - } - } - - Method [ <internal:pq> public method open ] { - - - Parameters [0] { - } - } - - Method [ <internal:pq> public method openAsync ] { - - - Parameters [0] { - } - } - - Method [ <internal:pq> public method close ] { - - - Parameters [0] { - } - } - - Method [ <internal:pq> public method closeAsync ] { - - - Parameters [0] { - } - } - - Method [ <internal:pq> public method fetch ] { - - - Parameters [1] { - Parameter #0 [ <required> $spec ] - } - } - - Method [ <internal:pq> public method move ] { - - - Parameters [1] { - Parameter #0 [ <optional> $spec ] - } - } - - Method [ <internal:pq> public method fetchAsync ] { - - - Parameters [2] { - Parameter #0 [ <optional> $spec ] - Parameter #1 [ <optional> $callback ] - } - } - - Method [ <internal:pq> public method moveAsync ] { - - - Parameters [2] { - Parameter #0 [ <optional> $spec ] - Parameter #1 [ <optional> $callback ] - } - } - } - } - - Class [ <internal:pq> class pq\COPY ] { - - - Constants [2] { - Constant [ integer FROM_STDIN ] { 0 } - Constant [ integer TO_STDOUT ] { 1 } - } - - - Static properties [0] { - } - - - Static methods [0] { - } - - - Properties [4] { - Property [ <default> public $connection ] - Property [ <default> public $expression ] - Property [ <default> public $direction ] - Property [ <default> public $options ] - } - - - Methods [4] { - Method [ <internal:pq, ctor> public method __construct ] { - - - Parameters [4] { - Parameter #0 [ <required> pq\Connection $connection ] - Parameter #1 [ <required> $expression ] - Parameter #2 [ <required> $direction ] - Parameter #3 [ <optional> $options ] - } - } - - Method [ <internal:pq> public method put ] { - - - Parameters [1] { - Parameter #0 [ <required> $data ] - } - } - - Method [ <internal:pq> public method end ] { - - - Parameters [1] { - Parameter #0 [ <optional> $error ] - } - } - - Method [ <internal:pq> public method get ] { - - - Parameters [1] { - Parameter #0 [ <required> &$data ] - } - } - } - } - - Class [ <internal:pq> class pq\LOB ] { - - - Constants [4] { - Constant [ integer INVALID_OID ] { 0 } - Constant [ integer R ] { 262144 } - Constant [ integer W ] { 131072 } - Constant [ integer RW ] { 393216 } - } - - - Static properties [0] { - } - - - Static methods [0] { - } - - - Properties [3] { - Property [ <default> public $transaction ] - Property [ <default> public $oid ] - Property [ <default> public $stream ] - } - - - Methods [6] { - Method [ <internal:pq, ctor> public method __construct ] { - - - Parameters [3] { - Parameter #0 [ <required> pq\Transaction $transaction ] - Parameter #1 [ <optional> $oid ] - Parameter #2 [ <optional> $mode ] - } - } - - Method [ <internal:pq> public method write ] { - - - Parameters [1] { - Parameter #0 [ <required> $data ] - } - } - - Method [ <internal:pq> public method read ] { - - - Parameters [2] { - Parameter #0 [ <optional> $length ] - Parameter #1 [ <optional> &$read ] - } - } - - Method [ <internal:pq> public method seek ] { - - - Parameters [2] { - Parameter #0 [ <required> $offset ] - Parameter #1 [ <optional> $whence ] - } - } - - Method [ <internal:pq> public method tell ] { - - - Parameters [0] { - } - } - - Method [ <internal:pq> public method truncate ] { - - - Parameters [1] { - Parameter #0 [ <optional> $length ] - } - } - } - } - } -} - diff --git a/php-pecl-pq-php7.spec b/php-pecl-pq-php7.spec deleted file mode 100644 index 46067f7..0000000 --- a/php-pecl-pq-php7.spec +++ /dev/null @@ -1,378 +0,0 @@ -# remirepo spec file for php-pecl-pq -# -# Copyright (c) 2014-2017 Remi Collet -# License: CC-BY-SA -# http://creativecommons.org/licenses/by-sa/4.0/ -# -# Please, preserve the changelog entries -# -%if 0%{?scl:1} -%global sub_prefix %{scl_prefix} -%scl_package php-pecl-pq -%endif - -%global gh_commit e381164032a750583657e449875f62d52b7b6609 -%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_owner m6w6 -%global gh_project ext-pq -#global gh_date 20150819 -%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} -%global pecl_name pq -#global prever RC1 -%if %{?runselftest}%{!?runselftest:1} -# Build using "--without tests" to disable tests -%global with_tests 0%{!?_without_tests:1} -%else -# Build using "--with tests" to enable tests -%global with_tests 0%{?_with_tests:1} -%endif -%if "%{php_version}" < "5.6" -# After raph, json -%global ini_name z-%{pecl_name}.ini -%else -# After 40-json, 40-raphf -%global ini_name 50-%{pecl_name}.ini -%endif - -Summary: PostgreSQL client library (libpq) binding -Name: %{?sub_prefix}php-pecl-%{pecl_name} -Version: 2.1.1 -%if 0%{?gh_date:1} -Release: 0.5.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} -Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz -%else -Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} -Source0: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz -%endif -License: BSD -Group: Development/Languages -URL: http://pecl.php.net/package/%{pecl_name} - -Patch0: %{pecl_name}-upstream.patch - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: postgresql-devel > 9 -BuildRequires: %{?scl_prefix}php-devel > 7 -BuildRequires: %{?scl_prefix}php-pear -BuildRequires: %{?scl_prefix}php-json -BuildRequires: %{?sub_prefix}php-pecl-raphf-devel >= 1.1.0 -%if %{with_tests} -BuildRequires: postgresql-server -BuildRequires: postgresql-contrib -%endif - -Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} -Requires: %{?scl_prefix}php(api) = %{php_core_api} -Requires: %{?scl_prefix}php-json%{?_isa} -Requires: %{?sub_prefix}php-raphf%{?_isa} >= 1.1.0 -%{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}} - -Provides: %{?scl_prefix}php-%{pecl_name} = %{version} -Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} -Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} -Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} -%if "%{?scl_prefix}" != "%{?sub_prefix}" -Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release} -Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release} -%endif - -%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} -# Other third party repo stuff -Obsoletes: php54-pecl-%{pecl_name} <= %{version} -Obsoletes: php54w-pecl-%{pecl_name} <= %{version} -Obsoletes: php55u-pecl-%{pecl_name} <= %{version} -Obsoletes: php55w-pecl-%{pecl_name} <= %{version} -Obsoletes: php56u-pecl-%{pecl_name} <= %{version} -Obsoletes: php56w-pecl-%{pecl_name} <= %{version} -Obsoletes: php70u-pecl-%{pecl_name} <= %{version} -Obsoletes: php70w-pecl-%{pecl_name} <= %{version} -%if "%{php_version}" > "7.1" -Obsoletes: php71u-pecl-%{pecl_name} <= %{version} -Obsoletes: php71w-pecl-%{pecl_name} <= %{version} -%endif -%endif - -%if 0%{?fedora} < 20 && 0%{?rhel} < 7 -# Filter shared private -%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$} -%{?filter_setup} -%endif - - -%description -PostgreSQL client library (libpq) binding. - -Documents: http://devel-m6w6.rhcloud.com/mdref/pq - -Highlights: -* Nearly complete support for asynchronous usage -* Extended type support by pg_type -* Fetching simple multi-dimensional array maps -* Working Gateway implementation - -Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl} by %{?scl_vendor}%{!?scl_vendor:rh})}. - - -%prep -%setup -q -c -%if 0%{?ghdate} -mv %{gh_project}-%{gh_commit} NTS -mv NTS/package.xml . -%else -mv %{pecl_name}-%{version}%{?prever} NTS -%endif - -# Don't install tests -sed -e '/role="test"/d' \ - %{?_licensedir: -e '/LICENSE/s/role="doc"/role="src"/' }\ - -i package.xml - -cd NTS -%patch0 -p1 -b .upstream - -# Sanity check, really often broken -extver=$(sed -n '/#define PHP_PQ_VERSION/{s/.* "//;s/".*$//;p}' php_pq.h) -if test "x${extver}" != "x%{version}%{?prever}"; then - : Error: Upstream extension version is ${extver}, expecting %{version}%{?prever}. - exit 1 -fi -cd .. - -%if %{with_zts} -# Duplicate source tree for NTS / ZTS build -cp -pr NTS ZTS -%endif - -# Create configuration file -cat << 'EOF' | tee %{ini_name} -; Enable "%{summary}" extension module -extension=%{pecl_name}.so -EOF - - -%build -cd NTS -%{_bindir}/phpize -%configure \ - --with-libdir=%{_lib} \ - --with-php-config=%{_bindir}/php-config -make %{?_smp_mflags} - -%if %{with_zts} -cd ../ZTS -%{_bindir}/zts-phpize -%configure \ - --with-libdir=%{_lib} \ - --with-php-config=%{_bindir}/zts-php-config -make %{?_smp_mflags} -%endif - - -%install -rm -rf %{buildroot} - -make -C NTS install INSTALL_ROOT=%{buildroot} - -# install config file -install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} - -# Install XML package description -install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml - -%if %{with_zts} -make -C ZTS install INSTALL_ROOT=%{buildroot} - -install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} -%endif - -# Documentation -for i in $(grep 'role="doc"' package.xml | sed -e 's/^.*name="//;s/".*$//') -do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i -done - - -%if 0%{?fedora} < 24 -# when pear installed alone, after us -%triggerin -- %{?scl_prefix}php-pear -if [ -x %{__pecl} ] ; then - %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : -fi - -# posttrans as pear can be installed after us -%posttrans -if [ -x %{__pecl} ] ; then - %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : -fi - -%postun -if [ $1 -eq 0 -a -x %{__pecl} ] ; then - %{pecl_uninstall} %{pecl_name} >/dev/null || : -fi -%endif - - -%check -if ! pkg-config libpq --atleast-version=9.3; then - : ignore some tests only because of "diag" content - rm ?TS/tests/{async003,async004,async005,async006,cancel001}.phpt -fi - -OPT="-n" -[ -f %{php_extdir}/json.so ] && OPT="$OPT -d extension=json.so" -[ -f %{php_extdir}/raphf.so ] && OPT="$OPT -d extension=raphf.so" - -: Minimal load test for NTS extension -%{__php} $OPT \ - --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \ - --modules | grep %{pecl_name} - -%if %{with_zts} -: Minimal load test for ZTS extension -%{__ztsphp} $OPT \ - --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \ - --modules | grep %{pecl_name} -%endif - -%if %{with_tests} -RET=0 - -: Running a server -DATABASE=$PWD/data -%ifarch x86_64 -PORT=5440 -%else -PORT=5436 -%endif -pg_ctl initdb -D $DATABASE -cat <<EOF >>$DATABASE/postgresql.conf -unix_socket_directories = '$DATABASE' -port = $PORT -EOF -pg_ctl -D $DATABASE -l $DATABASE/log -w -t 200 start -createdb -h localhost -p $PORT rpmtest - -cd NTS -sed -e "/PQ_DSN/s/\"host.*\"/'host=localhost port=$PORT dbname=rpmtest'/" \ - -i tests/_setup.inc - -: Upstream test suite for NTS extension -TEST_PHP_EXECUTABLE=%{__php} \ -TEST_PHP_ARGS="$OPT -d extension=$PWD/modules/%{pecl_name}.so" \ -NO_INTERACTION=1 \ -REPORT_EXIT_STATUS=1 \ -%{__php} -n run-tests.php --show-diff || RET=1 - -%if %{with_zts} -cd ../ZTS -sed -e "/PQ_DSN/s/\"host.*\"/'host=localhost port=$PORT dbname=rpmtest'/" \ - -i tests/_setup.inc - -: Upstream test suite for ZTS extension -TEST_PHP_EXECUTABLE=%{_bindir}/zts-php \ -TEST_PHP_ARGS="$OPT -d extension=$PWD/modules/%{pecl_name}.so" \ -NO_INTERACTION=1 \ -REPORT_EXIT_STATUS=1 \ -%{_bindir}/zts-php -n run-tests.php --show-diff || RET=1 -%endif - -cd .. -: Cleanup -psql -h localhost -p $PORT -c "SELECT version()" rpmtest -pg_ctl -D $DATABASE -w stop -rm -rf $DATABASE - -exit $RET -%endif - - -%clean -rm -rf %{buildroot} - - -%files -%defattr(-,root,root,-) -%doc %{pecl_docdir}/%{pecl_name} -%{?_licensedir:%license NTS/LICENSE} - -%{pecl_xmldir}/%{name}.xml -%config(noreplace) %{php_inidir}/%{ini_name} -%{php_extdir}/%{pecl_name}.so - -%if %{with_zts} -%config(noreplace) %{php_ztsinidir}/%{ini_name} -%{php_ztsextdir}/%{pecl_name}.so -%endif - - -%changelog -* Thu Dec 1 2016 Remi Collet <remi@fedoraproject.org> - 2.1.1-4 -- rebuild with PHP 7.1.0 GA - -* Tue Nov 15 2016 Remi Collet <remi@fedoraproject.org> - 2.1.1-3 -- add upstream patch for 7.1 - https://github.com/m6w6/ext-pq/issues/23 - -* Wed Sep 14 2016 Remi Collet <remi@fedoraproject.org> - 2.1.1-2 -- rebuild for PHP 7.1 new API version - -* Fri May 20 2016 Remi Collet <remi@fedoraproject.org> - 2.1.1-1 -- update to 2.1.1 (php 7, stable) -- open https://github.com/m6w6/ext-pq/issues/19 failed tests - so temporarily ignore them with pgsql < 9.3 - -* Fri May 20 2016 Remi Collet <remi@fedoraproject.org> - 2.1.0-1 -- update to 2.1.0 (php 7, stable) -- open https://github.com/m6w6/ext-pq/issues/18 pgsql < 9.3 - -* Wed May 4 2016 Remi Collet <remi@fedoraproject.org> - 2.0.1-1 -- update to 2.0.1 (php 7, stable) - -* Sun Mar 6 2016 Remi Collet <remi@fedoraproject.org> - 2.0.0-2 -- adapt for F24 - -* Thu Jan 21 2016 Remi Collet <remi@fedoraproject.org> - 2.0.0-1 -- Update to 2.0.0 (stable) - -* Mon Dec 7 2015 Remi Collet <remi@fedoraproject.org> - 2.0.0-0.5.RC1 -- Update to 2.0.0RC1 (beta) -- sources from pecl tarball - -* Tue Oct 13 2015 Remi Collet <remi@fedoraproject.org> - 2.0.0-0.4.20150819gite381164 -- rebuild for PHP 7.0.0RC5 new API version - -* Fri Sep 18 2015 Remi Collet <remi@fedoraproject.org> - 2.0.0-0.3.20150819gite381164 -- F23 rebuild with rh_layout - -* Tue Aug 25 2015 Remi Collet <remi@fedoraproject.org> - 2.0.0-0.2.20150819gite381164 -- really drop dependency on pear - -* Tue Aug 25 2015 Remi Collet <remi@fedoraproject.org> - 2.0.0-0.1.20150819gite381164 -- update to 2.0.0dev for PHP 7 -- sources from github - -* Wed Jul 29 2015 Remi Collet <remi@fedoraproject.org> - 0.6.0-0.3.RC2 -- allow build against rh-php56 (as more-php56) - -* Tue Jul 28 2015 Remi Collet <remi@fedoraproject.org> - 0.6.0-0.2.RC2 -- Update to 0.6.0RC2 (beta) -- raise dependency on raphf 1.1.0 - -* Wed Jun 10 2015 Remi Collet <remi@fedoraproject.org> - 0.6.0-0.1.RC1 -- Update to 0.6.0RC1 -- drop runtime dependency on pear, new scriptlets - -* Wed Dec 24 2014 Remi Collet <remi@fedoraproject.org> - 0.5.5-1.1 -- Fedora 21 SCL mass rebuild - -* Sat Oct 25 2014 Remi Collet <remi@fedoraproject.org> - 0.5.5-1 -- Update to 0.5.5 - -* Sat Oct 18 2014 Remi Collet <remi@fedoraproject.org> - 0.5.2-2 -- launch a postgresql server for test -- enable upstream test suite during build - -* Fri Oct 17 2014 Remi Collet <remi@fedoraproject.org> - 0.5.2-1 -- Update to 0.5.2 - -* Thu Oct 16 2014 Remi Collet <remi@fedoraproject.org> - 0.5.1-1 -- initial package, version 0.5.1 (beta) diff --git a/php-pecl-pq.spec b/php-pecl-pq.spec index 9de4d80..77886aa 100644 --- a/php-pecl-pq.spec +++ b/php-pecl-pq.spec @@ -7,17 +7,18 @@ # Please, preserve the changelog entries # %if 0%{?scl:1} -%if "%{scl}" == "rh-php56" -%global sub_prefix more-php56- -%else %global sub_prefix %{scl_prefix} -%endif %scl_package php-pecl-pq %endif -%global with_zts 0%{?__ztsphp:1} +%global gh_commit e381164032a750583657e449875f62d52b7b6609 +%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) +%global gh_owner m6w6 +%global gh_project ext-pq +#global gh_date 20150819 +%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global pecl_name pq -#global rcver RC1 +#global prever RC1 %if %{?runselftest}%{!?runselftest:1} # Build using "--without tests" to disable tests %global with_tests 0%{!?_without_tests:1} @@ -35,20 +36,23 @@ Summary: PostgreSQL client library (libpq) binding Name: %{?sub_prefix}php-pecl-%{pecl_name} -Version: 1.1.1 -%if 0%{?rcver:1} -Release: 0.1.%{rcver}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Version: 2.1.1 +%if 0%{?gh_date:1} +Release: 0.5.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz %else -Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 5%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Source0: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz %endif License: BSD Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} -Source0: http://pecl.php.net/get/%{pecl_name}-%{version}%{?rcver}.tgz + +Patch0: %{pecl_name}-upstream.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: postgresql-devel > 9 -BuildRequires: %{?scl_prefix}php-devel > 5.4 +BuildRequires: %{?scl_prefix}php-devel > 7 BuildRequires: %{?scl_prefix}php-pear BuildRequires: %{?scl_prefix}php-json BuildRequires: %{?sub_prefix}php-pecl-raphf-devel >= 1.1.0 @@ -74,17 +78,21 @@ Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{rele %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} # Other third party repo stuff -Obsoletes: php53-pecl-%{pecl_name} <= %{version} -Obsoletes: php53u-pecl-%{pecl_name} <= %{version} Obsoletes: php54-pecl-%{pecl_name} <= %{version} Obsoletes: php54w-pecl-%{pecl_name} <= %{version} -%if "%{php_version}" > "5.5" Obsoletes: php55u-pecl-%{pecl_name} <= %{version} Obsoletes: php55w-pecl-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "5.6" Obsoletes: php56u-pecl-%{pecl_name} <= %{version} Obsoletes: php56w-pecl-%{pecl_name} <= %{version} +Obsoletes: php70u-pecl-%{pecl_name} <= %{version} +Obsoletes: php70w-pecl-%{pecl_name} <= %{version} +%if "%{php_version}" > "7.1" +Obsoletes: php71u-pecl-%{pecl_name} <= %{version} +Obsoletes: php71w-pecl-%{pecl_name} <= %{version} +%endif +%if "%{php_version}" > "7.2" +Obsoletes: php72u-pecl-%{pecl_name} <= %{version} +Obsoletes: php72w-pecl-%{pecl_name} <= %{version} %endif %endif @@ -111,19 +119,25 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO %prep %setup -q -c -mv %{pecl_name}-%{version}%{?rcver} NTS +%if 0%{?ghdate} +mv %{gh_project}-%{gh_commit} NTS +mv NTS/package.xml . +%else +mv %{pecl_name}-%{version}%{?prever} NTS +%endif # Don't install tests -sed -e 's/role="test"/role="src"/' \ - %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \ +sed -e '/role="test"/d' \ + %{?_licensedir: -e '/LICENSE/s/role="doc"/role="src"/' }\ -i package.xml cd NTS +%patch0 -p1 -b .upstream # Sanity check, really often broken extver=$(sed -n '/#define PHP_PQ_VERSION/{s/.* "//;s/".*$//;p}' php_pq.h) -if test "x${extver}" != "x%{version}%{?rcver}"; then - : Error: Upstream extension version is ${extver}, expecting %{version}%{?rcver}. +if test "x${extver}" != "x%{version}%{?prever}"; then + : Error: Upstream extension version is ${extver}, expecting %{version}%{?prever}. exit 1 fi cd .. @@ -281,10 +295,10 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%{?_licensedir:%license NTS/LICENSE} %doc %{pecl_docdir}/%{pecl_name} -%{pecl_xmldir}/%{name}.xml +%{?_licensedir:%license NTS/LICENSE} +%{pecl_xmldir}/%{name}.xml %config(noreplace) %{php_inidir}/%{ini_name} %{php_extdir}/%{pecl_name}.so @@ -295,29 +309,53 @@ rm -rf %{buildroot} %changelog -* Fri May 20 2016 Remi Collet <remi@fedoraproject.org> - 1.1.1-1 -- update to 1.1.1 (php 5, stable) +* Fri Jun 23 2017 Remi Collet <remi@fedoraproject.org> - 2.1.1-5 +- add upstream patch for 7.2 + +* Thu Dec 1 2016 Remi Collet <remi@fedoraproject.org> - 2.1.1-4 +- rebuild with PHP 7.1.0 GA + +* Tue Nov 15 2016 Remi Collet <remi@fedoraproject.org> - 2.1.1-3 +- add upstream patch for 7.1 + https://github.com/m6w6/ext-pq/issues/23 + +* Wed Sep 14 2016 Remi Collet <remi@fedoraproject.org> - 2.1.1-2 +- rebuild for PHP 7.1 new API version + +* Fri May 20 2016 Remi Collet <remi@fedoraproject.org> - 2.1.1-1 +- update to 2.1.1 (php 7, stable) - open https://github.com/m6w6/ext-pq/issues/19 failed tests so temporarily ignore them with pgsql < 9.3 -* Fri May 20 2016 Remi Collet <remi@fedoraproject.org> - 1.1.0-1 -- update to 1.1.0 (php 5, stable) +* Fri May 20 2016 Remi Collet <remi@fedoraproject.org> - 2.1.0-1 +- update to 2.1.0 (php 7, stable) - open https://github.com/m6w6/ext-pq/issues/18 pgsql < 9.3 -* Wed May 4 2016 Remi Collet <remi@fedoraproject.org> - 1.0.1-1 -- update to 1.0.1 (php 5, stable) +* Wed May 4 2016 Remi Collet <remi@fedoraproject.org> - 2.0.1-1 +- update to 2.0.1 (php 7, stable) -* Tue Mar 8 2016 Remi Collet <remi@fedoraproject.org> - 1.0.0-3 +* Sun Mar 6 2016 Remi Collet <remi@fedoraproject.org> - 2.0.0-2 - adapt for F24 -* Tue Jan 19 2016 Remi Collet <remi@fedoraproject.org> - 1.0.0-1 -- Update to 1.0.0 (stable) +* Thu Jan 21 2016 Remi Collet <remi@fedoraproject.org> - 2.0.0-1 +- Update to 2.0.0 (stable) + +* Mon Dec 7 2015 Remi Collet <remi@fedoraproject.org> - 2.0.0-0.5.RC1 +- Update to 2.0.0RC1 (beta) +- sources from pecl tarball + +* Tue Oct 13 2015 Remi Collet <remi@fedoraproject.org> - 2.0.0-0.4.20150819gite381164 +- rebuild for PHP 7.0.0RC5 new API version + +* Fri Sep 18 2015 Remi Collet <remi@fedoraproject.org> - 2.0.0-0.3.20150819gite381164 +- F23 rebuild with rh_layout -* Mon Dec 7 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.1.RC1 -- Update to 1.0.0RC1 (beta) +* Tue Aug 25 2015 Remi Collet <remi@fedoraproject.org> - 2.0.0-0.2.20150819gite381164 +- really drop dependency on pear -* Sat Sep 5 2015 Remi Collet <remi@fedoraproject.org> - 0.6.0-1 -- Update to 0.6.0 (beta) +* Tue Aug 25 2015 Remi Collet <remi@fedoraproject.org> - 2.0.0-0.1.20150819gite381164 +- update to 2.0.0dev for PHP 7 +- sources from github * Wed Jul 29 2015 Remi Collet <remi@fedoraproject.org> - 0.6.0-0.3.RC2 - allow build against rh-php56 (as more-php56) diff --git a/pq-upstream.patch b/pq-upstream.patch index 6581539..e96dfc9 100644 --- a/pq-upstream.patch +++ b/pq-upstream.patch @@ -80,3 +80,28 @@ index 8533753..b24da0e 100644 ["timezone_type"]=> int(1) ["timezone"]=> +From be621b64a9a5faea34741430db84cfe16b7b40b6 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Fri, 23 Jun 2017 15:24:38 +0200 +Subject: [PATCH] fix pq\DateTime::createFromFormat() proto for 7.2 + +--- + src/php_pq_misc.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/php_pq_misc.c b/src/php_pq_misc.c +index 3f824ed..08f10c3 100644 +--- a/src/php_pq_misc.c ++++ b/src/php_pq_misc.c +@@ -139,7 +139,11 @@ static PHP_METHOD(pqdt, __toString) + ZEND_BEGIN_ARG_INFO_EX(ai_pqdt_create_from_format, 0, 0, 2) + ZEND_ARG_INFO(0, format) + ZEND_ARG_INFO(0, datetime) ++#if PHP_VERSION_ID >= 70200 ++ ZEND_ARG_OBJ_INFO(0, object, DateTimeZone, 1) ++#else + ZEND_ARG_INFO(0, timezone) ++#endif + ZEND_END_ARG_INFO(); + static PHP_METHOD(pqdt, createFromFormat) + { |